github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-12-04 22:05:51 -05:00
Code Issues Projects Releases Packages Wiki Activity
5908 commits 3 branches 7 tags 206 MiB
Commit graph

1431 commits

Author SHA1 Message Date
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
7fbf6d97bd Merge branch 'master' into pr-hide-review-panel 2017-05-26 09:39:29 +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
Paulo Reis
8dfb91fa6f Blur toggler after clicking. 2017-05-22 11:11:26 +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
58ad62c413 Relayout entries when commenting. 2017-05-19 16:57:51 +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
Paulo Reis
e532f543a3 Merge branch 'master' into pr-bulk-actions 2017-05-18 14:38:16 +01:00
Paulo Reis
832764dd3d Add key shortcut to toggle the review panel. 2017-05-18 11:02:50 +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
ada614cc69 Check response exists before calling method 2017-05-16 09:20:12 +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
Paulo Reis
82a19444b3 Merge branch 'master' into pr-bulk-actions 2017-05-15 10:29:15 +01:00
Paulo Reis
dd85c2fab2 Remove debug line. 2017-05-12 15:44:49 +01:00
Paulo Reis
658e70a772 Update ranges tracker. 2017-05-11 11:32:12 +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
Paulo Reis
8aee0edfe8 Integrate bulk actions dialog with controller actions. 2017-05-09 16:06:34 +01:00
Paulo Reis
f3e020df7e Add dialog to confirm bulk actions. 2017-05-09 16:06:19 +01:00
Paulo Reis
499272cbb5 Use new range-tracker method. 2017-05-08 16:12:21 +01:00
Paulo Reis
03b8b72520 Update range tracker with new bulk method. 2017-05-08 16:10:08 +01:00
Paulo Reis
3ced808411 Use a single accept changes method. 2017-05-05 15:19:31 +01:00
Paulo Reis
f25db3ff64 Reflect accepted changes on the UI layer. 2017-05-04 15:47:25 +01:00
Paulo Reis
19828d3c5b Basic bulk accept support. 2017-05-04 15:33:47 +01:00
Paulo Reis
8f6d11632b Add bulk rejection support. 2017-05-03 17:16:41 +01:00
Paulo Reis
dae66d5edf Add bulk methods in controller. 2017-05-03 17:16:29 +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
722d75f6ef Correctly check if deletions are within selection. 2017-05-02 17:08:41 +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
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
79bc4c1d3e = != == ;) 2017-04-24 16:16:02 +01:00
Henry Oswald
c733925a26 show rate limit message when compiled too much 2017-04-24 15:56:09 +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
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
ce59307c91 Merge pull request #475 from sharelatex/ja-scroll-overflow-in-review-panel 
Allow scrolling in the review panel to extend outside of top of text …
 2017-04-05 11:08:49 +01:00
Shane Kilkelly
0555154a24 Merge branch 'sk-fix-folder-creation' 2017-04-04 11:01:07 +01:00
Paulo Reis
7855afa0cd Remove unused scope binding. 2017-04-04 10:48:31 +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
James Allen
567edbfb31 Fix on the new comment button variation 2017-04-03 17:11:33 +01:00
James Allen
2fa909c707 Allow scrolling in the review panel to extend outside of top of text like Ace 2017-04-03 16:46:36 +01:00
James Allen
efac6b70f4 Merge pull request #468 from sharelatex/ja-allow-overlapping-comments 
Allo overlapping comments
 2017-04-03 14:04:14 +01:00
James Allen
1675185f37 Merge pull request #474 from sharelatex/pr-project-name-tooltip 
Project name tooltip
 2017-04-03 14:04:02 +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
