Commit Graph

512 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 e406034ad6 Add in Dropbox description 2014-10-07 14:42:03 +01:00
James Allen dbd85a05f1 Send user features and features switches to views where needed 2014-10-07 13:31:13 +01:00
James Allen 10732d112d Hook module system into project list page 2014-10-03 11:32:59 +01:00
Henry Oswald b05c6bb001 fixed hiding lang popup in firefox 2014-10-02 17:27:02 +01:00
Henry Oswald 3442786930 fixed template error 2014-09-30 21:52:00 +01:00
Henry Oswald de6135c777 added missing translations 2014-09-30 11:41:47 +01:00
Henry Oswald 9faf4771e7 added ab test controller so it is always loaded 2014-09-29 17:33:54 +01:00
Henry Oswald a0174c649b added a couple of missing translations 2014-09-26 16:35:57 +01:00
Henry Oswald ca4dc9bf00 added missing translation 2014-09-26 15:04:25 +01:00
Henry Oswald 21f46da08a changed ab test from 30 -> 14 to 14 -> 7 2014-09-26 10:56:45 +01:00
Henry Oswald d5f816598d fixed incorrect message showed in pubic modal 2014-09-20 09:20:36 +01:00
Henry Oswald 583b333a73 change nexted level of templates ng-controller 2014-09-10 15:33:59 +01:00
Henry Oswald bed78665f5 hide the currency dropdown for the moment 2014-09-10 08:17:22 +01:00
James Allen e973a66482 Allow client side module code injection 2014-09-08 17:33:30 +01:00
James Allen db9632f8f2 Allow modules to inject parts of views 2014-09-08 15:40:46 +01:00
Henry Oswald f1372fc449 moved button, not that pretty 2014-09-05 16:11:19 +01:00
Henry Oswald ff0365c157 change plan has multi currency view 2014-09-05 15:47:08 +01:00
Henry Oswald 08e61efeb6 added some whitespace betten translations 2014-09-05 13:12:23 +01:00
Henry Oswald 08cebe369d close dropdown on click 2014-09-05 12:16:02 +01:00
Henry Oswald eeb27062a0 added currency query string param to subscribe button 2014-09-05 11:40:14 +01:00
Henry Oswald 13a667f47a v1 of multi currency 2014-09-04 19:03:04 +01:00
Henry Oswald c4a379075d Merge branch 'master' of https://github.com/sharelatex/web-sharelatex 2014-09-02 10:49:43 +01:00
Henry Oswald 6a4ddd937b Merge pull request #104 from watercrossing/fixSpace
Add missing white space
2014-09-02 10:34:08 +01:00
watercrossing 81b543bbaa Add space at end of line 2014-09-01 20:14:49 +01:00
Henry Oswald 54b9cdc3e4 new ab framework up and running 2014-09-01 17:48:09 +01:00
Henry Oswald 62f207c368 added basic new a/b test funnely framework 2014-09-01 15:14:08 +01:00
Henry Oswald f3c04feda7 added a missing templates button back into templates index page 2014-09-01 15:13:37 +01:00
Henry Oswald 03137d4271 made more room for bottom left part of footer as it wraps some time in spanish 2014-08-29 15:29:51 +01:00
Henry Oswald cffcdbae18 fixed formatting $ and % 2014-08-29 13:49:37 +01:00
Henry Oswald ce3db55624 improved annual plans view 2014-08-29 13:40:35 +01:00
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
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 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