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