855d37289b Use ISO strings instead of of date type in locally resolved comments. 2017-03-31 14:29:28 +01:00
Shane Kilkelly
15d0a40f85 When error occurs, unset state.inflight 2017-03-31 10:30:28 +01:00
Shane Kilkelly
49446afb82 Remove duplicate line 2017-03-31 10:30:10 +01:00
James Allen
4c8ce65ce7 Allo overlapping comments 2017-03-28 16:50:30 +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
Paulo Reis
93934b9c8f Use deploy date. 2017-03-27 09:32:02 +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
Paulo Reis
c72ee95177 Refactor AB test participation code; add conversion code. 2017-03-23 15:00:43 +00:00
Paulo Reis
254e4953cb Wire-up AB test for adding comments. 2017-03-23 12:26:21 +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
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
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
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
James Allen
3c2f5525a1 Show an explanation error message on too many track changes error 2017-03-17 14:49:32 +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
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
James Allen
fb91219661 Don't submit comment on clicking cancel 2017-03-08 11:38: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
James Allen
e1cf6229f7 Merge branch 'master' into ja-use-dirty-state 2017-03-01 10:03:00 +00: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
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
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
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
00fce4d2da Merge branch 'master' into pr-collapse-overview-entries 2017-02-21 14:25:45 +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
f466be96dd Make sure first change isn't hidden under toolbar 2017-02-21 09:58:49 +01: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
1e66c46ca7 Add filter to retrieve number of keys in objects. 2017-02-17 14:31:50 +00:00
Paulo Reis
cd2c8e7199 Add directive based on jQuery animation API. 2017-02-17 11:54:33 +00:00
Paulo Reis
0841ab8278 Add directive to collapse elements via height. 2017-02-17 11:24:21 +00: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
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
Paulo Reis
badc4ecb7a Show add comment tooltip to the left when appropriate. 2017-02-14 14:40:21 +00: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
b48f57c2cb Submit comment on blur or selection change 2017-02-14 13:41:04 +01:00
Paulo Reis
594f2024d1 Style the onboarding prompt as a modal; close it when clicked outside. 2017-02-14 12:09:05 +00:00
Paulo Reis
1eed10b4e7 Add keyboard navigation 2017-02-14 10:21:45 +00: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
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
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
85c2910738 Don't animate review panel entries on toggle and resize 2017-02-13 09:49:51 +01: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
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
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
4a80f0de5a Clear selection after creating a comment 2017-02-03 15:09:40 +00: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
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
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
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
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
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
James Allen
f9ba7392e9 Allow editing/deleting of comments and threads 2017-01-24 16:21:14 +01:00
James Allen
2813b16ebf Use thread id for comment id 2017-01-23 09:45:37 +01:00
Shane Kilkelly
57cd54bf55 WIP: migrate from jade to pug 2017-01-20 12:03:02 +00: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
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
Paulo Reis
2f119e5787 Track review features usage. 2017-01-17 14:39:31 +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
James Allen
1b63db91d0 Add in a null check 2017-01-17 11:51:02 +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
5fb54d8447 Don't refresh resolved comments every times an entry changes 2017-01-16 16:55:14 +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
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
James Allen
b6ea338ff8 Separate resolved comments so they don't affect review panel 2017-01-13 15:27:45 +01: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
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
2052ee63a3 Recover tracked changes after a disconnect 2017-01-12 17:19:19 +01:00
James Allen
a42cc48be8 Fix doc names and sort order in resolved comments dropdown 2017-01-12 13:44:54 +01: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
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
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
931187bd8b Add a backdrop to the dropdown (to close when clicked outside). 2017-01-11 10:53:46 +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
James Allen
f31fa98679 Sync track changes state between sessions and client 2017-01-10 16:11:12 +01: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
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
0478fcd925 Add comment resolution info. 2017-01-06 15:24:33 +00: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
Paulo Reis
a1435d13a3 Basic structure for the resolved comments dropdown. 2017-01-05 17:15:27 +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
James Allen
84d9b2aa49 Save resolve and reopened state 2017-01-04 16:26:02 +01:00
Shane Kilkelly
259c589076 Add option to restrict invites to existing user accounts. 2016-12-20 09:54:42 +00:00
James Allen
988005e929 Send and get comments via the chat api 2016-12-16 16:42:41 +00:00
James Allen
5717cafcec Create comments via comment ops 2016-12-13 17:57:46 +00:00
James Allen
898277b4af Refactor ops model so it all happens in Document 2016-12-13 17:34:29 +00:00
Brian Gough
6e8ee826dc update latex syntax checker to include mathmode 
from our ace commit 21dde1e5f104b02e19534e56d7eb2dbd3a950db9

