github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-07 20:31:06 -05:00
Code Issues Projects Releases Packages Wiki Activity
5052 commits 3 branches 7 tags 201 MiB
Commit graph

2927 commits

Author SHA1 Message Date
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
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
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
Paulo Reis
3ced808411 Use a single accept changes method. 2017-05-05 15:19:31 +01:00
James Allen
014e3afb36 Don't call sync functions inside async 
Calling sync functions inside async can trigger the node max stack size.
Instead, build up our unique list of ids in advance, so we only call a
method in async for each user we actually need to look up, asynchronously.
Then use all the cached values synchronously afterwards.
 2017-05-04 17:04:20 +01:00
Paulo Reis
19828d3c5b Basic bulk accept support. 2017-05-04 15:33:47 +01:00
James Allen
8449b0417c Move all redis end points to be cluster compatible 2017-05-04 15:22:54 +01:00
Paulo Reis
6662ec34ae Only show bulk actions when n changes > 1. 2017-05-04 11:30:05 +01:00
Paulo Jorge Reis
20433327b8 Merge pull request #490 from sharelatex/pr-align-pdf-icon 
Use header button classes in the PDF button.
 2017-05-04 09:59:11 +01:00
Paulo Jorge Reis
9d2d217d35 Merge pull request #491 from sharelatex/pr-project-list-improvements 
Project list improvements
 2017-05-04 09:59:02 +01:00
Paulo Reis
05d9bf47d1 Use entry ids instead. 2017-05-03 16:53:04 +01:00
Paulo Reis
bf7bf701ed Store selected entries; improve visibility logic. 2017-05-03 16:35:58 +01:00
Paulo Reis
0249a13012 Add bulk actions as in-editor widgets. 2017-05-03 11:41:17 +01:00
Paulo Reis
3f441ff38c Count entries within selection; only show bulk actions if there are selected entries. 2017-05-02 17:02:30 +01:00
Paulo Reis
e2eaf6619e Bulk actions directive; include it in the review panel. 2017-05-02 16:15:40 +01:00
Paulo Reis
76ea497b33 Use a single entry for bulk actions. 2017-05-02 15:43:45 +01:00
Paulo Reis
d874eb70f8 Add and remove bulk accept and reject entries with selections. 2017-05-02 15:34:05 +01:00
Paulo Reis
d71296da9f Add row clicking in the projects list. 2017-05-01 17:11:03 +01:00
Paulo Reis
208f021bd0 Actually remove project from tag, inline. 2017-05-01 16:00:25 +01:00
Paulo Reis
2708fdf159 Add a button to allow inline removal of tags. 2017-05-01 15:43:44 +01:00
Paulo Reis
bca916d504 Use header button classes in the PDF button. 2017-05-01 15:04:08 +01:00
Paulo Reis
9fb166d2b3 Style improvements. 2017-04-28 17:09:34 +01:00
Paulo Reis
6e40284099 Add untagged projects counter. 2017-04-28 16:57:37 +01:00
Brian Gough
679680532f improve stream error handling on upload 2017-04-28 14:47:18 +01:00
Paulo Reis
84a2658259 Add an untagged filter in the projects list. 2017-04-28 12:11:51 +01:00
Brian Gough
46f693519a return 404 for api request on missing doc 2017-04-27 16:41:53 +01:00
Henry Oswald
3bdd5a4a2e Merge pull request #483 from sharelatex/ja-dont-fail-on-tpdsworker-error 
Continuing flushing document on tpds worker error
 2017-04-25 09:19:13 +01:00
Henry Oswald
5d55e383c7 Merge pull request #485 from sharelatex/sk-warn-on-zip-failure 
when the uploaded file is not a zip, warn instead of error
 2017-04-25 09:18:17 +01:00
Henry Oswald
f5267ac6ee Merge pull request #481 from sharelatex/ja-encode-project-names 
Error if no project returned from joinProject
 2017-04-25 09:17:59 +01:00
Henry Oswald
efe5e9efb0 Merge pull request #484 from sharelatex/ho-rate-limit-compiles 
added rate limit to compile endpoint
 2017-04-25 09:17:27 +01:00
