Henry Oswald 9c6f0faff6 Merge branch 'i18n' ...

Conflicts:
	app/coffee/Features/User/UserPagesController.coffee
	app/views/layout.jade
	app/views/project/editor/dropbox.jade
	app/views/project/editor/file-tree.jade
	app/views/project/editor/pdf.jade
	app/views/project/list/project-list.jade
	app/views/user/settings.jade

2014-08-07 14:46:17 +01:00

..

UserController.coffee

Changed the error messages which are sent down to the client to be translated first

2014-08-01 14:03:38 +01:00

UserCreator.coffee

Moved register function into user registration handler and new user

2014-04-10 16:32:47 +01:00

UserDeleter.coffee

moved newsletter manager into its own feature

2014-04-04 15:47:27 +01:00

UserGetter.coffee

Intial open source comment

2014-02-12 10:23:40 +00:00

UserInfoController.coffee

Wire up account settings forms

2014-06-20 11:15:25 +01:00

UserLocator.coffee

Intial open source comment

2014-02-12 10:23:40 +00:00

UserPagesController.coffee

Merge branch 'i18n'

2014-08-07 14:46:17 +01:00

UserRegistrationHandler.coffee

fix case problem with require of newsletter manager

2014-04-10 22:21:20 +01:00

UserUpdater.coffee

Changed the error messages which are sent down to the client to be translated first

2014-08-01 14:03:38 +01:00