23535 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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	d518b93902	Merge pull request #12 from sharelatex/ja-no-mongo ... Set version via docstore, not directly in mongo	2016-12-01 14:48:52 +00:00
James Allen	3da4c104c2	Merge pull request #380 from sharelatex/ja-set-version-in-docstore ... Proxy version number to and from docstore	2016-12-01 09:59:12 +00:00
James Allen	48cc5a992f	Merge branch 'master' into ja-set-version-in-docstore	2016-12-01 09:30:53 +00:00
Shane Kilkelly	e03d16e0cd	Deleting user: if subscription is already cancelled, ignore and proceed.	2016-11-30 16:03:18 +00:00
James Allen	dcc9a5de32	Merge pull request #382 from sharelatex/sk-spellcheck-underline-retina ... Sk spellcheck underline retina	2016-11-30 15:51:34 +00:00
James Allen	34276520d8	Merge pull request #379 from sharelatex/sk-show-user-email ... Add a `user_email` option to the nav "Account" dropdown.	2016-11-30 15:49:34 +00:00
James Allen	ddb956a647	Merge pull request #381 from sharelatex/sk-roll-sessions ... Add the `rolling` option to session	2016-11-30 15:48:53 +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
Shane Kilkelly	e081409b09	Update to modern images	2016-11-30 14:34:50 +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
Shane Kilkelly	ef115e2f91	add a 2x version of the spellcheck-underline image.	2016-11-30 11:25:47 +00:00
Shane Kilkelly	d38890e9f4	Add the rolling option to session	2016-11-30 09:41:58 +00:00
James Allen	7ede096903	Merge branch 'master' into ja-set-version-in-docstore	2016-11-29 17:24:53 +00:00
James Allen	eb648b9bc8	Proxy version number to and from docstore	2016-11-29 17:16:56 +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
Paulo Reis	73e0a63689	Basic mark-up and styles. Change the controller to hold all notifications.	2016-11-29 17:12:53 +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	50f2983912	Log out version when updating doc	2016-11-29 16:49:35 +00:00
Shane Kilkelly	cf94429e05	Add a user_email option to the nav "Account" dropdown.	2016-11-29 16:04:20 +00:00
James Allen	77b1d0ea21	Fix up package versions	2016-11-29 15:29:22 +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	10008fa9c4	Don't add colours in automated test script	2016-11-29 14:41:12 +00:00
Henry Oswald	68ddf04fe8	to string record event check	2016-11-29 14:38:45 +00:00
Henry Oswald	6e9458e9e1	wip	2016-11-29 14:38:25 +00:00
James Allen	7204c08fb2	Rebuild npm modules as part of acceptance test docker run	2016-11-29 14:29:51 +00:00
Henry Oswald	aacdb1e96b	to string record event check	2016-11-28 19:19:00 +00:00
James Allen	f7ba554658	set up acceptance tests to run via docker	2016-11-28 16:51:43 +00:00
James Allen	eb9a3b314a	Set/get version in docOps via docstore HTTP API	2016-11-28 14:55:16 +00:00
Shane Kilkelly	a03ac8fe72	More robust session destruction after deleting user account.	2016-11-28 12:37:53 +00:00
Shane Kilkelly	853dad95f3	After account delete, bounce to login after 1-second delay	2016-11-28 12:01:32 +00:00
Shane Kilkelly	d15659ed85	check user is present before accessing email	2016-11-28 12:01:11 +00:00
James Allen	e739e86c48	Get basic ChangeTracker hooked up. WIP	2016-11-28 10:14:42 +00:00
Shane Kilkelly	52462d7020	Merge branch 'sk-sync-details-from-sso'	2016-11-28 10:11:59 +00:00
Shane Kilkelly	395135a655	Merge branch 'sk-post-login-redirect'	2016-11-28 09:52:14 +00:00
Shane Kilkelly	acce8853ba	Remove redundant baseUrl from plans page.	2016-11-25 15:24:50 +00:00
Shane Kilkelly	2ab5ad4230	If we're updating details from a SSO source, don't allow editing on settings page.	2016-11-25 14:38:00 +00:00
Henry Oswald	4b59fdd453	added missing settings file to announcments controller	2016-11-25 11:59:50 +00:00