Henry Oswald
c733925a26 show rate limit message when compiled too much 2017-04-24 15:56:09 +01:00
Shane Kilkelly
779336e5b0 when the uploaded file is not a zip, warn instead of error 2017-04-13 15:12:54 +01:00
Shane Kilkelly
8d6370026e Merge pull request #479 from sharelatex/pr-fix-favicon-path 
Fetch favicon and related assets from root.
 2017-04-13 13:09:29 +01:00
Shane Kilkelly
e4e8520f27 Merge branch 'node-6.9' 2017-04-13 10:10:43 +01:00
Henry Oswald
65b83f2c67 added space before email for closed site 2017-04-12 17:04:12 +01:00
Shane Kilkelly
a9b8b864df Move content-disposition setting into a method on res 2017-04-12 16:00:02 +01:00
Shane Kilkelly
02d75deaa0 when setting content-disposition, uri-encode names 2017-04-12 09:31:59 +01:00
Henry Oswald
0961a034ea added rate limit to compile endpoint 2017-04-11 16:08:38 +01:00
James Allen
6d2f18016f Move tpds worker error ignoring logic into tpdsUpdateSender 2017-04-11 15:41:17 +01:00
James Allen
7c8f228f48 Continuing flushing document on tpds worker error 2017-04-11 14:02:08 +01:00
Shane Kilkelly
f398e87e6f Merge branch 'master' into node-6.9 2017-04-11 11:34:53 +01:00
James Allen
f6bd949f01 Error if no project returned from joinProject 
socket.io seems to choke on the unicode project name and just return
undefined when it fails to parse the JSON. I've improved the escaping
of the user data on HTML load, but reporting an error is the best we
can easily do on joinProject via websockets.
 2017-04-10 12:03:39 +01:00
Paulo Reis
332e4a80b2 Also fix iOS icon path. 2017-04-07 14:43:07 +01:00
Paulo Reis
a7d3721882 Fetch favicon and related assets from root. 2017-04-07 14:31:21 +01:00
James Allen
477278eea5 Merge pull request #476 from sharelatex/ja-use-new-comment-button 
Fix on the new comment button variation
 2017-04-05 11:08:59 +01:00
James Allen
7d24fbc225 Merge pull request #477 from sharelatex/ja-encode-project-names 
Properly pass project data as JSON and then parse it
 2017-04-05 11:08:37 +01:00
Shane Kilkelly
bb65da88fe Merge branch 'master' into node-6.9 2017-04-05 10:15:51 +01:00
Shane Kilkelly
0555154a24 Merge branch 'sk-fix-folder-creation' 2017-04-04 11:01:07 +01:00
James Allen
8d0186532f Properly pass project data as JSON and then parse it 2017-04-04 10:46:46 +01:00
Paulo Reis
15de552c2c Make new add comment button styles as the default; removed old add comment button code. 2017-04-04 10:40:53 +01:00
Shane Kilkelly
fc9bf838fc Merge branch 'sk-upgrade-metrics' 2017-04-04 10:28:58 +01:00
James Allen
567edbfb31 Fix on the new comment button variation 2017-04-03 17:11:33 +01:00
Shane Kilkelly
043520fc28 Remove the Metrics module, use metrics-sharelatex 2017-04-03 16:18:30 +01:00
James Allen
335f8f78f0 Merge pull request #445 from sharelatex/pr-new-logo 
PR New logo
 2017-04-03 14:05:51 +01:00
James Allen
6b03e4b2a1 Merge pull request #470 from sharelatex/pr-fix-high-cpu-firefox 
Set video source only when the onboarding prompt is shown.
 2017-04-03 14:04:27 +01:00
Paulo Reis
4a86ff4b44 Merge branch 'master' into pr-new-logo 2017-04-03 11:17:39 +01:00
Paulo Reis
6b9b8480a8 Only show the tooltip if the project name is truncated. 2017-03-31 16:36:58 +01:00
Paulo Reis
5b8c36dfc0 Add a project name tooltip. 2017-03-31 16:13:23 +01:00
Shane Kilkelly
bee62400a6 Merge branch 'master' into sk-upgrade-metrics 2017-03-31 14:08:12 +01:00
Shane Kilkelly
cc81eca902 Account for error being null 2017-03-31 10:46:13 +01:00
Shane Kilkelly
2c62acee0b Cleaner error reporting for addFolder endpoint 2017-03-31 10:31:03 +01:00
Paulo Reis
250d19163b Set video source only when the onboarding prompt is shown. 2017-03-30 10:35:16 +01:00
Paulo Reis
f298fac638 Improve wording on error pages. 2017-03-28 16:57:08 +01:00
James Allen
3bf19a38ee Merge pull request #467 from sharelatex/ja-validate-recurly-subscription-on-creation 
Handle a 404 from Recurly if account doesn't exist
 2017-03-28 16:06:25 +01:00
