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
Brian Gough
35259bf9b7
send joinProject after connectionAccepted
2016-11-01 11:17:36 +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
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
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
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
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
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
Brian Gough
84f986058a
enable pdfjs cmaps in pdfRenderer
2016-10-20 12:55:58 +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
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
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
Shane Kilkelly
e2cf40ff33
Remove old default subscription form, replace with 'simple' form
2016-10-11 14:07:31 +01:00
