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
Shane Kilkelly
c1ebc65a3b
Move convert to top
2016-10-24 10:41:32 +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
Brian Gough
29080bafb2
use PDFJS text layer renderer instead of our own
2016-10-14 12:00:47 +01:00
Brian Gough
c98f40b90b
use a single pdfjs worker, rotated to avoid leaks
2016-10-13 16:10:02 +01:00
Brian Gough
85d8c2ed2e
pass in PDFJS as a module, not global
2016-10-13 16:10:01 +01:00
Brian Gough
71275efebe
remove unused pdf dependency
2016-10-13 16:10:01 +01:00
Brian Gough
27a8dc1dfd
upgrade pdfjs to 1.6.210p1
2016-10-13 16:10:01 +01:00
Brian Gough
f31e3260ee
remove pdfjs special case disableFontFace for MSIE
2016-10-13 16:10:01 +01:00
Brian Gough
4ca918a3b8
render canvas on-screen to avoid bad fonts in MSIE
2016-10-13 14:40:57 +01:00
James Allen
7a4bebd785
Allow review panel to be toggled
2016-10-13 14:22:23 +01:00
James Allen
42ab2e8165
Init review panel with ace editor height
2016-10-13 12:21:49 +01:00
James Allen
77c02042f8
Recalculate change offsets on editor resize
2016-10-13 12:09:18 +01:00
James Allen
8d968f6865
Tidy up ReviewPanelController
2016-10-13 10:09:59 +01:00
James Allen
fc782581ea
Change review panel to feel like part of ace
2016-10-12 17:27:20 +01:00
Shane Kilkelly
3ec0e65ae1
Merge branch 'master' into sk-end-subform-test
2016-10-12 14:34:55 +01:00
James Allen
c689937297
Merge pull request #338 from sharelatex/ja-track-changes
...
Ja track changes
2016-10-12 09:21:46 +01:00
James Allen
4ac55c7671
Merge branch 'ja-track-changes' into ja-review-panel
2016-10-11 14:24:51 +01:00
James Allen
e9c8fc7c20
Add in review panel layout
2016-10-11 14:24:01 +01:00
Shane Kilkelly
e2cf40ff33
Remove old default subscription form, replace with 'simple' form
2016-10-11 14:07:31 +01:00
Brian Gough
452f6117cd
remove console.log
2016-10-11 13:56:17 +01:00
James Allen
65bc8a84db
Merge pull request #332 from MCribbin/patch-4
...
Update HumanReadableLogsRules.coffee
2016-10-11 11:11:10 +01:00
James Allen
cd33029678
Merge pull request #337 from MCribbin/patch-5
...
Update HumanReadableLogsRules.coffee
2016-10-11 11:10:44 +01:00
James Allen
32d7bb16e5
Be more explicit with query string to turn on track changes
2016-10-11 09:40:15 +01:00
James Allen
9682af3981
Merge branch 'master' into ja-track-changes
...
Conflicts:
public/coffee/ide/history/HistoryManager.coffee
2016-10-10 17:10:10 +01:00
James Allen
0995ba5ee6
Add basic change tracking into editor behind a feature flag
2016-10-10 17:06:46 +01:00
James Allen
1c9abd35f8
Rename track-changes -> history on the client
...
Conflicts:
app/views/project/editor/history.jade
2016-10-10 16:59:25 +01:00
Shane Kilkelly
c4fd9f3bce
Merge branch 'master' into sk-session-button
2016-10-10 14:49:55 +01:00
MCribbin
0d5e6e2abf
Update HumanReadableLogsRules.coffee
2016-10-10 13:31:38 +01:00
James Allen
220759ee7a
Merge pull request #330 from sharelatex/ja-non-english-spell-check
...
Use comprehensive unicode letter regex for spell check matching
2016-10-10 08:54:56 +01:00