2298 commits

Author	SHA1	Message	Date
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	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	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	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	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
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	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	ba5118d02a	Merge branch 'master' into ja-review-panel	2016-11-23 10:41:20 +00:00
Paulo Jorge Reis	ff0a5395e5	Merge pull request #374 from sharelatex/pr-wrap-ab-test-header ... PR Wrap header labels AB test	2016-11-23 09:49:53 +00:00
Shane Kilkelly	cee3326ce3	fix omission of 'length'	2016-11-22 17:06:05 +00:00
Shane Kilkelly	f9b1862ddb	Merge branch 'master' into sk-post-login-redirect	2016-11-22 16:54:12 +00:00
Shane Kilkelly	8a4352fff2	Set redirect when redirecting from restricted	2016-11-22 16:54:03 +00:00
Shane Kilkelly	2edd75de96	Allow the 500/Error page to render, even if res.locals aren't set up yet.	2016-11-22 16:48:13 +00:00
Shane Kilkelly	8089bb55a4	use session for the post-login redirect, remove redir query string.	2016-11-22 14:24:36 +00:00
Paulo Reis	dce272462a	Remove test-related mark-up.	2016-11-22 10:39:56 +00:00
James Allen	db93bc8cff	Grey out and add extra info to resolved comments	2016-11-21 17:13:17 +00:00
Paulo Reis	fc6730f5bf	Lower brightness in smaller username text spans; limit avatar text to 1 char.	2016-11-21 14:51:01 +00:00
Paulo Reis	ad857a15f9	Style resolved comments in the current file pane.	2016-11-21 11:16:23 +00:00
James Allen	5814d93f5e	Order entries in the overview panel based on their place in the document	2016-11-18 16:30:41 +00:00
James Allen	6ea61472ec	Add tooltip to add comment indicator	2016-11-18 16:08:02 +00:00
Paulo Reis	f029c7a7b2	Control click behaviour on comments; relayout when toggling panels.	2016-11-18 15:08:16 +00:00
Shane Kilkelly	da1be67aff	Merge branch 'sk-ext-auth-show-email'	2016-11-18 09:34:05 +00:00
James Allen	bf20799478	Allow comments to be resolved an deleted	2016-11-17 18:06:08 +00:00
James Allen	7a8af8a21a	Show file names in overview panel	2016-11-17 16:05:12 +00:00
James Allen	4a93e02407	Goto a change when clicked in the overview panel	2016-11-17 15:55:18 +00:00