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 |
|
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
|
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 |
|
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 |
|
Brian Gough
|
8887ab78c0
|
improve ace mode recognition
|
2016-10-27 15:42:19 +01:00 |
|
Brian Gough
|
cb4380fa78
|
fix problem with setting syntax validation option
|
2016-10-26 15:08:29 +01:00 |
|
James Allen
|
c9925a3590
|
Handle reporting of cyclic objects to Sentry
|
2016-10-26 11:34:05 +01:00 |
|
James Allen
|
2ac405e58c
|
Allow track changes to be toggled on and off
|
2016-10-20 16:59:58 +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 |
|
James Allen
|
2b94c69795
|
Don't use the trackChanges engine in the history editor panel
|
2016-10-20 12:19:57 +01:00 |
|
James Allen
|
52f3fe7303
|
Show different users changes in different colours
|
2016-10-20 12:15:22 +01:00 |
|
Brian Gough
|
3a07b785db
|
disable auto insert of brackets and quotes in ace
|
2016-10-20 11:33:12 +01:00 |
|
James Allen
|
193766b437
|
Don't switch back to editor view when selecting a file in the history view
|
2016-10-19 10:43:53 +01:00 |
|
James Allen
|
c88624bf4c
|
Pass through the data needed to trackChangesManager to determine if a remote was local or remote
|
2016-10-18 18:01:52 +01:00 |
|
James Allen
|
e717caab7f
|
Merge branch 'master' into ja-review-panel
|
2016-10-18 16:52:41 +01:00 |
|
James Allen
|
05cd6e69a7
|
Add in extra sentry logging for undefined start in aceDelta
|
2016-10-18 16:37:40 +01:00 |
|
James Allen
|
42ab2e8165
|
Init review panel with ace editor height
|
2016-10-13 12:21:49 +01:00 |
|
James Allen
|
77c02042f8
|
Recalculate change offsets on editor resize
|
2016-10-13 12:09:18 +01:00 |
|
James Allen
|
fc782581ea
|
Change review panel to feel like part of ace
|
2016-10-12 17:27:20 +01:00 |
|
James Allen
|
c689937297
|
Merge pull request #338 from sharelatex/ja-track-changes
Ja track changes
|
2016-10-12 09:21:46 +01:00 |
|
James Allen
|
4ac55c7671
|
Merge branch 'ja-track-changes' into ja-review-panel
|
2016-10-11 14:24:51 +01:00 |
|
Brian Gough
|
452f6117cd
|
remove console.log
|
2016-10-11 13:56:17 +01:00 |
|
James Allen
|
32d7bb16e5
|
Be more explicit with query string to turn on track changes
|
2016-10-11 09:40:15 +01:00 |
|
James Allen
|
9682af3981
|
Merge branch 'master' into ja-track-changes
Conflicts:
public/coffee/ide/history/HistoryManager.coffee
|
2016-10-10 17:10:10 +01:00 |
|
James Allen
|
0995ba5ee6
|
Add basic change tracking into editor behind a feature flag
|
2016-10-10 17:06:46 +01:00 |
|
James Allen
|
220759ee7a
|
Merge pull request #330 from sharelatex/ja-non-english-spell-check
Use comprehensive unicode letter regex for spell check matching
|
2016-10-10 08:54:56 +01:00 |
|
Brian Gough
|
9177544ed9
|
add left menu for syntax validator
|
2016-10-06 11:51:24 +01:00 |
|
James Allen
|
201012a131
|
Use comprehensive unicode letter regex for spell check matching
|
2016-10-04 11:24:48 +01:00 |
|
Brian Gough
|
0eaa359f6c
|
use syntax validator for beta programme users only
|
2016-09-23 15:19:40 +01:00 |
|