summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2010-03-03Merge branch 'testing' of git@gitorious.org:statusnet/mainlineBrion Vibber
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 'master' of git@gitorious.org:statusnet/mainlineBrion Vibber
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-03Merge branch 'testing' of git@gitorious.org:statusnet/mainlineBrion Vibber
Conflicts: plugins/OStatus/OStatusPlugin.php
2010-03-03Merge branch 'twitter-facebook-mods'Zach Copley
* 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-03Make 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-03Remove double word from Twitter bridge READMEZach Copley
2010-03-03- 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-03stupid mistake... let's not talk about this.Craig Andrews
2010-03-03Updated some references to the long gnone "isEnclosure" function to the new ↵Craig Andrews
"getEnclosure"
2010-03-03Update Facebook plugin README with info about new admin panelZach Copley
2010-03-03Initial Facebook admin panelZach Copley
2010-03-03Some wording / spelling fixesZach Copley
2010-03-03- Make 'Sign in with Twitter' optionalZach Copley
- Updates to the Twitter bridge plugin README
2010-03-03Remove un-needed config variable for enabling/disabling Twitter integrationZach Copley
2010-03-03Initial Twitter bridge admin panelZach Copley
2010-03-03Upgrade XML output scrubbing to better deal with newline and a few other charsZach Copley
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-02OStatus: support @example.com/path/to/profile mentions as well as ↵Brion Vibber
@profile@example.com (latter requires webfinger, former doesn't) Plus misc warnings/notices cleanup in the submission path.
2010-03-02Fix a bunch of notice & warning-level messages that were breaking my ↵Brion Vibber
inter-instance communications
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"