provide it as a beta release first
 2016-12-12 10:10:49 +00:00
James Allen
0a6a6c3c28 Keep files ordered in overview panel in the same was as the file tree 2016-12-09 16:17:28 +00:00
James Allen
293ba1fc4c Fetch all ranges from docstore when viewing overview panel 2016-12-09 15:43:08 +00:00
James Allen
1d426e538f Load ranges from docupdater and toggle track changes when possible 2016-12-08 14:10:30 +00:00
James Allen
65c1a62cb7 Add in null check for user when getting hue in chat 2016-11-25 11:08:32 +00:00
James Allen
04c151eed0 Only bind to Ace if track changes is enabled 2016-11-24 16:56:50 +00:00
Paulo Reis
8d933d9b5f Toggler style adjustments. 2016-11-23 16:10:35 +00:00
Paulo Reis
e655e85e6d Integrate toggler in review panel. 2016-11-23 14:34:55 +00:00
Paulo Reis
ed20f8533f Add toggler directive. 2016-11-23 14:34:21 +00:00
Paulo Reis
ba5118d02a Merge branch 'master' into ja-review-panel 2016-11-23 10:41:20 +00:00
James Allen
33f6c0dd1b Jump to position based on offset since we don't know doc lines for unopen docs 2016-11-22 16:34:39 +00:00
James Allen
db93bc8cff Grey out and add extra info to resolved comments 2016-11-21 17:13:17 +00:00
James Allen
222401c7fd Pull out logic linking changesTracker to reviewPanel.entries into ReviewPanelController 2016-11-21 16:57:52 +00:00
James Allen
12168b2ae8 Insert some mocked changes 2016-11-21 15:18:46 +00:00
Brian Gough
889d8f51c4 make Document _onError handler more robust 
replace console.error with sl_console.log to prevent browser crashing
before exiting document if console object does not exist.
 2016-11-21 13:58:08 +00:00
Paulo Reis
ad857a15f9 Style resolved comments in the current file pane. 2016-11-21 11:16:23 +00:00
James Allen
5814d93f5e Order entries in the overview panel based on their place in the document 2016-11-18 16:30:41 +00:00
James Allen
107f86fb2b Merge branch 'ja-review-panel' of github.com:sharelatex/web-sharelatex into ja-review-panel 2016-11-18 15:47:06 +00:00
James Allen
c5e7d154fd Improve undo behaviour of deletes 2016-11-18 15:46:54 +00:00
Paulo Reis
f029c7a7b2 Control click behaviour on comments; relayout when toggling panels. 2016-11-18 15:08:16 +00:00
James Allen
bf20799478 Allow comments to be resolved an deleted 2016-11-17 18:06:08 +00:00
James Allen
d30daa3477 Remove another debug logging line 2016-11-17 16:08:25 +00:00
James Allen
35d154b6e8 Remove some debug logging lines 2016-11-17 16:07:23 +00:00
James Allen
7a8af8a21a Show file names in overview panel 2016-11-17 16:05:12 +00:00
James Allen
4a93e02407 Goto a change when clicked in the overview panel 2016-11-17 15:55:18 +00:00
James Allen
d1a3ff4b73 Refactor callout and background styles and don't show in overview 2016-11-17 15:33:34 +00:00
James Allen
77400b000b Focus on box when adding a comment 2016-11-17 15:20:25 +00:00
James Allen
7c3a4dfa4d Always show current file in mini review panel 2016-11-17 14:57:11 +00:00
Paulo Reis
df420e0d21 Remove deprecated event handlers, conditionally add the new ones in the Ace wrapper directive. 2016-11-17 14:34:23 +00:00
James Allen
15d8f6c661 Sort out scroll bar positions and scroll position transitions 2016-11-17 14:29:35 +00:00
Paulo Reis
fe43f60b3d Offset review panel when Ace scrollbar is visibl.e 2016-11-17 12:02:45 +00:00
Paulo Reis
4bba8e8977 Remove deprecated event handlers, conditionally add the new ones in the Ace wrapper directive. 2016-11-17 10:51:17 +00:00
Paulo Reis
f170fd4b83 Refactor Ace directive to have a single events bridge. 2016-11-17 10:40:08 +00:00
James Allen
a87ed88a53 Use cleaner scrolling system that doesn't involve hiding a scroll bar 2016-11-17 10:24:48 +00:00
James Allen
70bf0be6dd Fix when the mini review panel is hidden 2016-11-16 17:17:50 +00:00
James Allen
1cec41d2cf Resize editor on review panel toggle 2016-11-16 16:28:01 +00:00
James Allen
c86cf5a61a Merge branch 'ja-review-panel' of github.com:sharelatex/web-sharelatex into ja-review-panel 2016-11-16 16:23:15 +00:00
James Allen
2f136c15c3 Don't draw our hacked zero width markers when they are offscreen 2016-11-16 16:22:59 +00:00
Paulo Reis
296fd9fe26 Merge branch 'ja-review-panel' of github.com:sharelatex/web-sharelatex into ja-review-panel 2016-11-16 16:13:49 +00:00
Paulo Reis
32b3ba6bbb Pull indicators into entries directives. 2016-11-16 16:13:39 +00:00
James Allen
6a4bf3885d Merge branch 'ja-review-panel' of github.com:sharelatex/web-sharelatex into ja-review-panel 
Conflicts:
	public/coffee/ide/review-panel/controllers/ReviewPanelController.coffee
 2016-11-16 16:05:05 +00:00
