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 |
|
James Allen
|
09195882f4
|
Add scrollbar todo note
|
2016-10-13 14:25:46 +01:00 |
|
James Allen
|
4999ed30f8
|
Merge branch 'master' into ja-review-panel
|
2016-10-13 14:22:43 +01:00 |
|
James Allen
|
7a4bebd785
|
Allow review panel to be toggled
|
2016-10-13 14:22:23 +01:00 |
|
Henry Oswald
|
bfeb7e082f
|
added textEncoding option for email
|
2016-10-13 14:22:08 +01:00 |
|
Henry Oswald
|
6db09c2c15
|
added textEncoding for email option
|
2016-10-13 14:21:33 +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 |
|
Henry Oswald
|
d0f9a07197
|
turn subscriptions off by default
|
2016-10-12 17:35:40 +01:00 |
|
James Allen
|
fc782581ea
|
Change review panel to feel like part of ace
|
2016-10-12 17:27:20 +01:00 |
|
Shane Kilkelly
|
a4e3bf3458
|
Merge pull request #341 from sharelatex/sk-end-subform-test
Remove old default subscription form, replace with 'simple' form
|
2016-10-12 14:43:27 +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 |
|
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 |
|