github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-10-31 21:21:03 -04:00
Code Issues Projects Releases Packages Wiki Activity
4660 commits 3 branches 7 tags 199 MiB
Commit graph

4559 commits

Author SHA1 Message Date
Henry Oswald
ebdce6169e idendifyUser on login 2017-03-22 15:50:49 +00:00
Henry Oswald
f910bb58de add tests for AnalyticsController 2017-03-22 13:11:45 +00:00
Shane Kilkelly
4e6553ebcc Merge branch 'sk-handle-analytics-absence' 2017-03-22 09:35:16 +00:00
Paulo Reis
d611ccd2cb Apply z-index rule to container, not to the button. 2017-03-21 14:28:58 +00:00
Shane Kilkelly
ca3497b6f6 Update metrics version to 1.7.0 2017-03-21 13:46:42 +00:00
James Allen
b22ef30876 Merge pull request #456 from sharelatex/ja-show-too-many-track-changes-error 
Show an explanation error message on too many track changes error
 2017-03-21 13:15:14 +00:00
James Allen
e705118dfe Merge pull request #457 from sharelatex/pr-new-add-comment-btn 
New "add comment" button
 2017-03-21 13:15:03 +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
a35f2585c7 Remove unused flag. 2017-03-20 14:02:25 +00:00
Paulo Reis
0e24d7118d Hide new UI behind query string parameter. 2017-03-20 13:56:36 +00:00
James Allen
1d927e5eb1 Merge pull request #454 from sharelatex/ja-show-overlapping-ranges 
Add opacity to comment and insert ranges so they can be seen overlapping
 2017-03-20 13:50:06 +00:00
James Allen
131d710a83 Merge pull request #453 from sharelatex/ja-cut-and-paste-comments 
Move comments when cutting and pasting
 2017-03-20 13:49:51 +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
Paulo Reis
c74449b2e3 Don't show the mini review panel when the only visible entry is the add comment one. 2017-03-17 16:28:21 +00:00
Shane Kilkelly
a64f890ed0 Upgrade metrics api 2017-03-17 14:55:41 +00:00
James Allen
3c2f5525a1 Show an explanation error message on too many track changes error 2017-03-17 14:49:32 +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
Henry Oswald
9a8ee112a5 null check path.split 
https://sentry.io/sharelatex-1/sl-web-client-prod/issues/202702369/
 2017-03-17 10:35:07 +00:00
James Allen
a4d6d5c53f Add opacity to comment and insert ranges so they can be seen overlapping 2017-03-16 17:33:01 +00:00
James Allen
aa36768d8a Remove debugging line 2017-03-16 16:01:03 +00:00
James Allen
6c1a15a698 Move comments when cutting and pasting 2017-03-16 15:48:57 +00:00
Shane Kilkelly
5e112043ca Fix unit tests for modules now using metrics.timeAsyncMethod 2017-03-16 11:08:17 +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
Paulo Reis
901bd296e3 Add poster assets. 2017-03-10 11:04:23 +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
Paulo Reis
dbfdd2eb12 Update intro video. 2017-03-09 12:19:36 +00:00
James Allen
8f434cdd8b Merge commit 'ab16aa9' 2017-03-09 11:36:22 +00:00
Paulo Reis
c4fb4e0321 Update videos. 2017-03-09 10:59:13 +00:00
Paulo Reis
e4e4b3b178 Remove unneeded images. 2017-03-09 10:59:04 +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
Paulo Reis
8c08b5d32c Add last user photo. 2017-03-09 09:07:56 +00:00
Paulo Reis
3b2ab7fce1 Add user photos. 2017-03-08 19:09:11 +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
df9eb83fc2 More responsive fixes. 2017-03-08 17:14:35 +00:00
Paulo Reis
e0547b4df9 Responsive fixes. 2017-03-08 16:55:05 +00:00
Paulo Reis
10e48de913 Remove min height in intro section. 2017-03-08 16:04:15 +00:00
Paulo Reis
5c294785e3 Add styling for feature page header. 2017-03-08 15:53:46 +00:00
Paulo Reis
821f35b622 Add white version of current logo. 2017-03-08 15:53:39 +00:00
Paulo Reis
ebd4db4484 Predefined sizing for main video; max content width. 2017-03-08 15:00:59 +00:00
Paulo Reis
f398b45d75 Ensure minimum height on load animation. 2017-03-08 14:32:55 +00:00
Paulo Reis
d28c976810 Styling for the intro animation. 2017-03-08 13:54:46 +00:00
Paulo Reis
fcfadbfd5e Make features sections responsive. 2017-03-08 12:32:19 +00:00
Paulo Reis
a5e2ae3853 New URL; style adjustments. 2017-03-08 12:25:21 +00:00
Paulo Reis
f1e362629f Add logos. 2017-03-08 12:23:08 +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
3a9f20cc1e Centre loading indicator when review panel is open 2017-03-08 11:42:14 +00:00
James Allen
fb91219661 Don't submit comment on clicking cancel 2017-03-08 11:38:28 +00:00
Paulo Reis
beb8484246 Style adjustments; add animation classes. 2017-03-07 17:22:02 +00:00
Paulo Reis
708edacea9 Add videos for the feature page. 2017-03-07 17:21:50 +00:00
Paulo Reis
deea69a9f4 More adjustments. 2017-03-06 16:47:10 +00:00
Paulo Reis
ebffcc71c2 Add hero image. 2017-03-06 16:46:35 +00:00
Paulo Reis
a5ce23f237 Layout adjustments, basic responsive behaviour. 2017-03-06 15:52:38 +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
33bebf1821 Also pull italic variants of PT Serif. 2017-03-03 17:17:11 +00:00
Paulo Reis
0f4579df72 Assets for the feature page. 2017-03-03 17:16:38 +00:00
Paulo Reis
45fe526284 Styles for the feature page. 2017-03-03 17:15:48 +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
fe96a173da Merge pull request #443 from sharelatex/bg-delete-old-versions-of-pdfjs 
delete old versions of pdfjs
 2017-03-02 14:04:35 +00:00
