536 commits

Author	SHA1	Message	Date
Henry Oswald	8097e6ad71	made 7 day free trial the default	2014-10-21 13:48:46 +01:00
Henry Oswald	36136a99ca	fixed escaping of html	2014-10-20 15:46:42 +01:00
Henry Oswald	3cf64ce34f	pass new compile features to client side, don't show timeout upgrade for premium users	2014-10-20 12:21:40 +01:00
Henry Oswald	fc4bc08fc2	added upgrade to get faster compiles message to timeout	2014-10-17 16:01:26 +01:00
Henry Oswald	750b050358	added ab test in for multi currency	2014-10-15 16:21:45 +01:00
Henry Oswald	e443809206	free trial length is show correctly at bottom of plans page	2014-10-15 11:49:20 +01:00
James Allen	fd8991f62e	Sort out responsive flow	2014-10-15 10:23:08 +01:00
James Allen	64fe2a2404	Improve CSS and layout of feature list on new subscription page	2014-10-15 10:22:03 +01:00
James Allen	b32375530c	Refactor card css for use in new subscription page	2014-10-14 15:46:44 +01:00
Henry Oswald	b2b13ef9a7	pass plan to payment page to get the number of collaborators	2014-10-14 12:14:24 +01:00
Henry Oswald	2538d16e63	Merge branch 'master' of https://github.com/sharelatex/web-sharelatex	2014-10-14 11:50:10 +01:00
Henry Oswald	3382c5bb17	added blurb to payment page	2014-10-13 17:51:59 +01:00
Henry Oswald	5a0d74753f	plans page will auto redirect to best guess currency	2014-10-13 17:39:44 +01:00
Henry Oswald	52c54e7300	added ability to change currency on payment page	2014-10-13 17:28:00 +01:00
Henry Oswald	58f6ae323b	fix which plan is "your plan" on dashboard	2014-10-13 16:33:01 +01:00
Henry Oswald	2bbdea3433	renamed change currency function and sorted out recommended currency	2014-10-13 16:27:27 +01:00
James Allen	cfb3969b88	Fix alignment in left menu	2014-10-13 14:45:45 +01:00
Henry Oswald	36264706f6	hooked the plans page up to the geo ip lookup	2014-10-13 14:10:15 +01:00
Henry Oswald	b90003b11e	added custom user dashboard page	2014-10-10 15:44:53 +01:00
Henry Oswald	9924882b59	Merge branch 'master' of https://github.com/sharelatex/web-sharelatex	2014-10-09 16:45:26 +01:00
Henry Oswald	9803f8bd70	changed uni page holder and footer	2014-10-09 16:45:04 +01:00
Henry Oswald	c2c29bb282	university site renders via prozy ok	2014-10-08 16:07:44 +01:00
James Allen	8f7dff1518	Don't show empty sync menu list for collaborators	2014-10-08 15:57:56 +01:00
James Allen	3a9d8c2b31	Make Dropbox unlinking consistent with github	2014-10-08 14:02:37 +01:00
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