summaryrefslogtreecommitdiffstats
path: root/lib/private
Commit message (Collapse)AuthorAgeFilesLines
* Ensure that FileInfo return values as required by its phpdoc.Piotr M2017-03-221-6/+8
| | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* Merge pull request #3497 from nextcloud/mount-shared-lastMorris Jobke2017-03-222-2/+34
|\ | | | | mount shared mounts last
| * mount shared mounts lastRobin Appelman2017-03-222-2/+34
| | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | Revert "Bundle vendor js"Roeland Jago Douma2017-03-221-15/+13
| |
* | Merge pull request #3977 from nextcloud/di_ng2blizzz2017-03-224-18/+55
|\ \ | | | | | | Make DI work for all apps
| * | Register the namespace with the autoloading to allow reverse recoveryJoas Schilling2017-03-222-7/+26
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | Also cache the namespace from appinfoJoas Schilling2017-03-221-3/+4
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | Don't do a recursive searchJoas Schilling2017-03-222-2/+22
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | buildAppNamespace already has the fallbackJoas Schilling2017-03-221-11/+1
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | Make DI work for all appsRoeland Jago Douma2017-03-211-6/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | As stated in https://github.com/nextcloud/server/pull/3901#issuecomment-288135309 appid's don't have to match the namespace. Work around this Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #3795 from nextcloud/bundle_vendor_jsRoeland Jago Douma2017-03-221-13/+15
|\ \ \ | |_|/ |/| | Bundle vendor js
| * | When debug don't load the bundled fileRoeland Jago Douma2017-03-221-2/+19
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Bundle more default vendor jsRoeland Jago Douma2017-03-221-3/+0
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Merge vendor jsRoeland Jago Douma2017-03-221-14/+2
| |/ | | | | | | | | | | | | | | There is a bunch of javascript we always load from vendors. This combines this into 1 javascript file. Which reduces the number of request by ~10. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* / Remove ownCloud Root Authority as per todoJoas Schilling2017-03-221-8/+1
|/ | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* Remove test codeLukas Reschke2017-03-211-1/+0
| | | | | | This seems to have been commited by mistake with https://github.com/nextcloud/server/commit/6dbe417c51125419516dd29ebe4e529926c41a0f Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* Merge pull request #3844 from nextcloud/unshare_eventJoas Schilling2017-03-212-38/+107
|\ | | | | Unshare event
| * Add LegacyHooksRoeland Jago Douma2017-03-172-39/+103
| | | | | | | | | | | | | | Use a helper class to listen to the eventDispatcher calls from the share manager to emit the old \OC_Hooks Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * Add unshare eventRoeland Jago Douma2017-03-171-0/+5
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Core is also a special appRoeland Jago Douma2017-03-211-0/+2
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Move a lot of stuff over to the ServerContainerRoeland Jago Douma2017-03-212-246/+156
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Fix settings testsRoeland Jago Douma2017-03-212-15/+19
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Add DI intergration testsRoeland Jago Douma2017-03-212-9/+16
| | | | | | | | | | | | | | | | | | * Moved some interface definitions to Server.php (more to come) * Build/Query only for existing classes in the AppContainer * Build/Query only for classes of the App in the AppContainer * Offload other stuff to the servercontainer Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Extend DI testsRoeland Jago Douma2017-03-211-4/+12
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | More elegant handling of recursionRoeland Jago Douma2017-03-212-4/+8
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | PoC of moving the interface classes to the servercontainerRoeland Jago Douma2017-03-212-10/+10
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Update query method for DIContainerRoeland Jago Douma2017-03-212-5/+13
| | | | | | | | | | | | | | To align with https://github.com/nextcloud/server/issues/2043#issuecomment-287348294 This would mean that AppContainers only hold the AppSpecific services Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #3530 from nextcloud/scss-variablesLukas Reschke2017-03-202-14/+19
|\ \ | | | | | | Implement scss variables
| * | Add tests for SCSSCacherJulius Härtl2017-03-201-24/+3
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | Add tests for SCSSCacherJulius Haertl2017-03-202-7/+8
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | Add variables.scss and import it for each scss fileJulius Haertl2017-03-201-6/+31
| | | | | | | | | | | | Signed-off-by: Julius Haertl <jus@bitgrid.net>
* | | Merge pull request #3957 from nextcloud/downstream-27307Christoph Wurst2017-03-201-26/+26
|\ \ \ | | | | | | | | Follow up to #3949 (app exists on enable)
| * | | Some more code fixesJoas Schilling2017-03-201-21/+22
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | Don't use a generic exceptionJoas Schilling2017-03-201-5/+4
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | Merge pull request #3945 from nextcloud/downstream-27298Lukas Reschke2017-03-201-1/+4
|\ \ \ \ | |_|/ / |/| | | Adding file, line, class and function to the query logger (#27298)
| * | | Adding file, line, class and function to the query logger (#27298)Thomas Müller2017-03-191-1/+4
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | Merge pull request #3939 from nextcloud/downstream-27159Joas Schilling2017-03-201-0/+11
|\ \ \ \ | | | | | | | | | | Fix malformed logging in exception
| * | | | Move error message to log entryLukas Reschke2017-03-201-1/+12
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | | | Fix malformed logging in exceptionkdslkdsaldsal2017-03-191-1/+1
| |/ / / | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | Merge pull request #3929 from nextcloud/downstream-27068Joas Schilling2017-03-201-2/+7
|\ \ \ \ | | | | | | | | | | cache loadUser if not exists
| * | | | Add tests for database user backend cachingVincent Petry2017-03-201-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add comment, closeCursor in user DB query Invalidate user in cache after successful creation Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | | cache loadUser if not existsJörn Friedrich Dreyer2017-03-201-1/+1
| |/ / / | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | Merge pull request #3884 from nextcloud/downstream-26956Joas Schilling2017-03-204-11/+38
|\ \ \ \ | | | | | | | | | | Skip null groups in group manager
| * | | | Use DIJoas Schilling2017-03-172-9/+17
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | Skip null groups in group manager (#26871) (#26956)Vincent Petry2017-03-173-6/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Skip null groups in group manager (#26871) * Skip null groups in group manager * Also skip null groups in group manager's search function * Add more group null checks in sharing code * Add unit tests for null group safety in group manager * Add unit tests for sharing code null group checks * Added tests for null groups handling in sharing code * Ignore moveShare optional repair in mount provider In some cases, data is inconsistent in the oc_share table due to legacy data. The mount provider might attempt to make it consistent but if the target group does not exist any more it cannot work. In such case we simply ignore the exception as it is not critical. Keeping the exception would break user accounts as they would be unable to use their filesystem. * Adjust null group handing + tests * Fix new group manager tests Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | Merge pull request #3924 from nextcloud/preview_fixesLukas Reschke2017-03-201-12/+26
|\ \ \ \ \ | | | | | | | | | | | | Do not generate the max preview twice
| * | | | | Some code cleanupRoeland Jago Douma2017-03-191-12/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As suggested by the inspector Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | | Don't generate max preview twiceRoeland Jago Douma2017-03-191-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If you request a preview of X by Y. And after calculating X and Y are equal to maxWidth and maxHeight then there is no reason to create a preview of that size. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | Merge pull request #3950 from nextcloud/downstream-27149Lukas Reschke2017-03-201-0/+1
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | Forbid to upload part files via web UI
| * | | | | Add ignore_files to config,Felix Heidecke2017-03-201-0/+1
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | test files against ignore_files list on upload fix typo and indentation Move blacklist declaration to lib/public/Files/FileInfo.php, Rename *ignored to *blacklisted Mocked blacklist_files for testing Mocked blacklist_files for testing Signed-off-by: Morris Jobke <hey@morrisjobke.de>