Brian Gough
9f5a189025 Merge pull request #442 from sharelatex/ho-system-messages-quicker 
bring system message checks down to 20 secs
 2017-03-02 14:04:14 +00:00
Brian Gough
9c8c838bc2 set .gitattributes to binary for pdfjs charmaps 2017-03-02 09:40:25 +00:00
Brian Gough
81e8e0e1de delete pdfjs-1.6.210p1 2017-03-02 09:39:05 +00:00
Brian Gough
6cf847146a delete pdfjs-1.3.91p1 2017-03-02 09:33:08 +00:00
Brian Gough
4f270cfbaa delete pdfjs-1.3.91 2017-03-02 09:32:42 +00:00
Brian Gough
6f392f2270 upgrade pdfjs to 1.7.225 2017-03-02 09:31:23 +00:00
Brian Gough
246775957e add pdfjs-1.7.225 to public/js/libs 2017-03-02 09:30:28 +00:00
James Allen
a6679a1aeb Stop local and remote ops being batched together in the undo manager if they happen in the same flush 2017-03-01 16:33:04 +00:00
Henry Oswald
8db684bd2d Update SystemMessageManager.coffee 2017-03-01 15:46:43 +00:00
James Allen
a8756432b7 Merge branch 'master' into ja-use-dirty-state 2017-03-01 10:03:16 +00:00
James Allen
e1cf6229f7 Merge branch 'master' into ja-use-dirty-state 2017-03-01 10:03:00 +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
Paulo Reis
cf896b5a5d Keep original text alignment; use a min-width. 2017-02-28 11:37:58 +00:00
Paulo Reis
e5533b91be Allow the global alerts area to expand according to text sizing. 2017-02-28 11:37:29 +00:00
Shane Kilkelly
9a641d43eb Remove cruft 2017-02-27 14:00:45 +00:00
Shane Kilkelly
98d7dc6f88 Make work on both 0.10 and 6.9 2017-02-27 13:54:57 +00:00
Shane Kilkelly
8d7c39ff42 Merge branch 'master' into node-6.9 2017-02-27 11:25:39 +00:00
Shane Kilkelly
bd997fc574 pin sinon js to 1.17, version 2 betas cause breakage 2017-02-27 11:01:25 +00:00
James Allen
0bf1bd2701 Merge pull request #438 from sharelatex/ja-track-changes-style-tweaks 
Don't overlap border of overview panel with PDF bar
 2017-02-27 11:10:41 +01:00
Paulo Reis
1646496f19 Patch overflow behaviour so that z-index is always higher by 1. 2017-02-24 14:38:46 +00:00
Paulo Reis
3bdbe7e538 Set synctex controls z-index to the minimum working value. 2017-02-24 14:36:08 +00:00
James Allen
dd0271e799 Only cancel deletes with inserts on undo and reject 2017-02-24 14:20:26 +01:00
Shane Kilkelly
34a1bd0e91 Merge branch 'master' into node-6.9 2017-02-24 11:27:32 +00:00
James Allen
40f61bfa66 Don't overlap border of overview panel with PDF bar 2017-02-23 15:10:03 +01:00
James Allen
7418d12bf8 Defer updates of remote ops until Ace has been updated 2017-02-23 11:34:58 +01:00
James Allen
f4bbd8ea10 Use dirty state rather events to avoid O(N^2) behaviour 2017-02-23 11:27:19 +01: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
Paulo Reis
96c44eec38 Support values other than objects in the numKeys filter, returning zero if so. 2017-02-21 14:48:21 +00:00
Paulo Reis
7f6941677d Check local storage on load; use explicit condition syntax. 2017-02-21 14:43:05 +00:00
Paulo Reis
2e8f917318 Support initial closed state. 2017-02-21 14:27:57 +00:00
James Allen
2df8479db3 Move translations back to devDependencies so it's not missed by shrinkwrap 2017-02-21 15:25:28 +01:00
Paulo Reis
5c7fc66964 Merge branch 'pr-collapse-overview-entries' of github.com:sharelatex/web-sharelatex into pr-collapse-overview-entries 2017-02-21 14:21:10 +00:00
Paulo Reis
33c8bc8684 Support saving state to local storage. 2017-02-21 14:20:51 +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
Paulo Reis
4dc13134e7 Kill overflow rule, allowing focused items to appear off-panel. 2017-02-21 10:40:28 +00:00
James Allen
2c2f7c5625 Animate call outs along with review entries 2017-02-21 11:20:08 +01:00
James Allen
5a62fec179 Merge pull request #434 from sharelatex/ja-scroll-review-panel-past-ace 
Ja scroll review panel past ace
 2017-02-21 10:59:16 +01:00
