23367 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
Henry Oswald	f130470971	log ip address of user when logging in	2016-11-25 11:59:50 +00:00
James Allen	65c1a62cb7	Add in null check for user when getting hue in chat	2016-11-25 11:08:32 +00:00
Henry Oswald	e56c4b189a	remove a bit of logging which is filling disk up	2016-11-24 18:54:32 +00:00
James Allen	04c151eed0	Only bind to Ace if track changes is enabled	2016-11-24 16:56:50 +00:00
Paulo Reis	ecd81738cb	Restyle toggle.	2016-11-24 15:55:09 +00:00
Shane Kilkelly	167f01857a	Remove stray next params.	2016-11-24 14:15:01 +00:00
Shane Kilkelly	4cc4a4e264	Merge branch 'master' into sk-post-login-redirect	2016-11-24 14:02:38 +00:00
Shane Kilkelly	22101d0305	If user is sent to login page with explicit redirect, obey	2016-11-24 11:38:13 +00:00
Paulo Reis	bf5aa5e253	Fix review panel toolbar in flex contexts.	2016-11-23 17:04:55 +00:00
Paulo Reis	1148b00c9a	Add review header item.	2016-11-23 16:53:13 +00:00
Paulo Reis	8d933d9b5f	Toggler style adjustments.	2016-11-23 16:10:35 +00:00
Henry Oswald	b1a3be4510	change how grunt splits tasks up which fix broken migrate call	2016-11-23 15:32:44 +00:00
Paulo Reis	f61aac0bb3	Make toggler label clickable.	2016-11-23 14:44:04 +00:00
Paulo Reis	e655e85e6d	Integrate toggler in review panel.	2016-11-23 14:34:55 +00:00
Paulo Reis	aba6c90524	Add styling for toggler.	2016-11-23 14:34:40 +00:00
Paulo Reis	ed20f8533f	Add toggler directive.	2016-11-23 14:34:21 +00:00
Shane Kilkelly	8a8ac600d1	Add options for saml firstName and lastName fields.	2016-11-23 14:13:37 +00:00
Paulo Reis	ba5118d02a	Merge branch 'master' into ja-review-panel	2016-11-23 10:41:20 +00:00