GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity
8,717 Commits 8 Branches 4 Tags 310 MiB
212b20e876
Commit Graph

8717 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brion Vibber
0624f7fd70 Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing 2010-03-03 15:44:29 -08:00
Brion Vibber
4a2511139e Initial user role controls on profile pages, for owner to add/remove administrator and moderator options. 
Buttons need to be themed.
 2010-03-03 15:43:49 -08:00
Evan Prodromou
0f1c6e239a Merge branch 'testing' 2010-03-03 18:20:45 -05:00
James Walker
4103e8584c Making one time passwords work on private sites 2010-03-03 18:17:40 -05:00
Brion Vibber
06db00d303 remove debug line 2010-03-03 15:15:46 -08:00
Sarven Capadisli
c16f9754e6 Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing 2010-03-03 17:48:42 -05:00
Sarven Capadisli
b3969be85a Updated remote subscribe button style in aside 2010-03-03 17:48:00 -05:00
Zach Copley
337b1aaaa1 Site-wide notice text admin panel 2010-03-03 14:37:30 -08:00
Brion Vibber
628338265c OStatus: fix up remote join button on group profiles 2010-03-03 14:06:05 -08:00
Brion Vibber
4bad176088 Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing 2010-03-03 13:41:00 -08:00
Brion Vibber
a42d1116db Separate the UI paths for ostatussub and ostatusgroup. They'll redirect to each other transparently if they find you've put a remote entity of the other type. 2010-03-03 13:40:26 -08:00
Sarven Capadisli
2a96d1d59d Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing 2010-03-03 16:27:19 -05:00
Sarven Capadisli
219e15ac64 Returning true instead for group remote subscription. If not logged 
in, it gives the chance to use the logged in join/leave instead.
 2010-03-03 16:26:02 -05:00
Sarven Capadisli
6ff994b14c Fix to group join event position. 2010-03-03 16:25:17 -05:00
Zach Copley
43de781e43 Merge branch 'testing' of gitorious.org:statusnet/mainline into testing 
* 'testing' of gitorious.org:statusnet/mainline:
  quick fix: skip notice from unused variable on group atom feed generation
  Avoid notice on local group creation when uri isn't passed in at create time (needs to be generated)
 2010-03-03 13:06:20 -08:00
Zach Copley
339b0b0a4d Don't expose global Twitter consumer key and secret, because that would be idiotic. 2010-03-03 13:05:11 -08:00
Brion Vibber
c04c8ae59a quick fix: skip notice from unused variable on group atom feed generation 2010-03-03 13:00:09 -08:00
Brion Vibber
7e5bf39f76 Avoid notice on local group creation when uri isn't passed in at create time (needs to be generated) 2010-03-03 12:57:40 -08:00
Sarven Capadisli
5c70481d30 Using the full width for the content area for the admin section. It 
also makes the local navigation's tabs stay in context with the content
 2010-03-03 15:43:02 -05:00
Sarven Capadisli
ef6bf8f331 Removed aside container from output for the admin panel sections 2010-03-03 15:42:34 -05:00
Sarven Capadisli
13713a09bb Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing 2010-03-03 15:31:44 -05:00
Sarven Capadisli
d3c1888256 Generalized style for remote subscription button 2010-03-03 15:31:16 -05:00
Sarven Capadisli
3c55edde39 Showing the remote subscribe button on the user groups page 2010-03-03 15:30:43 -05:00
Sarven Capadisli
2ce9ae004d Added event hooks for before and after user groups content 2010-03-03 15:29:51 -05:00
Zach Copley
c7d390e494 Add class="admin" to the content div of admin panels for styling 2010-03-03 12:18:20 -08:00
Zach Copley
09169d6f3c Merge branch 'testing' of gitorious.org:statusnet/mainline into testing 
* 'testing' of gitorious.org:statusnet/mainline:
  Language setting fixes:
 2010-03-03 12:11:20 -08:00
Zach Copley
82ea0f7884 Merge branch 'testing' of gitorious.org:statusnet/mainline into testing 
* 'testing' of gitorious.org:statusnet/mainline:
  subscribers list wasn't firing correct events
 2010-03-03 12:10:48 -08:00
Brion Vibber
0881eba80e Language setting fixes: 
- switch 'en_US' to 'en', fixes the "admin panel switches to Arabic" bug
- tweak setting descriptions to clarify that most of the time we'll be using browser language
- add a backend switch to disable language detection (should this be exposed to ui?)
 2010-03-03 12:10:43 -08:00
