242 commits

Author	SHA1	Message	Date
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	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
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
James Allen	128c672edd	Merge branch 'github-sync' ... Conflicts: package.json	2014-10-08 12:13:37 +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	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	7f2df4bbd3	renamed rate limiter tests	2014-09-29 11:42:46 +01:00
Henry Oswald	0d056434e6	fixed tests	2014-09-26 17:49:31 +01:00
Henry Oswald	558b6cdfde	remove test which isn't really that important	2014-09-18 14:41:30 +01:00
Henry Oswald	1b02dc72a3	destroy session on dropbox webhook	2014-09-10 14:19:44 +01:00
James Allen	971afb7342	Treat large text files as binary	2014-09-04 13:00:51 +01:00
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	416f41e59d	stopped using proper settings inside of a test	2014-08-29 13:06:50 +01:00
Henry Oswald	aa83b5ca5d	fixed tests whoops	2014-08-29 12:41:42 +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
James Allen	894024ba29	Don't allow folders to be moved into their child folders	2014-08-22 14:38:52 +01:00
James Allen	456d194dbb	Merge branch 'james_tmp'	2014-08-22 12:51:35 +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	670e8e5cb9	Use Dropbox Real-time polling	2014-08-13 17:26:18 +01:00
James Allen	b7ed3bab8f	Merge branch 'redis-queue'	2014-08-11 12:10:25 +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
James Allen	0a44aa9e71	Push into doc updater queue rather than pub/sub for updates	2014-08-07 13:19:10 +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	bf56e083cf	removed a load of console.logs	2014-07-25 13:14:19 +01:00
James Allen	1128b45b17	Add in system messages	2014-07-24 13:24:08 +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
James Allen	1c68ea7328	Don't care if user key has expired when we receive a cursor update	2014-07-21 13:16:07 +01:00
Henry Oswald	554fd7c7d0	change client connection timeout to 15 mins expire in redis	2014-07-17 16:03:53 +01:00
James Allen	37a12e88c1	Show who is online	2014-07-17 15:25:22 +01:00
James Allen	e0f1ed3c10	Use internal url for chat	2014-07-17 11:43:12 +01:00
Henry Oswald	abc4306e06	merge	2014-07-16 13:35:15 +01:00
James Allen	fce271f827	Fix unit tests	2014-07-16 12:01:15 +01:00