James Allen
d120dc5a2f Merge pull request #427 from sharelatex/pr-blank-screen-large-comments 
Avoid blank screen bug, when triggered by very large comments.
 2017-02-21 10:56:51 +01:00
James Allen
f1baa1b8ad Merge pull request #432 from sharelatex/ja-hide-offscreen-review-panel-entries 
Only render the entries that are visible in the text
 2017-02-21 10:28:45 +01:00
James Allen
582eff77ba Merge pull request #430 from sharelatex/pr-fix-border-retina 
Use solid color instead of opacity, to avoid rendering issues.
 2017-02-21 10:28:00 +01:00
James Allen
7eab8329b1 Merge pull request #431 from sharelatex/ja-scroll-review-panel-past-ace 
Scroll the review panel past the limits of Ace
 2017-02-21 10:27:49 +01:00
James Allen
f466be96dd Make sure first change isn't hidden under toolbar 2017-02-21 09:58:49 +01:00
Paulo Reis
e6997a8af0 Add jank-free image. 2017-02-20 16:14:23 +00:00
Paulo Reis
5e07565c8e Add retina icon for review features. 2017-02-20 15:37:12 +00:00
James Allen
3af7cdf0a9 Merge branch 'ja-scroll-review-panel-past-ace' into ja-hide-offscreen-review-panel-entries 2017-02-20 16:24:26 +01:00
James Allen
6c21d19894 Increase offscreen lines considered for visibility 2017-02-20 16:24:19 +01:00
James Allen
ad05cc288c Do DOM reads first to prevent thrashing 2017-02-20 16:22:18 +01:00
James Allen
8c5800ceaf Only render the entries that are visible in the text 2017-02-20 16:03:02 +01:00
James Allen
b52e4a5d1c Reset scroll margins when changing document 2017-02-20 15:46:53 +01:00
James Allen
995fa6122b Scroll the review panel past the limits of Ace 2017-02-20 12:56:26 +01:00
Paulo Reis
7ffb6edd1c Use solid color instead of opacity, to avoid rendering issues. 2017-02-20 11:21:56 +00: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
2eb9058c7c Add max-height to comment inputs. 2017-02-17 15:16:35 +00:00
Paulo Reis
e9752b4d10 Avoid blank screen bug, when triggered by very large comments. 2017-02-17 14:32:40 +00:00
Paulo Reis
121b783b4a Show number of entries per file, when collapsed. 2017-02-17 14:32:06 +00:00
Paulo Reis
1e66c46ca7 Add filter to retrieve number of keys in objects. 2017-02-17 14:31:50 +00:00
Paulo Reis
1f92a494e7 Remove unneeded CSS animation. 2017-02-17 11:55:20 +00:00
Paulo Reis
cd2c8e7199 Add directive based on jQuery animation API. 2017-02-17 11:54:33 +00:00
Paulo Reis
71cfc863b5 Avoid blank screen bug, when triggered by very large comments. 2017-02-17 11:24:50 +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
8e3c9b7079 Merge pull request #424 from sharelatex/pr-fix-invisible-scrollbar-safari 
Give the scrollbar a background-color, so that Safari knows that it s…
 2017-02-17 09:25:30 +01:00
James Allen
31ae2e7124 Update RangesTracker 2017-02-17 09:24:25 +01:00
James Allen
c8a6555cb1 Update RangesTracker 2017-02-16 17:07:56 +01: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
Paulo Reis
36e5ac74dc Give the scrollbar a background-color, so that Safari knows that it should paint it. 2017-02-15 15:11:01 +00:00
Henry Oswald
bb7ededaaf announcementClicked -> logAnnouncementClick 2017-02-15 12:43:13 +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
James Allen
bdee15128b Remove click handler on dismiss 2017-02-14 22:31:49 +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
Paulo Reis
12730caa63 Make the dismiss option more obvious. 2017-02-14 11:22:53 +00:00
Shane Kilkelly
621a07aff2 Merge branch 'master' into node-6.9 2017-02-14 11:01:14 +00:00
Paulo Reis
e5c33e7b71 Merge branch 'pr-review-panel-onboarding' of github.com:sharelatex/web-sharelatex into pr-review-panel-onboarding 2017-02-14 10:21:58 +00:00
Paulo Reis
1eed10b4e7 Add keyboard navigation 2017-02-14 10:21:45 +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
Shane Kilkelly
4d2f21e42e update nvm version 2017-02-14 10:04:44 +00: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
61ef158f76 Don't show review panel if user doesn't have track changes 2017-02-14 09:38:58 +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
bf5f5f832d Use correct flag for determining mini panel visibility 2017-02-13 14:39:43 +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
a9c89635bd Also scroll long deletes and insertions if would overflow 2017-02-13 10:16:16 +01:00
James Allen
f590b9c97a Scroll when long words would overflow comment entry 2017-02-13 10:09:35 +01:00
James Allen
d7c40fa6ef Run comments through same URL linking filter as chat 2017-02-13 10:05:48 +01:00
James Allen
85c2910738 Don't animate review panel entries on toggle and resize 2017-02-13 09:49:51 +01:00
Paulo Reis
52c601965b Improve button styling and paragraph width. 2017-02-10 15:28:57 +00:00
Paulo Reis
faef71d812 Wording. 2017-02-10 15:28:44 +00:00
Paulo Reis
481f9bbadc Add re-encoded videos (all forced to have the same size). 2017-02-10 15:28:22 +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
1263532271 Add a directive to control the playback state of media elements. 2017-02-09 15:44:15 +00:00
Paulo Reis
d137b00822 Relayout the onboarding, making a video slideshow. 2017-02-08 17:19:29 +00:00
Paulo Reis
1ef5cc97fc Rename stuff to refer to the new onboarding feature. 2017-02-08 17:19:13 +00:00
James Allen
51b76d2cf9 Merge pull request #413 from sharelatex/ja-abort-in-progress-spell-checks 
Abort any inprogress spell checks when switching document
 2017-02-08 11:38:05 +01:00
