2171 commits

Author	SHA1	Message	Date
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	0a00dea610	Merge pull request #469 from sharelatex/ja-feature-flag-rename ... Split references feature flag into mendeley and referencesSearch	2018-04-03 11:53:58 +01:00
Paulo Reis	bd3c12cf90	Make sure the layout lib knows about the resizer width in v2.	2018-03-29 10:35:17 +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	e0facd40da	Merge pull request #461 from sharelatex/ja-feature-flag-rename ... Replace references feature flag with mendeley and referencesSearch	2018-03-28 11:16:56 +01:00
James Allen	dc2d7a9c7e	Replace references feature flag with mendeley and referencesSearch	2018-03-27 16:20:21 +01:00
Henry Oswald	3b3b404288	Update LoggerSerializers.coffee	2018-03-27 14:45:47 +01:00
Henry Oswald	eeb76441c0	null check map on files and docs inside logger	2018-03-27 14:41:56 +01:00
Paulo Jorge Reis	8f7228d26e	Merge pull request #437 from sharelatex/pr-v2-splitters ... Improve v2 splitters	2018-03-27 10:08:05 +01:00
Alasdair Smith	5e2f838af4	Instead of loading script directly use requirejs config so it can be lazy loaded	2018-03-23 13:52:48 +00:00
James Allen	0c89f488bd	Merge pull request #440 from sharelatex/afc-fix-read-announcements-count ... Fix read announcements count	2018-03-23 12:06:49 +00:00
James Allen	45c853d30a	Merge pull request #425 from sharelatex/ja-disable-beta-program ... Disable beta program pages	2018-03-23 11:51:46 +00: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
Paulo Reis	906f4899aa	Only use custom togglers in v2.	2018-03-22 12:10:34 +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
James Allen	161d7b1d9d	Disable beta program pages	2018-03-20 12:03:48 +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
Alasdair Smith	e9ba73138e	Fix webpack config so that it's more consistent	2018-03-19 14:47:25 +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
Alasdair Smith	2e0804c728	Fix opts not passed to buildJsPath	2018-03-15 12:15:00 +00:00
Alasdair Smith	408c195c6a	Instead of using webpack chunk hashing, use existing system	2018-03-15 09:42:26 +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