James Allen
08699d7aa2 Handle a 404 from Recurly if account doesn't exist 2017-03-28 15:46:58 +01:00
James Allen
f53234271f Merge pull request #465 from sharelatex/sk-hide-email-errors 
If sending email fails, return a generic error.
 2017-03-28 13:16:43 +01:00
James Allen
2e6e51eb6d Merge pull request #464 from sharelatex/ja-validate-recurly-subscription-on-creation 
Check Recurly for subscription as well before creating subscription
 2017-03-28 13:15:58 +01:00
Brian Gough
835d8d618d use error handler 2017-03-28 11:33:37 +01:00
Brian Gough
6002fdbad6 return 404 on project details not found 2017-03-28 10:30:53 +01:00
Brian Gough
f433510e61 return NotFound error in ProjectDetailsHandler 2017-03-28 10:12:52 +01:00
Brian Gough
4e66b045e3 fix unhandled exception in ProjectDetailsHandler 2017-03-28 09:44:50 +01:00
Shane Kilkelly
d2e1efe4a9 fix a daft mistake 2017-03-27 17:45:19 +01:00
Shane Kilkelly
69b9b308d4 If sending email fails, return a generic error. 
This prevents us from leaking juicy details of our aws/ses setup via the
password-reset form.
 2017-03-27 16:17:38 +01:00
Paulo Reis
6ac99115a4 Safari pinned tab favicon. 2017-03-27 13:45:03 +01:00
Paulo Reis
73a9732b8e Favicons for mobile devices. 2017-03-27 13:45:03 +01:00
Paulo Reis
659028cf0f Graphically anchor elements of 500 error visual. 2017-03-27 13:45:03 +01:00
Paulo Reis
f5bf310d80 Adapt 500 error page. 2017-03-27 13:45:03 +01:00
Paulo Reis
d82dc7c1a1 Basic responsive behaviour. 2017-03-27 13:45:03 +01:00
Paulo Reis
e60b1b5922 Bootstrap 404 page; integrate styles. 2017-03-27 13:45:03 +01:00
Paulo Reis
7a1c06982e Styling of loading screen. 2017-03-27 13:33:49 +01:00
James Allen
7aa4c0c030 Check Recurly for subscription as well before creating subscription 2017-03-27 12:07:43 +01:00
Henry Oswald
f27dfa54f1 fixup AuthenticationController from missing module after merge 2017-03-27 09:42:49 +01:00
Paulo Jorge Reis
67943a8906 Merge pull request #463 from sharelatex/pr-ab-test-add-comments 
PR AB test "add comment" button
 2017-03-27 09:32:49 +01:00
Henry Oswald
9c7465fd64 Merge pull request #461 from sharelatex/ho-annom-user-events 
add identify on login
 2017-03-27 09:28:34 +01:00
Henry Oswald
aa4f768513 Merge pull request #455 from sharelatex/ho-bug-fix 
multiple small bug fixes
 2017-03-27 09:28:28 +01:00