James Allen
87aea41bed Abort any inprogress spell checks when switching document 2017-02-08 11:32:19 +01:00
James Allen
d44a0ece97 Merge pull request #411 from sharelatex/ja-fix-cursor-on-resize 
Ja fix cursor on resize
 2017-02-08 11:30:37 +01:00
James Allen
123300cdfb Clear highlighted word manager on session change 2017-02-08 11:08:26 +01:00
James Allen
f6743b839f Reflow review panel as editor pane changes size 2017-02-07 16:45:45 +01:00
Paulo Reis
6d35703963 Add clip showing review panel toggling. 2017-02-07 15:28:50 +00:00
Paulo Reis
d792230bf0 Basic onboarding tutorial for track-changes. 2017-02-07 15:07:26 +00:00
James Allen
11a104ef96 Move spelling marker to back marker layer where it is updated properly by Ace 2017-02-07 15:55:00 +01:00
James Allen
c1a2779d9e Merge branch 'master' into ja-fix-cursor-on-resize 2017-02-07 15:27:01 +01:00
James Allen
d00619ff3d Keep the cursor in the same position on screen when the editor resizes 2017-02-07 15:23:44 +01:00
Paulo Reis
73835f004d Add onboarding-related assets. 2017-02-07 14:13:25 +00:00
Shane Kilkelly
1d09fe2861 Merge branch 'sk-fix-password-set' 2017-02-07 09:17:56 +00:00
James Allen
1b06af766d Merge pull request #406 from sharelatex/pr-expandable-text-area-fixes 
Expandable text area fixes
 2017-02-07 09:04:10 +01:00
James Allen
c97ded201f Merge pull request #408 from sharelatex/ja-track-changes 
Clear selection after creating a comment
 2017-02-07 08:55:39 +01: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
