b218aee94e
Merge commit 'origin/testing' into 0.9.x
...
Conflicts:
lib/action.php
lib/adminpanelaction.php
2010-03-04 06:07:28 -08: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
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
337b1aaaa1
Site-wide notice text admin panel
2010-03-03 14:37:30 -08:00
2a96d1d59d
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-03-03 16:27:19 -05:00
6ff994b14c
Fix to group join event position.
2010-03-03 16:25:17 -05:00
c04c8ae59a
quick fix: skip notice from unused variable on group atom feed generation
2010-03-03 13:00:09 -08:00
13713a09bb
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-03-03 15:31:44 -05:00
2ce9ae004d
Added event hooks for before and after user groups content
2010-03-03 15:29:51 -05: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
b65ee23e82
Added event hooks for group subscribe
2010-03-03 12:01:38 -05:00
ddf3614c84
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x
2010-03-02 13:38:10 -08:00
72460091dd
Merge branch 'master' of git@gitorious.org:statusnet/mainline into testing
2010-03-02 12:21:48 -08:00
6b134ae4c7
Dropped deprecated timestamp-based 'since' parameter for all API methods. When it sneaks in it can cause some very slow queries due to mismatches with the indexing.
...
Twitter removed 'since' support some time ago, and we've already removed it from the public timeline, so it shouldn't be missed.
2010-03-02 11:54:02 -08:00
350e1289af
Added event hook for before and after personal timeline content
2010-03-02 12:33:25 -05:00
767d49495d
Add translator documentation
...
Signed-off-by: Siebrand Mazeland <s.mazeland@xs4all.nl>
2010-03-02 17:45:15 +01:00
d08fd8254a
Document 404 "Page not found" server error for translators.
2010-03-02 17:30:22 +01:00
53ac232f91
Documented all but one UI string in actions/accessadminpanel.php to get a feel on what documenting them in code actually means.
...
Signed-off-by: Siebrand Mazeland <s.mazeland@xs4all.nl>
2010-03-02 17:23:40 +01:00
284b1dc014
* Change translator documentation using _m() as designed together with Brion
...
* Add more translator documentation
Signed-off-by: Siebrand Mazeland <s.mazeland@xs4all.nl>
2010-03-02 16:38:36 +01:00
493b5479c1
OStatus: support @example.com/path/to/profile mentions as well as @profile@example.com (latter requires webfinger, former doesn't)
...
Plus misc warnings/notices cleanup in the submission path.
2010-03-01 16:43:36 -08:00
656a977016
remove strict check on OMB exception strings
2010-03-01 18:03:18 -05:00
c7d8641e7d
return correct HTTP status code for OMB errors
2010-03-01 18:03:18 -05:00
1414b6b849
send smaller error pages for OMB API endpoints
2010-03-01 18:03:18 -05:00
8e102da76c
Add contextual documentation to allow better localisation.
2010-03-01 22:28:38 +01:00
63ff9d86b8
Add content for all 3 Send buttons (2 are the same as far as I can tell)
2010-03-01 15:57:27 +01:00
78ea4c711e
Add context for Send button on invite.php
2010-03-01 15:49:53 +01:00
9b366547d7
Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x
2010-02-26 12:33:50 -08:00
88ae7f53bb
Merge branch 'master' of gitorious.org:statusnet/mainline into testing
2010-02-26 12:33:13 -08:00
c95daacfdb
Updated ShowGroup to Resolve Aliases Again.
...
The way we find groups changed with this new Local_group table.
I had to update this too.
2010-02-26 12:30:23 -08:00
fc576562a3
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-02-26 12:40:59 -05:00
6781f95c73
Merge branch 'blacklistplus' into testing
...
Conflicts:
EVENTS.txt
2010-02-26 12:40:30 -05:00
8dfc8f1635
Merge branch 'testing' into 0.9.x
2010-02-26 09:35:28 -08:00
6ae39da198
Fixed object name
2010-02-26 11:35:55 +01:00
6cc26a613b
Remove unnecessary requires
2010-02-25 22:08:25 -08:00
e650794300
Remove unnecessary requires
2010-02-25 22:06:31 -08:00
c49fbb63c5
Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
...
* 'testing' of gitorious.org:statusnet/mainline:
init_conversation.php script to copy old notice conversations into the conversation table
cache results of webfinger lookups
Parse an hcard for hints, if available
use new hcard method for webfinger
add hkit for hCard parsing
use new dedicated hcard method for Webfinger profile
Add an hcard action
2010-02-25 18:13:34 -08:00
792f0942f7
Fix atom feed IDs in user and group atom feeds
2010-02-25 18:13:06 -08:00
4aa82f75ed
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-02-25 18:45:32 -05:00
76216af806
Add an hcard action
...
A dedicated hcard action for users. Our profile page includes
an hcard, but it's so full of other hcards that it's ambiguous which
one is the "real" one. So, this one make sense for meaning, "This is
my hcard."
2010-02-25 18:39:55 -05:00
e254c660f6
Fix bug on subscribe/unsubscribe in profile lists. Bogus call to nonexisting profile->getProfile() was masked by DB_DataObject
2010-02-25 15:22:23 -08:00
b5b5184c88
OStatus: fix remote groups to work with new user_groups/local_groups split.
...
- fix <activity:subject> generation so we get the profile info (what's available so far)
- use id instead of nickname for group join/leave forms so we can join/leave remote groups
while the rest of the groups UI remains limited to local groups
(plugins are responsible for making sure remote notifications and permission checks are done)
- fix remote notification when joining group through OStatus's remote subscribe form
2010-02-25 13:02:08 -08:00
d53b4b9b84
save mainpage element for groups
2010-02-25 12:05:22 -05:00
e6858d7203
modify group actions so they use Local_group to look up by nickname
2010-02-25 08:44:15 -05:00
59be4b8cae
Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x
2010-02-24 15:47:51 -08:00
Brion Vibber
Zach Copley
Sarven Capadisli
Evan Prodromou
Siebrand Mazeland
Christopher Vollick
Michele