Henry Oswald
379efcb04a Merge branch 'master' into ho-annom-user-events 2017-03-27 09:28:03 +01:00
Paulo Reis
78e8a8319d Put review panel widgets container inside the review panel element; rearrange visibility logic. 2017-03-24 14:04:37 +00:00
Henry Oswald
ed4a321906 remove extra debug route 2017-03-23 15:39:12 +00:00
Henry Oswald
cff922a0f5 idendify -> identify 2017-03-22 16:01:26 +00:00
Henry Oswald
ebdce6169e idendifyUser on login 2017-03-22 15:50:49 +00:00
Shane Kilkelly
4e6553ebcc Merge branch 'sk-handle-analytics-absence' 2017-03-22 09:35:16 +00:00
Shane Kilkelly
1663f2a8eb Use res.send, not next 2017-03-21 11:09:39 +00:00
Shane Kilkelly
1ed1eaaa05 If analytics is not configured, produce a ServiceNotConfiguredError 2017-03-21 10:57:39 +00:00
Shane Kilkelly
8a8a5a7079 Add a 'ServiceNotConfiguredError' to Errors module. 2017-03-21 10:57:09 +00:00
Paulo Reis
0e24d7118d Hide new UI behind query string parameter. 2017-03-20 13:56:36 +00:00
Paulo Reis
8951e91e31 Remove add comment button from the mini review panel. 2017-03-20 11:35:35 +00:00
Paulo Reis
2c2abc3cae Wire up new button with existing UI for adding comments. 2017-03-20 11:18:29 +00:00
Henry Oswald
ca3849c0c2 jpeg -> json 2017-03-20 11:08:42 +00:00
Paulo Reis
beac43741c New add comment button. 2017-03-17 17:05:38 +00:00
Shane Kilkelly
a64f890ed0 Upgrade metrics api 2017-03-17 14:55:41 +00:00
Henry Oswald
625fa810c2 validate mongo id in getPrivilegeLevelForProject 
https://sentry.io/sharelatex-1/sl-web-server-prod/issues/204397665/
 2017-03-17 14:44:51 +00:00
Henry Oswald
8ee2e5ba63 null check folder in findElement 
https://sentry.io/sharelatex-1/sl-web-server-prod/issues/236000085/
 2017-03-17 13:29:20 +00:00
Henry Oswald
31b1c53faa proxy jpg to blog backend 
https://sentry.io/sharelatex-1/sl-web-server-prod/issues/212236471/
 2017-03-17 13:24:50 +00:00
Henry Oswald
e5468983ce clone project plow though null doc/file/folders 
https://sentry.io/sharelatex-1/sl-web-server-prod/issues/227107799/
 2017-03-17 13:21:30 +00:00
Henry Oswald
d453a4d5c7 null check stat when we check file on disk 
https://sentry.io/sharelatex-1/sl-web-server-prod/issues/125814174/
 2017-03-17 13:03:16 +00:00
Shane Kilkelly
f2b5901776 wip: use new metrics.timeAsyncMethod 2017-03-16 10:59:18 +00:00
Henry Oswald
085cc7a0b2 json stringify and trim recommended currency 2017-03-14 17:53:48 +00:00
Shane Kilkelly
1ce48e971a Merge branch 'sk-fix-file-upload' 2017-03-10 11:30:03 +00:00
James Allen
604aa7859e Merge pull request #449 from sharelatex/ho-trust-blog-urls 
don't add /blog to the start of blog urls in annoucements
 2017-03-09 13:28:36 +00:00
James Allen
6068ac8f88 Merge pull request #450 from sharelatex/pr-review-feature-page 
Review features page
 2017-03-09 13:28:25 +00:00
James Allen
8f434cdd8b Merge commit 'ab16aa9' 2017-03-09 11:36:22 +00:00
Shane Kilkelly
ec25ee9045 When upload to filestore fails, produce an error 2017-03-09 10:11:45 +00:00
James Allen
b75d0ab3eb Don't show onboarding for newly registered users 2017-03-09 09:13:49 +00:00
Henry Oswald
63b84d3724 don't add /blog to the start of blog urls in annoucements 
also up timeout
 2017-03-08 17:58:22 +00:00
Henry Oswald
d722f47b0f add indentify option and uuid for users not logged in 2017-03-08 17:51:35 +00:00
Paulo Reis
a5e2ae3853 New URL; style adjustments. 2017-03-08 12:25:21 +00:00
James Allen
eb30c46458 Turn on track changes for everyone and take out of beta 2017-03-08 11:58:16 +00:00
James Allen
fb91219661 Don't submit comment on clicking cancel 2017-03-08 11:38:28 +00:00
James Allen
a4464a330c Merge pull request #446 from sharelatex/ja-track-changes-module 
Pull track changes backend into a module
 2017-03-06 11:27:11 +00:00
Paulo Reis
5459ae8daa Prepare to use a static feature page. 2017-03-03 17:15:29 +00:00
James Allen
2b36a443c9 Pull track changes backend into a module 2017-03-02 16:45:24 +00:00
Brian Gough
e24873a945 Merge pull request #444 from sharelatex/bg-upgrade-pdfjs-1.7.225 
upgrade pdfjs 1.7.225
 2017-03-02 14:04:52 +00:00
