James Allen
d32a7d0a94
Only apply doc changes, not fold changes in undo manager
2016-11-14 09:44:59 +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
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
Paulo Reis
c88cb4574e
Support dismissing the dialog just with Enter.
2016-11-01 16:17:42 +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
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
Brian Gough
8887ab78c0
improve ace mode recognition
2016-10-27 15:42:19 +01:00
Shane Kilkelly
2029ec2535
Merge branch 'sk-plans-tidy'
2016-10-27 10:42:29 +01:00
Brian Gough
cb4380fa78
fix problem with setting syntax validation option
2016-10-26 15:08:29 +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
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
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
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
d5a7514923
Add AB test for plans (+15 squashed commits)
...
Squashed commits:
[45c2237] Add a `subscription-form-switch-to-student` event
[1ad9b8f] change experiment name, and re-enable switch-to-student workflow
[f7cdb78] Remove debug
[4b9778a] Incorporate collaborator alternative plans
[701e80b] Add collaborator plans for heron and ibis
[287aa0f] AB test plans from editor page
[c74052e] Fix change-plan view for default plans
[1a947d6] Use correct plan codes
[1eecda7] Adjust prices
[69c4c7b] Introduce two plans
[8b8d5f8] Rename sixpack experiment
[c332002] Fix up the change-plan page
[c7af52d] Overhaul change-plan page, show only plans from current generation
[33d86bf] update plan
[5bbd946] Add a basic plans AB test
2016-10-21 16:17:37 +01:00
Paulo Reis
4d33b11ce5
Restrict the appearance of the onboarding view.
2016-10-21 15:00:52 +01:00
Paulo Reis
777b28b443
Add animation and other styling items. Small refactor with Less vars.
2016-10-21 12:02:53 +01:00
