Commit Graph
3364 Commits
Author SHA1 Message Date
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 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
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 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
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 cd01137e7d Merge pull request #340 from sharelatex/bg-provide-default-requirejs-config
provide default requirejs config
2016-10-11 13:29:47 +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
James Allen 0fbbad33ff Use built in Ace browser detection 2016-10-11 11:40:26 +01:00
Paulo Reis e26eda5754 Update regex to grab Chrome version. 2016-10-11 11:34:33 +01:00
James Allen 0b6c71f688 Patch Ace to fix accent key problem in Chrome 2016-10-11 11:17:38 +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
Henry Oswald 65e48652ee don't add second slash into uni redirect 2016-10-10 15:36:12 +01:00
Henry Oswald adc6b429e6 record when a subscription is canceled 2016-10-10 15:29:54 +01:00