James Allen
beab95a871 Reflow review panel layout when adding a comment 2016-11-16 16:03:06 +00:00
James Allen
5d414e9a1b Tweak paddings in review panel 2016-11-16 15:57:51 +00:00
Paulo Reis
6153bd3022 Wrap add comment entries in a directive 2016-11-16 15:47:05 +00:00
Paulo Reis
24f82c3c35 Merge branch 'ja-review-panel' of github.com:sharelatex/web-sharelatex into ja-review-panel 2016-11-16 15:34:49 +00:00
James Allen
fc3fd5c73c Merge branch 'ja-review-panel' of github.com:sharelatex/web-sharelatex into ja-review-panel 2016-11-16 15:27:48 +00:00
James Allen
51afd49780 Bring scroll bar into editor when just mini review panel 2016-11-16 15:27:33 +00:00
James Allen
379afe4aa5 Refactor scroll handling into directive 2016-11-16 15:23:29 +00:00
Paulo Reis
00a6df156b Wrap comment entries in a directive 2016-11-16 15:12:58 +00:00
Paulo Reis
9ffb05cd98 Wrap insert and delete entries in a directive 2016-11-16 14:56:34 +00:00
James Allen
b006f4fbbf Position boxes next to indicator icons in mini review panel 2016-11-16 14:14:53 +00:00
James Allen
56408728cd fix initialization error 2016-11-16 14:00:29 +00:00
James Allen
443d772866 Don't clear entries when switching files 2016-11-16 13:53:01 +00:00
James Allen
479ea83e36 Dump everything (unstyled) into the review panel 2016-11-16 13:51:30 +00:00
James Allen
711f282575 Merge branch 'ja-review-panel' of github.com:sharelatex/web-sharelatex into ja-review-panel 2016-11-16 13:26:33 +00:00
Paulo Reis
f640c17d4d Add review panel substate toggling. 2016-11-16 12:31:47 +00:00
James Allen
b443c5d7dc Make mini review panel entries scroll and stack like main panel 2016-11-15 17:07:06 +00:00
James Allen
829ccb6641 Resize on toggling review panel 2016-11-15 16:21:45 +00:00
James Allen
3b4670509a Remove left over debug logging 2016-11-15 15:51:15 +00:00
James Allen
09074f5413 Merge branch 'ja-review-panel' of github.com:sharelatex/web-sharelatex into ja-review-panel 2016-11-15 15:48:17 +00:00
James Allen
4542d1094d Keep separate persistent change tracker for each doc 2016-11-15 15:48:12 +00:00
Paulo Reis
7bf55823b2 Hide review panel when there are no entries. 2016-11-15 15:04:29 +00:00
Paulo Reis
b181115277 Basic review minimized state. 2016-11-15 10:34:39 +00:00
Paulo Reis
0c600ba9b8 Support overflowing panes in UI layout. 2016-11-15 10:34:19 +00:00
James Allen
c89579e1df Focus on the focused change 2016-11-14 12:47:46 +00:00
James Allen
d447ebe304 Add timeout around reply layout render 2016-11-14 11:49:34 +00:00
James Allen
d32a7d0a94 Only apply doc changes, not fold changes in undo manager 2016-11-14 09:44:59 +00:00
James Allen
747e14dffe Merge branch 'ja-review-panel' of github.com:sharelatex/web-sharelatex into ja-review-panel 2016-11-11 16:16:10 +00:00
Paulo Reis
3694754ca6 Merge branch 'ja-review-panel' of github.com:sharelatex/web-sharelatex into ja-review-panel 2016-11-11 16:10:44 +00:00
Paulo Reis
d04d7f834e Adjustments in the threaded comments, mocked comments responses. 2016-11-11 16:10:26 +00:00
James Allen
9509e87dc1 Update entries in place and position via DOM attributes directly 2016-11-11 16:09:32 +00:00
James Allen
36b950ea30 Use evalAsync instead of timeout 2016-11-11 13:35:16 +00:00
Paulo Reis
6c5c1549b6 Add comment replies via enter keypress. 2016-11-11 10:51:32 +00:00
James Allen
e69b6da684 Stop deletes overlapping comments (but leads to occasional flickering) 2016-11-10 12:01:42 +00:00
James Allen
938a8c4894 Fix logic around not tracking rejections to changes 2016-11-10 10:58:55 +00:00
James Allen
812ee82af1 Merge branch 'ja-review-panel' of github.com:sharelatex/web-sharelatex into ja-review-panel 
Conflicts:
	app/views/project/editor/editor.jade
 2016-11-10 10:52:40 +00:00
