Raphael d753e31205 Merge remote branch 'ed0h/309-user-choose-language' ... Add explicit language set to spec in users_controller_spec.rb Conflicts: app/models/user.rb		2010-10-29 12:06:14 -07:00
..
albums_helper.rb	Add or later to license notice	2010-10-07 16:25:34 -07:00
application_helper.rb	a person now has a photos#index page.	2010-10-29 10:38:17 -07:00
aspects_helper.rb	Remove unused helper method	2010-10-19 11:36:33 -07:00
dashboards_helper.rb	Add or later to license notice	2010-10-07 16:25:34 -07:00
error_messages_helper.rb	Add or later to license notice	2010-10-07 16:25:34 -07:00
language_helper.rb	allow user to change his language in his settings	2010-10-28 17:29:17 +02:00
layout_helper.rb	Add or later to license notice	2010-10-07 16:25:34 -07:00
people_helper.rb	Add or later to license notice	2010-10-07 16:25:34 -07:00
photos_helper.rb	Add or later to license notice	2010-10-07 16:25:34 -07:00
publics_helper.rb	Add or later to license notice	2010-10-07 16:25:34 -07:00
requests_helper.rb	EM websocket cleanly merged with master. webfingering is now async	2010-10-29 11:05:17 -07:00
sockets_helper.rb	Add or later to license notice	2010-10-07 16:25:34 -07:00
status_messages_helper.rb	Modified spec (doesn't check Youtube handling due to disabled net::http)	2010-10-17 21:07:49 +02:00