summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #3884 from nextcloud/downstream-26956Joas Schilling2017-03-2011-103/+315
|\ | | | | Skip null groups in group manager
| * Fix 5.6 duplicate class importJoas Schilling2017-03-171-3/+1
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * Clean up the testJoas Schilling2017-03-171-81/+52
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * Use DIJoas Schilling2017-03-174-37/+49
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * Skip null groups in group manager (#26871) (#26956)Vincent Petry2017-03-1710-10/+241
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 #3868 from nextcloud/issue-3834-escape-theming-footerJoas Schilling2017-03-202-5/+6
|\ \ | | | | | | Correctly escape the footer description from theming
| * | Don't use private apiJoas Schilling2017-03-201-1/+2
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | Correctly escape the footer description from themingJoas Schilling2017-03-172-5/+5
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Merge pull request #3924 from nextcloud/preview_fixesLukas Reschke2017-03-202-13/+31
|\ \ \ | | | | | | | | Do not generate the max preview twice
| * | | Fix testsRoeland Jago Douma2017-03-191-1/+5
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | 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-206-2/+23
|\ \ \ \ | | | | | | | | | | Forbid to upload part files via web UI
| * | | | Fix grammarLukas Reschke2017-03-201-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | | | Add ignore_files to config,Felix Heidecke2017-03-206-2/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | | Merge pull request #3946 from nextcloud/downstream-27263Roeland Jago Douma2017-03-201-0/+4
|\ \ \ \ \ | | | | | | | | | | | | Fix public link download button (unit test only)
| * | | | | Fix public link download buttonVincent Petry2017-03-201-0/+4
| |/ / / / | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | Merge pull request #3952 from nextcloud/downstream-27209Morris Jobke2017-03-204-8/+38
|\ \ \ \ \ | | | | | | | | | | | | Log files:scan exception, add InterruptedException
| * | | | | Update autoloaderLukas Reschke2017-03-202-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | | | | Log files:scan exception, add InterruptedExceptionVincent Petry2017-03-202-8/+36
| |/ / / / | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | Merge pull request #3949 from nextcloud/downstream-27307Morris Jobke2017-03-202-4/+26
|\ \ \ \ \ | | | | | | | | | | | | Check if app exists before enabling
| * | | | | Add exception to PHPDocLukas Reschke2017-03-201-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | | | | Improve the test caseMorris Jobke2017-03-201-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | | | checking if app exists in the FileStream nownoveens2017-03-202-4/+22
| |/ / / / | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | Merge pull request #3954 from nextcloud/downstream-27392Morris Jobke2017-03-202-0/+57
|\ \ \ \ \ | | | | | | | | | | | | Added logic and tests to remove everything inside a folder
| * | | | | Added logic and tests to remove everything inside a folderSergio Bertolin2017-03-202-0/+57
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | Merge pull request #3940 from nextcloud/downstream-27048Lukas Reschke2017-03-201-0/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add postLogout hook to finish sessions from external session managers…
| * | | | | | Add postLogout hook to finish sessions from external session managers (#27048)Felix Rupp2017-03-191-0/+3
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add postLogout hook to finish sessions from external session managers like CAS * Add postLogout hook to finish sessions from external session managers like CAS Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | Merge pull request #3943 from nextcloud/downstream-27318Morris Jobke2017-03-201-1/+3
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Output maintenance mode message on STDERR
| * | | | | ownC -> NextcMorris Jobke2017-03-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | | | maintenance warning printed on STDERR rather than STDOUTnoveens2017-03-191-1/+3
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | redundant check removed Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | Merge pull request #3947 from nextcloud/downstream-27323Morris Jobke2017-03-201-0/+5
|\ \ \ \ \ | | | | | | | | | | | | Disable empty password for user::resetpassword command using CLI
| * | | | | Disable empty password for user::resetpassword command using CLISujith H2017-03-201-0/+5
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes issue: https://github.com/owncloud/core/issues/25206 Signed-off-by: Sujith H <sharidasan@owncloud.com> Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | Merge pull request #3941 from nextcloud/downstream-27254Morris Jobke2017-03-201-2/+2
|\ \ \ \ \ | | | | | | | | | | | | HTTP 1.1 used when giving 403 and 404 errors while attempting to down…
| * | | | | HTTP 1.1 used when giving 403 and 404 errors while attempting to download ↵noveens2017-03-191-2/+2
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | non-existent file Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | Merge pull request #3917 from michaelletzgus/html5-fix_dup-IDsMorris Jobke2017-03-203-5/+5
|\ \ \ \ \ | | | | | | | | | | | | Fix duplicate id "apps-management"
| * | | | | Fix duplicate id "apps-management"Michael Letzgus2017-03-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change CSS from #apps-management to .apps-management Signed-off-by: Michael Letzgus <michaelletzgus@users.noreply.github.com>
| * | | | | Fix duplicate id "apps-management"Michael Letzgus2017-03-192-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make duplicate id "apps-management" a class since IDs must be unique: https://www.w3.org/TR/2011/WD-html5-20110525/elements.html#the-id-attribute https://api.jquery.com/id-selector/ Signed-off-by: Michael Letzgus <michaelletzgus@users.noreply.github.com>
* | | | | | Merge pull request #3931 from nextcloud/downstream-27295Roeland Jago Douma2017-03-202-0/+12
|\ \ \ \ \ \ | | | | | | | | | | | | | | Don't store empty groupids
| * | | | | | test setTagGroups with empty groupidsJörn Friedrich Dreyer2017-03-191-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | | | | don't store empty groupidsJörn Friedrich Dreyer2017-03-191-0/+3
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | gives an exception on oracle and shouldn't be added in the first place Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | Merge pull request #3930 from nextcloud/downstream-27227Morris Jobke2017-03-201-0/+24
|\ \ \ \ \ \ | | | | | | | | | | | | | | Added functions to add files in local_storage
| * | | | | | Added functions to add files in local_storageSergio Bertolin2017-03-191-0/+24
| |/ / / / / | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | Merge pull request #3934 from nextcloud/downstream-27246Morris Jobke2017-03-201-4/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | Update the occ:encrypt-all prompt
| * | | | | | ownC -> NextcMorris Jobke2017-03-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | | | | Update the occ:encrypt-all promptMatthew Setter2017-03-191-4/+4
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The message isn't as clear, nor as succinct, as it could be. Given that, this commit seeks to address both those points. This commit was prompted by https://github.com/owncloud/documentation/pull/2835. Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | Merge pull request #3935 from nextcloud/downstream-27293Morris Jobke2017-03-201-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | log where a resource was not found
| * | | | | | log where a resource was not foundJörn Friedrich Dreyer2017-03-191-1/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | Merge pull request #3936 from nextcloud/downstream-27253Christoph Wurst2017-03-201-0/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add extensionpoint to sharedialogview
| * | | | | | Add extensionpoint to sharedialogviewFelix Heidecke2017-03-191-0/+2
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Write method overriding extension Add a list of unknowns while inputting a search term Rename OCA.Share extension point Signed-off-by: Morris Jobke <hey@morrisjobke.de>
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-16 07:02:57 +0000