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
|
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
|
e85cb161b2
|
Merge branch 'sk-bug-can-invite-collaborator'
|
2016-11-07 15:10:21 +00:00 |
|
Brian Gough
|
f77ee597f4
|
Merge pull request #365 from sharelatex/bg-redirect-to-login-on-403
redirect to login on 403
|
2016-11-07 14:44:08 +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
|
f54bb9744a
|
redirect to /login on failed requests
|
2016-11-04 16:03:18 +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 |
|