danielvincent 8ed98270a6 Merge branch 'master' of github.com:diaspora/diaspora into fb ... Conflicts: config/routes.rb		2010-09-22 16:09:25 -07:00
..
albums	visual tweaks on header. moved upload a file button to header on album#show	2010-09-19 14:27:20 -07:00
aspects	DG IZ moving friends is now ajaxy	2010-09-20 17:26:20 -07:00
comments	removed the auto_link seems to fix HTML injection, no more autolinking	2010-09-21 11:59:04 -07:00
devise	RS, IZ; removed url from user and views	2010-09-21 15:52:26 -07:00
js	websocket js should honor app socket port configuration	2010-09-17 03:11:11 +08:00
layouts	Spell our own name right	2010-09-15 17:56:18 -07:00
people	MS remove some stray puts	2010-09-20 17:11:07 -07:00
photos	use photos_path to generate the correct POST destination for photo uploads	2010-09-18 07:50:12 +08:00
posts	added git info (branch,date,author) to debug partial	2010-09-16 17:03:14 -07:00
publics	DG MS fixing webfinger, i hope to goodness	2010-09-15 13:28:06 -07:00
registrations	RS, IZ; removed url from user and views	2010-09-21 15:52:26 -07:00
requests	Spell our own name right	2010-09-15 17:56:18 -07:00
shared	DG IZ; reshare redirects to specific page	2010-09-22 15:32:11 -07:00
status_messages	DG IZ; reposting now works. redirects to a template missing page, though.	2010-09-22 15:05:51 -07:00
users	Merge branch 'master' of github.com:diaspora/diaspora into fb	2010-09-22 16:09:25 -07:00