 Shane Kilkelly
|
e7d8848a6a
|
Include possible overleaf subscription in feature setting
|
2017-12-04 15:12:26 +00:00 |
|
|
Paulo Reis
|
0bad7d8549
|
Adjustments to synctex controls.
|
2017-12-04 15:12:13 +00:00 |
|
|
Alasdair Smith
|
77dc7adf1f
|
Revert "Move to sidebar template"
This reverts commit 15dc1a35184aade8912d129ea75248ffc8b1b4bd.
|
2017-12-04 14:53:18 +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 |
|
|
Alasdair Smith
|
ab78cea48d
|
Move to sidebar template
|
2017-12-04 12:24:21 +00:00 |
|
|
Alasdair Smith
|
1fd518ec58
|
Add query param to mark as explicitly using V1 dash
|
2017-12-04 12:22:27 +00:00 |
|
|
Alasdair Smith
|
65b7b242d9
|
Merge remote-tracking branch 'origin' into as-v1-dash-link
|
2017-12-04 12:02:41 +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
|
52b414498c
|
Merge branch 'master' into as-show-v1-warnings
|
2017-12-04 10:03:38 +00:00 |
|
|
James Allen
|
0b0fd576eb
|
Merge branch 'master' into as-v1-dash-link
|
2017-12-04 10:02:42 +00:00 |
|
|
James Allen
|
0602fed6e5
|
Merge branch 'master' into as-import-v1
|
2017-12-04 10:02:21 +00:00 |
|
|
James Allen
|
158b0d56cf
|
Merge branch 'master' into pr-style-v2-resizers
|
2017-12-04 10:01:45 +00:00 |
|
|
James Allen
|
f21870aac2
|
Merge branch 'master' into pr-ol-beta-editor-styling
|
2017-12-04 10:01:27 +00:00 |
|
|
Hayden Faulds
|
4094801f18
|
pass object to DocumentUpdater.updateProjectStructure instead of separate arrays
|
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
|
9736513f59
|
fix ProjectEntityHandler.replaceFile
|
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 |
|
|
Henry Oswald
|
aaa908187d
|
added layout.pug back in
|
2017-12-02 13:38:23 +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
|
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 |
|
|
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 |
|
|
Alasdair Smith
|
5b8c9b2f4c
|
Add aria role to warning
|
2017-12-01 11:00:13 +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
|
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 |
|