alois/Verso
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,109 Commits 7 Branches 11 Tags
c30bcfce534d2e18525cb289af01eb4088726d08
Commit Graph

326 Commits

Author SHA1 Message Date
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
James Allen 13c6fcb8d9 Handle encoded parameters in request URL to wiki 2014-07-31 13:12:24 +01:00
James Allen 94bcfc0eac Only store host, not path in wiki URL setting 2014-07-30 15:56:27 +01:00
James Allen 49258fe3dd Proxy to wiki 2014-07-30 15:44:03 +01:00
Henry Oswald f906d63067 added some logging around dropbox update 2014-07-29 10:32:11 +01:00
Henry Oswald 344d32d4e8 fixed email logo link 2014-07-29 10:29:40 +01:00
Henry Oswald 2267a484f4 added /home so in dev can easily see home page when logged in 2014-07-28 17:04:17 +01:00
Henry Oswald b7c6af1341 /home goes to home page, so can look at it when logged in 2014-07-25 14:17:40 +01:00
Henry Oswald 7255231abc Merge branch 'master-redesign' of https://github.com/sharelatex/web-sharelatex into master-redesign 
updated upstream into a topic branch.
 2014-07-24 13:57:49 +01:00
James Allen 06ca7c904e Merge branch 'master-redesign' of github.com:sharelatex/web-sharelatex into master-redesign 2014-07-24 13:24:20 +01:00
James Allen 1128b45b17 Add in system messages 2014-07-24 13:24:08 +01:00
Henry Oswald 67cba0dfd2 killed info controller and setup features.less for dropbox and feature pages 
also moved dropbox to external pages
 2014-07-24 12:15:54 +01:00
Henry Oswald a8deac697c Merge branch 'master-redesign' of https://github.com/sharelatex/web-sharelatex into master-redesign 2014-07-24 11:29:11 +01:00
Henry Oswald a7b678a2c0 removed dropbox template that is not needed 2014-07-24 11:29:05 +01:00
Henry Oswald 49f356b38f removed advisor and themes page 2014-07-24 11:23:53 +01:00
James Allen fbd36d8b07 Sort of style of admin panel and trim functionality 2014-07-24 11:22:22 +01:00
Henry Oswald 17962426ea blog returns 404's if the page does not exist in blog 2014-07-23 12:16:52 +01:00
Henry Oswald 83b94f987c cleaned up few small things with templates 2014-07-23 12:16:31 +01:00