Commit graph

5672 commits

Author SHA1 Message Date
Hayden Faulds
980e43e478 pass user_id into EditorController.addDoc 2017-12-04 09:42:09 +00:00
Hayden Faulds
e4ca3bc5ad pass user_id into EditorController.addDocWithoutLock 2017-12-04 09:42:09 +00:00
Hayden Faulds
7d63939f79 pass owner_id to ProjectEntityHandler.addDoc from ProjectDuplicator 2017-12-04 09:42:09 +00:00
Hayden Faulds
300f76bc5c pass user_id into ProjectEntityHandler.addDoc / addDocWithProject 2017-12-04 09:42:09 +00:00
Hayden Faulds
bfd22899a0 fix DocumentUpdaterHandler.updateProjectStructure 2017-12-04 09:42:09 +00:00
Hayden Faulds
62f88402e8 fix DocumentUpdaterHandler casing 2017-12-04 09:42:09 +00:00
Hayden Faulds
acda4c2295 remove inline requires from ProjectEntityHandler 2017-12-04 09:42:09 +00:00
Hayden Faulds
ef68c6a531 avoid N+1 lookups in DocumentUpdaterHandler 2017-12-04 09:42:09 +00:00
Hayden Faulds
953dba0ede pass userId into Editorcontroller.addFile / addFileWithoutLock 2017-12-04 09:42:09 +00:00
Hayden Faulds
42a1deaaca pass userId into ProjectEntityHandler.addFile 2017-12-04 09:42:09 +00:00
Hayden Faulds
c1481d596f call DocumentUpdaterHandle.updateProjectStructure from ProjectEntityHandler.addDoc and addFile
pass in user_id as null
2017-12-04 09:42:09 +00:00
Hayden Faulds
6e84c635cf return url from FileStoreHandler.uploadFileFromDisk 2017-12-04 09:42:09 +00:00
Hayden Faulds
0178f78249 handle file additions in DocumentUpdaterHandler.updateProjectStructure 2017-12-04 09:42:09 +00:00
Hayden Faulds
1974eebf74 Merge pull request #190 from sharelatex/hof-integration-acceptance
Support overleaf-integration-model project import acceptance tests
2017-12-04 09:37:15 +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
b38cf9ef6e Merge pull request #189 from sharelatex/ho-fine-uploader
moment and fineuploader are loaded separately in editor, not packaged up
2017-12-02 13:41:01 +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
Alasdair Smith
bf23a09644 Move setting sidebar height to OL only file so var can be moved to specific scope 2017-12-01 17:59:02 +00:00
Alasdair Smith
e7f83c73ae Extract v1 dash link styles to file so can define OL only vars 2017-12-01 17:53:52 +00:00
Alasdair Smith
d6e50ac940 Extract var to allowed to be overridden 2017-12-01 17:16:37 +00:00
Alasdair Smith
7f622e2e6b Conditionally show V1 dash link 2017-12-01 17:14:53 +00:00
Alasdair Smith
9a073cdaf0 Add link to V1 dash 2017-12-01 16:58:19 +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
Alasdair Smith
5b8c9b2f4c Add aria role to warning 2017-12-01 11:00:13 +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
Alasdair Smith
7d58427485 Show warnings on project list for some V1 data 2017-11-30 16:59:13 +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
Alasdair Smith
52ad852814 Add check for OL host to prevent failure on legacy SL 2017-11-30 15:14:47 +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
4769090dcd Merge pull request #184 from sharelatex/as-ignore-modules
Update modules gitignore to ignore everything except specific modules
2017-11-30 13:44:20 +00:00