3693 commits

Author	SHA1	Message	Date
Paulo Reis	a1435d13a3	Basic structure for the resolved comments dropdown.	2017-01-05 17:15:27 +00:00
Paulo Reis	22db36d21b	Merge branch 'ja-track-changes' of github.com:sharelatex/web-sharelatex into ja-track-changes	2017-01-05 11:51:00 +00:00
Paulo Reis	d13035a4f4	Simpler UI for comments; remove some unused code.	2017-01-05 11:50:43 +00:00
James Allen	5155ebaeec	Don't show resolved comments when loading editor	2017-01-05 10:55:16 +01:00
James Allen	898d20a6fc	Fix signature of call to unresolveComment	2017-01-05 10:34:28 +01:00
Paulo Reis	1599c41670	Sizing adjustments.	2017-01-04 15:34:24 +00:00
James Allen	60152e219b	Merge branch 'ja-track-changes' of github.com:sharelatex/web-sharelatex into ja-track-changes	2017-01-04 16:26:08 +01:00
James Allen	84d9b2aa49	Save resolve and reopened state	2017-01-04 16:26:02 +01:00
Paulo Reis	fdafcf9677	Restyle insertions and deletions - increasing info density.	2017-01-04 15:24:49 +00:00
James Allen	988005e929	Send and get comments via the chat api	2016-12-16 16:42:41 +00:00
James Allen	5717cafcec	Create comments via comment ops	2016-12-13 17:57:46 +00:00
James Allen	898277b4af	Refactor ops model so it all happens in Document	2016-12-13 17:34:29 +00:00
James Allen	0a6a6c3c28	Keep files ordered in overview panel in the same was as the file tree	2016-12-09 16:17:28 +00:00
James Allen	293ba1fc4c	Fetch all ranges from docstore when viewing overview panel	2016-12-09 15:43:08 +00:00
James Allen	1d426e538f	Load ranges from docupdater and toggle track changes when possible	2016-12-08 14:10:30 +00:00
James Allen	1830d41eba	Proxy ranges between doc updater and docstore	2016-12-08 14:09:06 +00:00
Shane Kilkelly	a5d2183441	if Recurly error, parse body xml rather than using regex match	2016-12-06 10:39:59 +00:00
Shane Kilkelly	58280bf6ee	Merge branch 'master' into sk-user-delete-with-cancelled-sub	2016-12-06 09:31:42 +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
Shane Kilkelly	e081409b09	Update to modern images	2016-11-30 14:34:50 +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	eb648b9bc8	Proxy version number to and from docstore	2016-11-29 17:16:56 +00:00
Shane Kilkelly	cf94429e05	Add a user_email option to the nav "Account" dropdown.	2016-11-29 16:04:20 +00:00
Henry Oswald	68ddf04fe8	to string record event check	2016-11-29 14:38:45 +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
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
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
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