38e1b66fdc Use slightly slower video. 2017-02-06 14:06:08 +00:00
Paulo Reis
31102d30da Update prompt title. 2017-02-06 12:24:20 +00:00
Joe Green
a32ec78a54 added about image for jg 2017-02-06 11:59:32 +00:00
James Allen
6e39824e41 Fix language icons in language recommendation 2017-02-03 16:31:42 +01:00
Paulo Reis
d19cb2a31b Fix border-radius in entries. 2017-02-03 15:20:50 +00:00
James Allen
4a80f0de5a Clear selection after creating a comment 2017-02-03 15:09:40 +00: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
James Allen
27c48f3790 Clear selection after creating a comment 2017-02-03 14:17:09 +01:00
Paulo Reis
6ef8d2d46d Merge branch 'master' into pr-expandable-text-area-fixes 2017-02-02 14:38:09 +00:00
Paulo Reis
9d1d2df977 Disable mocked feature flag behaviour. 2017-02-02 12:19:44 +00:00
Paulo Reis
8f9e43f339 Handle track changles toggling when the feature is not enabled. 2017-02-02 12:12:14 +00:00
Paulo Reis
f50967295d Support disabling the review-panel toggle, like a standard checkbox. 2017-02-02 12:08:17 +00:00
Paulo Reis
fe33fa1f65 Add modal controller. 2017-02-02 10:19:00 +00:00
Paulo Reis
98b98005a6 Create and integrate track changes upgrade prompt. 2017-02-01 16:52:18 +00:00
Paulo Reis
ad3a30b1b3 Add track changes teaser assets. 2017-02-01 16:51:37 +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
21986694d8 update gitignore 2017-01-30 15:13:03 +00:00
James Allen
9663df3457 Jump to text when clicking change icon as well 2017-01-30 16:00:32 +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
30618d33db Add in extra check to set ui state 2017-01-27 17:13:11 +01:00
James Allen
d9b774bb9b Sycn track changes based on doc state, not editor state 2017-01-27 17:12:17 +01:00
James Allen
ff7c5a0954 Merge branch 'master' into ja-track-changes 2017-01-27 17:11:49 +01: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
68aab6e05c Don't use code check on .bib files 2017-01-26 16:13:21 +01:00
James Allen
0479b01b9d Jump to code when clicking on review panel entries 2017-01-26 16:04:08 +01:00
Paulo Reis
ce89714a48 Emit event when textarea resizes; capture it in the review panel and trigger reflow. 2017-01-26 14:35:01 +00:00
James Allen
76328ff93f Tell other clients when threads are deleted 2017-01-26 15:12:59 +01:00
James Allen
abb4ef14d8 Streamline the update/rendering process to not do extra work 2017-01-26 15:08:30 +01:00
Paulo Reis
6304c213bd Add a min-height to the review panel text areas. 2017-01-26 12:00:11 +00:00
Paulo Reis
1a1320b561 Avoid shrinking the expandable text area. 2017-01-26 11:59:55 +00: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
James Allen
406181b05d Remove a console.log 2017-01-25 15:49:38 +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
Shane Kilkelly
60500bc4ea update shrinkwrap 2017-01-25 10:52:08 +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
Paulo Reis
f11926d0a9 Make sure layout math is done on load. 2017-01-25 10:31:02 +00:00
Shane Kilkelly
f7b4e00466 Restore npm-shrinkwrap.json 2017-01-25 10:30:53 +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
Paulo Reis
1de8b3bce7 Disable text selection with right click on file tree. 2017-01-24 15:19:48 +00: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
James Allen
2813b16ebf Use thread id for comment id 2017-01-23 09:45:37 +01: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
Henry Oswald
6f2c7ba6c6 Merge branch 'master' of https://github.com/sharelatex/web-sharelatex 2017-01-20 14:51:23 +00:00
Henry Oswald
03555f0339 added chris and removed geri from pics 2017-01-20 14:50:38 +00:00
Shane Kilkelly
cfa2777d62 Merge branch 'sk-launchpad' 2017-01-20 13:58:16 +00:00
Shane Kilkelly
36eb453aed Clarify logic of asyncform onsuccess and onerror handlers 2017-01-20 13:52:31 +00:00
Shane Kilkelly
57cd54bf55 WIP: migrate from jade to pug 2017-01-20 12:03:02 +00:00
Paulo Reis
73c1016f4a Avoid using 0px, because minifiers might convert the value to 0, which will still cause issues on IE. 2017-01-19 16:58:16 +00:00
Paulo Reis
1970ab4e63 Ensure that the change text fits the entry UI in IE. 2017-01-19 16:55:21 +00:00
Paulo Reis
a4ca7e2ca9 Fix padding in the review panel toolbar for IE. 2017-01-19 16:54:34 +00:00
Paulo Reis
cd975c6190 Make resolved comments dropdown scrollable in IE. 2017-01-19 15:43:26 +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
3b9a599276 Fix entries z-index issues on IE10. 2017-01-19 11:57:49 +00:00
Paulo Reis
5489514d7a Add some compatibility style rules for IE10. 2017-01-18 15:38:34 +00:00
Paulo Reis
e0f3593bff Add autoprefixer to Grunt tasks. 2017-01-18 15:38:18 +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
2589ac7d58 Remove unneeded review panel layout event. 2017-01-18 10:55:51 +00:00
Paulo Reis
49fe8ef3a3 Update entry truncating logic while typing. 2017-01-18 10:53:59 +00: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
a8618fa4d9 Merge branch 'ja-track-changes' of github.com:sharelatex/web-sharelatex into ja-track-changes 2017-01-17 17:36:30 +01: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
Paulo Reis
f27118084c Make review header icon behave like font-awesome icons. 2017-01-17 16:03:41 +00:00
James Allen
318313d66c Merge branch 'ja-track-changes' of github.com:sharelatex/web-sharelatex into ja-track-changes 2017-01-17 16:55:25 +01: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
Paulo Reis
2f119e5787 Track review features usage. 2017-01-17 14:39:31 +00:00
Shane Kilkelly
1137ab0715 Don't record redirect to static asset paths 2017-01-17 14:35:37 +00:00
James Allen
e15d01874d Remove comment from dropdown when it is reopened 2017-01-17 15:13:50 +01:00
James Allen
dec9b5bf1e Use email if name is blank 2017-01-17 15:10:44 +01:00
James Allen
960d1e8b2f Only call /project/.../threads if we need the threads 2017-01-17 15:04:49 +01:00
James Allen
4a47d135c7 Reapply ops to track changes as current user when reconnecting 2017-01-17 14:54:22 +01:00
Shane Kilkelly
70c7e32e58 Add a 'testEmail' email type 2017-01-17 10:52:04 +00:00
James Allen
eb8e801dea Merge branch 'ja-track-changes' of github.com:sharelatex/web-sharelatex into ja-track-changes 2017-01-17 11:51:11 +01:00
James Allen
1b63db91d0 Add in a null check 2017-01-17 11:51:02 +01:00
Paulo Reis
d66f2033bb Ensure that review panel elements are above, z-index-wise, Ace elements. 2017-01-17 10:16:10 +00:00
Shane Kilkelly
06bba062a4 Merge branch 'master' into sk-launchpad 2017-01-17 09:29:37 +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
Paulo Reis
1c8942c5c6 Merge branch 'ja-track-changes' of github.com:sharelatex/web-sharelatex into ja-track-changes 2017-01-16 16:28:27 +00:00
Paulo Reis
65e257ca37 Change text marker colors on Ace dark themes. 2017-01-16 16:25:38 +00:00
James Allen
f12aeedb35 Tweak padding around track changes toggle loading indicator 2017-01-16 16:57:20 +01:00
James Allen
5fb54d8447 Don't refresh resolved comments every times an entry changes 2017-01-16 16:55:14 +01: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
Brian Gough
962a4d5039 roll out math mode linter for all users 
from our ace commit 953ff92c3283f03da94559d50a933fe685b05631
 2017-01-16 09:17:38 +00:00
