summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2009-01-23Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunkEvan Prodromou
2009-01-23Merge branch 'master' of /var/www/trunkZach Copley
2009-01-23trac750 Fixed bad url that made the 'skip' step when adding status_update ↵Zach Copley
permission fail
2009-01-23public is readonlyEvan Prodromou
2009-01-23Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunkEvan Prodromou
2009-01-23Merge branch 'master' of ../trunksarven
2009-01-23Minorsarven
2009-01-23Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunkEvan Prodromou
2009-01-23Fix for Twitter bridge bug introduced by uiredesign mergeZach Copley
2009-01-23Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunkEvan Prodromou
2009-01-23Merge branch 'master' of /var/www/mublogEvan Prodromou
Conflicts: actions/api.php actions/deletenotice.php actions/recoverpassword.php actions/remotesubscribe.php actions/tag.php actions/tagrss.php actions/twitapiaccount.php actions/twitapiusers.php classes/Notice.php classes/User.php lib/common.php lib/language.php lib/subs.php lib/twitterapi.php lib/util.php scripts/inbox_users.php scripts/update_translations.php Merged development trunk into laconica head. woohoo!
2009-01-23Merge branch 'master' of /var/www/trunkRobin Millette
2009-01-23Group searchRobin Millette
2009-01-23Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunkEvan Prodromou
2009-01-23trac750 Let's try that again - fix for base css hrefZach Copley
2009-01-23Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunkEvan Prodromou
2009-01-23Update version numberEvan Prodromou
2009-01-23Upload logos for groupsEvan Prodromou
2009-01-23trac750 fix href for theme stylesheetZach Copley
2009-01-23Minorsarven
2009-01-23Default stylesheetsarven
2009-01-23Merge branch 'master' of /var/www/trunkEvan Prodromou
2009-01-23Add several more help filesEvan Prodromou
2009-01-23Not using thickbox... yetsarven
2009-01-23Missing closing lisarven
2009-01-23trac750 small fix to FBJS redirectZach Copley
2009-01-23Merge branch 'master' of /var/www/trunkZach Copley
2009-01-23Merge branch 'master' of /var/www/trunkRobin Millette
2009-01-23use new error actions classes to display errorRobin Millette
2009-01-23Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunkEvan Prodromou
2009-01-23trac750 fix for crash when a user logs in and hasn't already posted a noticeZach Copley
2009-01-23Merge branch 'master' of /var/www/trunkZach Copley
2009-01-23trac750 linked in stylesheets for login and permissions prompt screensZach Copley
2009-01-23Merge branch 'master' of ../trunksarven
2009-01-23Cleanupsarven
2009-01-23Made avatar upload a two-stage process; first upload, then cropEvan Prodromou
2009-01-23Better math for secitonEvan Prodromou
2009-01-23make avatar bigger on single notice pagesRobin Millette
2009-01-23A sectionEvan Prodromou
2009-01-23Merge branch 'master' of ../trunksarven
2009-01-23Cleanupsarven
2009-01-23make avatar bigger on single notice pagesRobin Millette
2009-01-23Merge branch 'master' of /var/www/trunkRobin Millette
2009-01-23uiredesignRobin Millette
2009-01-23trac750 FB script to update statuses working again with new uiredesign stuffZach Copley
2009-01-23Merge branch 'master' of /var/www/trunkRobin Millette
2009-01-23uiredesignRobin Millette
2009-01-23anon_noticesarven
2009-01-23Merge branch 'master' of ../trunksarven
2009-01-23Tag cloud font-size and line-heightsarven