Commit Graph

343 Commits

Author SHA1 Message Date
James Allen 128c672edd Merge branch 'github-sync'
Conflicts:
	package.json
2014-10-08 12:13:37 +01:00
James Allen dbd85a05f1 Send user features and features switches to views where needed 2014-10-07 13:31:13 +01:00
Henry Oswald 8789a4bde1 server rejects rename of entitys over 150 chars 2014-10-07 11:16:26 +01:00
Henry Oswald b01b05e49b server rejects project names over 150 chars 2014-10-07 11:14:02 +01:00
James Allen 6c7c09075c Treat paths properly in project content update methods 2014-10-03 11:33:18 +01:00
James Allen 13a96c925b Add in endpoints to allow updating project files when the project id is know 2014-10-02 14:15:30 +01:00
Henry Oswald 81307324fc v2, seems to work... 2014-09-26 17:04:33 +01:00
Henry Oswald f73629f8d9 v1 of sentinal support 2014-09-26 14:52:00 +01:00
Henry Oswald 9c98e95ca4 send cancelation email after 1 hour 2014-09-16 14:25:12 +01:00
Henry Oswald 6efda9cf1c push currency default to seperate var 2014-09-11 11:45:00 +01:00
Henry Oswald 20f0c648e5 default to USD 2014-09-11 11:35:39 +01:00
Henry Oswald 1b02dc72a3 destroy session on dropbox webhook 2014-09-10 14:19:44 +01:00
Henry Oswald d961b48857 imporved logging for session debug 2014-09-10 08:20:36 +01:00
Henry Oswald 93b4c5f4f8 thank you page displays the correct currency 2014-09-08 10:59:12 +01:00
Henry Oswald aee0dda243 added currency to signiture 2014-09-08 10:36:30 +01:00
Henry Oswald eeb27062a0 added currency query string param to subscribe button 2014-09-05 11:40:14 +01:00
James Allen 971afb7342 Treat large text files as binary 2014-09-04 13:00:51 +01:00
Henry Oswald e740e4913d if user is already annual tell them so on the annual upgrade page 2014-08-29 14:13:05 +01:00
Henry Oswald 350b95a0a5 annual upgrade page works, needs a bit of copy love now 2014-08-28 18:14:31 +01:00
Henry Oswald f5618e9d9c added confirm you want to change plan modal
added page and corisponding endpoint to migrate to annual plan
2014-08-27 17:51:10 +01:00
Henry Oswald 27b9cad8ca make ga experiements per page 2014-08-24 17:07:40 +01:00
James Allen 894024ba29 Don't allow folders to be moved into their child folders 2014-08-22 14:38:52 +01:00
Henry Oswald c91e95d593 Merge branch 'master' of https://github.com/sharelatex/web-sharelatex 2014-08-22 14:22:12 +01:00
Henry Oswald 6c131b1084 - removed free trial on annual accounts
- added setting val for google analytics experiments to be added in head
- added 14 day free trial variation to plans page
2014-08-22 14:20:39 +01:00
James Allen c8ab1bd394 Merge branch 'master' of github.com:sharelatex/web-sharelatex 2014-08-22 12:52:31 +01:00
James Allen 456d194dbb Merge branch 'james_tmp' 2014-08-22 12:51:35 +01:00
Henry Oswald 4a19d6731a Merge branch 'master' of https://github.com/sharelatex/web-sharelatex 2014-08-21 13:03:54 +01:00
Henry Oswald b9372e6dcd added key for your projects 2014-08-21 13:02:28 +01:00
James Allen f093c99b96 Remove deprecated background dropbox polling logic 2014-08-21 13:01:27 +01:00
James Allen d0eee7a1e5 Refactor template settings 2014-08-20 14:47:27 +01:00
James Allen 9be7228247 Delay Dropbox polling by 5 seconds and dispatch only a single request 2014-08-14 13:48:23 +01:00
James Allen 7816810249 Add in poll dropbox endpoint back into admin 2014-08-14 10:12:01 +01:00
James Allen 604505131b Convert integer dropbox id to string when searching mongo 2014-08-13 17:34:45 +01:00
James Allen 670e8e5cb9 Use Dropbox Real-time polling 2014-08-13 17:26:18 +01:00
James Allen 3348249dcd Download template PDF and zip file with good file names 2014-08-12 12:02:09 +01:00
James Allen b7ed3bab8f Merge branch 'redis-queue' 2014-08-11 12:10:25 +01:00
Henry Oswald 4c073ff285 render template name in CanonicalPage 2014-08-08 14:43:07 +01:00
James Allen b20934e579 Merge branch 'master' of github.com:sharelatex/web-sharelatex 2014-08-08 11:42:02 +01:00
James Allen 10021986c5 Don't error on password reset if no email found, and translate error messages 2014-08-08 11:41:54 +01:00
Henry Oswald 66ba6e612d Revert "send 401 when login fails"
This reverts commit fb901c6365d37654ba9058f57a71a4e60366688e.
2014-08-08 10:21:17 +01:00
Henry Oswald 7976f2f0fe send 401 when login fails 2014-08-07 16:28:00 +01:00
James Allen b367c4a968 Show group subscription status on subscription dashboard page
Conflicts:
	app/views/subscriptions/dashboard.jade
2014-08-07 15:51:43 +01:00
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
Henry Oswald c961cea514 fixed some bits 2014-08-07 13:56:04 +01:00
James Allen 0a44aa9e71 Push into doc updater queue rather than pub/sub for updates 2014-08-07 13:19:10 +01:00
James Allen a7cf8d6b0a Sort out title of wiki 2014-08-05 17:08:38 +01:00
Henry Oswald 1e0652888a removed console.log 2014-08-04 12:21:38 +01:00
Henry Oswald d047d44079 Changed the error messages which are sent down to the client to be translated first
fixed up tests from titles we check when rendering, deleted them as they never
catch anything important, more hastle than they are worth imo.
2014-08-01 14:03:38 +01:00
Henry Oswald 1b8c8b8c48 sorted out titles 2014-08-01 13:47:14 +01:00
James Allen 55ad2ce78d Include contents page down side of wiki 2014-07-31 16:26:02 +01:00