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
James Allen
2ac405e58c
Allow track changes to be toggled on and off
2016-10-20 16:59:58 +01:00
Paulo Reis
ac07ba035b
Navigation in onboarding UI.
2016-10-20 16:39:43 +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
8f9a4882c8
Don't let widgets in review panel overlap
2016-10-20 15:04:10 +01:00
Brian Gough
84f986058a
enable pdfjs cmaps in pdfRenderer
2016-10-20 12:55:58 +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
