f54fa6b10b
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-03-03 23:36:05 -05:00
38503096d9
Puts All groups and Remote sub button in the mini list on the same line
2010-03-03 23:34:48 -05:00
1c8399fde1
refactor xrd to allow for ownerxrd - xrd document for the site owner.
...
introduced $config['webfinger']['owner'] for a custom xrd subject
2010-03-03 23:20:30 -05:00
239750aa00
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-03-03 22:58:28 -05:00
de687d00c0
Updated OStatus subscription error messages to be more user friendly.
...
Hopefully.
2010-03-03 22:56:50 -05:00
24835c1164
OStatus: catchable exception instead of fatal when parsing valid XML that isn't a valid XRD doc
2010-03-03 18:31:35 -08:00
14065ca350
OStatus: code cleanup on webfinger fallback path
2010-03-03 18:28:39 -08:00
a4d9171306
Fix up catching of webfinger setup fails
2010-03-03 18:23:28 -08:00
6a5a629afa
Updated label and note text for user and group remote subscribe forms
2010-03-03 20:08:55 -05:00
1761b185bf
Removed clipboard icon from core
2010-03-03 19:53:09 -05:00
0994589b73
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-03-03 19:52:28 -05:00
a26d23b395
Changed clipboard icon to magic wand for user role button
2010-03-03 19:51:41 -05:00
61de37ec7b
Move snapshot configuration to its own admin panel
...
Turn on with: $config['admin']['panels'][] = 'snapshot';
2010-03-03 16:49:14 -08:00
8436306d28
Fix notice warning in RSS friends timeline
2010-03-03 16:38:51 -08:00
9fadf8da11
Put all required field setup into AtomUserNoticeFeed and AtomGroupNoticeFeed, consolidating some code. (RSS feeds pulling title, logo etc from the Atom data structure so we don't dupe it.)
...
OStatus now calling the feed classes directly instead of faking a call into the API, should be less flakey.
2010-03-03 16:33:20 -08:00
04e474c98c
Updated icons README
2010-03-03 19:29:59 -05:00
6ebc0f8723
Updated identica theme for User Role styles
2010-03-03 19:28:54 -05:00
610238442e
Added styles for User Role
2010-03-03 19:24:18 -05:00
0624f7fd70
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-03-03 15:44:29 -08:00
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
4103e8584c
Making one time passwords work on private sites
2010-03-03 18:17:40 -05:00
06db00d303
remove debug line
2010-03-03 15:15:46 -08:00
c16f9754e6
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-03-03 17:48:42 -05:00
b3969be85a
Updated remote subscribe button style in aside
2010-03-03 17:48:00 -05:00
337b1aaaa1
Site-wide notice text admin panel
2010-03-03 14:37:30 -08:00
628338265c
OStatus: fix up remote join button on group profiles
2010-03-03 14:06:05 -08:00
4bad176088
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-03-03 13:41:00 -08:00
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
2a96d1d59d
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-03-03 16:27:19 -05:00
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
6ff994b14c
Fix to group join event position.
2010-03-03 16:25:17 -05:00
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
339b0b0a4d
Don't expose global Twitter consumer key and secret, because that would be idiotic.
2010-03-03 13:05:11 -08:00
c04c8ae59a
quick fix: skip notice from unused variable on group atom feed generation
2010-03-03 13:00:09 -08:00
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
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
ef6bf8f331
Removed aside container from output for the admin panel sections
2010-03-03 15:42:34 -05:00
13713a09bb
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-03-03 15:31:44 -05:00
d3c1888256
Generalized style for remote subscription button
2010-03-03 15:31:16 -05:00
3c55edde39
Showing the remote subscribe button on the user groups page
2010-03-03 15:30:43 -05:00
2ce9ae004d
Added event hooks for before and after user groups content
2010-03-03 15:29:51 -05:00
c7d390e494
Add class="admin" to the content div of admin panels for styling
2010-03-03 12:18:20 -08:00
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
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
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
2f167f2663
Fix syntax errors
2010-03-03 12:10:21 -08:00
c82efb7fd8
subscribers list wasn't firing correct events
2010-03-03 15:09:07 -05:00
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
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
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
James Walker
Brion Vibber
Zach Copley
Evan Prodromou