Brian Gough
6f392f2270 upgrade pdfjs to 1.7.225 2017-03-02 09:31:23 +00:00
Henry Oswald
8db684bd2d Update SystemMessageManager.coffee 2017-03-01 15:46:43 +00:00
Henry Oswald
1a9c035647 bring system message checks down to 1 min. 
can take ages when at 5 mins
 2017-02-28 18:53:34 +00:00
Shane Kilkelly
34a1bd0e91 Merge branch 'master' into node-6.9 2017-02-24 11:27:32 +00:00
James Allen
e83c7dfe05 Merge pull request #429 from sharelatex/pr-collapse-overview-entries 
Collapse overview entries
 2017-02-22 13:45:23 +01:00
Paulo Reis
519cd3c0bd Avoid showing files in overview if the associated review entries object is still undefined. 2017-02-21 15:20:00 +00:00
James Allen
1b6cbdba1b Merge pull request #428 from sharelatex/ja-translate-track-changes 
Translate track changes
 2017-02-21 15:10:47 +01:00
James Allen
00fce4d2da Merge branch 'master' into pr-collapse-overview-entries 2017-02-21 14:25:45 +01:00
James Allen
53a127cc65 Make consistent with file tree 2017-02-21 14:25:26 +01:00
James Allen
2553dfbf82 Translate placeholders 2017-02-21 14:19:46 +01:00
Paulo Reis
0b7863185c Make expand/collapse indicator consistent with the one used in filetree. 2017-02-21 11:05:55 +00:00
James Allen
8c5800ceaf Only render the entries that are visible in the text 2017-02-20 16:03:02 +01:00
Shane Kilkelly
9734f29086 Merge branch 'master' into node-6.9 2017-02-20 11:07:14 +00:00
James Allen
637cfa2e18 Translate tooltips 2017-02-20 11:51:06 +01:00
James Allen
44377ed03c Fix typo 2017-02-17 16:37:49 +01:00
James Allen
71b13b3f43 Fix translation string 2017-02-17 16:30:06 +01:00
James Allen
f180b25850 Convert track changes text to translation strings 2017-02-17 16:28:53 +01:00
Paulo Reis
121b783b4a Show number of entries per file, when collapsed. 2017-02-17 14:32:06 +00:00
Paulo Reis
1f92a494e7 Remove unneeded CSS animation. 2017-02-17 11:55:20 +00:00
Paulo Reis
0841ab8278 Add directive to collapse elements via height. 2017-02-17 11:24:21 +00:00
Henry Oswald
58c7dda945 fix couple of bad translations 2017-02-17 11:05:32 +00:00
Henry Oswald
debe78030a use html from jade as strings now fully html escaped 2017-02-17 11:05:32 +00:00
James Allen
04b9f8d249 Merge branch 'master' into ja-track-changes 2017-02-16 17:07:12 +01:00
Paulo Reis
a639f13cb6 Bootstrap collapsing behavior in files list. Store state. 2017-02-16 15:48:58 +00:00
Shane Kilkelly
4945c0d478 Merge branch 'master' into node-6.9 2017-02-16 09:33:20 +00:00
Henry Oswald
5626be2913 change free trial from track changes to real-time-track-changes, conflict with old event 2017-02-15 12:39:29 +00:00
Henry Oswald
8cd3d21792 track read more clicks in announcements 2017-02-15 12:17:10 +00:00
James Allen
d01d6a35cf Only create Controller when showing onboarding 2017-02-15 09:47:37 +01:00
Shane Kilkelly
2d0a7b2bdb Merge branch 'master' into node-6.9 2017-02-14 14:42:35 +00:00
Paulo Reis
badc4ecb7a Show add comment tooltip to the left when appropriate. 2017-02-14 14:40:21 +00:00
James Allen
b40b9add5a Turn on track changes for beta users 2017-02-14 15:28:21 +01:00
James Allen
a0a4509edc Avoid underscore (_) name overwriting 2017-02-14 15:26:36 +01:00
James Allen
03ceb23fcf Update wording slightly 2017-02-14 15:23:02 +01:00
James Allen
c8096facfb Merge pull request #421 from sharelatex/ho-announcments 
mark announcments before user signs up as read
 2017-02-14 15:12:10 +01:00