Zach Copley
2f167f2663 Fix syntax errors 2010-03-03 12:10:21 -08:00
Evan Prodromou
c82efb7fd8 subscribers list wasn't firing correct events 2010-03-03 15:09:07 -05:00
Brion Vibber
13521cb510 Merge branch 'testing' of git@gitorious.org:statusnet/mainline 2010-03-03 11:42:02 -08:00
Evan Prodromou
ccd0db1e0a add remote subscribe button for not-logged-in users looking a profile list with local users in it 2010-03-03 14:32:03 -05:00
Brion Vibber
33af29b47c Fix for 4113f2884113f288: show regular subscribe form for all non-OMB profiles. We can't initiate remote sub for an OMB from our end, so dropping there. 2010-03-03 19:22:22 +00:00
Brion Vibber
3bb42d1170 Use poster's subscribed groups to disambiguate group linking when a remote group and a local group exist with the same name. (If you're a member of two groups with the same name though, there's not a defined winner.) 2010-03-03 19:00:02 +00:00
Sarven Capadisli
e6fd387c94 Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing 2010-03-03 13:38:31 -05:00
Sarven Capadisli
023b9bb00f Renamed subscribe button from New to Remote since it only does remote 
subscriptions at the moment.
 2010-03-03 13:30:14 -05:00
Zach Copley
a82cd89a97 Merge branch 'testing' of gitorious.org:statusnet/mainline into testing 
* 'testing' of gitorious.org:statusnet/mainline:
  Using position relative only for the remote subscription in section
  Added group subscription button to groups mini list
  Added event hooks at the start and end of groups mini list
 2010-03-03 10:28:45 -08:00
Zach Copley
61ada4558d Fix for disappearing 'connect' menu if xmpp and sms are disabled. 
All 'connect' menu panels used to be optional, so Action tried to
figure out what the first item on the 'connect' menu should be.
This is no longer necessary because we have the non-optional OAuth
client connections panel now, which is not optional and can't be
turned off.
 2010-03-03 10:19:14 -08:00
Sarven Capadisli
7d7847295a Using position relative only for the remote subscription in section 2010-03-03 13:17:00 -05:00
Brion Vibber
e793b5661c Merge branch 'master' of git@gitorious.org:statusnet/mainline 2010-03-03 09:57:08 -08:00
Sarven Capadisli
2c9887bce5 Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing 2010-03-03 12:57:03 -05:00
Sarven Capadisli
c8bdf3cacb Added group subscription button to groups mini list 2010-03-03 12:56:19 -05:00
Sarven Capadisli
15574c59de Added event hooks at the start and end of groups mini list 2010-03-03 12:55:01 -05:00
Brion Vibber
7313cd9094 Merge branch 'testing' of git@gitorious.org:statusnet/mainline 
Conflicts:
	plugins/OStatus/OStatusPlugin.php
 2010-03-03 09:53:38 -08:00
Zach Copley
8a58b52a68 Merge branch 'twitter-facebook-mods' 
* twitter-facebook-mods:
  Make Facebook plugin look for API key and secret before doing anything
  Show global key and secret, if defined, in Twitter bridge admin panel
  Remove double word from Twitter bridge README
  - Have Twitter bridge check for a global key and secret if it can't
  stupid mistake... let's not talk about this.
  Updated some references to the long gnone "isEnclosure" function to the new "getEnclosure"
  Update Facebook plugin README with info about new admin panel
  Initial Facebook admin panel
  Some wording / spelling fixes
  - Make 'Sign in with Twitter' optional
  Remove un-needed config variable for enabling/disabling Twitter integration
  Initial Twitter bridge admin panel
  Upgrade XML output scrubbing to better deal with newline and a few other chars
 2010-03-03 09:53:16 -08:00
Zach Copley
4aa516db45 Make Facebook plugin look for API key and secret before doing anything 2010-03-03 09:52:25 -08:00
Zach Copley
ecccb344e0 Show global key and secret, if defined, in Twitter bridge admin panel 2010-03-03 09:52:25 -08:00
Zach Copley
9342e6f818 Remove double word from Twitter bridge README 2010-03-03 09:52:24 -08:00
Zach Copley
ca86a4efb8 - Have Twitter bridge check for a global key and secret if it can't 
find one in the local config
- Refuse to work at all if the consumer key and secret aren't set
 2010-03-03 09:52:24 -08:00
Craig Andrews
b1e172a3d9 stupid mistake... let's not talk about this. 2010-03-03 09:52:24 -08:00