21677 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Shane Kilkelly	62e3cb41a2	Merge branch 'master' of github.com:sharelatex/docstore-sharelatex	2017-03-31 11:03:26 +01:00
Shane Kilkelly	cc81eca902	Account for error being null	2017-03-31 10:46:13 +01:00
Shane Kilkelly	2c62acee0b	Cleaner error reporting for addFolder endpoint	2017-03-31 10:31:03 +01:00
Shane Kilkelly	15d0a40f85	When error occurs, unset state.inflight	2017-03-31 10:30:28 +01:00
Shane Kilkelly	49446afb82	Remove duplicate line	2017-03-31 10:30:10 +01:00
Brian Gough	fe5711ef07	Merge pull request #31 from sharelatex/bg-error-check-on-unlock ... add error check on unlock	2017-03-31 09:29:53 +01:00
James Allen	f94e33a3a9	Merge branch 'master' into ja-archive-ranges ... Conflicts: app/coffee/DocArchiveManager.coffee test/acceptance/coffee/ArchiveDocsTests.coffee	2017-03-30 17:19:42 +01:00
James Allen	a9ab7b739d	Archive ranges as well as doc lines	2017-03-30 17:13:43 +01:00
Paulo Reis	e9a5c37fb6	Adjust grey tone in error pages.	2017-03-30 16:46:04 +01:00
Paulo Reis	5ae7baccf5	New logo with better spacing.	2017-03-30 16:39:44 +01:00
Brian Gough	5583764d05	fix callback prototype in getLock	2017-03-30 15:31:47 +01:00
Brian Gough	c11618b475	improve unlock error handling	2017-03-30 15:31:34 +01:00
Brian Gough	b2b4bc44df	upgrade logger-sharelatex to v1.5.6	2017-03-30 14:16:35 +01:00
Brian Gough	5989d8f27f	Merge pull request #25 from sharelatex/bg-error-on-out-of-order-ops ... return error when out-of-order ops detected	2017-03-30 14:00:23 +01:00
Brian Gough	8bb3dd07a4	continue when ops are out of order	2017-03-30 13:37:11 +01:00
Brian Gough	20d27024b6	Merge pull request #30 from sharelatex/bg-log-pushed-ops ... log op versions pushed to track changes	2017-03-30 13:33:02 +01:00
Brian Gough	d29141d583	return error when out-of-order ops detected	2017-03-30 11:48:26 +01:00
Brian Gough	527c02a00b	log op versions pushed to track changes	2017-03-30 11:20:50 +01:00
Paulo Reis	250d19163b	Set video source only when the onboarding prompt is shown.	2017-03-30 10:35:16 +01:00
Brian Gough	70bb95fb36	update logger-sharelatex to v1.5.6	2017-03-30 09:41:42 +01:00
Brian Gough	9d6101e365	Merge pull request #3 from sharelatex/bg-rate-limit ... rate limit on logging	2017-03-29 16:26:16 +01:00
Brian Gough	42009093ef	Merge pull request #469 from sharelatex/bg-fix-tikzfeynman-code-check ... handle the \feynmandiagram command in code check	2017-03-29 15:57:34 +01:00
Brian Gough	13492c7fc4	handle the \feynmandiagram command in code check ... pulled from our ace repository https://github.com/sharelatex/ace commit baeb9aff561d048b8a839683261ffdf149ecd4ef	2017-03-29 15:27:10 +01:00
Brian Gough	9c7494eb67	fix off-by-one error in error count	2017-03-29 13:38:07 +01:00
Brian Gough	c7a6f44b11	add unit tests	2017-03-29 13:38:07 +01:00
Paulo Reis	f298fac638	Improve wording on error pages.	2017-03-28 16:57:08 +01:00
Paulo Reis	5b69156948	Use slightly lighter gray in headings.	2017-03-28 16:56:46 +01:00
James Allen	4c8ce65ce7	Allo overlapping comments	2017-03-28 16:50:30 +01:00
Paulo Reis	b7040c2aa6	Remove unused assets.	2017-03-28 16:13:50 +01:00
Paulo Reis	307cd8a11b	Update favicon-related assets with new typography.	2017-03-28 16:12:52 +01:00
James Allen	3bf19a38ee	Merge pull request #467 from sharelatex/ja-validate-recurly-subscription-on-creation ... Handle a 404 from Recurly if account doesn't exist	2017-03-28 16:06:25 +01:00
James Allen	08699d7aa2	Handle a 404 from Recurly if account doesn't exist	2017-03-28 15:46:58 +01:00
Paulo Reis	6d9563e8fb	Try Merriweather as serif font.	2017-03-28 15:18:34 +01:00
Paulo Reis	41a454a955	Update new logo.	2017-03-28 15:18:15 +01:00
James Allen	f53234271f	Merge pull request #465 from sharelatex/sk-hide-email-errors ... If sending email fails, return a generic error.	2017-03-28 13:16:43 +01:00
James Allen	2e6e51eb6d	Merge pull request #464 from sharelatex/ja-validate-recurly-subscription-on-creation ... Check Recurly for subscription as well before creating subscription	2017-03-28 13:15:58 +01:00
Brian Gough	28d2ec93b8	Revert "Revert "Merge pull request #23 from sharelatex/bg-move-lock"" ... This reverts commit 85bc45099f047aa8dfa6d189f02f4b4327c9d602.	2017-03-28 12:52:49 +01:00
Brian Gough	e8039c3204	Merge pull request #466 from sharelatex/bg-prevent-exception-on-nonexistent-project ... fix unhandled exception in ProjectDetailsHandler	2017-03-28 11:56:38 +01:00
Brian Gough	835d8d618d	use error handler	2017-03-28 11:33:37 +01:00
Brian Gough	6002fdbad6	return 404 on project details not found	2017-03-28 10:30:53 +01:00
Brian Gough	f433510e61	return NotFound error in ProjectDetailsHandler	2017-03-28 10:12:52 +01:00
Brian Gough	4e66b045e3	fix unhandled exception in ProjectDetailsHandler	2017-03-28 09:44:50 +01:00
Shane Kilkelly	d2e1efe4a9	fix a daft mistake	2017-03-27 17:45:19 +01:00
Shane Kilkelly	69b9b308d4	If sending email fails, return a generic error. ... This prevents us from leaking juicy details of our aws/ses setup via the password-reset form.	2017-03-27 16:17:38 +01:00
Shane Kilkelly	7cf65d072d	Add a .nvmrc file	2017-03-27 15:28:36 +01:00
Shane Kilkelly	bd1d6aa9c3	Add a .nvmrc file	2017-03-27 14:59:09 +01:00
Shane Kilkelly	ad319498f7	Add a .nvmrc file	2017-03-27 14:52:40 +01:00
Shane Kilkelly	ed76d57bf8	Add a .nvmrc file	2017-03-27 14:51:46 +01:00
Shane Kilkelly	0229794616	Add a .nvmrc file	2017-03-27 14:50:56 +01:00
Shane Kilkelly	64658d0034	Add a .nvmrc file	2017-03-27 14:50:09 +01:00