Commit graph

4485 commits

Author SHA1 Message Date
Paulo Reis
19ecffd654 Merge branch 'master' into pr-aggregate-insert-delete 2017-06-06 17:04:31 +01:00
Paulo Reis
34796b18c5 Add translation keys. 2017-06-06 16:46:36 +01:00
Paulo Reis
afa011c813 Avoid flickering when elements enter the review panel. 2017-06-06 16:11:00 +01:00
Brian Gough
e417a72e0a remove old version of pdfjs 2017-06-06 15:06:09 +01:00
Paulo Reis
73a67c6617 Add a note on the need of reverse sorting changes when rejecting. 2017-06-06 13:34:48 +01:00
Brian Gough
ecf0857756 update pdfjs to v1.8.188 2017-06-06 12:19:13 +01:00
Brian Gough
ff7e383f08 add compatibility.js from pdfjs repo 2017-06-06 12:18:58 +01:00
Paulo Reis
4504f77aa3 Do bulk rejects in reverse order. 2017-06-06 12:06:43 +01:00
Brian Gough
5aa1e4cc2a add pdfjs-1.8.188 2017-06-06 11:47:30 +01:00
Paulo Reis
81a5a5311d Clear selection after bulk actions. 2017-06-06 10:03:33 +01:00
Paulo Reis
af93fc1869 Make aggregate entries work when the review panel is minimised. 2017-06-06 10:00:50 +01:00
Brian Gough
b277ee3254 Merge pull request #511 from sharelatex/bg-handle-web-api-errors
use a separate error handler for api router errors
2017-06-06 09:22:28 +01:00
Paulo Reis
5a75663a0c Do bulk rejects in reverse order. 2017-06-05 17:17:47 +01:00
Paulo Reis
e616a62d68 Save entry ids inside entry object, not only as the key. 2017-06-05 16:29:55 +01:00
Shane Kilkelly
f7ad4a4786 WIP: basically working, with client sync 2017-06-05 14:48:50 +01:00
James Allen
cb1745a1e6 Fix redirect in clone project modal 2017-06-05 13:33:32 +01:00
James Allen
d7981fd2d4 Merge pull request #512 from sharelatex/ja-project-name-validation
Refactor project name validation into one place and restrict /s
2017-06-05 11:55:39 +01:00
Shane Kilkelly
51881dbbcc Only load labels from current doc if change is local 2017-06-05 11:09:58 +01:00
Paulo Reis
d4ac91f75e Use correct handlers in directives. 2017-06-05 10:52:11 +01:00
Paulo Reis
6c3cdbcc3a Remove dead code, backend does not send single change events anymore. 2017-06-05 10:43:03 +01:00
Paulo Reis
8d8bcab1e8 Consolidate change accept and reject code. 2017-06-05 10:41:59 +01:00
Shane Kilkelly
f29320dd93 Add ability to load labels from single document 2017-06-05 09:26:13 +01:00
Shane Kilkelly
4cb41a988a WIP: initial work on server-side labels 2017-06-02 15:12:59 +01:00
Paulo Reis
e2edf4184f Explicit naming. 2017-06-02 11:43:43 +01:00
Shane Kilkelly
0e498d5e65 Merge branch 'master' of github.com:sharelatex/web-sharelatex 2017-06-02 09:55:30 +01:00
Shane Kilkelly
51e3a6b3a3 Don't use String.startsWith, use slice instead.
- String.startsWith is not supported in IE
2017-06-02 09:54:48 +01:00
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
Shane Kilkelly
6feb6959a3 Merge pull request #517 from sharelatex/pr-fix-error-banner-clicks
Make the alert container a zero-height static element, to avoid capt…
2017-06-01 09:15:46 +01:00
Shane Kilkelly
6b746f757e Merge pull request #514 from sharelatex/ja-update-raven
Update Raven (Sentry lib) to 3.15.0 in client
2017-06-01 09:13:40 +01:00
Shane Kilkelly
5847973615 Merge pull request #515 from sharelatex/ja-editable-asy-files
Make .asy files editable when uploaded
2017-06-01 09:13:25 +01:00
Shane Kilkelly
9a15420c4e Merge branch 'master' into sk-labels-autocomplete 2017-06-01 08:34:56 +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
Shane Kilkelly
039d18bf8b Simplify logic for deciding whether to re-scan doc on not 2017-05-26 15:08:38 +01:00
Shane Kilkelly
faf0337ca9 Refactor labels autocomplete 2017-05-26 14:56:38 +01:00
Paulo Reis
17acede8ce Control visibility when there are no entries. 2017-05-26 09:58:12 +01:00
Paulo Reis
7fbf6d97bd Merge branch 'master' into pr-hide-review-panel 2017-05-26 09:39:29 +01:00
Paulo Reis
749fc6a425 Make the alerts container a zero-height static element, to avoid capturing clicks. 2017-05-25 16:10:10 +01:00
Shane Kilkelly
7923450e25 Move labelsManager into aceEditor directory 2017-05-25 09:42:07 +01:00
Shane Kilkelly
0543f32ff0 Add comment explaining debounce 2017-05-25 09:35:38 +01:00
Shane Kilkelly
ea9a0dda83 More robust change detection for autocomplete.
- accurately detect when labels are involved in 'remove' event
2017-05-25 09:33:15 +01:00
Shane Kilkelly
1ba8b702ad More robust regex for matching/parsing labels.
- limit label name to max 80 characters
- don't use `.*`
- limit total labels per document to 1000
2017-05-25 09:32:10 +01:00
Shane Kilkelly
a363b62f23 Remove periodic polling of document for labels 2017-05-25 09:31:36 +01:00
Shane Kilkelly
d0bf407515 Use coffeescript => functions, rather than self=this. 2017-05-24 15:05:53 +01:00
Shane Kilkelly
efd01081f7 Set up and automatic refresh of labels 2017-05-24 14:28:27 +01:00
Shane Kilkelly
b871cdab4c Remove debug logs 2017-05-24 14:28:15 +01:00
Shane Kilkelly
1f3a375b4e Update commentary 2017-05-24 11:42:00 +01:00
Shane Kilkelly
da84b3f31c WIP: basically working labels/ref autocomplete 2017-05-24 11:40:12 +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
Shane Kilkelly
c43a2087d7 WIP: autocomplete for label/ref 2017-05-24 10:07:14 +01:00
James Allen
e2be4b6293 Make .asy files editable when uploaded 2017-05-22 17:12:01 +01:00
James Allen
32b27766bc Update Raven (Sentry lib) to 3.15.0 in client 2017-05-22 16:45:50 +01:00
James Allen
59085c1ddd Add missing require stubs and remove console.logs in unit tests 2017-05-22 15:33:52 +01:00
James Allen
3105c6743e Fix unit tests 2017-05-22 15:24:52 +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
James Allen
ba62206b91 Refactor project name validation into one place and restrict /s 2017-05-19 17:42:24 +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
Brian Gough
5ac2ed8fc6 use a separate error handler for api router errors 2017-05-19 16:36:29 +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 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 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
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
Paulo Reis
f4e46bb2f9 Use new ranges tracker method to get N changes at once; small refactor. 2017-05-15 11:24:40 +01:00
Paulo Reis
7bb5d65b52 Update ranges tracker. 2017-05-15 11:11:28 +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