summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2010-03-03Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testingSarven Capadisli
2010-03-03Updated remote subscribe button style in asideSarven Capadisli
2010-03-03Site-wide notice text admin panelZach Copley
2010-03-03OStatus: fix up remote join button on group profilesBrion Vibber
2010-03-03Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testingBrion Vibber
2010-03-03Separate the UI paths for ostatussub and ostatusgroup. They'll redirect to ↵Brion Vibber
each other transparently if they find you've put a remote entity of the other type.
2010-03-03Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testingSarven Capadisli
2010-03-03Returning true instead for group remote subscription. If not loggedSarven Capadisli
in, it gives the chance to use the logged in join/leave instead.
2010-03-03Fix to group join event position.Sarven Capadisli
2010-03-03Merge branch 'testing' of gitorious.org:statusnet/mainline into testingZach Copley
* '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-03Don't expose global Twitter consumer key and secret, because that would be ↵Zach Copley
idiotic.
2010-03-03quick fix: skip notice from unused variable on group atom feed generationBrion Vibber
2010-03-03Avoid notice on local group creation when uri isn't passed in at create time ↵Brion Vibber
(needs to be generated)
2010-03-03Using the full width for the content area for the admin section. ItSarven Capadisli
also makes the local navigation's tabs stay in context with the content
2010-03-03Removed aside container from output for the admin panel sectionsSarven Capadisli
2010-03-03Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testingSarven Capadisli
2010-03-03Generalized style for remote subscription buttonSarven Capadisli
2010-03-03Showing the remote subscribe button on the user groups pageSarven Capadisli
2010-03-03Added event hooks for before and after user groups contentSarven Capadisli
2010-03-03Add class="admin" to the content div of admin panels for stylingZach Copley
2010-03-03Merge branch 'testing' of gitorious.org:statusnet/mainline into testingZach Copley
* 'testing' of gitorious.org:statusnet/mainline: Language setting fixes:
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-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-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.