Commit Graph
3217 Commits
Author SHA1 Message Date
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 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 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 SmithandGitHub dba0ab003c Merge pull request #166 from sharelatex/as-autocompile-rollout-20
Increase autocompile rollout to 20%
2017-11-30 10:08:55 +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 2a50a18d23 Merge branch 'ns-package-aware-autocomplete' 2017-11-28 10:24:37 -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
Alasdair Smith bbaacb4db4 Increase autocompile rollout to 20% 2017-11-28 10:52:46 +00:00
Alasdair SmithandGitHub c5f459a531 Merge pull request #159 from sharelatex/as-show-v1-owner
Show v1 project owner's name in project list
2017-11-28 09:51:04 +00:00
Shane Kilkelly f7c8930b90 Convert html to pug for uploader templates 2017-11-27 13:56:49 +00:00
Shane Kilkelly 661041a35d Use template elements for file uploaders, and i18n 2017-11-27 12:06:18 +00:00
Alasdair Smith 099305d909 Show v1 project owner name 2017-11-23 17:10:42 +00:00
Shane Kilkelly c121653dc4 Add error-handling to attempt to get user subscription 2017-11-23 16:22:57 +00:00
Shane Kilkelly caa65dddc1 Send user to hosted recurly billing-details page.
And remove our update-billing-details form, the APIs for which will be
deprecated soon.
2017-11-23 16:16:13 +00:00
Brian GoughandGitHub bb2d1321d4 Merge pull request #91 from sharelatex/bg-add-project-history-flag
route history requests based on project
2017-11-23 15:36:45 +00:00
Brian Gough 98fe352a8c use a separate flag for reading from history
the overleaf.history object controls writing to the project history
service, we need a separate flag to determine whether to read from it or
from track changes.
2017-11-23 15:14:33 +00:00
Shane KilkellyandGitHub 10fc89c8cf Merge pull request #142 from sharelatex/sk-fix-token-indexes
use correct partial indexes on project token fields
2017-11-23 10:30:31 +00:00