summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2009-01-23Merge branch 'master' of ../trunksarven
2009-01-23Giving more avatars per linesarven
2009-01-23trac750 Better CSS file organization and linking fore the FB appZach Copley
2009-01-23Matching it to avatar layoutsarven
2009-01-23Facebook app stylessarven
2009-01-23Cleaningsarven
2009-01-23Merge branch 'master' of /var/www/trunkZach Copley
2009-01-23trac750 Better styling for the Facebook profile box widgetZach Copley
2009-01-23Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunkEvan Prodromou
2009-01-23These aren't readonlyEvan Prodromou
2009-01-23remove top posters from publicEvan Prodromou
2009-01-23Merge branch 'master' of ssh://zach@dev.controlyourself.ca/var/www/trunkZach Copley
2009-01-23Bring the Twitter compatible API inline with new uiredesign stuffZach Copley
2009-01-23Merge branch 'master' of /var/www/trunkRobin Millette
2009-01-23mark nudge action read-onlyRobin Millette
2009-01-23mark a bunch of actions read-onlyRobin Millette
2009-01-23Merge branch 'master' of ../trunksarven
2009-01-23Using openidlogin instead of openid in order to show the current localsarven
nav item
2009-01-23Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunkEvan Prodromou
2009-01-23Merge branch 'master' of ../trunksarven
2009-01-23openid markup and stylesarven
2009-01-23usergroups is read onlyEvan Prodromou
2009-01-23groups are readonlyEvan Prodromou
2009-01-23showstream is readonlyEvan Prodromou
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
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-11-09 21:44:42 +0000