272 commits

Author	SHA1	Message	Date
Shane Kilkelly	33b4a1768b	Merge branch 'master' into sk-linked-files-from-project	2018-05-15 10:53: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	dee96920b0	Allow font family and line height to be user configurable	2018-05-10 18:03:54 +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	24764f66ff	Merge pull request #544 from sharelatex/bg-add-lockvalue-to-lockmanager ... improve locking in web	2018-05-08 11:11:32 +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
Shane Kilkelly	5cb85c0332	WIP: Add ProjectFileAgent	2018-05-03 14:29:03 +01:00
Shane Kilkelly	af70ef0dc4	Add templates to the hasFeature function	2018-05-01 14:01:52 +01:00
hugh-obrien	157efa6d96	make publish modal accessible from query string	2018-04-27 15:50:11 +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
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
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	eb05be6eb3	Remove unused feature flag	2018-04-06 17:00:27 +01:00
James Allen	1e8439a2c6	Fix restore of docs from old deleted docs	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
Paulo Reis	bd3c12cf90	Make sure the layout lib knows about the resizer width in v2.	2018-03-29 10:35:17 +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
Paulo Reis	906f4899aa	Only use custom togglers in v2.	2018-03-22 12:10:34 +00:00
Alasdair Smith	e9ba73138e	Fix webpack config so that it's more consistent	2018-03-19 14:47:25 +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
Hayden Faulds	a7945e9b96	extra logging for DocumentUpdaterHandler	2018-03-09 11:16:35 +00:00
Shane Kilkelly	84fff5e9b7	Merge pull request #379 from sharelatex/sk-geolocate-user-sessions ... Geolocate user, and pass country-code to editing-sessions	2018-03-06 11:33:50 +00:00
James Allen	85f25b810c	First pass at URL based linked files	2018-03-05 10:37:00 +00:00
Shane Kilkelly	bbe15a3ff3	Remove stray log	2018-03-02 12:06:18 +00:00
Shane Kilkelly	1629f68d5e	Geolocate user on login, and pass country-code to editing-sessions	2018-03-02 12:02:45 +00:00
Hayden Faulds	adc90b68e7	use gauge not inc	2018-02-21 13:25:25 +00:00
Hayden Faulds	584cd71173	fix exceeded lock timeout logging ... we were logging this after failing to get the lock, this stops that	2018-02-20 14:03:45 +00:00
Hayden Faulds	d924dbd1ed	improve metrics	2018-02-20 13:58:09 +00:00
Hayden Faulds	d750f942de	fix: stop pass milis not seconds into setTimeout	2018-02-20 10:26:24 +00:00
Hayden Faulds	e50c3837bc	add extra metrics around locking	2018-02-19 12:15:02 +00:00
Hayden Faulds	693c8e8c60	move where lock keys are defined	2018-02-16 14:44:21 +00:00
Hayden Faulds	cbc6fb232d	add mongo transaction lock when getting or updating projects	2018-02-16 14:44:21 +00:00
Alasdair Smith	bfda9c595b	Hide rich text behind feature flag	2018-02-09 10:42:11 +00:00
James Allen	de7f13aea6	Use hasFeature for message about returning to v1/SL	2018-01-31 10:05:56 +00:00
James Allen	3ed805a65a	Show different message if user comes from SL rather than OL v2	2018-01-24 16:56:51 +00:00
James Allen	945ef25ef5	Merge pull request #244 from sharelatex/hof-lock-file-upload ... Project Locking: ProjectUploadController	2018-01-11 08:42:36 +00:00
Hayden Faulds	817840840a	use LockManger.runWithLock	2018-01-09 16:37:34 +00:00
Paulo Reis	0484b46027	Redundancy.	2017-12-21 13:52:34 +00:00
Paulo Reis	484d34e296	Only render announcements in SL.	2017-12-21 12:57:07 +00:00
Paulo Reis	0a0c6c6c0c	Merge branch 'master' into pr-style-v2-chatpane	2017-12-20 09:50:49 +00:00
Henry Oswald	70298ba65c	only hash the static content when minified is on	2017-12-19 13:13:31 +00:00
Paulo Reis	cb83e2c1b2	Tone down chat colors.	2017-12-19 10:52:23 +00:00