diaspora/app/helpers
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_helper.rb Added I18n translations to helpers 2010-09-17 15:26:31 -04:00
application_helper.rb Merge branch 'master' into HEAD 2010-09-22 21:32:03 -07:00
aspects_helper.rb Added I18n translations to helpers 2010-09-17 15:26:31 -04:00
dashboards_helper.rb Merge branch 'master' into HEAD 2010-09-22 21:32:03 -07:00
error_messages_helper.rb Added I18n translations to helpers 2010-09-17 15:26:31 -04:00
layout_helper.rb Cleanup stray whitespace 2010-09-16 10:07:59 +08:00
people_helper.rb Added I18n translations to helpers 2010-09-17 15:26:31 -04:00
photos_helper.rb Some refactoring again (define code rules would be good) 2010-09-22 02:55:54 +08:00
publics_helper.rb Some refactoring again (define code rules would be good) 2010-09-22 02:55:54 +08:00
requests_helper.rb RS, IZ; Pod url moved to app_config.yml, app_config.yml refactored, diaspora_handle now set based on APP_CONFIG 2010-09-21 15:46:57 -07:00
sockets_helper.rb Some refactoring again (define code rules would be good) 2010-09-22 02:55:54 +08:00
status_messages_helper.rb Added I18n translations to helpers 2010-09-17 15:26:31 -04:00