19060 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Tom	c77a5e7e53	Merge pull request #1 from tomcoombs87/patch-2 ... Patch 2	2017-08-05 22:42:19 +01:00
Tom	b0dce93a24	tiny typo	2017-08-05 22:33:16 +01:00
Tom	79b54adfd8	removed a space to fix broken wiki link	2017-08-05 22:00:33 +01:00
James Allen	711d25e92c	Merge pull request #553 from tomcoombs87/patch-1 ... fixed a typo	2017-08-05 21:14:24 +02:00
tomcoombs87	65247bd8ab	fixed a typo	2017-08-05 20:09:55 +01:00
James Allen	e5c01df9a8	Merge pull request #544 from sharelatex/ja-update-ace ... Update Ace with new context tracking linter	2017-08-04 10:46:34 +02:00
James Allen	6c342a6e65	Merge branch 'master' into ja-update-ace	2017-08-04 10:39:53 +02:00
James Allen	4826616411	Update with latex mode bracket matching changes	2017-08-04 10:38:54 +02:00
James Allen	0ac6cc3207	Merge pull request #42 from sharelatex/ja-return-latest-doc-on-no-version ... Don't return all updates if no version is given	2017-08-04 09:33:41 +02:00
James Allen	b8d0eb2823	Merge branch 'master' into ja-return-latest-doc-on-no-version	2017-08-04 09:31:19 +02:00
Nate Stemen	769875c5d5	Adding default autocomplete commands w/ argument options	2017-08-03 16:31:46 +01:00
Winston Li	b7c3fce8a0	Merge pull request #27 from winstonli/empty_file_in_dotgit ... Empty file in dotgit: direct response to Git Bridge Fails to Clone With IllegalStateException (#3705)	2017-08-03 16:21:09 +01:00
Brian Gough	44ae011703	added files out of sync error object	2017-08-03 15:56:59 +01:00
Shane Kilkelly	cce2f93ab3	Merge pull request #571 from sharelatex/sk-fully-hide-trackchanges ... Sk fully hide trackchanges when not enabled	2017-08-03 15:33:05 +01:00
Shane Kilkelly	05c5b4f9c5	Merge branch 'master' into sk-fully-hide-trackchanges	2017-08-03 15:20:20 +01:00
Shane Kilkelly	9cc461605e	Prevent track-changes hotkey actions when not enabled.	2017-08-03 15:17:28 +01:00
Shane Kilkelly	670d4438dc	If track-changes is not enabled, don't show hotkeys for it.	2017-08-03 15:16:54 +01:00
Brian Gough	f5f516a910	delete clsi state when deleting doc (if used)	2017-08-03 15:04:12 +01:00
Brian Gough	860537146b	avoid logging doclines in getProjectDocs	2017-08-03 15:04:12 +01:00
Brian Gough	80be5adc0d	change filter to exclude in getProjectDocs	2017-08-03 15:04:06 +01:00
Brian Gough	54e02cd895	update docupdater endpoint to /project/id/docs	2017-08-03 14:41:34 +01:00
Brian Gough	1321009fe1	update docupdater endpoint to /project/id/docs	2017-08-03 14:40:46 +01:00
Henry Oswald	33fe252a15	null check user during logout	2017-08-03 13:26:14 +01:00
Henry Oswald	35f31d5a3c	null check the user correctly	2017-08-03 13:17:39 +01:00
Brian Gough	38c879faf2	improve comment about ClsiStateManager hash	2017-08-03 12:15:27 +01:00
Brian Gough	6d331e8ffd	use projectStateUnchanged instead of stateOk	2017-08-03 12:10:23 +01:00
Brian Gough	f44b844d74	refer to project state as projectStateHash	2017-08-03 12:08:11 +01:00
Brian Gough	d4aad06c1f	use syncType and syncState for clsi state options	2017-08-03 12:00:32 +01:00
Brian Gough	5c02255e07	use syncType and syncState for clsi state options	2017-08-03 11:44:10 +01:00
Brian Gough	fb29ac3031	clean up logging	2017-08-03 11:36:59 +01:00
Brian Gough	0a859d3b33	clean up state manager	2017-08-03 11:36:23 +01:00
Brian Gough	a955b8fcc9	remove unused inline function	2017-08-03 11:35:42 +01:00
Brian Gough	a4117487e9	switch from mongoose to mongojs in ClsiManager ... for efficiency	2017-08-03 11:35:42 +01:00
Brian Gough	17b1075dc9	add rootFolder to attributes in Clsi request	2017-08-03 10:20:57 +01:00
James Allen	86a38df6e0	Merge pull request #563 from sharelatex/pr-support-html-encoded-i18n ... Support HTML encoded i18n	2017-08-03 10:36:35 +02:00
James Allen	b2e6c028ba	Merge pull request #562 from sharelatex/pr-ignore-deleted-projects-uncategorized ... Correct count of uncategorized projects	2017-08-03 10:36:20 +02:00
James Allen	ef9b3e06ee	Merge pull request #568 from sharelatex/ja-validate-contact-form ... Validate and add error status to contact form	2017-08-03 10:35:48 +02:00
James Allen	2f3c1fae86	Merge pull request #564 from sharelatex/sk-autocomplete-graphics ... Sk autocomplete graphics	2017-08-03 10:35:27 +02:00
James Allen	3d9da02815	Merge pull request #555 from sharelatex/sk-password-policy ... Enforce stricter password policy.	2017-08-03 10:35:00 +02:00
James Allen	28838eff60	Merge pull request #567 from sharelatex/ja-admin-panel-additions ... Some refactoring and methods needed to support the admin panel	2017-08-03 10:34:33 +02:00
Shane Kilkelly	e162c779d3	Merge pull request #24 from sharelatex/sk-ignore-png-optimiser-timeout ... If optipng is sigkilled by timeout, then ignore that error	2017-08-03 09:22:43 +01:00
Winston Li	f9307c7110	Check file size on tar input path and use stream copying instead of buffering fully	2017-08-02 21:40:00 +01:00
Winston Li	045eea8282	Add messages to precondition checks	2017-08-02 20:58:26 +01:00
Winston Li	fd743d1bf3	Fix #3705	2017-08-02 20:58:15 +01:00
Winston Li	ad687e5f58	Add failing test for #3705	2017-08-02 20:51:20 +01:00
Brian Gough	4d4cf4f693	project state can be stored per project ... there is no need to store it per project+user because it reflects the state of the project itself	2017-08-02 16:25:47 +01:00
Henry Oswald	a1b40b3663	Merge pull request #549 from sharelatex/hof-replace-grunt-init ... Replace grunt service initialisation with bash script	2017-08-02 14:00:30 +01:00
James Allen	66d18bcbcd	Validate and add error status to contact form	2017-08-02 14:59:03 +02:00
Brian Gough	cf780fd8bb	start making requests incremental	2017-08-02 13:53:32 +01:00
Brian Gough	da86a094a8	write files incrementally	2017-08-02 13:46:10 +01:00