2679 commits

Author	SHA1	Message	Date
Paulo Reis	11c0644490	Aggregate changes; make accept and reject work.	2017-06-01 11:47:55 +01:00
Paulo Reis	b6cef2e3d7	Include directive; add some styling.	2017-05-31 15:53:14 +01:00
Paulo Reis	8dfb91fa6f	Blur toggler after clicking.	2017-05-22 11:11:26 +01:00
Paulo Reis	914e50f3f6	Add new review-related hotkeys; re-arrange hotkeys modal.	2017-05-19 15:52:04 +01:00
Paulo Reis	15980d5427	Merge branch 'master' into pr-hide-review-panel	2017-05-19 15:31:14 +01:00
Paulo Reis	957b201fc1	Add commenting and track-changes keyboard shortcuts.	2017-05-19 15:28:49 +01:00
James Allen	76b8fecde9	Merge pull request #509 from sharelatex/ja-fix-clsi-cookie-cluster ... Don't try to set the server id if it isn't returned in the response	2017-05-19 15:00:18 +01:00
James Allen	01548a0216	Don't try to set the server id if it isn't returned in the response	2017-05-19 10:23:01 +01:00
Paulo Reis	e532f543a3	Merge branch 'master' into pr-bulk-actions	2017-05-18 14:38:16 +01:00
James Allen	39ca6d1e6c	Merge pull request #508 from sharelatex/ja-fix-clsi-cookie-cluster ... Check for blank string in clsi cookie caching	2017-05-18 11:12:11 +01:00
James Allen	f708a0cd81	Check for blank string in clsi cookie caching ... ioredis returns "" for a blank entry, the previous driver returned null, so also check for a blank string	2017-05-18 11:09:33 +01:00
Paulo Reis	832764dd3d	Add key shortcut to toggle the review panel.	2017-05-18 11:02:50 +01:00
Paulo Reis	5a9519d18f	Add a toggler element inside the review panel.	2017-05-17 16:41:53 +01:00
Brian Gough	5237647b8b	Merge pull request #489 from sharelatex/bg-improve-upload-robustness ... improve stream error handling on upload	2017-05-17 15:26:03 +01:00
Shane Kilkelly	6338835baf	Merge branch 'sk-sudo-mode'	2017-05-17 09:48:22 +01:00
Shane Kilkelly	4e3284cec8	Merge branch 'sk-dont-redirect-to-images'	2017-05-17 09:48:16 +01:00
Shane Kilkelly	25e0a19350	Make confirm-password routes more restful	2017-05-16 11:51:06 +01:00
Brian Gough	e23871118d	Merge remote-tracking branch 'origin/master' into bg-improve-upload-robustness	2017-05-15 16:01:01 +01:00
Shane Kilkelly	60d3e4a97b	If external auth system is in use, skip sudo-mode checks	2017-05-15 15:46:24 +01:00
Shane Kilkelly	707a81cc2a	Correct title of confirm-password page	2017-05-15 15:46:11 +01:00
James Allen	5aa8b71832	Allow writing of clsi cookie cache to redis cluster secondary	2017-05-15 15:35:01 +01:00
Shane Kilkelly	1d7d0193fc	Use translations for sudo-mode prompt	2017-05-15 13:37:54 +01:00
Shane Kilkelly	1f7724be68	Merge branch 'sk-sudo-mode' of github.com:sharelatex/web-sharelatex into sk-sudo-mode	2017-05-15 11:54:14 +01:00
Shane Kilkelly	c864288c4e	On logout, clear sudo mode	2017-05-15 11:53:52 +01:00
James Allen	17b064df18	Adjust style of sudo mode prompt	2017-05-15 11:45:41 +01:00
Shane Kilkelly	0f75d9f4d9	Test SudoModeController	2017-05-15 10:56:43 +01:00
Paulo Reis	82a19444b3	Merge branch 'master' into pr-bulk-actions	2017-05-15 10:29:15 +01:00
Shane Kilkelly	76285a1554	Start testing SudoModeController	2017-05-15 10:07:22 +01:00
Shane Kilkelly	8605dc83b4	Merge branch 'master' into sk-sudo-mode	2017-05-15 09:21:13 +01:00
Shane Kilkelly	0e26222551	Don't redirect to images, icons, etc, in login workflow	2017-05-12 15:46:16 +01:00
Paulo Jorge Reis	d550ede112	Merge pull request #496 from sharelatex/pr-review-panel-relayout ... Review panel relayout	2017-05-12 13:54:59 +01:00
Shane Kilkelly	1640dfa79a	Merge branch 'sk-fix-cooldown-tpds'	2017-05-12 09:11:23 +01:00
James Allen	3bfd92dd9c	Rename lock to avoid potential conflict with doc updater	2017-05-11 15:27:01 +01:00
Shane Kilkelly	7b0aca7f02	add cooldown to tpds mergeUpdate path	2017-05-11 11:29:57 +01:00
Paulo Reis	a3ab994ab3	Use the same watcher to control miniRP visibility and trigger Ace resizing.	2017-05-11 10:17:25 +01:00
Shane Kilkelly	a08dd26ef3	Remove CooldownMiddlewear from Tpds routes	2017-05-11 10:07:04 +01:00
Shane Kilkelly	e6286c721d	Merge branch 'master' into sk-fix-large-projects	2017-05-11 08:40:17 +01:00
Shane Kilkelly	01ee104f77	Revert "update to newest mongoose" ... This reverts commit 7b05891ba0e87e4cf00fd6b1ea87d7406dc70989.	2017-05-10 15:31:17 +01:00
Shane Kilkelly	08567ff220	if projectId is not defined, error out	2017-05-10 15:25:23 +01:00
Shane Kilkelly	b8e4cafd81	Fix log line	2017-05-10 15:16:36 +01:00
Shane Kilkelly	27842996aa	start testing SudoModoController	2017-05-10 15:15:57 +01:00
James Allen	274d6f4ac6	Merge pull request #493 from sharelatex/ja-redis-cluster-refactor ... Move all redis end points to be cluster compatible	2017-05-10 14:38:37 +01:00
Shane Kilkelly	08fd501ce2	Add a hint to the sudo-mode prompt	2017-05-10 11:36:35 +01:00
Shane Kilkelly	16128288a9	Add sudo-mode protection to sessions page	2017-05-10 11:36:19 +01:00
Shane Kilkelly	5a97521b04	Fix typo in log message	2017-05-10 11:36:05 +01:00
Shane Kilkelly	a3a2108526	Increase sudo-mode time to one hour	2017-05-10 11:35:47 +01:00
Shane Kilkelly	094784b6d5	protect settings page with sudo-mode middlewear	2017-05-10 10:25:32 +01:00
Shane Kilkelly	029c96c7cc	Add sudo-mode 'confirm password' prompt	2017-05-10 10:05:48 +01:00
Paulo Reis	f3e020df7e	Add dialog to confirm bulk actions.	2017-05-09 16:06:19 +01:00
Shane Kilkelly	fd0176c0cf	if project goes over maximum allowed files, put on cooldown	2017-05-09 14:20:29 +01:00