857 commits

Author	SHA1	Message	Date
Henry Oswald	4a774981cf	Merge branch 'master' into multicurrency	2014-10-14 11:52:03 +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	3bac4dc39f	increase auto compile limit	2014-10-14 11:50:06 +01:00
Henry Oswald	6437f74cd3	use req.ip not x-forwarded-for to get ip address for multi currency	2014-10-13 17:55:18 +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
Henry Oswald	2bf34bba4d	added currency to subscription view model	2014-10-13 16:14:13 +01:00
James Allen	3c058edfb4	Add github feature flag to user model	2014-10-13 15:45:19 +01:00
Henry Oswald	7964616f02	changing email address should lowercase the email	2014-10-13 15:44:45 +01:00
James Allen	5edefe2498	Add in compile timeout and group feature options	2014-10-13 15:42:11 +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	3ca04e25fd	add 1 second timeout to geoiplookup ... response times generally seem to be around 0.05s from our servers	2014-10-13 13:15:48 +01:00
Henry Oswald	2e6c2c1926	default to USD in geo ip lookup. ... Decided to put default logic in the GeoIpLookup.getCurrencyCode as we are going to want this default everywhere we use it.	2014-10-13 13:08:11 +01:00
Henry Oswald	e78e4d46b0	use first ip passed though in string for ip lookup	2014-10-13 13:04:20 +01:00
Henry Oswald	259871cbdd	added geoip lookup feature	2014-10-13 00:45:45 +01:00
Henry Oswald	40c3c3e1ce	added customAccount to subscription model	2014-10-10 15:57:27 +01:00
Henry Oswald	b90003b11e	added custom user dashboard page	2014-10-10 15:44:53 +01:00
Henry Oswald	3ba3a91043	if its a custom account redirect to /user/subscription/custom_account	2014-10-10 15:11:22 +01:00
Henry Oswald	e5ab40c911	added example session invalidation code	2014-10-09 18:10:01 +01:00
Henry Oswald	e7984a90d7	unlink dropbox when a user cancels	2014-10-09 17:05:41 +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
James Allen	4743b460f5	Only show rename or deleted message once	2014-10-09 09:13:38 +01:00
James Allen	accd8207b2	Show password reset expired message rather than server error if that's what has happened	2014-10-08 17:18:24 +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	82dc3cf654	Don't reload module views each request by default	2014-10-08 12:39:36 +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
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	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
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	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	9a97245c01	Merge branch 'redis-sentinal'	2014-09-26 17:40:53 +01:00
Henry Oswald	81307324fc	v2, seems to work...	2014-09-26 17:04:33 +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	f73629f8d9	v1 of sentinal support	2014-09-26 14:52:00 +01:00
Henry Oswald	21f46da08a	changed ab test from 30 -> 14 to 14 -> 7	2014-09-26 10:56:45 +01:00