2209 commits

Author	SHA1	Message	Date
James Allen	e7a4aeaf79	Merge pull request #560 from sharelatex/ja-enable-v2-for-all ... Enable the v2 banner for everyone if showV2Banner is set	2018-05-17 11:55:21 +01:00
Shane Kilkelly	06c0b45ef7	Merge branch 'master' into sk-fix-references-full-index	2018-05-14 13:45:12 +01:00
Shane Kilkelly	43d00a2e5f	Account for the new referencesSearch flag when deciding to do fullIndex	2018-05-14 11:31:59 +01:00
Hayden Faulds	3fb3daaee7	Merge pull request #529 from sharelatex/sk-remove-templates-from-v2 ... Add `templates` to the `Features.hasFeature` function	2018-05-14 10:57:28 +01:00
James Allen	58b5d67bdd	Enable the v2 banner for everyone if showV2Banner is set	2018-05-14 10:29:42 +01:00
James Allen	dee96920b0	Allow font family and line height to be user configurable	2018-05-10 18:03:54 +01:00
Hayden Faulds	9ccdf073c4	accept attributes rather than projectHistoryId to ProjectCreationHandler	2018-05-10 11:39:23 +01:00
James Allen	78aefc2871	Merge pull request #542 from sharelatex/ja-match-front-to-v1 ... Update font and line spacing in Ace to match OL v1	2018-05-09 12:24:37 +01:00
Brian Gough	2bb2d9615f	added comment about using a project entity iterator	2018-05-08 13:37:33 +01:00
Brian Gough	f34ce5b12b	rename _updateProjectStructure to _updateProjectStructureWithDeletedEntity	2018-05-08 13:37:33 +01:00
Brian Gough	1278e2da45	fix project structure version when deleting folder	2018-05-08 13:37:33 +01:00
Brian Gough	24764f66ff	Merge pull request #544 from sharelatex/bg-add-lockvalue-to-lockmanager ... improve locking in web	2018-05-08 11:11:32 +01:00
Hugh O'Brien	57f07fb5fe	Merge pull request #518 from sharelatex/hob-publish-modal-qs ... Publish modal accessible from query string	2018-05-08 09:40:41 +01:00
Brian Gough	afd4a10a19	retry lock with exponential backoff	2018-05-04 15:02:36 +01:00
James Allen	1aadd7d369	Configure line height and font family separately for v2	2018-05-04 14:05:20 +01:00
Brian Gough	e414100c41	add support for unique lock values	2018-05-04 13:22:33 +01:00
Hayden Faulds	ba0e06d0fe	add V1HistoryNotSyncedError	2018-05-02 13:18:43 +01:00
Shane Kilkelly	af70ef0dc4	Add templates to the hasFeature function	2018-05-01 14:01:52 +01:00
James Allen	4c7364fd01	Merge pull request #503 from sharelatex/ja-reorder-compile-rate-limits ... Re-order compile rate limits	2018-05-01 08:48:22 +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
hugh-obrien	157efa6d96	make publish modal accessible from query string	2018-04-27 15:50:11 +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	d9a7b1248a	Re-order compile rate limits to do project/user check before everyone check	2018-04-17 14:43:54 +01:00
James Allen	9e525702c1	Merge branch 'master' into ja-restore-files	2018-04-16 16:14:31 +01:00
Alasdair Smith	3af10733cc	Replace hard coded rich text hashed file path with registration system	2018-04-16 14:14:49 +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
Hugh O'Brien	2d3f169c49	Merge pull request #473 from sharelatex/hob-publish-modal-setup ... Publish modal web setup	2018-04-12 14:01:18 +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	60a28f7173	Fix hashed file path for rich text	2018-04-11 12:00:36 +01:00
hugh-obrien	a250004036	initial publish modal setup	2018-04-10 15:59:24 +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	eb05be6eb3	Remove unused feature flag	2018-04-06 17:00:27 +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