summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* Log access to preview imagesLukas Reschke2017-03-203-13/+56
| | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* Merge pull request #3957 from nextcloud/downstream-27307Christoph Wurst2017-03-201-1/+8
|\ | | | | Follow up to #3949 (app exists on enable)
| * Fix provisioning API callJoas Schilling2017-03-201-1/+8
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Merge pull request #3884 from nextcloud/downstream-26956Joas Schilling2017-03-204-4/+45
|\ \ | | | | | | Skip null groups in group manager
| * | Use DIJoas Schilling2017-03-171-1/+1
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | Skip null groups in group manager (#26871) (#26956)Vincent Petry2017-03-174-4/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 #3950 from nextcloud/downstream-27149Lukas Reschke2017-03-202-1/+6
|\ \ \ \ | |_|_|/ |/| | | 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-202-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* / / / Log files:scan exception, add InterruptedExceptionVincent Petry2017-03-201-8/+10
|/ / / | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | [tx-robot] updated from transifexNextcloud bot2017-03-2016-46/+336
| | |
* | | Merge pull request #3906 from nextcloud/shares-circles-2Roeland Jago Douma2017-03-197-9/+117
|\ \ \ | | | | | | | | Support Circles
| * | | shares-circlesMaxence Lange2017-03-177-9/+117
| | | | | | | | | | | | Signed-off-by: Maxence Lange <maxence@nextcloud.com>
* | | | Merge pull request #3913 from cwickert/masterRoeland Jago Douma2017-03-191-1/+1
|\ \ \ \ | | | | | | | | | | DummyGetResponsePlugin: ownCloud -> Nexcloud
| * | | | DummyGetResponsePlugin: ownCloud -> NexcloudChristoph Wickert2017-03-181-1/+1
| |/ / / | | | | | | | | | | | | Signed-off-by: Christoph Wickert <cwickert@suse.de>
* | | | [tx-robot] updated from transifexNextcloud bot2017-03-198-0/+348
| | | |
* | | | [tx-robot] updated from transifexNextcloud bot2017-03-1810-0/+182
|/ / /
* | | Merge pull request #3887 from nextcloud/downstream-26379Morris Jobke2017-03-173-0/+377
|\ \ \ | | | | | | | | Add CleanupRemoteStorages command
| * | | Safer queriesJoas Schilling2017-03-171-2/+2
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | Better outputJoas Schilling2017-03-171-10/+13
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | Add CleanupRemoteStorages commandJörn Friedrich Dreyer2017-03-173-0/+374
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cleanup files, address review Fix CleanupRemoteStoragesTest tests Fix test expectation. Added files count to check filecache deletion. Sort by numeric id for deterministic test results Removed precise order test and added storage check Remove inaccurate removal message check which has a different order on Oracle. Added more checks to confirm that existing storages still exist. Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | Merge pull request #3886 from nextcloud/downstream-26995Joas Schilling2017-03-172-1/+13
|\ \ \ \ | | | | | | | | | | Chunking NG: Assemble in natural sort order of files
| * | | | Chunking NG: Assemble in natural sort order of filesMarkus Goetz2017-03-172-1/+13
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For https://github.com/owncloud/client/pull/5476 Before this, the assembly could be bogusly in the order 0,1,10,11,2,3 etc. As per the spec "The name of every chunk should be its chunk number." https://github.com/cernbox/smashbox/blob/master/protocol/chunking.md Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | Merge pull request #2824 from nextcloud/ext-storage-expireversionsMorris Jobke2017-03-163-10/+29
|\ \ \ \ | |_|/ / |/| | | Properly expire ext storage versions (#26601)
| * | | Properly expire ext storage versions (#26601)Vincent Petry2017-03-103-10/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Properly expire ext storage versions System-wide external storages have no real owner so the current user is used as owner. However when running cron.php there is no current user, so no expiry can be done. This fix adds an user argument to the expire() function to tell for which user to expire files. This information is anyway always available now through the expire command job. * Move version expire setupFS into the expire function * Add comment about not tearing down in version Storage::expire() Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | [tx-robot] updated from transifexNextcloud bot2017-03-1736-498/+838
| |/ / |/| |
* | | Merge pull request #3679 from nextcloud/socialsharingLukas Reschke2017-03-161-0/+19
|\ \ \ | | | | | | | | Add social sharing
| * | | Fix layout of sharing buttonsMorris Jobke2017-03-141-0/+8
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | Move social buttons to menuRoeland Jago Douma2017-03-031-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * If there are social sharing buttons move them and the copy action to a menu * If there are no social sharing buttons just leave the copy action where it is directly Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | Don't set the HTTP status twiceJoas Schilling2017-03-161-1/+0
| |_|/ |/| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Merge pull request #3802 from Ko-/masterRoeland Jago Douma2017-03-162-2/+6
|\ \ \ | | | | | | | | Check that set_time_limit is not disabled before calling it
| * | | Check that set_time_limit is not disabled before calling itKo-2017-03-112-2/+6
| | | | | | | | | | | | | | | | Signed-off-by: Ko- <k.stoffelen@cs.ru.nl>
* | | | Fix scheduling plugin on legacy caldav endpointJoas Schilling2017-03-161-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | [tx-robot] updated from transifexNextcloud bot2017-03-1650-68/+18
| | | |
* | | | Merge pull request #3788 from nextcloud/fed-share-modifyRoeland Jago Douma2017-03-152-21/+59
|\ \ \ \ | | | | | | | | | | Add api to change the remote of an incoming federated share
| * | | | Add api to change the remote of an incoming federated shareRobin Appelman2017-03-102-21/+59
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | Merge pull request #3848 from nextcloud/remove-single-quotes-around-search-queryRoeland Jago Douma2017-03-151-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Remove single quotes around search query like in user search
| * | | | | Remove single quotes around search query like in user searchJoas Schilling2017-03-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | Merge pull request #3841 from nextcloud/encyryption-trash-binBjörn Schießle2017-03-154-14/+34
|\ \ \ \ \ \ | | | | | | | | | | | | | | Delete files on encryption error
| * | | | | | delete files right away in case of a encryption exceptionBjoern Schiessle2017-03-142-8/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | | | | | always throw a encryption exceptionBjoern Schiessle2017-03-142-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | | | | | | [tx-robot] updated from transifexNextcloud bot2017-03-1512-30/+126
| | | | | | |
* | | | | | | fix mockMaxence Lange2017-03-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | | switch reshares to trueMaxence Lange2017-03-141-1/+1
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Maxence Lange <maxence@nextcloud.com>
* | | | | | | Merge pull request #3600 from coletivoEITA/masterRoeland Jago Douma2017-03-141-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | added method needsPartFile() in Storage