Commit graph

158 commits

Author SHA1 Message Date
James Allen
e10d09d040 Merge pull request #22 from sharelatex/ja-archive-ranges
Archive ranges as well as doc lines
2017-05-17 12:02:42 +01:00
Shane Kilkelly
6a6fdc13a5 Merge branch 'sk-upgrade-metrics' 2017-04-04 09:34:45 +01:00
James Allen
7a64f040f1 Test and fix _mongoDocToS3Doc 2017-04-03 16:04:54 +01:00
James Allen
bf187f30ec Add tests for _s3DocToMongo 2017-04-03 15:50:33 +01:00
Shane Kilkelly
b14039715f Stub out logger in tests 2017-03-31 11:25:23 +01:00
Shane Kilkelly
f7bc400f22 upgrade to most recent metrics 2017-03-31 11:18:31 +01:00
Shane Kilkelly
62e3cb41a2 Merge branch 'master' of github.com:sharelatex/docstore-sharelatex 2017-03-31 11:03:26 +01:00
James Allen
f94e33a3a9 Merge branch 'master' into ja-archive-ranges
Conflicts:
	app/coffee/DocArchiveManager.coffee
	test/acceptance/coffee/ArchiveDocsTests.coffee
2017-03-30 17:19:42 +01:00
James Allen
a9ab7b739d Archive ranges as well as doc lines 2017-03-30 17:13:43 +01:00
Henry Oswald
e231f8d367 Merge pull request #20 from sharelatex/ho-delete-doc-id-true
safely always get inS3 to unarchive automatically
2017-03-27 12:02:07 +01:00
Shane Kilkelly
ce01b39967 Update metrics version to 1.7.0 2017-03-21 13:48:21 +00:00
Shane Kilkelly
60393ac44f Merge branch 'master' into sk-upgrade-metrics 2017-03-20 09:45:50 +00:00
Shane Kilkelly
e3ca46705c Merge branch 'master' of github.com:sharelatex/docstore-sharelatex 2017-03-20 09:45:42 +00:00
Henry Oswald
8b02ba95b6 add missing error handler 2017-03-17 15:58:01 +00:00
Shane Kilkelly
bc37c844ea update to new metrics api 2017-03-17 15:27:36 +00:00
Shane Kilkelly
e879f9c742 Upgrade metrics 2017-03-16 16:46:58 +00:00
Henry Oswald
c0e23df82b break getDoc into multiple helpers, stop passing filters though from other calls 2017-03-15 22:09:56 +00:00
Henry Oswald
ffd1aa0ca4 just get doc_id for quick check to see if it exists 2017-03-10 11:45:03 +00:00
Henry Oswald
7adc67d13a add missing error handler 2017-03-10 10:37:11 +00:00
Henry Oswald
c2b96c7e1e Merge pull request #17 from sharelatex/ho-always-check-s3
Always get inS3 when getting doc
2017-03-10 10:36:59 +00:00
Henry Oswald
f067c039fe always search for inS3 when getting a doc 2017-03-09 18:51:54 +00:00
Henry Oswald
d6146b2970 got failing acceptence test 2017-03-09 18:18:50 +00:00
Henry Oswald
2fbb148438 Merge pull request #16 from sharelatex/ho-check-unarchive-lines
error if doc lines are not array when unarchiving
2017-03-09 17:38:02 +00:00
Henry Oswald
8bd0df3530 also log out lines in error message 2017-03-09 17:36:28 +00:00
Henry Oswald
dbfe5ac712 error if doc lines are not array when unarchiving 2017-03-09 17:34:33 +00:00
Shane Kilkelly
d09a4cb275 Lengthen sleep for acceptance tests 2017-03-06 15:11:04 +00:00
Shane Kilkelly
929ffbd83a Don't npm rebuild inside container 2017-02-20 10:07:30 +00:00
James Allen
315a1d5e80 Add ranges into health check 2017-01-31 10:23:51 +01:00
James Allen
048c6860d1 Merge pull request #15 from sharelatex/ja-require-ranges
Validate that ranges are present in a set document request
2017-01-31 10:13:45 +01:00
James Allen
fb39bb0442 Validate that ranges are present in a set document request 2017-01-19 12:15:14 +01:00
James Allen
f9d6b3f250 Merge pull request #14 from sharelatex/ja-track-changes
Ja track changes
2017-01-16 11:08:43 +01:00
James Allen
5afb266ab7 Merge branch 'master' into ja-track-changes 2017-01-13 13:34:39 +01:00
James Allen
5e730b33b2 Support new comment op format 2016-12-16 16:44:08 +00:00
James Allen
0174495f75 Add an end point to get all the ranges in a project 2016-12-09 14:37:24 +00:00
James Allen
88699491c7 Merge pull request #13 from sharelatex/ja-delete-refactor
Include deleted docs when archiving
2016-12-06 15:08:17 +00:00
James Allen
6fa8b89154 Be explicit about the data we return from mongo 2016-12-05 17:27:31 +00:00
James Allen
a6ec672d84 Merge branch 'ja-delete-refactor' into ja-track-changes
Conflicts:
	test/acceptance/coffee/ArchiveDocsTests.coffee
2016-12-05 16:58:29 +00:00
James Allen
3d195de3e9 Improve testing of archiving and be explicit about include_deleted parameter 2016-12-05 16:48:01 +00:00
James Allen
7717625534 Include deleted docs when archiving 2016-12-05 16:31:51 +00:00
James Allen
2985cb587a Add tests for RangeManager 2016-12-05 15:38:38 +00:00
James Allen
b8a97731e4 Merge branch 'master' into ja-track-changes
Conflicts:
	test/acceptance/coffee/GettingAllDocsTests.coffee
2016-12-05 14:58:57 +00:00
James Allen
bd5086c054 Don't return deleted docs with all project docs 2016-12-05 14:37:44 +00:00
James Allen
0a65a5eabf Set and get ranges along with lines 2016-12-05 14:21:49 +00:00
James Allen
ca96d168dd Make attributes that can be set in mongo flexible 2016-12-02 15:22:08 +00:00
James Allen
144bae3a55 Add an error guard around the version being present 2016-12-02 15:17:38 +00:00
James Allen
ab527c3c5d remove code left over from migration 2016-12-02 15:02:54 +00:00
James Allen
e156d8017c Be explicit in version filter 2016-11-30 15:29:43 +00:00
James Allen
9b0cef808a Merge pull request #12 from sharelatex/ja-set-version-in-docstore
Don't look up version in mongo if not needed
2016-11-30 15:27:59 +00:00
James Allen
8b95a04a36 Don't look up version in mongo if not needed 2016-11-30 15:08:56 +00:00
James Allen
0677bcb110 Merge pull request #11 from sharelatex/ja-set-version-in-docstore
Set version in docstore, not doc-updater
2016-11-30 14:28:11 +00:00