James Allen
34b2b665a3 Accept and reject changes 2016-11-10 10:52:09 +00:00
Paulo Reis
950fc0179c Basic support for action icons. 2016-11-10 10:19:52 +00:00
James Allen
184b421b1f Show user name in comments 2016-11-09 16:34:23 +00:00
James Allen
b44f1cde10 Add user data into changes 2016-11-09 16:23:08 +00:00
Paulo Reis
19241e571f Distinguish between inserts and deletes in the entries repeater. 2016-11-09 15:58:03 +00:00
James Allen
c5532bd8a3 Add cancel buttons for comments 2016-11-09 15:51:40 +00:00
James Allen
1622269d1b Relayout review panel as needed 2016-11-09 15:46:47 +00:00
James Allen
6d7f4e9e6a Add basic comment replying 2016-11-09 15:25:41 +00:00
James Allen
707ed43a7d Very crude adding of comments 2016-11-09 14:50:58 +00:00
James Allen
446ca7212a Track timestamps of changes 2016-11-09 12:19:48 +00:00
James Allen
cd494f7866 Update ChangesTracker to handle delete edge case 2016-11-08 17:57:23 +00:00
James Allen
f68c615f61 Remove markers correctly 2016-11-08 17:47:54 +00:00
James Allen
084838926d Add in dashed line callouts for changes and comments 2016-11-08 17:31:08 +00:00
James Allen
4f8055d998 make sure line 1 changes don't hide under toolbar 2016-11-08 16:51:20 +00:00
James Allen
064ae1945a Toggle review panel and track changes with ui elements 2016-11-08 16:43:01 +00:00
James Allen
a907ec04fc Don't complain about comment markers when checking 2016-11-08 15:17:20 +00:00
James Allen
8c65cb5835 Track and highlight comment ranges 2016-11-08 15:12:25 +00:00
Shane Kilkelly
2ff211ce2c Make sure the $scope.canAddCollaborators var is initialised at least once, outside of angular $watch. 2016-11-07 14:36:04 +00:00
James Allen
0b50623d51 Escape \ 2016-11-05 11:07:58 +00:00
James Allen
26f9ee7fd3 Escape \ 2016-11-05 11:07:07 +00:00
Brian Gough
307f08e6bb Merge pull request #363 from sharelatex/bg-lock-editor-when-connection-down 
lock editor when connection down
 2016-11-04 11:04:30 +00:00
