4481 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Paulo Reis	26260fc11f	Prevent aggregation of changes from different users.	2017-06-01 16:33:50 +01:00
Paulo Reis	b2a7686204	DRYness.	2017-06-01 15:28:37 +01:00
Paulo Reis	2a0454f2f1	Integrate aggregate changes with bulk actions.	2017-06-01 15:18:43 +01:00
Paulo Reis	1490ea7b04	Change aggregated change model: the main change is now the insertion, deletion is stored in metadata.	2017-06-01 15:03:37 +01:00
Paulo Reis	11c0644490	Aggregate changes; make accept and reject work.	2017-06-01 11:47:55 +01:00
Paulo Reis	3cf8f26583	Add collapse and expand behaviour to aggregate change entries.	2017-05-31 16:23:24 +01:00
Paulo Reis	b6cef2e3d7	Include directive; add some styling.	2017-05-31 15:53:14 +01:00
Paulo Reis	a6108480f5	Add directive to show change entries.	2017-05-31 14:47:25 +01:00
Paulo Reis	17acede8ce	Control visibility when there are no entries.	2017-05-26 09:58:12 +01:00
Paulo Jorge Reis	104bcc94f5	Merge pull request #510 from sharelatex/pr-hide-review-panel ... Hide review panel+keyboard shortcuts for review	2017-05-26 09:40:11 +01:00
Paulo Reis	7fbf6d97bd	Merge branch 'master' into pr-hide-review-panel	2017-05-26 09:39:29 +01:00
Shane Kilkelly	17dd64f48a	Merge pull request #507 from sharelatex/sk-squash-web-errors ... Squash various web errors	2017-05-24 10:57:18 +01:00
Paulo Reis	8dfb91fa6f	Blur toggler after clicking.	2017-05-22 11:11:26 +01:00
Paulo Reis	35c90daa8b	Also show the toggler when the review panel is minimized.	2017-05-22 11:07:57 +01:00
Paulo Reis	0c8cacc222	Highlight review panel splitter when hovered.	2017-05-19 17:08:52 +01:00
Paulo Reis	58ad62c413	Relayout entries when commenting.	2017-05-19 16:57:51 +01:00
Paulo Reis	914e50f3f6	Add new review-related hotkeys; re-arrange hotkeys modal.	2017-05-19 15:52:04 +01:00
Paulo Reis	75c5bf60a8	Make hotkeys modal larger.	2017-05-19 15:51:32 +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	b0b75e2ebb	Update docupdaterhandler tests.	2017-05-18 15:04:12 +01:00
Paulo Jorge Reis	04585c59be	Merge pull request #498 from sharelatex/pr-bulk-actions ... Bulk actions	2017-05-18 14:40:44 +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	7c26628ce0	Improve styling.	2017-05-18 11:02:31 +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
Paulo Jorge Reis	9e4869ee3d	Merge pull request #506 from sharelatex/pr-prepare-bulk-actions-events ... Prepare bulk actions events	2017-05-16 15:51:19 +01:00
Paulo Reis	7f3c0ed5ac	Refactor accept and reject methods to support multiple changes; support bulk actions events.	2017-05-16 14:27:06 +01:00
Paulo Reis	36b4a8e6c2	Update ranges tracker.	2017-05-16 14:04:13 +01:00
Paulo Reis	ac99422c26	Update ranges tracker.	2017-05-16 14:04:06 +01:00
Paulo Reis	a3c529d23f	Update range tracker with new bulk method.	2017-05-16 14:03:52 +01:00
Shane Kilkelly	25e0a19350	Make confirm-password routes more restful	2017-05-16 11:51:06 +01:00
James Allen	9d2bdcf8da	Merge pull request #505 from sharelatex/ja-redis-cluster-refactor ... Allow writing of clsi cookie cache to redis cluster secondary	2017-05-16 10:17:30 +01:00
Shane Kilkelly	ada614cc69	Check response exists before calling method	2017-05-16 09:20:12 +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
Brian Gough	0908e36fb7	fix unit tests	2017-05-15 13:46: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