Henry Oswald
fed88504f8 rate limit emails sent sharing projects by users 2017-01-14 14:52:32 +00:00
Paulo Reis
1ed0ccf854 Improve hovering behaviour for entries in mini mode. 2017-01-13 16:07:08 +00:00
Shane Kilkelly
25956d4c62 Fix up tests 2017-01-13 16:04:26 +00:00
Paulo Reis
3968761ac8 Add collapsing behaviour to resolved comments. 2017-01-13 15:37:24 +00:00
Paulo Reis
5eece9f5d9 Add collapsing behaviour to long entries. 2017-01-13 15:30:31 +00:00
Shane Kilkelly
1ef1912cf8 Point to fork of rolling-rate-limiter that supports ioredis 2017-01-13 15:21:05 +00:00
James Allen
b6ea338ff8 Separate resolved comments so they don't affect review panel 2017-01-13 15:27:45 +01:00
Shane Kilkelly
525e871d55 Merge branch 'master' into sk-rate-limit-cluster 2017-01-13 14:17:18 +00:00
James Allen
bf7038f506 Adapt review panel line height to editor 2017-01-13 14:52:08 +01:00
James Allen
718f3dc388 Fix slightly broken callout positioning behaviour 2017-01-13 14:30:04 +01:00
James Allen
6c49b95538 Don't allow overlapping comments 
Note that this is only a 'soft' don't allow. You could resolve a comment, comment in the same area,
and get them to overlap. It's not a problem if they overlap, just a bit ugly UI wise
 2017-01-13 14:17:47 +01:00
James Allen
aab4dea8ae Merge branch 'master' into ja-track-changes 2017-01-13 13:46:01 +01:00
Paulo Reis
823c2c854a Add styling to have left-based layout when there is no space on the right. 2017-01-12 17:06:08 +00:00
Paulo Reis
3d5691ddaf Merge branch 'ja-track-changes' of github.com:sharelatex/web-sharelatex into ja-track-changes 2017-01-12 16:49:56 +00:00
Paulo Reis
e3e8541a63 Add class when review panel should layout to the left. 2017-01-12 16:49:47 +00:00
Paulo Reis
9f008318cc Emit event after linking the layout directive. 2017-01-12 16:49:29 +00:00
James Allen
b31d086330 Merge branch 'ja-track-changes' of github.com:sharelatex/web-sharelatex into ja-track-changes 2017-01-12 17:22:18 +01:00
James Allen
2052ee63a3 Recover tracked changes after a disconnect 2017-01-12 17:19:19 +01:00
Paulo Reis
b97ce52c6f Handle z-index issues with mini review panel. 2017-01-12 14:20:41 +00:00
Brian Gough
a153375688 Merge pull request #391 from sharelatex/bg-syntax-checker-mathmode 
math mode syntax checking improvements
 2017-01-12 14:18:11 +00:00
Brian Gough
df4b5c1b37 math mode syntax checking improvements 
for beta users

from our ace commit 442a1c522c58b1e511d2fd2c6f03909488d41e60
 2017-01-12 13:25:19 +00:00
Shane Kilkelly
d17483fd47 Merge branch 'sk-top-menu-rework' 2017-01-12 13:24:47 +00:00
James Allen
a42cc48be8 Fix doc names and sort order in resolved comments dropdown 2017-01-12 13:44:54 +01:00
James Allen
8e0c2ff0b3 Adjust resolved comments buttons and add tooltip 2017-01-12 13:37:44 +01:00
Henry Oswald
daee77f052 Merge pull request #387 from sharelatex/pr-email-template-improvements 
Email template improvements
 2017-01-12 12:34:35 +00:00
James Allen
f9b8ada215 track changes for anonymous users 2017-01-12 13:29:57 +01:00
James Allen
0d02b860d9 Merge branch 'ja-track-changes' of github.com:sharelatex/web-sharelatex into ja-track-changes 2017-01-12 13:08:57 +01:00
Paulo Reis
0b57cc650b Fix merge mistake; adjust animation timings. 2017-01-12 11:56:04 +00:00
James Allen
64b9fe52dd Handle deleted users in comments gracefully 2017-01-12 12:31:01 +01:00
Paulo Reis
88b694f894 Animate comment resolving. 2017-01-12 11:25:36 +00:00
James Allen
9a867438b2 Always show user name next to comment 2017-01-12 12:06:02 +01:00
James Allen
ea7f1abb6b Darken comment reply text area 2017-01-12 12:05:50 +01:00
James Allen
6cd8e2a935 Add user data to comments correctly 2017-01-12 12:05:35 +01:00
James Allen
e7ab92b7c9 Only show users controls they have permission to use 2017-01-12 11:52:39 +01:00
James Allen
953371ad2d Don't double track a reject 2017-01-12 10:59:16 +01:00
Shane Kilkelly
5c25d15a18 WIP: try switch to rolling rate limiter 2017-01-12 09:25:18 +00:00
James Allen
0264efccae Don't let review panel entries go off the top of the screen 2017-01-11 14:57:00 +01:00
James Allen
a081ae7307 Properly sync resolved comments dropdown to entries 2017-01-11 14:13:49 +01:00
James Allen
4ee4aa9f0a Merge branch 'ja-track-changes' of github.com:sharelatex/web-sharelatex into ja-track-changes 2017-01-11 13:41:16 +01:00
James Allen
2e5c6d4570 Don't remove add comment marker when updating entries 2017-01-11 13:41:07 +01:00
Paulo Reis
d701c1ef5e Make the dropdown scrollable. 2017-01-11 11:25:18 +00:00
Paulo Reis
931187bd8b Add a backdrop to the dropdown (to close when clicked outside). 2017-01-11 10:53:46 +00:00
Shane Kilkelly
411cb4330c Fix typo in hyperlink 2017-01-11 10:39:34 +00:00
Shane Kilkelly
731f280e2e Move auth parts of top menu out of config and into web templates. 
Move the remaining configuration into a new config var: `nav.header_extras`.
Add a `nav.showSubscriptionLink` var to control visibility of subscription link
in the Account menu.

