summaryrefslogtreecommitdiff
path: root/lib
AgeCommit message (Collapse)Author
2010-03-04Merge commit 'origin/testing' into 0.9.xBrion Vibber
Conflicts: lib/action.php lib/adminpanelaction.php
2010-03-04Removed unused stub classZach Copley
2010-03-04Add generator tag into Atom feeds.Zach Copley
2010-03-04Fix variable name in NoConfigExceptionZach Copley
2010-03-03Temp fix for problem getting actor from PuSH updates where actor is only ↵Zach Copley
specified in subject
2010-03-03Revert "Revert "Show <activity:subject> and no activity actors for user feed""Zach Copley
This reverts commit e2578cfad68c45ca177c51997c4cc7c0abafbd9a.
2010-03-03Move snapshot configuration to its own admin panelZach Copley
Turn on with: $config['admin']['panels'][] = 'snapshot';
2010-03-03Put all required field setup into AtomUserNoticeFeed and ↵Brion Vibber
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-03Initial user role controls on profile pages, for owner to add/remove ↵Brion Vibber
administrator and moderator options. Buttons need to be themed.
2010-03-03Merge branch 'testing'Evan Prodromou
2010-03-03Site-wide notice text admin panelZach Copley
2010-03-03Removed aside container from output for the admin panel sectionsSarven Capadisli
2010-03-03Add class="admin" to the content div of admin panels for stylingZach Copley
2010-03-03Language setting fixes:Brion Vibber
- 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-03Merge branch 'testing' of git@gitorious.org:statusnet/mainlineBrion Vibber
2010-03-03Fix for 4113f2884113f288: show regular subscribe form for all non-OMB ↵Brion Vibber
profiles. We can't initiate remote sub for an OMB from our end, so dropping there.
2010-03-03Use poster's subscribed groups to disambiguate group linking when a remote ↵Brion Vibber
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-03Merge branch 'testing' of gitorious.org:statusnet/mainline into testingZach Copley
* '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-03Fix for disappearing 'connect' menu if xmpp and sms are disabled.Zach Copley
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-03Added event hooks at the start and end of groups mini listSarven Capadisli
2010-03-03Merge branch 'testing' of git@gitorious.org:statusnet/mainlineBrion Vibber
Conflicts: plugins/OStatus/OStatusPlugin.php
2010-03-03Added event hooks for start and end of subscriptions mini listSarven Capadisli
2010-03-02OStatus: save file records for enclosuresBrion Vibber
Also stripping id from foreign HTML messages (could interfere with UI) and disabled failing attachment popup for a.attachment links that don't have a proper id, so you can click through instead of getting an error. Issues: * any other links aren't marked and saved * inconsistent behavior between local and remote attachments (local displays in lightbox, remote doesn't) * if the enclosure'd object isn't referenced in the content, you won't be offered a link to it in our UI
2010-03-02OStatus fix: look for <link>s in the current element's children, not in all ↵Brion Vibber
its descendants. Was breaking notice URL transfer, pulling a profile link by mistake.
2010-03-02stupid mistake... let's not talk about this.Craig Andrews
2010-03-02Updated some references to the long gnone "isEnclosure" function to the new ↵Craig Andrews
"getEnclosure"
2010-03-02Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.xBrion Vibber
2010-03-02Add translator documentationSiebrand Mazeland
Signed-off-by: Siebrand Mazeland <s.mazeland@xs4all.nl>
2010-03-02Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testingSarven Capadisli
2010-03-02Added Subscribe button to remote user entity actions in profie listsSarven Capadisli
2010-03-02Merge branch 'master' of git@gitorious.org:statusnet/mainline into testingBrion Vibber
2010-03-02Dropped deprecated timestamp-based 'since' parameter for all API methods. ↵Brion Vibber
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-02Merge branch '0.9.x' of git://gitorious.org/statusnet/mainline into 0.9.xSiebrand Mazeland
2010-03-02Fix for regression in updated mention checks, sometimes lost links to folks ↵Brion Vibber
mentioned in the replied message.
2010-03-02* Change translator documentation using _m() as designed together with BrionSiebrand Mazeland
* Add more translator documentation Signed-off-by: Siebrand Mazeland <s.mazeland@xs4all.nl>
2010-03-02Revert "Show <activity:subject> and no activity actors for user feed"Evan Prodromou
This reverts commit c25fc8a4b51466f13c41efc0565bf15f78f6cb4d.
2010-03-02Merge branch 'master' into testingEvan Prodromou
2010-03-02Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testingEvan Prodromou
2010-03-02Show <activity:subject> and no activity actors for user feedEvan Prodromou
We only need one author for user feeds: the user themselves. So, show the user as the activity:subject, and don't repeat the same activity:actor for every notice unnecessarily.
2010-03-01Remove un-needed config variable for enabling/disabling Twitter integrationZach Copley
2010-03-01Initial Twitter bridge admin panelZach Copley
2010-03-01Use PHP exceptions for PEAR error handling.Craig Andrews
Allows for the common try/catch construct, which makes error handling cleaner and easier.
2010-03-01Modify configuration to have an option to allow uploads regardless of mime typeCraig Andrews
2010-03-01Merge branch 'testing' of gitorious.org:statusnet/mainline into testingZach Copley
* 'testing' of gitorious.org:statusnet/mainline: (25 commits) Fix a bunch of notice & warning-level messages that were breaking my inter-instance communications more output in updateostatus.php lost important fields when switching queries show service debug info pass listener URI into consumer for OMB remove strict check on OMB exception strings return correct HTTP status code for OMB errors send smaller error pages for OMB API endpoints Remove check for secret in token deletion on Subscription::cancel() Better logging on bad token in subscription Return empty array when no subscriptions to remote drop tokens for OMB on unsubscribe fix path for updateostatus.php Script to convert OMB subscriptions to OStatus subscriptions show service debug info pass listener URI into consumer for OMB remove strict check on OMB exception strings return correct HTTP status code for OMB errors send smaller error pages for OMB API endpoints Remove check for secret in token deletion on Subscription::cancel() ...
2010-03-01Revert "show service debug info"Evan Prodromou
This reverts commit 19ec0e3a62d4c60d7e5581b4e38ec705650b1d18.
2010-03-01lost important fields when switching queriesEvan Prodromou
2010-03-01show service debug infoEvan Prodromou
2010-03-01pass listener URI into consumer for OMBEvan Prodromou
2010-03-01Return empty array when no subscriptions to remoteEvan Prodromou
2010-03-01Merge branch 'testing' into 0.9.xZach Copley
* testing: Upgrade XML output scrubbing to better deal with newline and a few other chars