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
..
Authentication	Changed the error messages which are sent down to the client to be translated first	2014-08-01 14:03:38 +01:00
Blog
Chat
Collaborators
Compile
ConnectedUsers
Docstore
Documents
DocumentUpdater
Downloads
Dropbox
Editor	added some logging around dropbox update	2014-07-29 10:32:11 +01:00
Email
Errors	fixed some bits	2014-08-07 13:56:04 +01:00
FileStore
HealthCheck
Newsletter
PasswordReset	Changed the error messages which are sent down to the client to be translated first	2014-08-01 14:03:38 +01:00
Project	sorted out titles	2014-08-01 13:47:14 +01:00
Referal	sorted out titles	2014-08-01 13:47:14 +01:00
Security
ServerAdmin
Spelling
StaticPages	Sort out title of wiki	2014-08-05 17:08:38 +01:00
Subscription	sorted out titles	2014-08-01 13:47:14 +01:00
SystemMessages
Tags
Templates	sorted out titles	2014-08-01 13:47:14 +01:00
ThirdPartyDataStore	added some logging around dropbox update	2014-07-29 10:32:11 +01:00
TrackChanges
Uploads
User	Merge branch 'i18n'	2014-08-07 14:46:17 +01:00
Wiki	Sort out title of wiki	2014-08-05 17:08:38 +01:00