James Allen
4dbc2c3066 Merge pull request #418 from sharelatex/pr-review-panel-onboarding 
Pr review panel onboarding
 2017-02-14 15:00:39 +01:00
James Allen
bb3589ab2d Merge pull request #420 from sharelatex/ja-track-changes 
List track changes in beta program
 2017-02-14 14:41:57 +01:00
James Allen
b48f57c2cb Submit comment on blur or selection change 2017-02-14 13:41:04 +01:00
Henry Oswald
27caf4d555 mark announcments before user signs up as read 2017-02-14 12:29:48 +00:00
Paulo Reis
594f2024d1 Style the onboarding prompt as a modal; close it when clicked outside. 2017-02-14 12:09:05 +00:00
James Allen
cc0986b4da List track changes in beta program 2017-02-14 12:22:53 +01:00
Shane Kilkelly
621a07aff2 Merge branch 'master' into node-6.9 2017-02-14 11:01:14 +00:00
James Allen
3f2ebbcf91 Show message asking owner to upgrade if user is not owner 2017-02-14 11:18:22 +01:00
James Allen
34c07b97b9 Ensure showTrackChangesOnboarding is a boolean 2017-02-14 11:13:12 +01:00
James Allen
c08c8e09ff Only show onboarding for users with track changes enabled 2017-02-14 11:09:37 +01:00
James Allen
03ecf4b4ae Only show track changes onboarding once based on analytics API events 2017-02-14 10:25:46 +01:00
James Allen
c8baae84da Merge branch 'pr-review-panel-onboarding' of github.com:sharelatex/web-sharelatex into pr-review-panel-onboarding 2017-02-13 16:51:16 +01:00
Paulo Reis
7dd9a3fa44 Add a dismiss button. 2017-02-13 15:49:58 +00:00
James Allen
6a4f0ace3b Merge branch 'master' into pr-review-panel-onboarding 2017-02-13 16:19:56 +01:00
James Allen
f840a20f5c Merge pull request #417 from sharelatex/pr-track-changes-upgrade-prompt 
Turn on track changes for beta users with upgrade prompt
 2017-02-13 12:44:04 +01:00
James Allen
1d58efbca0 Don't enable for beta users just yet 2017-02-13 12:42:53 +01:00
James Allen
3334078fe6 Merge pull request #415 from sharelatex/ja-track-changes 
Don't animate review panel entries on toggle and resize
 2017-02-13 12:17:45 +01:00
James Allen
e99c9a2065 Enable track changes for beta users 2017-02-13 12:09:47 +01:00
James Allen
47a66eed50 Merge branch 'ja-include-track-changes-feature' into pr-track-changes-upgrade-prompt 2017-02-13 11:50:56 +01:00
James Allen
4728077cca Add track changes feature flag into model 2017-02-13 11:50:32 +01:00
James Allen
d7c40fa6ef Run comments through same URL linking filter as chat 2017-02-13 10:05:48 +01:00
Paulo Reis
faef71d812 Wording. 2017-02-10 15:28:44 +00:00
Paulo Reis
a8a7589973 More style adjustments. 2017-02-09 17:13:23 +00:00
Paulo Reis
dd15cc06a0 Integrate playback state directive in tutorial videos; style adjustments. 2017-02-09 15:44:38 +00:00
Paulo Reis
d137b00822 Relayout the onboarding, making a video slideshow. 2017-02-08 17:19:29 +00:00
Paulo Reis
d792230bf0 Basic onboarding tutorial for track-changes. 2017-02-07 15:07:26 +00:00
Shane Kilkelly
6a161b4071 remove commented out code 2017-02-06 16:35:52 +00:00
Shane Kilkelly
7d5dc34b3e fix the set-password form for new (admin-created) users 2017-02-06 14:58:54 +00:00
Paulo Reis
31102d30da Update prompt title. 2017-02-06 12:24:20 +00:00
James Allen
6e39824e41 Fix language icons in language recommendation 2017-02-03 16:31:42 +01:00
James Allen
935847f2a1 Add track changes flag into user model 2017-02-03 14:47:04 +01:00
James Allen
343abfde23 Use user feature flags to determine track changes state 2017-02-03 14:36:11 +01:00
Paulo Reis
8f9e43f339 Handle track changles toggling when the feature is not enabled. 2017-02-02 12:12:14 +00:00
Paulo Reis
98b98005a6 Create and integrate track changes upgrade prompt. 2017-02-01 16:52:18 +00:00
Shane Kilkelly
5be65431f7 Fix sentry config 2017-02-01 10:55:01 +00:00
Shane Kilkelly
efdd777c89 Add a _headLinks block to layout 2017-01-31 15:43:53 +00:00
Shane Kilkelly
b0dd7475b0 fix pug syntax 2017-01-31 14:57:22 +00:00
Shane Kilkelly
83d0f26011 Merge branch 'master' into sk-pug 2017-01-31 10:18:53 +00:00
James Allen
ca11f5fa18 Merge pull request #400 from sharelatex/ja-goto-code-from-rp 
Jump to code when clicking on review panel entries
 2017-01-31 10:49:13 +01:00
