502 commits

Author	SHA1	Message	Date
Shane Kilkelly	30beb098ab	Sort the project entities by path	2018-05-04 11:06:59 +01:00
Shane Kilkelly	08263180fa	Add project_id to the entities payload	2018-05-04 11:03:54 +01:00
Shane Kilkelly	3c3ce2010a	Add endpoint to list entities within a project	2018-05-04 10:45:13 +01:00
Shane Kilkelly	4925bfe536	Add an endpoint to get users projects as json	2018-05-04 09:44:13 +01:00
James Allen	d454be8053	Bring down proportion to 10%	2018-04-30 17:19:21 +01:00
James Allen	6399621d1f	Show front widget for paid and sampled free users	2018-04-30 17:13:57 +01:00
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	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	1e8439a2c6	Fix restore of docs from old deleted docs	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
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
Hayden Faulds	d22d8324af	disable history resync when project-history is not enabled	2018-03-15 16:57:39 +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
Hayden Faulds	af9cc28419	additional logging	2018-03-09 11:11:06 +00:00
Hayden Faulds	5b2e7d981a	resyncProject -> resyncProjectHistory	2018-03-09 11:11:06 +00:00
Hayden Faulds	926f91dd3b	wrap project resync in project structure lock	2018-03-09 11:11:06 +00:00
Tim Alby	d5109d22d2	record both project-created and project-imported events	2018-03-06 18:26:25 -05:00
Tim Alby	4b291fab2a	Record new project event	2018-03-06 18:13:24 -05:00
James Allen	9733223840	Show linked file status in front end	2018-03-05 10:37:00 +00:00
James Allen	85f25b810c	First pass at URL based linked files	2018-03-05 10:37:00 +00:00
Brian Gough	3bbd49c7eb	Merge pull request #377 from sharelatex/bg-add-project-structure-version-number ... add project structure version number	2018-03-05 08:41:14 +00:00
Brian Gough	98f50919e8	comment about file replacements	2018-03-01 12:32:08 +00:00
Brian Gough	67d784a74a	increment project version on every structure change	2018-03-01 12:32:08 +00:00
Brian Gough	470d67a3aa	avoid exception in error message when project undefined	2018-03-01 12:31:51 +00:00
Brian Gough	cb35da3cf7	increment a project version number on every change in folder structure	2018-03-01 12:17:33 +00:00
James Allen	becb76d69b	Don't allow backslashes in file names	2018-03-01 11:42:44 +00:00
Hayden Faulds	e50c3837bc	add extra metrics around locking	2018-02-19 12:15:02 +00:00
Hayden Faulds	dd582d1b2e	type-check ProjectGetter.getProject and getProjectWithoutLock arguments	2018-02-16 14:44:21 +00:00
Hayden Faulds	693c8e8c60	move where lock keys are defined	2018-02-16 14:44:21 +00:00
Hayden Faulds	a05d172052	clean up variable names in ProjectGetter.getProject	2018-02-16 14:44:21 +00:00