summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2010-03-03Merge branch 'testing' of gitorious.org:statusnet/mainline into testingZach Copley
* 'testing' of gitorious.org:statusnet/mainline: subscribers list wasn't firing correct events
2010-03-03Fix syntax errorsZach Copley
2010-03-03subscribers list wasn't firing correct eventsEvan Prodromou
2010-03-03add remote subscribe button for not-logged-in users looking a profile list ↵Evan Prodromou
with local users in it
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 git@gitorious.org:statusnet/mainline into testingSarven Capadisli
2010-03-03Renamed subscribe button from New to Remote since it only does remoteSarven Capadisli
subscriptions at the moment.
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-03Using position relative only for the remote subscription in sectionSarven Capadisli
2010-03-03Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testingSarven Capadisli
2010-03-03Added group subscription button to groups mini listSarven Capadisli
2010-03-03Added event hooks at the start and end of groups mini listSarven Capadisli
2010-03-03Fix for hcard parsing: typo caused notice spew accessing unset array indexBrion Vibber
2010-03-03Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testingBrion Vibber
2010-03-03Clean up OStatus mentions finding; separate regexes keeps the code paths a ↵Brion Vibber
bit clearer. Also switched to hitting HTTP profile first; as the common case it'll be faster.
2010-03-03Avoid warning/notice spew in XRD parser. Not all DOM nodes are elements.Brion Vibber
2010-03-03Added remote join action for group profileSarven Capadisli
2010-03-03Added event hooks for group subscribeSarven Capadisli
2010-03-03Moved the remote subscription button to subscription mini listSarven Capadisli
2010-03-03Added event hooks for start and end of subscriptions mini listSarven Capadisli
2010-03-03Changed label text for remote subscription to something similar. GivenSarven Capadisli
that this button will be used within context of subscriptions, 'New' works along with the '+' icon.
2010-03-02Make Facebook plugin look for API key and secret before doing anythingZach Copley
2010-03-03Show global key and secret, if defined, in Twitter bridge admin panelZach Copley
2010-03-03Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testingZach Copley
2010-03-02Remove double word from Twitter bridge READMEZach Copley
2010-03-02Merge branch 'testing' of gitorious.org:statusnet/mainline into testingZach Copley
* 'testing' of gitorious.org:statusnet/mainline: OStatus: save file records for enclosures Changed the geo location cookie Expire to Session.
2010-03-02- Have Twitter bridge check for a global key and secret if it can'tZach Copley
find one in the local config - Refuse to work at all if the consumer key and secret aren't set
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-02Changed the geo location cookie Expire to Session.Sarven Capadisli
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 testingSarven Capadisli
2010-03-02Added Subscribe button to remote user entity actions in profie listsSarven Capadisli
2010-03-02Don't need to float the anchorSarven Capadisli
2010-03-02Merge branch 'master' of git@gitorious.org:statusnet/mainline into testingBrion Vibber
2010-03-02Performance fix on Sphinx search results: use id instead of created ↵Brion Vibber
timestamp for reverse date sorting; should give same result but doesn't trigger a filesort.
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-02Fix for regression in updated mention checks, sometimes lost links to folks ↵Brion Vibber
mentioned in the replied message.
2010-03-02Refactored remote subscribe action in OStatusSarven Capadisli
2010-03-02Showing remote subscription button on the personal timelineSarven Capadisli
2010-03-02Generalized style for entity remote subscription actionSarven Capadisli
2010-03-02Added event hook for before and after personal timeline contentSarven Capadisli
2010-03-02Just a label change. Since the user already went ahead withSarven Capadisli
subscribing, in this step we are just confirming the profile.
2010-03-02Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testingEvan Prodromou
2010-03-02Revert "Show <activity:subject> and no activity actors for user feed"Evan Prodromou
This reverts commit c25fc8a4b51466f13c41efc0565bf15f78f6cb4d.
2010-03-02Merge branch 'testing' of gitorious.org:statusnet/mainline into testingZach Copley
* 'testing' of gitorious.org:statusnet/mainline: don't duplicate title in summary in Atom output per RFC4287 4.2.13 Show <activity:subject> and no activity actors for user feed Revert "show service debug info"
2010-03-02Update Facebook plugin README with info about new admin panelZach Copley
2010-03-02don't duplicate title in summary in Atom output per RFC4287 4.2.13Evan Prodromou