Commit graph

80 commits

Author SHA1 Message Date
Alasdair Smith
b7200066e9 Inject rich text variable to conditionally show rich text styles 2018-02-09 10:42:11 +00:00
Alasdair Smith
09fbafa1f6 Include ShareJS CM adapter in compiled lib and fix bug with CM adapter
Because the CM & Ace scripts are naively concat-ed together, the Ace
applyToShareJS function would be overwritten by the CM version.

Also fixes bugs where adapter was calling old version of ShareJS api
and the old CM api
2018-02-09 10:38:51 +00:00
Paulo Reis
3c3bb0a892 Use globalVars strategy to do v2-specific styling. 2018-02-05 16:20:33 +00:00
Henry Oswald
490c56c692 libs -> libraries
don't use hash in non minjs version
2017-12-13 17:15:44 +00:00
Henry Oswald
357617d952 works with libs compiled into it 2017-12-13 14:19:19 +00:00
Shane Kilkelly
2ea3caf08b Properly version the fineuploader library 2017-12-01 11:22:41 +00:00
James Allen
62de9d8946 Move test/UnitTests -> unit/test 2017-11-27 17:10:22 +00:00
Hayden Faulds
5cdddc7d0e debugging output if acceptance tests fail on CI 2017-11-23 10:39:21 +00:00
Hayden Faulds
09964cfe95 compile acceptance tests 2017-11-23 10:38:55 +00:00
Paulo Reis
70a56d0474 Merge branch 'master' into pr-ol-beta-theme 2017-10-24 16:19:31 +01:00
Paulo Reis
9b128591b1 Enable sourcemaps on dev and prod environments (both minified and normal). 2017-10-24 16:03:59 +01:00
Paulo Reis
83a1b2f5a0 Reenable source maps. 2017-10-23 16:58:02 +01:00
Paulo Reis
79c77188f3 Disable source maps (to be reenabled later on). 2017-10-17 15:04:43 +01:00
Paulo Reis
589d4521a5 Add source map to less files. 2017-09-28 12:12:22 +01:00
James Allen
1502da85cf Set up acceptance tests to run in docker container 2017-09-27 10:37:20 +02:00
James Allen
b4254f06ef Update Project schema for overleaf imports 2017-08-21 17:49:08 +02:00
James Allen
5c8442a86f Allow configureable brand prefix with overleaf styles 2017-08-07 17:01:59 +02:00
Paulo Reis
f993966935 Typo in gruntfile. 2017-06-26 16:27:12 +01:00
Paulo Reis
5b9e5ecd13 Update grunt tasks to generate source maps. 2017-06-26 16:14:03 +01:00
Shane Kilkelly
4e9426e6bf Merge branch 'master' into sk-pug 2017-01-30 14:36:10 +00:00
Shane Kilkelly
57cd54bf55 WIP: migrate from jade to pug 2017-01-20 12:03:02 +00:00
Paulo Reis
e0f3593bff Add autoprefixer to Grunt tasks. 2017-01-18 15:38:18 +00:00
Brian Gough
27a8dc1dfd upgrade pdfjs to 1.6.210p1 2016-10-13 16:10:01 +01:00
James Allen
bf0fba2c89 Minify correct version of Ace 2016-10-12 09:52:15 +01:00
Brian Gough
837151a395 include moment in package versions 2016-10-05 14:54:42 +01:00
Brian Gough
8b6425317f introduce PackageVersions module
put all package versions in one central place
2016-10-05 14:54:42 +01:00
Brian Gough
0a350c8e3f infrastructure for using ace syntax checking 2016-09-23 15:19:40 +01:00
James Allen
2478a95bcb Don't watch files as grunt default 2016-09-21 10:48:23 +01:00
Brian Gough
64dc1784d3 switch to patched version of pdfjs 2016-09-19 11:15:27 +01:00
Brian Gough
74959e7947 add Grunt task to run without parallel watch 2016-08-26 15:21:18 +01:00
Henry Oswald
90e0f829f5 removed old grunt tasks, moved to sharelatex/sharelatex 2016-08-05 15:16:01 +01:00
Shane Kilkelly
29d333ae51 Increase timeout on acceptance tests 2016-07-28 14:50:08 +01:00
Paulo Reis
8eae4e4044 Revert "Use custom shrinkwrap to ignore the translations package."
This reverts commit 25a8a7cd9a59f738277ce893318c69db539384d6.
2016-07-12 13:42:46 +01:00
Paulo Reis
112a64ce84 Use custom shrinkwrap to ignore the translations package. 2016-07-12 13:37:26 +01:00
Henry Oswald
94d760e32d import bootstrap font awseome via less not html 2016-07-10 11:10:43 +01:00
Henry Oswald
85936a1391 moved css min to exec, import was not working via grunt 2016-07-10 11:04:51 +01:00
Paulo Reis
040739ef7f Comment out sprity and leave a not in README.md. 2016-07-04 16:03:29 +01:00
Paulo Reis
64a73b0356 Disable default 4px margin on grunt-sprity, also add the built files. 2016-07-01 16:02:40 +01:00
Henry Oswald
6f4a7f4779 mvp for using sprites for flags, needs border removing 2016-07-01 15:04:39 +01:00
Henry Oswald
7cb266d904 removed imagemin 2016-06-30 14:59:05 +01:00
Henry Oswald
d35a48e683 minfiy css as well 2016-06-18 21:49:32 +01:00
Henry Oswald
4fc9c9a263 compress to 7 levels and only watch public files 2016-06-18 19:16:45 +01:00
Henry Oswald
1d26be30a9 added grunt imagemin used to compress images 2016-06-18 16:50:56 +01:00
Henry Oswald
560b7f7177 grunt will auto recompile client and less now, run concurrently 2016-06-15 12:08:11 +01:00
Henry Oswald
ed17bd026d added delete user script in grunt 2016-06-08 15:36:08 +01:00
James Allen
e36be96ec9 Move public access setting to its own end point 2016-03-10 11:13:57 +00:00
James Allen
e1fa77dd72 Add beginnings of acceptance tests 2016-03-08 15:59:04 +00:00
James Allen
8a095a5144 Upgrade to PDF 1.3.91 2016-02-04 14:27:00 +00:00
Henry Oswald
003cdc01fc consolidated 2 options in payment left menu 2015-11-18 15:21:48 +00:00
Henry Oswald
49e6f4db87 set NODE_TLS_REJECT_UNAUTHORIZED to 0 for testing
allows us to talk to staging sixpack
2015-11-12 12:38:35 +00:00