4424 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
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
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	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
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	cb51b1ada1	Merge pull request #500 from sharelatex/ja-rename-lock ... Rename lock to avoid potential conflict with doc updater	2017-05-11 15:29:36 +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	f2dac28a65	Consolidate some watchers.	2017-05-11 10:23:41 +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
Shane Kilkelly	4d662f23de	test SudoModeMiddlewear	2017-05-10 14:54:49 +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	b09a41c557	Fix acceptance tests	2017-05-10 13:45:53 +01:00
Shane Kilkelly	993c261b10	start testing sudo-mode	2017-05-10 11:37:32 +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
James Allen	e19f5a1a5e	Update redis-sharelatex and shrinkwrap	2017-05-09 17:18:04 +01:00
Shane Kilkelly	fd0176c0cf	if project goes over maximum allowed files, put on cooldown	2017-05-09 14:20:29 +01:00
Shane Kilkelly	8e90b7fb9b	Add Cooldown to Tpds routes	2017-05-09 13:54:11 +01:00
Shane Kilkelly	149e38855f	Add a cooldown mechanism for projects which go over limits	2017-05-09 11:40:42 +01:00
Shane Kilkelly	c5c0364d49	update to newest mongoose	2017-05-08 16:09:59 +01:00