This will allow admins to more easily configure extra links in the top
navigation bar, without the danger of overwriting the important auth menus.
 2017-01-11 10:27:38 +00:00
Paulo Reis
72baed60ef Merge branch 'ja-track-changes' of github.com:sharelatex/web-sharelatex into ja-track-changes 2017-01-10 16:29:36 +00:00
Paulo Reis
010612aacc Keep track of resolved threads in the dropdown. 2017-01-10 16:29:27 +00:00
James Allen
f17ce2705c Don't include wrapper for resolved comments, since it throws the review panel layout off 2017-01-10 17:17:07 +01:00
James Allen
3668d7dd1f Remove global debugging hook 2017-01-10 16:58:59 +01:00
Shane Kilkelly
f5ced03074 Set redirect when sending user to login page. 
Allows smart redirecting to work when public access is turned off.
 2017-01-10 15:42:36 +00:00
James Allen
f31fa98679 Sync track changes state between sessions and client 2017-01-10 16:11:12 +01:00
Shane Kilkelly
f3af44fab0 add on-success and on-error handlers to async-form. 2017-01-10 14:46:09 +00:00
James Allen
85c613e161 Merge branch 'ja-track-changes' of github.com:sharelatex/web-sharelatex into ja-track-changes 2017-01-10 13:44:01 +01:00
James Allen
d03aa7056e Rename /ranges/users end point to /changes/users 2017-01-10 13:43:53 +01:00
Paulo Reis
5bd49c08f8 Simpler resolved comments dropdown data structure. 2017-01-10 12:16:58 +00:00
Paulo Reis
9c7d89c5bd Merge branch 'ja-track-changes' of github.com:sharelatex/web-sharelatex into ja-track-changes 2017-01-10 11:23:15 +00:00
Paulo Reis
072044ee90 Remove thread from view collection; some clean-up. 2017-01-10 11:23:06 +00:00
James Allen
7ae33041b5 Don't enter infinite loop generating id 2017-01-10 11:58:55 +01:00
James Allen
12e1b2bc3d Don't show resolved comments highlighted in the text 2017-01-10 11:55:59 +01:00
Paulo Reis
32fb317820 Add delete action to the dropdown. 2017-01-10 10:33:54 +00:00
Paulo Reis
70134d44d0 Add unresolve action to the dropdown. 2017-01-09 17:22:01 +00:00
James Allen
4e128b6ab7 Send user data in /threads dat 2017-01-09 17:25:06 +01:00
Paulo Reis
1a100b77df Hide resolved comments from the review panel. 2017-01-09 15:15:03 +00:00
James Allen
35bdb4383a Merge branch 'ja-track-changes' of github.com:sharelatex/web-sharelatex into ja-track-changes 
Conflicts:
	public/coffee/ide/review-panel/controllers/ReviewPanelController.coffee
 2017-01-09 16:11:59 +01:00
