Commit Graph

5382 Commits

Author SHA1 Message Date
Paulo Reis 963ad4fece Style resizer togglers. 2017-12-04 15:48:23 +00:00
Paulo Reis 0bad7d8549 Adjustments to synctex controls. 2017-12-04 15:12:13 +00:00
Paulo Reis 9fda8e62fa Merge branch 'pr-style-v2-resizers' of github.com:sharelatex/web-sharelatex-internal into pr-style-v2-resizers 2017-12-04 13:48:52 +00:00
Paulo Reis fd852004fe Refactor synctex controls z-index handling. 2017-12-04 12:25:40 +00:00
James Allen e03dcd3bae Merge branch 'master' into pr-style-v2-resizers 2017-12-04 10:15:43 +00:00
James Allen 158b0d56cf Merge branch 'master' into pr-style-v2-resizers 2017-12-04 10:01:45 +00:00
Hayden Faulds 28bcf83d87 better error when project creation fails 2017-12-04 09:25:22 +00:00
Hayden Faulds eacb19fac9 create user in db and use login endpoint instead of register 2017-12-04 09:25:22 +00:00
Hayden Faulds 938d22da3f get csrf token from /dev/csrf not /register 2017-12-04 09:25:22 +00:00
James Allen b51ee7ea7e Point track-changes-web-module back at master 2017-12-04 09:22:47 +00:00
Henry Oswald aaa908187d added layout.pug back in 2017-12-02 13:38:23 +00:00
James Allen a9ca54b98a Generate docker-compose.yml before any docker-compose command 2017-12-02 13:02:37 +00:00
Henry Oswald c020e4e6bd moment and fineuploader are loaded seperately in editor, not packaged up 2017-12-02 12:29:06 +00:00
James Allen 5e3f192eda Merge pull request #187 from sharelatex/sk-version-fineuploader
Version the fineuploader library
2017-12-01 13:34:31 +00:00
James Allen 381761127e Replace previous fineuploader path with old version 2017-12-01 13:26:31 +00:00
Shane Kilkelly 3ee6f5d4be Update fineuploader on project page 2017-12-01 11:27:06 +00:00
Shane Kilkelly 2ea3caf08b Properly version the fineuploader library 2017-12-01 11:22:41 +00:00
Paulo Reis aeffe1cea9 Style resizers while dragging. 2017-12-01 11:22:12 +00:00
James Allen e895a495d6 Move make clean step to before compile 2017-12-01 10:49:00 +00:00
James Allen e9733514af Fail on failing module acceptance tests 2017-12-01 10:07:09 +00:00
James Allen 65e44d4770 Clean up old docker-shared.yml before running tests 2017-12-01 09:31:22 +00:00
James Allen fa2a3574db Look for Makefile, not makefile 2017-12-01 09:01:36 +00:00
James Allen 040546b1d3 Move -q flag to correct place 2017-12-01 08:49:10 +00:00
James Allen e62ec77161 Merge pull request #180 from sharelatex/ja-quiet-npm
Run npm with -q flag for less verbose test output
2017-12-01 08:32:46 +00:00
James Allen c433ac7e2d Merge pull request #183 from sharelatex/hof-module-acceptance-files
acceptance test changes for module test
2017-12-01 08:32:14 +00:00
Paulo Reis cd6b51a1f6 Increase v2 resizer hit area. 2017-11-30 17:00:42 +00:00
Paulo Reis ce3e410250 Configure resizer colors. 2017-11-30 17:00:25 +00:00
Paulo Reis 3a959cccfd Use custom chat resizer values. 2017-11-30 15:24:48 +00:00
Paulo Reis 826f49b9a4 Add default resizer values to layout directive. 2017-11-30 15:24:39 +00:00
Paulo Reis 024741ac51 Correct chat resizer values. 2017-11-30 15:24:10 +00:00
Paulo Reis e38c0de6b9 Merge branch 'pr-ol-beta-editor-styling' into pr-style-v2-resizers 2017-11-30 15:13:00 +00:00
Paulo Reis 71604ebd5c Create uiConfig Pug local; render it in the HTML. 2017-11-30 15:12:36 +00:00
Alasdair Smith a5cdcea9c7 Update modules gitignore to ignore everything except specific modules 2017-11-30 13:32:23 +00:00
Hayden Faulds e916fc906a add mkdirp dev dependency 2017-11-30 13:15:39 +00:00
Hayden Faulds 78709d819e generate test acceptance files volume for modules 2017-11-30 13:15:23 +00:00
James Allen b2a3e06717 Find / replace mistake 2017-11-30 11:20:25 +00:00
James Allen 870e87ebe1 Run npm with -q flag for less verbose test output 2017-11-30 11:00:28 +00:00
James Allen 488e6d7c5d Merge pull request #158 from sharelatex/ja-dockerise-tests
Dockerize unit and acceptance tests using docker-compose
2017-11-30 10:09:07 +00:00
Alasdair Smith dba0ab003c Merge pull request #166 from sharelatex/as-autocompile-rollout-20
Increase autocompile rollout to 20%
2017-11-30 10:08:55 +00:00
Nate Stemen c2bb8b9f89 removing calls 2017-11-29 13:30:53 -05:00
Nate Stemen 74ba7402de Merge branch 'ns-file-completer' 2017-11-29 09:20:09 -05:00
James Allen bb74f8318a Support make clean install usage 2017-11-29 14:16:29 +00:00
James Allen 50b3045548 Tidy up docker-compose and makefile 2017-11-29 13:49:36 +00:00
Shane Kilkelly c203a8d80a Merge branch 'sk-use-recurly-hosted-details-page' 2017-11-29 09:45:54 +00:00
Shane Kilkelly 8b5115ff03 Merge branch 'sk-update-fineuploader' 2017-11-29 09:41:14 +00:00
Nate Stemen 26df9bca05 Merge pull request #136 from sharelatex/ns-autocomplete-bugs
fixing popup and code folding issues
2017-11-28 10:28:54 -05:00
Nate Stemen 2a50a18d23 Merge branch 'ns-package-aware-autocomplete' 2017-11-28 10:24:37 -05:00
Nate Stemen 8ef48925c1 Merge pull request #71 from sharelatex/ns-package-completer
fixing package completer
2017-11-28 08:56:49 -05:00
Shane Kilkelly cc9986cefd Remove the obsolete update-billing-details page 2017-11-28 11:52:14 +00:00
Shane Kilkelly 22c163c60a Move the recurly-billing-details link up to main subscription page 2017-11-28 11:40:48 +00:00