 Alasdair Smith
|
65b7b242d9
|
Merge remote-tracking branch 'origin' into as-v1-dash-link
|
2017-12-04 12:02:41 +00:00 |
|
|
Hayden Faulds
|
1ddd199b7d
|
Merge pull request #104 from sharelatex/hof-version-entity-creation
Version entity creation in SL -> OL history
|
2017-12-04 11:35:54 +00:00 |
|
|
Alasdair Smith
|
a25464d925
|
Add check for OL host
|
2017-12-04 11:34:00 +00:00 |
|
|
Alasdair Smith
|
f595009911
|
Switch to existing v1 dash flag
|
2017-12-04 11:23:09 +00:00 |
|
|
James Allen
|
d3b4567a5c
|
Merge branch 'master' into as-v1-dash-link
|
2017-12-04 10:40:49 +00:00 |
|
|
James Allen
|
0b0fd576eb
|
Merge branch 'master' into as-v1-dash-link
|
2017-12-04 10:02:42 +00:00 |
|
|
Hayden Faulds
|
4094801f18
|
pass object to DocumentUpdater.updateProjectStructure instead of separate arrays
|
2017-12-04 09:42:10 +00:00 |
|
|
Hayden Faulds
|
1405b645f3
|
fix acceptance tests after rebase
|
2017-12-04 09:42:10 +00:00 |
|
|
Hayden Faulds
|
19643f4bb5
|
pass user_id into editorController.addDoc in ThirdPartyDataStore/UpdateMerger
|
2017-12-04 09:42:10 +00:00 |
|
|
Hayden Faulds
|
497c6facd5
|
fix ProjectEntityHandler.replaceFile
|
2017-12-04 09:42:10 +00:00 |
|
|
Hayden Faulds
|
77eac423c7
|
add tpds project structure acceptance tests
|
2017-12-04 09:42:09 +00:00 |
|
|
Hayden Faulds
|
9736513f59
|
fix ProjectEntityHandler.replaceFile
|
2017-12-04 09:42:09 +00:00 |
|
|
Hayden Faulds
|
3466db0aae
|
add acceptance tests
|
2017-12-04 09:42:09 +00:00 |
|
|
Hayden Faulds
|
61a1336ec6
|
pass userId into ProjectEntiyHandler.copyFileFromExistingProjectWithProject
|
2017-12-04 09:42:09 +00:00 |
|
|
Hayden Faulds
|
feee582368
|
pass user_id into EditorController.replaceFile
|
2017-12-04 09:42:09 +00:00 |
|
|
Hayden Faulds
|
08891c7a7f
|
pass userId into ProjectEntityHandler.replaceFile
|
2017-12-04 09:42:09 +00:00 |
|
|
Hayden Faulds
|
088ce33cbc
|
version ProjectEntityHandler.copyFileFromExistingProjectWithProject
|
2017-12-04 09:42:09 +00:00 |
|
|
Hayden Faulds
|
60ee78704a
|
return url from FileStoreHandler.copyFile
|
2017-12-04 09:42:09 +00:00 |
|
|
Hayden Faulds
|
4ec0d07aae
|
remove unused ProjectEntityHandler.copyFileFromExistingProject
|
2017-12-04 09:42:09 +00:00 |
|
|
Hayden Faulds
|
90e3b71c1c
|
version replacing files
|
2017-12-04 09:42:09 +00:00 |
|
|
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 |
|