nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
diaspora/app/views
History
Raphael 2489f8503f Merge branch 'master' into HEAD 
Conflicts:
	app/controllers/albums_controller.rb
	app/controllers/aspects_controller.rb
	app/controllers/photos_controller.rb
	app/controllers/registrations_controller.rb
	app/controllers/requests_controller.rb
	app/helpers/dashboards_helper.rb
	app/views/albums/show.html.haml
	app/views/aspects/manage.html.haml
	app/views/shared/_aspect_nav.haml
	app/views/shared/_sub_header.haml
	app/views/status_messages/_status_message.html.haml
	app/views/status_messages/show.html.haml
	config/locales/de.yml
	config/locales/en.yml
	config/locales/es.yml
	config/locales/fr.yml
2010-09-22 21:32:03 -07:00
..
albums Merge branch 'master' into HEAD 2010-09-22 21:32:03 -07:00
aspects Merge branch 'master' into HEAD 2010-09-22 21:32:03 -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 Added localization to layouts and shared views 2010-09-16 15:11:58 -04:00
people Merge branch 'master' into HEAD 2010-09-22 21:32:03 -07:00
photos merged with diaspora master; this fork has spanish, german and french translations (need some help with the last two) 2010-09-18 02:21:45 -04: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 Merge branch 'master' into HEAD 2010-09-22 21:32:03 -07:00
requests Added translations to new requests view and aspects controller 2010-09-17 16:38:50 -04:00
shared Merge branch 'master' into HEAD 2010-09-22 21:32:03 -07:00
status_messages Merge branch 'master' into HEAD 2010-09-22 21:32:03 -07:00
users Merge branch 'master' into HEAD 2010-09-22 21:32:03 -07:00