126 commits

Author	SHA1	Message	Date
James Allen	8725aeab03	Allow deleting of comment ranges	2017-01-24 15:57:11 +01:00
James Allen	5fed2424d0	Remove unused redis package reference	2017-01-16 13:05:05 +01:00
James Allen	0706feb26b	Add max limit on number of comments and changes per doc	2017-01-10 16:58:11 +01:00
James Allen	be19532a1d	Add HTTP end point for accepting changes	2017-01-09 14:41:18 +01:00
James Allen	65f4360738	Consolidate HttpController tests into one file	2017-01-09 14:34:10 +01:00
James Allen	7cac2f7d76	Generate deterministic range ids based on seed	2017-01-09 10:46:58 +01:00
James Allen	2c7029cc50	Revert "Support a {dr:...} op for deleting ranges" ... This reverts commit 24c58e5ad430e0240533cc1e5c21122859fe8dc9.	2017-01-09 09:24:19 +01:00
James Allen	0f13cb3aa7	Support a {dr:...} op for deleting ranges	2017-01-06 16:58:51 +01:00
James Allen	59a06cd798	Accept comments with thread id as an op type	2016-12-13 15:51:47 +00:00
James Allen	47b19818ff	Add in new comment op type	2016-12-12 17:53:43 +00:00
James Allen	e3fee1a1d1	Rename 'track changes entries' -> 'ranges'	2016-12-08 12:31:43 +00:00
James Allen	3ea2e07993	Add tests for fetching and flushing track changes entries to persistence layer	2016-12-02 12:01:23 +00:00
James Allen	418405e8b9	Return track changes entries in HTTP request	2016-12-02 11:37:27 +00:00
James Allen	4fadd75ef3	Track changes based on flag on op, not global setting	2016-12-02 11:04:21 +00:00
James Allen	f43355b74d	Fix UpdateManager tests	2016-12-01 18:19:47 +00:00
James Allen	ce93a76e7f	Fix ShareJsUpdateManager tests	2016-12-01 18:11:03 +00:00
James Allen	e7ff05e792	Fix UpdateManager tests	2016-12-01 18:06:33 +00:00
James Allen	889f5fdf9f	Fix ShareJsDB tests	2016-12-01 17:14:40 +00:00
James Allen	b6c93c718d	Update TrackChangesManagerTests -> HistoryManagerTests	2016-12-01 16:50:55 +00:00
James Allen	d878dd5758	Fix RedisManagerTests	2016-12-01 16:49:53 +00:00
James Allen	9ee913be39	Update PersistenceManagerTests	2016-12-01 16:40:15 +00:00
James Allen	fb39e37fe0	Update DocumentManager tests	2016-12-01 16:27:40 +00:00
James Allen	d36f1a86f1	Merge branch 'master' into ja-track-changes ... Conflicts: app/coffee/PersistenceManager.coffee	2016-12-01 16:06:13 +00:00
James Allen	efab68e6b2	Add in guards on bad data from web API	2016-11-29 17:13:16 +00:00
James Allen	546d9e9cee	Remove left over test	2016-11-29 17:13:07 +00:00
James Allen	2852043a6d	Don't store doc version in Mongo directly, instead use docstore	2016-11-29 17:06:23 +00:00
James Allen	f7ba0946be	More acceptance test fixes	2016-11-29 15:09:11 +00:00
James Allen	2df5c08389	Update acceptance tests to use redis-sharelatex	2016-11-29 15:05:02 +00:00
James Allen	db8b4bf991	Update acceptance test script	2016-11-29 14:57:05 +00:00
James Allen	e739e86c48	Get basic ChangeTracker hooked up. WIP	2016-11-28 10:14:42 +00:00
James Allen	5ce15c4d60	Move check of zero length op array up a level	2016-09-12 10:37:41 +01:00
James Allen	993aab7a78	Don't try to redis rpush with no arguments	2016-09-12 10:37:32 +01:00
James Allen	2d82d56f93	Process updates one at a time and write into redis after each one	2016-09-09 11:01:14 +01:00
James Allen	c85fd7ef41	Merge branch 'master' into ja-consistency-refactor	2016-09-07 11:08:04 +01:00
Brian Gough	9bc7594226	clean up redis query	2016-09-05 10:31:54 +01:00
James Allen	8779f3f686	Only write DocOps atomically with version and lines, after all docs are applied	2016-08-23 16:00:46 +01:00
James Allen	87f3e5e809	Remove old migration code	2016-08-23 11:03:37 +01:00
Shane Kilkelly	39cc9cda6d	Remove docker-related config. test:acceptance:docker now depends on acceptance-test-runner-sharelatex.	2016-07-18 11:09:04 +01:00
Shane Kilkelly	4c0dc5a0ef	Increase timeout for test.	2016-07-08 16:05:36 +01:00
Shane Kilkelly	0a5f95f22d	Move docker-entrypoint.sh into the test/acceptance/scripts directory	2016-07-08 15:52:02 +01:00
Shane Kilkelly	32d06b805c	run only the acceptance tests inside container, rather than compile and test.	2016-07-08 15:15:41 +01:00
Shane Kilkelly	b16b34d7c6	only execute app inside container, instead of compile and execute.	2016-07-08 14:50:30 +01:00
Shane Kilkelly	6d9aecae4c	capture exit code of the test run.	2016-07-08 14:31:43 +01:00
Shane Kilkelly	879482a955	grunt scripts to run the docker acceptance tests	2016-07-08 12:09:01 +01:00
Shane Kilkelly	bca8f6c376	working docker image which can run the acceptance tests	2016-07-08 10:51:22 +01:00
Shane Kilkelly	c38d903f92	Basic docker file.	2016-07-07 16:07:14 +01:00
James Allen	1c62a1c5a1	Don't propagate error on secondary timeout	2016-07-07 09:46:15 +01:00
James Allen	59883023ca	Ignore different order of results from smembers	2016-07-06 14:24:27 +01:00
James Allen	89f90c1b04	Timeout secondary requests if they take longer than 200ms	2016-07-06 12:25:36 +01:00
James Allen	508a95c19b	Use the main redis instance for locks	2016-07-06 11:50:02 +01:00