James Allen
|
f62d95dd8c
|
Merge branch 'ja-review-panel' of github.com:sharelatex/web-sharelatex into ja-review-panel
|
2016-11-09 17:11:02 +00:00 |
|
James Allen
|
2e719fc450
|
Start adding callouts in review panel
|
2016-11-09 17:10:58 +00:00 |
|
Paulo Reis
|
013df17192
|
Entry header layout.
|
2016-11-09 17:09:57 +00:00 |
|
Paulo Reis
|
f28119aacb
|
Merge branch 'ja-review-panel' of github.com:sharelatex/web-sharelatex into ja-review-panel
|
2016-11-09 16:36:12 +00:00 |
|
Paulo Reis
|
341a092231
|
Merge + basic layout for entries.
|
2016-11-09 16:36:06 +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
|
e0fbb45844
|
Add colored borders.
|
2016-11-09 16:00:02 +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 |
|
Paulo Reis
|
74ddd33bd9
|
Add colors to LESS file.
|
2016-11-09 15:39:01 +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
|
6f41dddb42
|
disable spell check for anonymous users
these requests always fail
|
2016-11-04 16:03:18 +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 |
|
Shane Kilkelly
|
8f0e56930c
|
Merge branch 'master' of github.com:sharelatex/web-sharelatex
|
2016-11-04 10:05:54 +00:00 |
|
Shane Kilkelly
|
b16a533610
|
add npm-shrinkwrap.json
|
2016-11-04 10:04:12 +00:00 |
|
Paulo Reis
|
b7cf77eb62
|
Add GitHub-related teaser media.
|
2016-11-03 16:14:38 +00:00 |
|
Paulo Reis
|
cd0a9d922e
|
Generalize and improve teaser styles.
|
2016-11-03 16:14:13 +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 Reis
|
559350eaa2
|
Avoid showing the history upgrade teaser when user is not the project owner.
|
2016-11-02 16:08:47 +00:00 |
|
Shane Kilkelly
|
e7b09a81a7
|
Merge branch 'sk-passport-ldap'
|
2016-11-02 15:39:32 +00:00 |
|
Paulo Reis
|
140748d466
|
Remove text-shadow, use stricter box-shadow syntax.
|
2016-11-02 14:38:26 +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 |
|
Henry Oswald
|
fde9ab60cc
|
remove left-menu-upgraed-rotation ab test
|
2016-11-02 10:24:03 +00:00 |
|