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
Henry Oswald
227666087c
don't show register when external auth is used
2016-10-21 15:43:58 +01:00
Paulo Reis
4d33b11ce5
Restrict the appearance of the onboarding view.
2016-10-21 15:00:52 +01:00
Paulo Reis
9dd06df839
More style adjustments.
2016-10-21 15:00:26 +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
1ec133c68d
Merge pull request #345 from sharelatex/bg-enable-pdfjs-cmaps
...
enable pdfjs cmaps
2016-10-20 13:30:42 +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
Paulo Reis
e60f67dacb
Bootstrapping.
2016-10-20 12:24:07 +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
Henry Oswald
7b83a941ee
Merge branch 'master' into node-4.2
2016-10-19 13:04:26 +01:00
Henry Oswald
1707ea187d
Update docker-compose.yml
2016-10-19 12:10:27 +01:00
Henry Oswald
3e13565a84
added coffeescript and moved admin require to bottom of file
2016-10-19 11:39:40 +01:00
Henry Oswald
bdea2e3236
Merge branch 'master' of https://github.com/sharelatex/sharelatex
2016-10-19 11:32:32 +01:00
Henry Oswald
3eeeccc0ec
log out which version is being checked out
2016-10-19 11:30:10 +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
Henry Oswald
794c6431e3
project name should be clickable href in invite email
2016-10-18 16:04:25 +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
8add9ff3ea
fix exception in error log
2016-10-14 10:23:13 +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
Henry Oswald
75364f058a
Create ProjectSize.coffee
2016-10-13 15:46:18 +01:00
Brian Gough
4ca918a3b8
render canvas on-screen to avoid bad fonts in MSIE
2016-10-13 14:40:57 +01:00