598 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Brian Gough	747f44c1c1	Merge remote-tracking branch 'public/master'	2017-12-14 14:54:16 +00:00
Brian Gough	41f15c4fa8	fix unit test	2017-12-14 14:46:27 +00:00
Brian Gough	947e18eccf	Merge branch 'bg-limit-ops-in-lock'	2017-12-14 14:26:44 +00:00
Brian Gough	e3efbaffac	Merge pull request #14 from sharelatex/ja-calculate-doclength ... Calculate and send doc length before each update	2017-12-14 14:25:11 +00:00
Brian Gough	3d57976ef9	Merge pull request #37 from sharelatex/bg-limit-ops-in-lock ... put a limit on the number of ops per iteration	2017-12-14 14:21:14 +00:00
James Allen	6abf9c227d	Calculate and send doc length before each update	2017-12-11 17:26:32 +00:00
Hayden Faulds	bd45fcb5f8	Merge pull request #12 from sharelatex/hof-version-entity-creation ... version entity creation; Connects to sharelatex/web-sharelatex-internal#104	2017-11-24 10:02:51 +00:00
Brian Gough	fb572670cd	Merge pull request #11 from sharelatex/bg-use-separate-flush-count-for-projects ... use a separate parameter for doc and project flush	2017-11-21 13:54:03 +00:00
Brian Gough	0bb9f147aa	fix whitespace	2017-11-13 11:56:08 +00:00
Brian Gough	a4bbf5cf52	use a separate parameter for doc and project flush	2017-11-13 11:53:39 +00:00
Hayden Faulds	d0e56e5054	add acceptance tests for entity additions	2017-11-10 15:01:37 +00:00
Hayden Faulds	a3420b1236	version entity additions	2017-11-10 14:54:56 +00:00
Hayden Faulds	569912a832	Merge pull request #10 from sharelatex/hof-version-renames ... version entity renames	2017-11-09 09:15:59 +00:00
Hayden Faulds	944e633bac	add acceptance test for entity renaming	2017-11-08 09:20:38 +00:00
Hayden Faulds	7e86afe55e	version file renames	2017-11-08 09:20:38 +00:00
Hayden Faulds	6d571e6d23	version document renames	2017-11-08 09:20:37 +00:00
Hayden Faulds	b8052e7612	allow settings.redis.project_history to be undefined	2017-10-25 13:56:38 +01:00
Hayden Faulds	5b7be93c79	Merge pull request #2 from sharelatex/hof-doc-pathname ... Add metadata to updates for history	2017-10-25 13:13:00 +01:00
Brian Gough	e590543e42	Merge pull request #4 from sharelatex/bg-fix-listen-in-acceptance-tests ... exit if mock servers fail to start	2017-10-25 09:13:48 +01:00
Brian Gough	a781f336ad	Merge pull request #9 from sharelatex/bg-upgrade-ioredis-via-redis-sharelatex ... upgrade ioredis to 3.2.1 via redis-sharelatex	2017-10-24 12:21:37 +01:00
Brian Gough	f3098f7470	upgrade ioredis to 3.2.1 via redis-sharelatex	2017-10-24 12:20:14 +01:00
Brian Gough	367ed1e941	Merge pull request #8 from sharelatex/bg-upgrade-to-node-6x ... upgrade to node 6.9.5	2017-10-24 11:11:23 +01:00
Brian Gough	56fd6e3d48	upgrade to node 6.9.5	2017-10-24 11:08:20 +01:00
Brian Gough	006d38f201	Merge pull request #7 from sharelatex/bg-remove-unused-ioredis-package ... remove unused ioredis package	2017-10-24 10:56:35 +01:00
Brian Gough	d9d58393d7	remove unused ioredis package ... it is loaded from redis-sharelatex, not here.	2017-10-24 10:39:00 +01:00
Brian Gough	5ac270533e	Merge pull request #6 from sharelatex/bg-upgrade-async ... upgrade async	2017-10-24 10:17:36 +01:00
Hayden Faulds	d1f0c4ceae	add acceptance tests for project history API	2017-10-24 09:06:23 +01:00
Brian Gough	14f3d22071	upgrade to latest async ^2.5.0	2017-10-23 16:02:24 +01:00
Brian Gough	20655b6eeb	remove unused requires of async	2017-10-23 15:59:32 +01:00
Hayden Faulds	04ecd1e7ee	set pathname in acceptance tests	2017-10-23 15:32:25 +01:00
Hayden Faulds	be41a1614d	decorate ops with pathname and doc_length	2017-10-23 15:32:25 +01:00
Hayden Faulds	962520fca8	flush track-changes and project-history in HistoryManager	2017-10-23 15:32:25 +01:00
Hayden Faulds	d003aef31c	conditionally enqueue history updates for project	2017-10-23 15:32:25 +01:00
Hayden Faulds	c27df0bfef	split apart multi and rclient in tests	2017-10-23 14:24:23 +01:00
Hayden Faulds	81f998afe9	return pathname from DocumentManager.getDoc	2017-10-23 14:23:21 +01:00
Hayden Faulds	748315aadc	handle pathname in DocumentManager.getDoc	2017-10-23 14:23:21 +01:00
Hayden Faulds	cbdace7386	store pathname in Redis cache	2017-10-23 14:23:21 +01:00
Hayden Faulds	05b93a629a	return pathname from PersistenceManager	2017-10-23 14:17:14 +01:00
Brian Gough	02d3d1bd17	fix unit tests ... timekeeper must be called before SandboxedModule.require	2017-10-23 14:02:53 +01:00
Brian Gough	7c2a28c161	fix use of timekeeper in unit tests	2017-10-23 13:33:14 +01:00
Brian Gough	4d82f1432a	Merge pull request #5 from sharelatex/bg-upgrade-ioredis-to-3x ... update to ioredis 3	2017-10-23 13:27:02 +01:00
Brian Gough	448f131011	exit if mock servers fail to start	2017-10-20 14:56:12 +01:00
Brian Gough	5bf2cb6374	Merge remote-tracking branch 'public/master'	2017-10-20 13:27:13 +01:00
Joe Green	3df2d60948	Update Jenkinsfile	2017-10-16 14:14:06 +01:00
Joe Green	595d4dae71	Update Jenkinsfile	2017-10-16 14:09:20 +01:00
Joe Green	d387f979bc	only alert on master	2017-10-12 16:53:31 +01:00
Brian Gough	3954ecf85e	add missing timekeeper package	2017-10-12 11:23:24 +01:00
Brian Gough	08f0c67cbf	Merge pull request #3 from sharelatex/bg-auto-doc-flush ... add unflushed time to doc in redis; connects to overleaf/sharelatex#190	2017-10-12 10:55:54 +01:00
Brian Gough	79c276ea77	update to ioredis 3	2017-10-11 17:00:01 +01:00
Brian Gough	727a534d01	keep the existing GET method temporarily ... to avoid any problems due to deployment in the wrong order	2017-10-11 15:44:35 +01:00