James Allen
|
aab4dea8ae
|
Merge branch 'master' into ja-track-changes
|
2017-01-13 13:46:01 +01:00 |
|
James Allen
|
2052ee63a3
|
Recover tracked changes after a disconnect
|
2017-01-12 17:19:19 +01:00 |
|
James Allen
|
f9b8ada215
|
track changes for anonymous users
|
2017-01-12 13:29:57 +01:00 |
|
James Allen
|
953371ad2d
|
Don't double track a reject
|
2017-01-12 10:59:16 +01:00 |
|
James Allen
|
12e1b2bc3d
|
Don't show resolved comments highlighted in the text
|
2017-01-10 11:55:59 +01:00 |
|
James Allen
|
5155ebaeec
|
Don't show resolved comments when loading editor
|
2017-01-05 10:55:16 +01: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
|
1d426e538f
|
Load ranges from docupdater and toggle track changes when possible
|
2016-12-08 14:10:30 +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
|
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
|
bf20799478
|
Allow comments to be resolved an deleted
|
2016-11-17 18:06:08 +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 |
|
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
|
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
|
2f136c15c3
|
Don't draw our hacked zero width markers when they are offscreen
|
2016-11-16 16:22:59 +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
|
3b4670509a
|
Remove left over debug logging
|
2016-11-15 15:51:15 +00:00 |
|
James Allen
|
4542d1094d
|
Keep separate persistent change tracker for each doc
|
2016-11-15 15:48:12 +00:00 |
|
James Allen
|
c89579e1df
|
Focus on the focused change
|
2016-11-14 12:47:46 +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
|
9509e87dc1
|
Update entries in place and position via DOM attributes directly
|
2016-11-11 16:09:32 +00:00 |
|
James Allen
|
938a8c4894
|
Fix logic around not tracking rejections to changes
|
2016-11-10 10:58:55 +00:00 |
|
James Allen
|
34b2b665a3
|
Accept and reject changes
|
2016-11-10 10:52:09 +00:00 |
|
Paulo Reis
|
19241e571f
|
Distinguish between inserts and deletes in the entries repeater.
|
2016-11-09 15:58:03 +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
|
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 |
|
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 |
|
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 |
|