Brian Gough
476de0118c Merge pull request #362 from sharelatex/bg-fix-saving-indicator 
fix saving indicator
 2016-11-04 11:02:32 +00:00
Brian Gough
d2ba575d85 note that acks are for our own ops 2016-11-04 10:55:46 +00:00
Brian Gough
c25395d80b fix links to wiki 2016-11-04 10:25:08 +00:00
Brian Gough
e1b54322ee fix whitespace 2016-11-04 10:18:33 +00:00
Brian Gough
49a06f8489 modal for lost connection 2016-11-03 12:37:44 +00:00
Brian Gough
91a590ad0e update links from tender to wiki 2016-11-03 12:28:19 +00:00
Brian Gough
2a8efea29a use browser 'online' event to trigger reconnect 2016-11-03 12:28:19 +00:00
Brian Gough
87d8192d29 decrease reconnect ratelimit for user activity 2016-11-03 12:28:19 +00:00
Brian Gough
62b8c30d0b make pollSavedStatus more robust against failure 
check last ack timestamp and size of pending op

provide method to compute sharejs op size so we can check if pending
ops get too big
 2016-11-03 11:28:23 +00:00
James Allen
8763e444e9 Include aceDelta in error message 2016-11-03 11:23:27 +00:00
James Allen
091eb7e462 Merge branch 'master' into ja-review-panel 
Conflicts:
	public/coffee/ide.coffee
	public/stylesheets/app/editor.less
 2016-11-03 10:07:37 +00:00
Paulo Jorge Reis
74d8fb103b Merge pull request #358 from sharelatex/pr-latex-linter-onboarding 
Code-checker onboarding
 2016-11-02 13:58:06 +00:00
Paulo Reis
c88cb4574e Support dismissing the dialog just with Enter. 2016-11-01 16:17:42 +00:00
Brian Gough
b907620fc1 clean up whitespace 2016-11-01 12:19:29 +00:00
Brian Gough
2461c1b7be add more sl_console debugging to ConnectionManager 2016-11-01 12:19:29 +00:00
Brian Gough
e2c66e8d56 keep track of reconnect timer 2016-11-01 12:19:29 +00:00
Brian Gough
4da9008300 rate limit on reconnection attempts (cursor/click) 2016-11-01 12:19:29 +00:00
Brian Gough
f894048292 fix lastUpdate in ConnectionManager 2016-11-01 12:19:29 +00:00
Brian Gough
d57e191ad0 use socket.io connect method instead of reconnect 
the reconnect method tries 10 times by default, but we want to manage
reconnections ourselves
 2016-11-01 12:06:41 +00:00
Brian Gough
69e957419d Merge pull request #355 from sharelatex/bg-handle-reconnects 
wait for confirmation before sending joinProject
 2016-11-01 11:50:44 +00:00
Paulo Reis
2c78b5967f Fix settings logic. 2016-11-01 11:36:05 +00:00
Brian Gough
35259bf9b7 send joinProject after connectionAccepted 2016-11-01 11:17:36 +00:00
Paulo Reis
aa58b70d43 Improve visibility logic. 2016-10-31 20:18:08 +00:00
James Allen
11c24377cb fix JSONstringifyWithCycles 2016-10-31 16:57:29 +00:00
James Allen
c2eb49845f Revert "Make very simple shallow copy of aceDelta when there's an undo error" 
This reverts commit 1d77a95f17dde6f8792bca1989d65952474b144c.
 2016-10-31 16:56:49 +00:00
