Commit Graph

772 Commits

Author SHA1 Message Date
Henry Oswald e67d3889f9 got better logic and copy for upgrade annual plans, needs i18n next 2014-08-29 12:36:36 +01:00
Henry Oswald 50890af0cf Merge branch 'master' of https://github.com/sharelatex/web-sharelatex 2014-08-29 12:35:37 +01:00
James Allen d7e2b19852 Remove your card will charged message since it doesn't apply to free trials 2014-08-29 10:23:11 +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 d0d08824da modal asking users to confirm a change of plan 2014-08-27 13:21:39 +01:00
Henry Oswald b99e933266 fixed jade formating prob causing console error 2014-08-27 11:09:22 +01:00
Henry Oswald 67fdd73472 fixed template problem with next billing details 2014-08-26 20:18:56 +01:00
Henry Oswald 3b41a6eef4 change spacing on footer due to i18n problems 2014-08-26 16:59:42 +01:00
Henry Oswald 54f083820a translate footer text 2014-08-26 12:29:27 +01:00
Henry Oswald 97b118c2ac added in couple of missing translations 2014-08-24 17:12:22 +01:00
Henry Oswald 27b9cad8ca make ga experiements per page 2014-08-24 17:07:40 +01:00
Henry Oswald 705c282b0a changed ga injection 2014-08-23 19:02:41 +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 0152f42416 Put template settings on client side 2014-08-22 13:10:32 +01:00
James Allen c8ab1bd394 Merge branch 'master' of github.com:sharelatex/web-sharelatex 2014-08-22 12:52:31 +01:00
James Allen dc5e1f71bd Remove console.log debug line 2014-08-22 12:52:27 +01:00
James Allen 456d194dbb Merge branch 'james_tmp' 2014-08-22 12:51:35 +01:00
Henry Oswald fd8221b869 make it possible to hide a lng 2014-08-21 17:58:25 +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 9bcf979e8a changed title for restricted to use translations key 2014-08-21 13:03:51 +01:00
Henry Oswald b9372e6dcd added key for your projects 2014-08-21 13:02:28 +01:00
James Allen e234d7831a Merge branch 'master' of github.com:sharelatex/web-sharelatex 2014-08-21 13:01:34 +01:00
James Allen f093c99b96 Remove deprecated background dropbox polling logic 2014-08-21 13:01:27 +01:00
Henry Oswald e144f9c19a changed key for profile complete 2014-08-21 12:48:55 +01:00
Henry Oswald dd8ca9ca0e changed key Actions -> actions 2014-08-21 12:45:19 +01:00
Henry Oswald daec56359f rename != delete tooltip 2014-08-21 04:41:06 +01:00
Henry Oswald 04e50f8ba6 changed cookie name from hard coded to be config option, defaults to sharelatex.sid 2014-08-20 18:01:21 +01:00
James Allen c4b91de8e8 Layout templates in rows of four 2014-08-20 14:58:01 +01:00
James Allen d0eee7a1e5 Refactor template settings 2014-08-20 14:47:27 +01:00
Henry Oswald c51c0c1cf2 fixed misconfig translate string 2014-08-20 14:40:27 +01:00
Henry Oswald 3cd43ddd86 found sneaky missing translations 2014-08-20 14:31:44 +01:00
Henry Oswald 8d51fcc457 hide translations notification on editor page 2014-08-20 14:08:59 +01:00
Henry Oswald 21f288fbe5 missed off few tooltips in translation 2014-08-20 13:47:45 +01:00
Henry Oswald 8e4974d559 fix more escaping html 2014-08-20 12:45:29 +01:00
Henry Oswald c1c46a36b9 render html of bonus page para 2014-08-20 08:14:36 +01:00
James Allen 156c6ec4b6 Add PDF viewer label in 2014-08-19 14:40:10 +01:00
Henry Oswald ca5b1e7422 cleaned up smoke tests 2014-08-19 14:35:20 +01:00
Henry Oswald 83d8c48dc6 Merge branch 'master' of https://github.com/sharelatex/web-sharelatex 2014-08-19 11:20:06 +01:00
Henry Oswald 523694c4ff changed smoke tests to work with curl
this was needed as there is a bug with request/tough cookie with
multi subdomain cookies ie .sharelatex.com

https://github.com/goinstant/tough-cookie/issues/16

moving it to request in the future is probably a good idea, if we do move to
request then with the current issues we would we need to set

jar._jar.rejectPublicSuffixes = false
2014-08-19 11:17:51 +01:00
Henrique Dias e0e9949da5 dynamic template menu by config settings 2014-08-18 14:26:47 -03:00
James Allen 02ec2bc264 Align flags on left of menu to match flag in footer 2014-08-14 16:41:48 +01:00
James Allen ac4b3663cb CSS tweaks to i18n stuff 2014-08-14 16:33:01 +01:00
Henry Oswald aa4f748608 Merge branch 'master' into i18n 2014-08-14 15:42:54 +01:00
Henry Oswald f75838b353 don't show the lng select if there is only 1 lang to show 2014-08-14 15:42:31 +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
Henry Oswald 7c2beb5d2d added correct flags 2014-08-14 13:00:04 +01:00
James Allen 7816810249 Add in poll dropbox endpoint back into admin 2014-08-14 10:12:01 +01:00