1300 commits

Author	SHA1	Message	Date
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	4c905c168a	do null check on csrf token in smoke test	2014-11-10 11:20:34 +00:00
Henry Oswald	e9232eb197	try catch converting id to object id	2014-11-09 23:08:23 +00:00
James Allen	6d10e45135	Fix unit test	2014-11-07 12:35:10 +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	f7e6b24ff6	Save template description on modal close	2014-11-07 10:26:09 +00:00
James Allen	a59a2dcf39	Make sure to send description before publishing	2014-11-07 10:20:29 +00:00
James Allen	c9e5583394	Use local versions of jquery and angular	2014-11-07 09:49:30 +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	1a2411d4c2	removed bad require in test causing redis to be required in unit test #shouldhavebeenabountyhunter	2014-11-06 12:07:50 +00:00
Henry Oswald	a2f99bc04f	prevent spell check from running twice on doc load	2014-11-04 14:20:59 +00:00
Henry Oswald	908926a0cc	compiled pdf.worker with closure compiler manually	2014-11-04 12:44:45 +00:00
Henry Oswald	05a872763e	revert updated pdf worker and don't minify it ... This reverts commit ffbf6f052f1800b55c7636a98e4f16fdf629c376.	2014-11-04 12:16:06 +00:00
Henry Oswald	be6f0c1ad7	updated pdf worker	2014-11-04 12:10:21 +00:00
Henry Oswald	15285b67cc	minify more assets	2014-11-04 12:01:53 +00:00
Henry Oswald	b9dd2d826e	added null check on subscription for group plans	2014-11-04 10:53:03 +00:00
James Allen	22f5c5dcb9	Keep spacing consistent	2014-11-03 14:25:53 +00:00
James Allen	1d6647e67d	Add in github to plans page	2014-11-03 14:23:12 +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	ccae47979f	added chinese flags under cn	2014-10-31 13:21:04 +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	4f590d7acb	added chinese flags in	2014-10-30 11:52:45 +00:00
Henry Oswald	14d32af6bf	allow ace to scoll off screen	2014-10-30 08:33:54 +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	2a69e185ce	Append spell check menu to body so it isn't hidden by PDF view resizer	2014-10-27 14:51:28 +00:00
James Allen	184189fa3f	Disable hotkeys for layout panels since they interfere with text editing	2014-10-27 14:47:06 +00:00
James Allen	f1ddff4061	Only ignore hidden files from Dropbox, not GitHub	2014-10-27 14:39:20 +00:00
Henry Oswald	f4be1884d3	Merge branch 'master' of https://github.com/sharelatex/web-sharelatex	2014-10-27 11:23:50 +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
James Allen	2debba6bbc	Update PGP key	2014-10-24 11:55:30 +01:00
Henry Oswald	0a123418ac	insert ref data into uni page	2014-10-23 14:13:40 +01:00
Henry Oswald	fab0dc5cbc	change button to a	2014-10-23 11:51:35 +01:00
Henry Oswald	b067e0d0a4	fixed email us button on templates	2014-10-23 11:18:04 +01:00
Henry Oswald	0f8519f619	Merge branch 'master' of https://github.com/sharelatex/web-sharelatex	2014-10-21 14:57:52 +01:00
Henry Oswald	c60f11519f	added ga logging of starting free trial again	2014-10-21 14:06:53 +01:00