James Allen
26410690da Make very simple shallow copy of aceDelta when there's an undo error 2016-10-31 16:47:13 +00:00
James Allen
8368577867 Merge branch 'master' into ja-review-panel 
Conflicts:
	app/views/project/editor/editor.jade
	public/coffee/ide.coffee
	public/coffee/ide/editor/directives/aceEditor.coffee
 2016-10-31 16:42:55 +00:00
Paulo Reis
97b92928dc Merge branch 'master' into pr-latex-linter-onboarding 2016-10-28 16:36:10 +01:00
Brian Gough
8887ab78c0 improve ace mode recognition 2016-10-27 15:42:19 +01:00
Shane Kilkelly
2029ec2535 Merge branch 'sk-plans-tidy' 2016-10-27 10:42:29 +01:00
Brian Gough
cb4380fa78 fix problem with setting syntax validation option 2016-10-26 15:08:29 +01:00
Shane Kilkelly
d912c3b487 Merge branch 'master' into sk-plans-tidy 2016-10-26 13:47:26 +01:00
James Allen
c9925a3590 Handle reporting of cyclic objects to Sentry 2016-10-26 11:34:05 +01:00
Paulo Reis
70c7880639 Style adjustments. 2016-10-26 11:12:34 +01:00
James Allen
032165c930 Merge pull request #349 from sharelatex/ja-real-time-reconnects 
Reconnect gracefully when asked to by real-time
 2016-10-26 10:04:25 +01:00
Paulo Reis
b913118e07 Save the syntax validation setting in the onboarding view. 2016-10-25 15:01:30 +01:00
Paulo Reis
f4849201aa Merge branch 'master' into pr-latex-linter-onboarding 2016-10-25 15:00:26 +01:00
Paulo Reis
238e07ddde Save syntax checking as a user setting. 2016-10-25 14:59:20 +01:00
James Allen
43aeb5a21d Clear SERVERID cookie when reconnecting gracefully 2016-10-25 14:09:36 +01:00
Shane Kilkelly
6069d4dba3 Merge branch 'master' into sk-plans-tidy 2016-10-25 13:14:44 +01:00
James Allen
52754e038a Reconnect gracefully when asked to by real-time 2016-10-24 16:36:40 +01:00
Paulo Reis
32d59b6212 Add setting saving logic. 2016-10-24 12:20:08 +01:00
Shane Kilkelly
d5a7514923 Add AB test for plans (+15 squashed commits) 
Squashed commits:
[45c2237] Add a `subscription-form-switch-to-student` event
[1ad9b8f] change experiment name, and re-enable switch-to-student workflow
[f7cdb78] Remove debug
[4b9778a] Incorporate collaborator alternative plans
[701e80b] Add collaborator plans for heron and ibis
[287aa0f] AB test plans from editor page
[c74052e] Fix change-plan view for default plans
[1a947d6] Use correct plan codes
[1eecda7] Adjust prices
[69c4c7b] Introduce two plans
[8b8d5f8] Rename sixpack experiment
[c332002] Fix up the change-plan page
[c7af52d] Overhaul change-plan page, show only plans from current generation
[33d86bf] update plan
[5bbd946] Add a basic plans AB test
 2016-10-21 16:17:37 +01:00
Paulo Reis
4d33b11ce5 Restrict the appearance of the onboarding view. 2016-10-21 15:00:52 +01:00
Paulo Reis
777b28b443 Add animation and other styling items. Small refactor with Less vars. 2016-10-21 12:02:53 +01:00
James Allen
2ac405e58c Allow track changes to be toggled on and off 2016-10-20 16:59:58 +01:00
Paulo Reis
ac07ba035b Navigation in onboarding UI. 2016-10-20 16:39:43 +01:00
Brian Gough
e9b5fc056d fold aceEditor resetSession into session set up 
it is not used elsewhere, and mode setting is now done during the
initialisation.
 2016-10-20 16:03:55 +01:00
Brian Gough
7258e947a8 use ace modelist extension to auto-detect mode 2016-10-20 16:03:19 +01:00
James Allen
60a81beb11 Try out different styling for highlights 2016-10-20 15:18:45 +01:00