134 commits

Author	SHA1	Message	Date
James Allen	d1b68ddf7c	Fix RestoreManager unit tests	2018-04-16 16:27:24 +01:00
James Allen	9e525702c1	Merge branch 'master' into ja-restore-files	2018-04-16 16:14:31 +01:00
Brian Gough	882b555433	create new file on replace	2018-04-09 12:05:08 +01:00
Brian Gough	baec4eb195	move uploads outside the lock	2018-04-09 12:05:07 +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
Hayden Faulds	57de597e60	404 when resyncing deleting projects	2018-03-16 15:26:19 +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
Shane Kilkelly	9dc8600588	Add a unit test for the analytics events sent from project-creation	2018-03-12 10:50:15 +00:00
Hayden Faulds	75f5fbcdbf	refactor DocumentUpdaterHandler	2018-03-09 11:15:18 +00:00
Hayden Faulds	5b2e7d981a	resyncProject -> resyncProjectHistory	2018-03-09 11:11:06 +00:00
Hayden Faulds	50fdfec6e8	add unit tests for project history resync	2018-03-09 11:11:06 +00:00
Tim Alby	4b291fab2a	Record new project event	2018-03-06 18:13:24 -05: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
Shane Kilkelly	feee992b43	Reverse an un-necessary re-arrangement of tests	2018-03-06 10:13:39 +00:00
Shane Kilkelly	b3f47ea44a	Remove obsolete segmentation payload in editing-session request	2018-03-05 11:15:41 +00:00
Shane Kilkelly	f625b22ec5	Move the geolocation out of login, to the editingSession action	2018-03-05 10:46:51 +00:00
James Allen	cae09028ff	Fix tests	2018-03-05 10:37:53 +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
Shane Kilkelly	1629f68d5e	Geolocate user on login, and pass country-code to editing-sessions	2018-03-02 12:02:45 +00:00
Brian Gough	af494dedf2	check project structure version in unit tests	2018-03-01 12:32:09 +00:00
Brian Gough	67d784a74a	increment project version on every structure change	2018-03-01 12:32:08 +00:00
James Allen	becb76d69b	Don't allow backslashes in file names	2018-03-01 11:42:44 +00:00
Alasdair Smith	f11f208772	Revert "Revert "Upgrade to mocha 5.0.1""	2018-02-27 15:03:21 +00:00
Alasdair Smith	315587605c	Revert "Upgrade to mocha 5.0.1"	2018-02-27 12:25:42 +00:00
Alasdair Smith	46ac74a160	Fix incorrectly scoped variable	2018-02-26 14:26:04 +00:00
Alasdair Smith	2247e4d465	Fix scoping issues where stubs were defined in wrong describe blocks	2018-02-26 14:21:14 +00:00
Alasdair Smith	136fd84810	Fix module stub in incorrect scope	2018-02-26 13:52:58 +00:00
Alasdair Smith	be6fa346d5	Fix bug where incorrect variable was used	2018-02-26 13:37:17 +00:00
Alasdair Smith	ec7237b7e8	Fix callback stub being defined in wrong scope	2018-02-26 12:33:48 +00:00
Alasdair Smith	2529ed756a	Fix callback being defined in wrong describe block	2018-02-26 12:27:54 +00:00
Alasdair Smith	fd8c61985f	Fix bug where stubs were attached to undefined variables	2018-02-26 12:19:56 +00:00
Alasdair Smith	5d017beac5	Fix stub incorrectly overriding top level beforeEach	2018-02-26 11:46:06 +00:00
Alasdair Smith	cfc9dbdbb3	Fix bad scoping of user agent	2018-02-26 11:34:08 +00:00
Alasdair Smith	34b53726d4	Fix error not being defined in wrong describe block	2018-02-26 11:19:52 +00:00
Alasdair Smith	192eb8b44f	Fix error not being defined in wrong describe block	2018-02-26 11:16:04 +00:00
Alasdair Smith	d79e226a20	Fix callback defined in wrong describe block scope	2018-02-26 10:58:20 +00:00
Hayden Faulds	adc90b68e7	use gauge not inc	2018-02-21 13:25:25 +00:00
Hayden Faulds	d924dbd1ed	improve metrics	2018-02-20 13:58:09 +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	66cd5cd24b	use ProjectGetter.getProject in other ProjectGetter methods	2018-02-16 14:44:21 +00:00
Hayden Faulds	95b82a3c9d	use ProjectGetter in ProjectLocator.findElementByPath	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
Brian Gough	fc1e94b14a	Merge pull request #343 from sharelatex/bg-block-javascript-property-names ... block javascript property names being used as file names	2018-02-16 14:07:12 +00:00
Hayden Faulds	eb198cd8c3	make getSafePathname a method in CompileController rather than Project	2018-02-16 13:10:48 +00:00
Brian Gough	8a10e98b56	block javascript property names being used as file names	2018-02-16 10:31:47 +00:00
Hayden Faulds	304a6bc332	use ProjectGetter rather than Project directly	2018-02-16 08:55:09 +00:00
Hayden Faulds	aa89b7e70b	Merge pull request #327 from sharelatex/hof-entity-refactoring ... Refactor ProjectEntityHandler	2018-02-14 13:28:41 +00:00