statusnet/lukeshus-gnu-social - Unnamed repository; edit this file 'description' to name the repository.

Age	Commit message (Collapse)	Author
2009-01-23	Merge branch 'master' of ssh://zach@dev.controlyourself.ca/var/www/trunk	Zach Copley

2009-01-23	Bring the Twitter compatible API inline with new uiredesign stuff	Zach Copley

2009-01-23	mark nudge action read-only	Robin Millette

2009-01-23	mark a bunch of actions read-only	Robin Millette

2009-01-23	Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk	Evan Prodromou

2009-01-23	Merge branch 'master' of ../trunk	sarven

2009-01-23	openid markup and style	sarven

2009-01-23	usergroups is read only	Evan Prodromou

2009-01-23	groups are readonly	Evan Prodromou

2009-01-23	showstream is readonly	Evan Prodromou

2009-01-23	Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk	Evan Prodromou

2009-01-23	Merge branch 'master' of /var/www/trunk	Zach Copley

2009-01-23	trac750 Fixed bad url that made the 'skip' step when adding status_update ↵	Zach Copley
	permission fail
2009-01-23	public is readonly	Evan Prodromou

2009-01-23	Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk	Evan Prodromou

2009-01-23	Fix for Twitter bridge bug introduced by uiredesign merge	Zach Copley

2009-01-23	Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk	Evan Prodromou

2009-01-23	Merge branch 'master' of /var/www/mublog	Evan 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-23	Merge branch 'master' of /var/www/trunk	Robin Millette

2009-01-23	Group search	Robin Millette

2009-01-23	Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk	Evan Prodromou

2009-01-23	Upload logos for groups	Evan Prodromou

2009-01-23	trac750 fix href for theme stylesheet	Zach Copley

2009-01-23	Missing closing li	sarven

2009-01-23	trac750 small fix to FBJS redirect	Zach Copley

2009-01-23	Merge branch 'master' of /var/www/trunk	Zach Copley

2009-01-23	Merge branch 'master' of /var/www/trunk	Robin Millette

2009-01-23	use new error actions classes to display error	Robin Millette

2009-01-23	Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk	Evan Prodromou

2009-01-23	trac750 fix for crash when a user logs in and hasn't already posted a notice	Zach Copley

2009-01-23	Merge branch 'master' of /var/www/trunk	Zach Copley

2009-01-23	trac750 linked in stylesheets for login and permissions prompt screens	Zach Copley

2009-01-23	Merge branch 'master' of ../trunk	sarven

2009-01-23	Cleanup	sarven

2009-01-23	Made avatar upload a two-stage process; first upload, then crop	Evan Prodromou

2009-01-23	make avatar bigger on single notice pages	Robin Millette

2009-01-23	uiredesign	Robin Millette

2009-01-23	Merge branch 'master' of /var/www/trunk	Robin Millette

2009-01-23	uiredesign	Robin Millette

2009-01-23	anon_notice	sarven

2009-01-23	uiredesign	Robin Millette

2009-01-23	Merge branch 'master' of /var/www/trunk	Robin Millette

2009-01-23	small bugfix, it's prepare() not initialize()	Robin Millette

2009-01-23	Anonymous notice	sarven

2009-01-23	Merge branch 'master' of /var/www/trunk	Robin Millette

2009-01-23	uiredesign	Robin Millette

2009-01-23	p -> div for markup wrapper	Evan Prodromou

2009-01-23	Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk	Evan Prodromou

2009-01-23	Anonymous message for group page	Evan Prodromou

2009-01-23	Merge branch 'master' of /var/www/trunk	Zach Copley