Shane Kilkelly
e2a207d618 Merge branch 'master' into sk-pug 2017-01-31 09:39:06 +00:00
James Allen
e7efa40c75 Merge pull request #401 from sharelatex/ja-spam-code-fixes 
Refactor rate limiting code around sending invites
 2017-01-31 10:21:55 +01:00
Shane Kilkelly
4e9426e6bf Merge branch 'master' into sk-pug 2017-01-30 14:36:10 +00:00
Shane Kilkelly
3ed85dad42 Merge branch 'master' into sk-upgrade-uuid 2017-01-30 11:09:50 +00:00
James Allen
b086d7afa2 Refactor rate limiting code around sending invites 2017-01-27 16:26:58 +01:00
Paulo Reis
15ad3f4769 Avoid stopping propagation, check event target instead. 2017-01-26 16:11:02 +00:00
James Allen
0479b01b9d Jump to code when clicking on review panel entries 2017-01-26 16:04:08 +01:00
James Allen
abb4ef14d8 Streamline the update/rendering process to not do extra work 2017-01-26 15:08:30 +01:00
James Allen
32b0c6a4fb Merge pull request #398 from sharelatex/ja-track-changes 
Fix style issues in IE 10
 2017-01-25 15:55:15 +01:00
James Allen
757c7002eb Merge pull request #397 from sharelatex/ja-modify-threads 
Allow editing/deleting of comments and threads
 2017-01-25 15:50:00 +01:00
Paulo Reis
a924794a5a Add expandable text area directive; apply it to review panel text areas. 2017-01-25 13:51:33 +00:00
Shane Kilkelly
e2f4fc3653 Merge branch 'master' into sk-rate-limit-cluster 2017-01-25 10:52:34 +00:00
Henry Oswald
3eb13ccdd1 fix stupid mistake 2017-01-25 10:38:39 +00:00
Henry Oswald
2a00b9c7a2 use user._id for error log 2017-01-25 10:33:30 +00:00
Shane Kilkelly
239164fe26 Merge branch 'master' into sk-rate-limit-cluster 2017-01-25 09:56:08 +00:00
Henry Oswald
cc717f0357 domainAnnouncementsToShow -> domainAnnouncements 2017-01-25 09:44:13 +00:00
Henry Oswald
02e6eb4dd1 Merge pull request #399 from sharelatex/ho-promote-case-study 
promote domain alerts
 2017-01-25 09:41:50 +00:00
Henry Oswald
1280a2313d add check for id to exist in domain announcments 
null check user at start of getUnreadAnnouncements
fix spelling mistake
 2017-01-25 09:35:11 +00:00
