1838 commits

Author	SHA1	Message	Date
Alasdair Smith	ad1df3532f	Merge pull request #490 from sharelatex/hof-deleted-project-history ... Pass project history id with updates	2018-04-23 10:05:07 +01:00
James Allen	9e525702c1	Merge branch 'master' into ja-restore-files	2018-04-16 16:14:31 +01:00
Hayden Faulds	7755a7cc1f	add overleaf to projections for project structure updates	2018-04-13 13:45:07 +01:00
Hayden Faulds	9ef40902ca	send projectHistoryId with resync requests	2018-04-13 13:45:03 +01:00
Hayden Faulds	3006d018d9	send projectHistoryId with project structure updates	2018-04-13 13:45:03 +01:00
Hayden Faulds	e5f3c472e3	return projectHistoryId in DocumentController.getDoc	2018-04-13 13:45:02 +01:00
Hayden Faulds	50686090c8	push doc pathname logic into DocController	2018-04-12 16:16:44 +01:00
Brian Gough	4115a35773	Merge pull request #445 from sharelatex/bg-separate-uploads-and-locking ... replace files and separate uploads and locking (connects to overleaf/sharelatex#422)	2018-04-12 09:52:02 +01:00
Alasdair Smith	35cc5bf19c	Add defensive check for req.query, fixing tests	2018-04-10 10:38:40 +01:00
Brian Gough	882b555433	create new file on replace	2018-04-09 12:05:08 +01:00
Brian Gough	1a68f768d4	rename internal method uploadFile to _uploadFile	2018-04-09 12:05:08 +01:00
Brian Gough	38dab1c82c	clean up whitespace	2018-04-09 12:05:08 +01:00
Brian Gough	e29c657c8a	preserve original callback signature for addFile	2018-04-09 12:05:08 +01:00
Brian Gough	b551f3c7e9	fix indentation	2018-04-09 12:05:08 +01:00
Brian Gough	61b192fb2c	fix indentation of comment	2018-04-09 12:05:07 +01:00
Brian Gough	fe8897d757	refactor addFile and addFileWithOutUpdatingHistory	2018-04-09 12:05:07 +01:00
Brian Gough	d949338ed4	separate out file uploads	2018-04-09 12:05:07 +01:00
Brian Gough	cdfa2de68d	add comment about upsert and locking	2018-04-09 12:05:07 +01:00
Brian Gough	baec4eb195	move uploads outside the lock	2018-04-09 12:05:07 +01:00
Alasdair Smith	d433a88158	Pass rich text flag if query string is set	2018-04-06 16:58:12 +01:00
James Allen	2c0bd94fa7	Use mkdirp when restoring a file if the folder doesn't exist	2018-04-06 15:20:51 +01:00
James Allen	1e8439a2c6	Fix restore of docs from old deleted docs	2018-04-06 10:30:13 +01:00
James Allen	b4fa47d664	Add unit tests for RestoreManager	2018-04-06 10:30:13 +01:00
James Allen	0a1c543841	Hook up front end to restore documents	2018-04-06 10:30:13 +01:00
James Allen	075db1e5b9	Remove stray console.log	2018-04-06 10:30:13 +01:00
James Allen	3832850be6	Implement restore end point with acceptance tests	2018-04-06 10:30:13 +01:00
James Allen	beee86f1ce	First pass at restore end point	2018-04-06 10:30:13 +01:00
James Allen	f80962b74b	Split references feature flag into mendeley and referencesSearch	2018-03-28 17:11:41 +01:00
James Allen	f13c7fd573	Revert "Replace references feature flag with mendeley and referencesSearch" ... This reverts commit 12fdff37f9fd5d47e8446eebc576d8bb9e045aa4.	2018-03-28 13:47:34 +01:00
James Allen	dc2d7a9c7e	Replace references feature flag with mendeley and referencesSearch	2018-03-27 16:20:21 +01:00
Alberto Fernández Capel	fef7601433	Early return only applies to fault tolerant request ... We need to return the data to other requests like getLastOccurrence.	2018-03-23 10:02:11 +00:00
Shane Kilkelly	135854a0e0	Merge branch 'master' into ta-add-publisher-hub-analytics-proxy	2018-03-21 10:32:04 +00:00
Tim Alby	643f687640	Add recentV1TemplateIdsActivity proxy to AnalyticRouter	2018-03-20 17:32:45 -05:00
Shane Kilkelly	e50fef151f	Add uniExternalCollaboration proxy to AnalyticRouter	2018-03-20 13:19:51 +00:00
Alberto Fernández-Capel	f9ba4ea467	Merge pull request #414 from sharelatex/afc-retries-with-exp-backoff ... Use exponential backoff in request retries to analytics	2018-03-20 09:55:07 +00:00
Alberto Fernández Capel	132b31c39f	Increase timeout	2018-03-19 14:46:18 +00:00
Alberto Fernández Capel	f2fc999ce4	Extract method to add common params	2018-03-19 10:30:06 +00:00
Alberto Fernández Capel	07b0f37579	Log errors in requests to analytics	2018-03-19 09:56:44 +00:00
Hayden Faulds	57de597e60	404 when resyncing deleting projects	2018-03-16 15:26:19 +00:00
Hayden Faulds	482d140716	add overleaf to projection	2018-03-16 13:29:22 +00:00
Alberto Fernández Capel	6609c10d36	Use exponential backoff to retry request to analytics	2018-03-15 17:14:50 +00:00
Hayden Faulds	d22d8324af	disable history resync when project-history is not enabled	2018-03-15 16:57:39 +00:00
James Allen	de94e33b5d	Merge pull request #397 from sharelatex/ja-fix-project-upload ... Add files to project in series to avoid lock contention	2018-03-13 13:33:16 +00:00
James Allen	371caa41ca	Merge pull request #378 from sharelatex/hof-history-resync ... resync project history endpoint	2018-03-13 13:33:08 +00:00
James Allen	d9b301023a	Use eachSeries rather than a job array	2018-03-13 13:30:06 +00:00
James Allen	33904fe7be	Add files to project in series to avoid lock contention	2018-03-13 13:21:48 +00:00
Alasdair Smith	41d8a50a8e	Merge pull request #385 from sharelatex/sk-add-recent-team-activity-proxy ... Add a proxy to `AnalyticsRouter` for `/recentTeamActivity`	2018-03-13 11:20:55 +00:00
Hayden Faulds	a7945e9b96	extra logging for DocumentUpdaterHandler	2018-03-09 11:16:35 +00:00
Hayden Faulds	75f5fbcdbf	refactor DocumentUpdaterHandler	2018-03-09 11:15:18 +00:00
Hayden Faulds	af9cc28419	additional logging	2018-03-09 11:11:06 +00:00