516 commits

Author	SHA1	Message	Date
Henry Oswald	857d867191	added locks into editor controller for new/move/deletes ... filesystem import manager uses the unlocked version	2014-11-26 15:32:23 +00:00
Henry Oswald	bd841b4795	coppied the lock manager over from doc updater	2014-11-25 16:52:27 +00:00
Henry Oswald	3bae278c92	Revert "increased timeout for geoip to 3 seconds" ... This reverts commit e4c892b59734a0b6b67ad37a1d09c1618ec389d4.	2014-11-25 13:10:00 +00:00
Henry Oswald	d91064a369	increased timeout for geoip to 3 seconds	2014-11-25 11:51:03 +00:00
Henry Oswald	dbecadcaea	Merge branch 'master' into multicurrency	2014-11-25 11:35:59 +00:00
Henry Oswald	6c0f03e9c7	added ab test to show collar plan to people in editor	2014-11-24 16:21:03 +00:00
James Allen	b8fdbdb406	Handle errors in request pipes	2014-11-24 13:58:41 +00:00
James Allen	970125b7a8	Check for null project in joinProject	2014-11-24 13:43:08 +00:00
James Allen	3578e41c9c	Add null check into FileTypeManager isDirectory check	2014-11-24 13:39:07 +00:00
James Allen	d4af0fe36d	Wrap smoke test in domain to catch errors	2014-11-24 13:36:10 +00:00
Henry Oswald	a52b91691a	Merge branch 'master' into multicurrency	2014-11-21 13:16:29 +00:00
Henry Oswald	6d22bda88f	added new currencies removed ab test as well	2014-11-21 13:13:53 +00:00
Henry Oswald	6c746d9aec	added redis health check in	2014-11-19 23:18:20 +00:00
Henry Oswald	cd8c233c05	Revert robust redis connection code	2014-11-19 15:06:05 +00:00
James Allen	8b9a26d6f3	Add in http health check end points for redis subscription channels	2014-11-19 14:12:37 +00:00
James Allen	d6532c63f8	Use new robust subscription model	2014-11-19 11:09:42 +00:00
Henry Oswald	804bc16bc8	redirect users to /register when coming from templates or share url ... redirect to /login when going anywhere else (/project /project/1234)	2014-11-13 17:12:39 +00:00
Henry Oswald	f5d3801bfb	changed findElementByPath to not call cb more than once & deal with nulls	2014-11-11 14:44:44 +00:00
Henry Oswald	ae897cb41d	try catch encodeURIComponent	2014-11-10 16:30:02 +00:00
Henry Oswald	c920874872	added null check to compile features	2014-11-10 11:26:40 +00:00
Henry Oswald	29ae816432	added next into controller for error	2014-11-10 11:23:07 +00:00
Henry Oswald	e077108993	null check user in logging	2014-11-10 11:21:59 +00:00
Henry Oswald	e9232eb197	try catch converting id to object id	2014-11-09 23:08:23 +00:00
James Allen	84c08edcf3	Factor out common joinProject logic to provide and HTTP end point for the real-time API	2014-11-07 12:31:47 +00:00
James Allen	218f5fedf8	Fix broken template creation route	2014-11-07 11:21:55 +00:00
James Allen	9c5ae5adf4	Remove unused old update method	2014-11-07 09:39:17 +00:00
James Allen	d27af25bc9	Convert template publishing to use HTTP end points	2014-11-06 14:39:40 +00:00
James Allen	7b6ec86cef	Access Dropbox status via HTTP end points	2014-11-06 14:39:40 +00:00
James Allen	e596b60af0	Move collaborator HTTP end points into the Collaborators feature	2014-11-06 14:39:40 +00:00
James Allen	5c3e8e6d88	Add and remove collaborators with HTTP requests, not websockets	2014-11-06 14:39:40 +00:00
James Allen	94a17bd36d	Remove unused socket.io endpoints	2014-11-06 14:39:40 +00:00
Henry Oswald	b9dd2d826e	added null check on subscription for group plans	2014-11-04 10:53:03 +00:00
Henry Oswald	16e93b6f1b	Merge branch 'master' of https://github.com/sharelatex/web-sharelatex	2014-11-03 12:07:53 +00:00
Henry Oswald	edf715919d	send user to 404 if templates returns 404	2014-11-03 11:48:56 +00:00
Henry Oswald	4c7293f8c2	remove lang from page title in wiki article	2014-11-03 11:48:43 +00:00
James Allen	528ff743e8	Remove github feature flat	2014-11-03 10:55:35 +00:00
Henry Oswald	30100f2a07	fixed badly called flushProjectToThirdPartyDataStore causing issues with initial drobox sync	2014-10-31 12:41:06 +00:00
Henry Oswald	aeb956c8a4	wiki will try and get spanish version of page then fall back to english if it is not there	2014-10-31 12:15:03 +00:00
Henry Oswald	e0aae65050	added file ref null check	2014-10-31 10:50:20 +00:00
Henry Oswald	0f4d9771aa	added null check to where we insert elements into a project	2014-10-31 10:37:44 +00:00
Henry Oswald	d428e7e5b4	handle a null in the file refs list ... this seems to happen now and then when there is networking issues	2014-10-31 10:34:21 +00:00
Henry Oswald	56efefd6d4	renamed variable	2014-10-30 08:33:18 +00:00
James Allen	ca664e0063	Get subscription status correctly for showing upgrade/bonus link	2014-10-27 15:00:46 +00:00
James Allen	f1ddff4061	Only ignore hidden files from Dropbox, not GitHub	2014-10-27 14:39:20 +00:00
Henry Oswald	011bdc4617	explicitly set the file types to delete ... the wild card version can get mixed up with app.del '/project/:project_id/contents/*', httpAuth, TpdsController.deleteProjectContents	2014-10-24 12:01:52 +01:00
Henry Oswald	0a123418ac	insert ref data into uni page	2014-10-23 14:13:40 +01:00
Henry Oswald	8097e6ad71	made 7 day free trial the default	2014-10-21 13:48:46 +01:00
Henry Oswald	4bd0708029	put the compile group on the session so proxied requests are sent to the correct place ... I know this is premature optimisation however we do make a lot of requests to the clsi for each compile and this will save mongo a lot of calls	2014-10-21 09:34:58 +01:00
Henry Oswald	fb53be7ce4	Revert "priority compiles are proxyed to the priority servers" ... This reverts commit 5375af085a1fc20def19a858e3f63c52f3bec9b0.	2014-10-21 09:16:23 +01:00
Henry Oswald	250606472d	priority compiles are proxyed to the priority servers	2014-10-20 17:48:00 +01:00