James Allen
dbe5331566 Tell other clients when comments are resolved and reopened 2017-01-09 16:09:29 +01:00
Paulo Reis
037389b7dd Decouple ranges update from the overview panel; integrate it with the dropdown. 2017-01-09 14:59:01 +00:00
James Allen
43f6b9de7c Inform other clients when we accept a change 2017-01-09 15:54:12 +01:00
Paulo Reis
5e483f2a97 Merge branch 'ja-track-changes' of github.com:sharelatex/web-sharelatex into ja-track-changes 2017-01-09 14:31:31 +00:00
James Allen
7e33d1a24e Fix generation of thread id 2017-01-09 15:30:48 +01:00
Paulo Reis
f0ab1fa2d4 Merge branch 'ja-track-changes' of github.com:sharelatex/web-sharelatex into ja-track-changes 2017-01-09 14:30:40 +00:00
Paulo Reis
4871d56725 Isolate overview panel overrides. 2017-01-09 14:30:29 +00:00
James Allen
9379cff89d Add end point for accepting change in doc updater 2017-01-09 15:25:27 +01:00
James Allen
a4097b4709 Merge branch 'ja-track-changes' of github.com:sharelatex/web-sharelatex into ja-track-changes 2017-01-09 10:52:01 +01:00
James Allen
14c624614d Update RangesTracker 2017-01-09 10:51:55 +01:00
James Allen
ae30f32481 Use deterministic ids based on a seed 2017-01-09 10:49:03 +01:00
Paulo Reis
037b61cbba Further styling. 2017-01-06 17:22:22 +00:00
Paulo Reis
0478fcd925 Add comment resolution info. 2017-01-06 15:24:33 +00:00
James Allen
cb24e9390a Fix comments in overview panel 2017-01-06 14:17:57 +01:00
James Allen
beb94b0756 Merge branch 'ja-track-changes' of github.com:sharelatex/web-sharelatex into ja-track-changes 2017-01-06 13:42:08 +01:00
James Allen
3a5d45fa32 Get user info via web, not chat 2017-01-06 13:41:58 +01:00
Paulo Reis
42585085c0 Integrate new directive, plumb data into it. More styling. 2017-01-06 12:00:17 +00:00
Paulo Reis
f2e6e69df6 Add an entry directive for resolved comments, with file and quoted text. 2017-01-06 11:59:49 +00:00
Henry Oswald
0b67265eb6 use admin email for closed site 2017-01-06 11:32:57 +00:00
Henry Oswald
84ce2d0e14 change default nav to use translations for login and register 2017-01-06 11:00:21 +00:00
Paulo Reis
a1435d13a3 Basic structure for the resolved comments dropdown. 2017-01-05 17:15:27 +00:00
Henry Oswald
862e15b842 log out user id and anonymous when loading editor 2017-01-05 15:02:10 +00:00
Paulo Reis
22db36d21b Merge branch 'ja-track-changes' of github.com:sharelatex/web-sharelatex into ja-track-changes 2017-01-05 11:51:00 +00:00
Paulo Reis
d13035a4f4 Simpler UI for comments; remove some unused code. 2017-01-05 11:50:43 +00:00
James Allen
5155ebaeec Don't show resolved comments when loading editor 2017-01-05 10:55:16 +01:00
James Allen
898d20a6fc Fix signature of call to unresolveComment 2017-01-05 10:34:28 +01:00
Paulo Reis
1599c41670 Sizing adjustments. 2017-01-04 15:34:24 +00:00
James Allen
60152e219b Merge branch 'ja-track-changes' of github.com:sharelatex/web-sharelatex into ja-track-changes 2017-01-04 16:26:08 +01:00
James Allen
84d9b2aa49 Save resolve and reopened state 2017-01-04 16:26:02 +01:00
Paulo Reis
fdafcf9677 Restyle insertions and deletions - increasing info density. 2017-01-04 15:24:49 +00:00
Shane Kilkelly
7bbbfe20b9 If external auth is used, remove /register items from header nav. 
(logic moved from docker-image settings file)
 2016-12-21 13:50:13 +00:00
Shane Kilkelly
64f69069b2 Experimental: upgrade to node 6.9.2 (latest LTS release) 2016-12-21 10:23:42 +00:00
Henry Oswald
bcf9a17fb3 Merge branch 'master' into node-4.2 2016-12-20 15:23:02 +00:00
Shane Kilkelly
259c589076 Add option to restrict invites to existing user accounts. 2016-12-20 09:54:42 +00:00
Shane Kilkelly
822f76a883 Add unit tests for RedisWrapper 2016-12-19 15:12:22 +00:00
Shane Kilkelly
d428f9adbc Make LoginRateLimiter a thin wrapper around RateLimiter 2016-12-19 14:10:51 +00:00
Shane Kilkelly
03b541fb64 Fix small mistakes 2016-12-19 14:10:27 +00:00
Shane Kilkelly
535e489ae5 Add an example redis.ratelimiter config. 2016-12-19 12:17:58 +00:00
Shane Kilkelly
9f787943b6 Remove stray redis imports. 2016-12-19 12:17:23 +00:00
Shane Kilkelly
ef0a5801d5 Create a RedisWrapper, and use it for rate limiting. 2016-12-19 12:17:02 +00:00
Paulo Reis
d6fcc21ab5 Add support for GMail go-to actions in the single CTA template. 2016-12-16 17:04:26 +00:00
James Allen
988005e929 Send and get comments via the chat api 2016-12-16 16:42:41 +00:00
Paulo Reis
869f729132 Fix forgotten templating function. 2016-12-16 15:15:06 +00:00
Paulo Reis
ca5040882f Use the new template in the join group email. 2016-12-16 14:57:59 +00:00
Brian Gough
3a8a12fcb3 Revert "rollout linter math mode to all users" 
This reverts commit 0ac0a11d3028cabac53d1e347b2509cb9e785f9f.
 2016-12-16 14:07:47 +00:00
Paulo Reis
0fe3664a82 Use the new template in the reset pwd email. 2016-12-16 12:16:45 +00:00
Paulo Reis
2234c438a1 Support a secondary message in the single CTA email template. 2016-12-16 12:16:33 +00:00
Shane Kilkelly
637fcb5784 Merge branch 'master' into sk-learn-anchor-links 2016-12-16 11:20:43 +00:00
Shane Kilkelly
fdcf97f877 Disable angular html5Mode. 2016-12-16 10:26:25 +00:00
Paulo Reis
7dfc2c61a6 Make the CTA button text configurable. 2016-12-16 10:06:56 +00:00