Henry Oswald
69ab275404 Update list.jade 2017-01-25 09:14:21 +00:00
James Allen
59c40ea5cc Only show delete options when thread has more than one message! 2017-01-24 17:03:32 +01:00
Henry Oswald
13d21b881f use new annoncments feature for case study info 2017-01-24 16:03:05 +00:00
James Allen
798e09f011 Don't show 'no comments' when submitting 2017-01-24 16:56:08 +01:00
James Allen
f9ba7392e9 Allow editing/deleting of comments and threads 2017-01-24 16:21:14 +01:00
Henry Oswald
2341a8481a Merge branch 'master' into ho-promote-case-study 2017-01-24 14:49:35 +00:00
Shane Kilkelly
a148eb1f43 Merge branch 'master' into sk-rate-limit-cluster 2017-01-24 09:24:47 +00:00
Shane Kilkelly
0add3ed66e Merge branch 'master' into sk-upgrade-uuid 2017-01-23 10:04:31 +00:00
Shane Kilkelly
abbffb8e4b Remove deprecated node-uuid package, replace with uuid. 2017-01-23 10:03:16 +00:00
Henry Oswald
9153ffac41 limit project name in email to 40 chars 2017-01-21 12:58:16 +00:00
Henry Oswald
74240e28c7 rate limit via ip the number of invite to project requests 2017-01-21 12:44:09 +00:00
Henry Oswald
6d35585847 limit number of invites each user can do 
done with the number of collaborators a user can add
prevents notifications getting filled up as well
 2017-01-21 12:43:15 +00:00
Shane Kilkelly
cfa2777d62 Merge branch 'sk-launchpad' 2017-01-20 13:58:16 +00:00
Shane Kilkelly
57cd54bf55 WIP: migrate from jade to pug 2017-01-20 12:03:02 +00:00
Paulo Reis
76ea469970 Reposition the track-changes indicator element to avoid issues with IE positioning. 2017-01-19 12:12:34 +00:00
Paulo Reis
5489514d7a Add some compatibility style rules for IE10. 2017-01-18 15:38:34 +00:00
Shane Kilkelly
8922c9dbf5 New email layout for "testEmail" 2017-01-18 15:28:51 +00:00
James Allen
3413687833 Merge pull request #393 from sharelatex/ja-track-changes 
Ja track changes
 2017-01-18 15:32:16 +01:00
James Allen
f97d36eb73 Merge branch 'ja-track-changes' of github.com:sharelatex/web-sharelatex into ja-track-changes 2017-01-18 14:07:29 +01:00
Paulo Reis
329c6af168 Add a track-changes indicator in the editor, for when the review panel is closed. 2017-01-17 17:20:51 +00:00
James Allen
786c92b2fc Don't show delete comment button (until it works) 2017-01-17 17:34:11 +01:00
Shane Kilkelly
707838baa4 Merge branch 'master' into sk-launchpad 2017-01-17 16:25:59 +00:00
Shane Kilkelly
59ab66fca2 Fix double-callback 2017-01-17 16:25:18 +00:00
James Allen
4d15fc30ba Don't flash resolved comments when editor is loading 2017-01-17 16:55:18 +01:00
James Allen
5a34d17947 Toggle track changes in a project based on the owner's feature switch 2017-01-17 15:59:18 +01:00
Shane Kilkelly
d7251c6bfe Merge branch 'master' into sk-launchpad 2017-01-17 14:55:08 +00:00
Shane Kilkelly
1137ab0715 Don't record redirect to static asset paths 2017-01-17 14:35:37 +00:00
James Allen
960d1e8b2f Only call /project/.../threads if we need the threads 2017-01-17 15:04:49 +01:00
Shane Kilkelly
70c7e32e58 Add a 'testEmail' email type 2017-01-17 10:52:04 +00:00
James Allen
9c0bf885be Merge branch 'master' into ja-track-changes 2017-01-17 10:16:41 +01:00
Paulo Reis
36f15ff56e Avoid empty comment submission. 2017-01-16 17:14:06 +00:00
Paulo Reis
121629426e Avoid empty comment replies. 2017-01-16 17:06:57 +00:00
James Allen
bf56952f88 Make overview panel entries jump to place in doc again 2017-01-16 15:31:51 +01:00
James Allen
d4f60977fd Add loading indicator while submitting new comments 2017-01-16 15:25:10 +01:00
James Allen
e5c96eb619 Focus on text area when adding a comment 2017-01-16 15:17:56 +01:00
James Allen
278bfc1f50 Use 'show all' instead of 'more' 2017-01-16 15:06:47 +01:00
Shane Kilkelly
82ddeab2bd If user tries to invite themselves to project, don't. 2017-01-16 13:45:01 +00:00
Shane Kilkelly
635b935acc Add an acceptance test for login rate limits, cleanup 2017-01-16 11:46:59 +00:00
Henry Oswald
fed88504f8 rate limit emails sent sharing projects by users 2017-01-14 14:52:32 +00:00