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
Henry Oswald
1c3edcd627
added some debug lines
2016-10-24 23:36:49 +01:00
Shane Kilkelly
667c7ce520
Show correct number of collaborators for plans
2016-10-24 11:47:01 +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
James Allen
49fecc9ef4
Use v1.6.0 of metrics
2016-10-24 10:51:20 +01:00
Shane Kilkelly
c1ebc65a3b
Move convert to top
2016-10-24 10:41:32 +01:00
Henry Oswald
8ba3884428
Merge branch 'master' of https://github.com/sharelatex/web-sharelatex
2016-10-21 19:20:43 +01:00
Henry Oswald
91e9447fe5
added logging to smoke test
2016-10-21 19:20:21 +01:00
Henry Oswald
450946212a
log out health check failures
2016-10-21 18:59:28 +01:00
Shane Kilkelly
8c1d110688
Remove debug logs
2016-10-21 16:21:21 +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
84f986058a
enable pdfjs cmaps in pdfRenderer
2016-10-20 12:55:58 +01:00
Brian Gough
4d551ced5e
add pdfjs cmaps
2016-10-20 12:53:34 +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
Henry Oswald
1beca53b3d
project name should be clickable href in invite email
2016-10-18 15:53:56 +01:00
Brian Gough
cf09a9ed83
Merge pull request #344 from sharelatex/bg-upgrade-pdfjs
...
upgrade pdfjs
2016-10-14 17:03:13 +01:00
Henry Oswald
a02da61cb0
fixed email sender tests looking for wrong settings
2016-10-14 16:43:59 +01:00
Brian Gough
29080bafb2
use PDFJS text layer renderer instead of our own
2016-10-14 12:00:47 +01:00
Brian Gough
e42d256d4f
remove pdfjs-1.0.712 no longer used
2016-10-13 16:10:02 +01:00
Brian Gough
1bbf237943
remove pdfjs-1.0.1040 no longer used
2016-10-13 16:10:02 +01:00
Brian Gough
991486ab60
make html valid (div not allowed in p tag)
2016-10-13 16:10:02 +01:00
Brian Gough
0bd36a9e3b
fix comment
2016-10-13 16:10:02 +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
5748d1e7ec
add pdfjs 1.6.210 (patched with font fix)
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
Henry Oswald
bfeb7e082f
added textEncoding option for email
2016-10-13 14:22:08 +01:00
Henry Oswald
d0f9a07197
turn subscriptions off by default
2016-10-12 17:35:40 +01:00
Shane Kilkelly
3ec0e65ae1
Merge branch 'master' into sk-end-subform-test
2016-10-12 14:34:55 +01:00
James Allen
bf0fba2c89
Minify correct version of Ace
2016-10-12 09:52:15 +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
436d63fa12
Merge pull request #339 from sharelatex/ja-fix-accent-keys
...
Patch Ace to fix accent key problem in Chrome
2016-10-12 09:21:33 +01:00
Shane Kilkelly
e706057677
Merge branch 'master' of github.com:sharelatex/web-sharelatex
2016-10-11 14:44:09 +01:00
Brian Gough
ed262409de
Merge pull request #342 from sharelatex/bg-provide-default-requirejs-config
...
use separate jade template block for requirejs
2016-10-11 14:42:40 +01:00
Shane Kilkelly
8fcc58495e
Use a new key for the delete-account warning
2016-10-11 14:34:30 +01:00
Brian Gough
380487abf0
use separate jade template block for requirejs
...
removes the need to suppressDefaultJs
2016-10-11 14:31:04 +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
Brian Gough
0f2959eb3b
use suppressDefaultJs instead of suppressFooter
2016-10-11 13:04:10 +01:00
Brian Gough
b9ecfcf41f
provide minimal requirejs config
2016-10-11 13:02:30 +01:00