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 |
|
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 |
|
Henry Oswald
|
11a097c9a6
|
remove some old sixpack tests
|
2016-11-02 10:09:12 +00:00 |
|
Shane Kilkelly
|
a63f7685b8
|
Move the planCode logic for Collaborator into a helper function.
|
2016-11-02 09:56:33 +00:00 |
|
Paulo Reis
|
c88cb4574e
|
Support dismissing the dialog just with Enter.
|
2016-11-01 16:17:42 +00:00 |
|
Paulo Reis
|
79caa14385
|
Fix logic for showing the onboarding prompt.
|
2016-11-01 15:26:50 +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
|
fda66107a9
|
Turn teaser visibility logic on.
|
2016-11-01 11:46:47 +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 |
|
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 |
|
Paulo Reis
|
97b92928dc
|
Merge branch 'master' into pr-latex-linter-onboarding
|
2016-10-28 16:36:10 +01:00 |
|
Shane Kilkelly
|
5c8cdd22cc
|
Merge branch 'sk-account-delete-pass'
|
2016-10-28 11:02:41 +01:00 |
|
Paulo Jorge Reis
|
a274e0e175
|
Merge pull request #353 from sharelatex/pr-ab-test-history-teaser
AB test history teaser
|
2016-10-28 09:08:26 +01:00 |
|
Brian Gough
|
8887ab78c0
|
improve ace mode recognition
|
2016-10-27 15:42:19 +01:00 |
|
Paulo Reis
|
1c4183e7b1
|
Merge branch 'master' into pr-ab-test-history-teaser
|
2016-10-27 12:35:11 +01:00 |
|
Paulo Reis
|
ad33aa1bb8
|
Move Metabase tracking code.
|
2016-10-27 12:22:58 +01:00 |
|
Paulo Reis
|
991626692b
|
Track subscriptions in metabase with AB test variant.
|
2016-10-27 12:05:32 +01:00 |
|
Shane Kilkelly
|
2029ec2535
|
Merge branch 'sk-plans-tidy'
|
2016-10-27 10:42:29 +01:00 |
|
Shane Kilkelly
|
f396f5b09e
|
update prices in front-end
|
2016-10-27 09:57:46 +01:00 |
|
Shane Kilkelly
|
1538f140f3
|
update test timestamp
|
2016-10-27 09:41:51 +01:00 |
|
Brian Gough
|
cb4380fa78
|
fix problem with setting syntax validation option
|
2016-10-26 15:08:29 +01:00 |
|
Shane Kilkelly
|
dfd13e0815
|
Update AB test timestamp
|
2016-10-26 14:24:00 +01:00 |
|
Shane Kilkelly
|
d912c3b487
|
Merge branch 'master' into sk-plans-tidy
|
2016-10-26 13:47:26 +01:00 |
|
James Allen
|
c9925a3590
|
Handle reporting of cyclic objects to Sentry
|
2016-10-26 11:34:05 +01:00 |
|
Paulo Reis
|
70c7880639
|
Style adjustments.
|
2016-10-26 11:12:34 +01:00 |
|
James Allen
|
032165c930
|
Merge pull request #349 from sharelatex/ja-real-time-reconnects
Reconnect gracefully when asked to by real-time
|
2016-10-26 10:04:25 +01:00 |
|
Shane Kilkelly
|
1c8721ceab
|
Functioning account deletion with password
|
2016-10-25 16:23:50 +01:00 |
|
Paulo Reis
|
b913118e07
|
Save the syntax validation setting in the onboarding view.
|
2016-10-25 15:01:30 +01:00 |
|
Paulo Reis
|
f4849201aa
|
Merge branch 'master' into pr-latex-linter-onboarding
|
2016-10-25 15:00:26 +01:00 |
|
Paulo Reis
|
238e07ddde
|
Save syntax checking as a user setting.
|
2016-10-25 14:59:20 +01:00 |
|
Shane Kilkelly
|
efe6df145c
|
WIP: ask for password when deleting account
|
2016-10-25 14:33:47 +01:00 |
|
James Allen
|
43aeb5a21d
|
Clear SERVERID cookie when reconnecting gracefully
|
2016-10-25 14:09:36 +01:00 |
|
Shane Kilkelly
|
6069d4dba3
|
Merge branch 'master' into sk-plans-tidy
|
2016-10-25 13:14:44 +01:00 |
|
Shane Kilkelly
|
ae2d030a32
|
Don't call participate if should not test plans
|
2016-10-25 11:46:52 +01:00 |
|
Shane Kilkelly
|
e268275e77
|
Fix participate/convert flow for plan tests
|
2016-10-25 10:47:14 +01:00 |
|
Shane Kilkelly
|
c091399610
|
Remove track-changes-discount experiment
|
2016-10-25 09:47:22 +01:00 |
|
James Allen
|
52754e038a
|
Reconnect gracefully when asked to by real-time
|
2016-10-24 16:36:40 +01:00 |
|
Paulo Reis
|
32d59b6212
|
Add setting saving logic.
|
2016-10-24 12:20:08 +01:00 |
|
Shane Kilkelly
|
c051b56abf
|
Cloak plans until they have loaded
|
2016-10-24 11:24:28 +01:00 |
|
Shane Kilkelly
|
5cf82e4ef7
|
Add Metabase events
|
2016-10-24 11:08:19 +01:00 |
|
Shane Kilkelly
|
8dfd487941
|
Add plan to event tracking
|
2016-10-24 11:00:09 +01:00 |
|