summaryrefslogtreecommitdiff
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-04Couple of tweaks to the HTML to try and make installer look bettter. This ↵Zach Copley
still needs some work.
2010-03-04Create an initial user during install, and grant owner, moderator and ↵Zach Copley
administrator roles.
2010-03-04Fix variable name in NoConfigExceptionZach Copley
2010-03-04Catch a previously uncaught exception and add some additional debug logs for ↵James Walker
signature verification
2010-03-04Merge remote branch 'statusnet/testing' into testingJames Walker
2010-03-04update xrd -> userxrdJames Walker
2010-03-04Updated styles for unsandbox, unsilence, revoke administrator andSarven Capadisli
moderator icons
2010-03-04Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testingSarven Capadisli
2010-03-04Added the inverse icons for badge, sandbox, speech, adminSarven Capadisli
2010-03-03Temp fix for problem getting actor from PuSH updates where actor is only ↵Zach Copley
specified in subject
2010-03-03Test a small user feed to ensure we're taking the activity actor from the ↵Zach Copley
subject
2010-03-03Revert "Revert "Show <activity:subject> and no activity actors for user feed""Zach Copley
This reverts commit e2578cfad68c45ca177c51997c4cc7c0abafbd9a.
2010-03-03Changed text for authorizing/confirming remote profileSarven Capadisli
2010-03-03Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testingSarven Capadisli
2010-03-03Puts All groups and Remote sub button in the mini list on the same lineSarven Capadisli
2010-03-03refactor xrd to allow for ownerxrd - xrd document for the site owner.James Walker
introduced $config['webfinger']['owner'] for a custom xrd subject
2010-03-03Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testingSarven Capadisli
2010-03-03Updated OStatus subscription error messages to be more user friendly.Sarven Capadisli
Hopefully.
2010-03-03OStatus: catchable exception instead of fatal when parsing valid XML that ↵Brion Vibber
isn't a valid XRD doc
2010-03-03OStatus: code cleanup on webfinger fallback pathBrion Vibber
2010-03-03Fix up catching of webfinger setup failsBrion Vibber
2010-03-03Updated label and note text for user and group remote subscribe formsSarven Capadisli
2010-03-03Removed clipboard icon from coreSarven Capadisli
2010-03-03Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testingSarven Capadisli
2010-03-03Changed clipboard icon to magic wand for user role buttonSarven Capadisli
2010-03-03Move snapshot configuration to its own admin panelZach Copley
Turn on with: $config['admin']['panels'][] = 'snapshot';
2010-03-03Fix notice warning in RSS friends timelineBrion Vibber
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-03Updated icons READMESarven Capadisli
2010-03-03Updated identica theme for User Role stylesSarven Capadisli
2010-03-03Added styles for User RoleSarven Capadisli
2010-03-03Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testingBrion Vibber
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-03Making one time passwords work on private sitesJames Walker
2010-03-03remove debug lineBrion Vibber
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