summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1806 from nextcloud/karakayasemi_1767Roeland Jago Douma2016-10-211-4/+4
|\ | | | | Update file.php put function posthook calls
| * Update file.php put function posthook callsSemih Serhat Karakaya2016-10-201-4/+4
| | | | | | | | | | | | Logicaly, postHooks should emit after touch. For chunking file it is already emitting after touch. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #1835 from nextcloud/downstream-24948Morris Jobke2016-10-2023-34/+39
|\ \ | | | | | | Move OC\Files\Storage\Shared to the right namespace
| * | Fix shared storage namespace in DecryptAll classVincent Petry2016-10-202-2/+2
| | |
| * | Move OC\Files\Storage\Shared to the right namespaceJoas Schilling2016-10-2021-32/+37
| | |
* | | Merge pull request #1827 from nextcloud/downstream-26381Morris Jobke2016-10-205-193/+0
|\ \ \ | |_|/ |/| | Get rid of very old oc:// stream wrapper (#26381)
| * | Get rid of very old oc:// stream wrapper (#26381)Vincent Petry2016-10-205-193/+0
|/ /
* | Merge pull request #1826 from nextcloud/downstream-26391Morris Jobke2016-10-202-2/+24
|\ \ | | | | | | Fix post_unshareFromSelf hook parameter format
| * | Fix post_unshareFromSelf hook parameter formatVincent Petry2016-10-202-2/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When unsharing from self in a group share situation, the share items passed to the post_unshareFromSelf hook were using the wrong format in which the attribute names (ex: "share_type") have non camel-case format. This fix makes sure that in group sharing case we use the correct format. It looks like the code was already producing it but in array_merge it was not using it and adding the unprocessed one.
* | | Merge pull request #1824 from nextcloud/downstream-26423Morris Jobke2016-10-202-7/+11
|\ \ \ | |_|/ |/| | Ensure $commands being an array
| * | Ensure $commands being an array - fixes #26073Thomas Müller2016-10-202-0/+4
| | |
| * | use short array syntaxMorris Jobke2016-10-201-7/+7
| |/ | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #1821 from nextcloud/downstream-26366Morris Jobke2016-10-202-22/+25
|\ \ | | | | | | Code style changes from downstream
| * | Sanitize length headers when validating quotaThomas Müller2016-10-202-22/+25
| |/
* | Merge pull request #1817 from nextcloud/oc_nusLukas Reschke2016-10-201-0/+1
|\ \ | | | | | | Expose the needupgrade status (#26209)
| * | Expose the needupgrade status (#26209)Kristof Provost2016-10-201-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | During upgrades, before the DB migration is complete, the system is not usable, but there's no way for monitoring systems to detect this. Add the 'needupgrade' field to the status json so monitoring systems can detect this. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #1822 from ↵Roeland Jago Douma2016-10-205-51/+46
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/restore-overwritten-services-after-errors Restore overwritten services after errors
| * | | Restore all services when a tests failed/finished for better testcase isolationJoas Schilling2016-10-201-3/+26
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | Make sure all tests use the TestCase method to overwrite servicesJoas Schilling2016-10-204-48/+20
| |/ / | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Merge pull request #1812 from ↵Jakob Sack2016-10-201-0/+1
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/allow-to-dismiss-the-code-integrity-warning Allow to dismiss the code integrity warning
| * | | Allow to dismiss the code integrity warningJoas Schilling2016-10-201-0/+1
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | Merge pull request #1796 from nextcloud/oc_fav-reportLukas Reschke2016-10-2013-280/+124
|\ \ \ \ | | | | | | | | | | Make it possible to filter by tags with REPORT method
| * | | | Make it possible to filter by tags with REPORT methodVincent Petry2016-10-1913-280/+124
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enhanced the REPORT method on the Webdav endpoint and added a "oc:favorite" filter rule. When set, it will return a flat list of results filtered with only favorite files. The web UI was also adjusted to use this REPORT method instead of the private API endpoint. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | Merge pull request #1816 from nextcloud/settings_nopngMorris Jobke2016-10-206-0/+0
|\ \ \ \ \ | |_|_|_|/ |/| | | | Get rid of settings/img/*.png
| * | | | Get rid of settings/img/*.pngRoeland Jago Douma2016-10-206-0/+0
| | |_|/ | |/| | | | | | | | | | | | | | | | | | We only use SVG icons so no need to ship them! Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | Merge pull request #1768 from nextcloud/more-filepickerJan-Christoph Borchardt2016-10-207-76/+114
|\ \ \ \ | |/ / / |/| | | More filepicker improvements
| * | | Improve the stylingMorris Jobke2016-10-202-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * remove the scrollbar (content did an overflow due to a min-width) * have proper padding on the right too - padding is 15px on all sides for .oc-dialog Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | add proper left margin for filepicker titleJan-Christoph Borchardt2016-10-191-0/+1
| | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * | | fix filepicker with no mimetype filterRobin Appelman2016-10-191-3/+6
| | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | fix file exist dialog stylingRobin Appelman2016-10-191-0/+1
| | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | filepicker: improve layout and styleJan-Christoph Borchardt2016-10-193-22/+26
| | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * | | Use a table for the filepicker list and add size columnRobin Appelman2016-10-194-41/+57
| | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | use fileclient to get the filelist for the filepickerRobin Appelman2016-10-191-12/+17
| | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | Allow selecting a folder after using the breadcrumbRobin Appelman2016-10-191-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | Allow selecting the root folderRobin Appelman2016-10-191-1/+5
| | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | Merge pull request #1813 from nextcloud/remove-unused-jsRoeland Jago Douma2016-10-201-193/+0
|\ \ \ \ | | | | | | | | | | Remove unused js
| * | | | Remove deprecated breadcrumbs implementationMorris Jobke2016-10-201-117/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * was replaced by the version in files/ Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | | Remove OC.localStorage and object methodMorris Jobke2016-10-201-76/+0
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | * use the localstorage APIs of the browser instead * use new Object() instead Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | Merge pull request #1809 from nextcloud/drop-compatibility.jsMorris Jobke2016-10-204-158/+1
|\ \ \ \ | |_|_|/ |/| | | Remove unneeded compatibility polyfills
| * | | Remove unneeded compatibility polyfillsMorris Jobke2016-10-204-158/+1
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - `Object.create` supported with IE9+: https://developer.mozilla.org/de/docs/Web/JavaScript/Reference/Global_Objects/Object/create#Browser_compatibility - `Object.keys` supported with IE9+: https://developer.mozilla.org/de/docs/Web/JavaScript/Reference/Global_Objects/Object/keys#Browser_compatibility - `Array.prototype.filter` supported in IE9+: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/filter#Browser_compatibility - `Array.prototype.indexOf` supported in IE9+: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/indexOf#Browser_compatibility - `Array.prototype.map` supported in IE9+: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/map#Browser_compatibility - `Function.prototype.bind` supported in IE9+: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Function/bind#Browser_compatibility - `String.prototype.trim` supported with IE9+: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/Trim#Browser_compatibility - `outerHTML` supported with Firefox 11+: https://developer.mozilla.org/en-US/docs/Web/API/Element/outerHTML#Browser_compatibility - `window.devicePixelRatio` supported in IE11+: http://caniuse.com/#feat=devicepixelratio Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #1810 from nextcloud/drop-placeholders.jsMarius Blüm2016-10-202-460/+0
|\ \ \ | | | | | | | | Remove unneeded placeholder polyfill
| * | | Remove unneeded placeholder polyfillMorris Jobke2016-10-202-460/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * placeholders are supported in IE11+ * http://caniuse.com/#feat=input-placeholder Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | Merge pull request #1797 from ↵Morris Jobke2016-10-202-2/+26
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | nextcloud/issue-1791-show-path-on-filename-conflict Show the path, when the filename conflicts
| * | | | Show the path, when the filename conflictsJoas Schilling2016-10-192-2/+26
| | |_|/ | |/| | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | Merge pull request #1803 from nextcloud/fullscreen-iconMorris Jobke2016-10-203-0/+15
|\ \ \ \ | |_|/ / |/| | | add fullscreen icon
| * | | add fullscreen iconJan-Christoph Borchardt2016-10-193-0/+15
| | |/ | |/| | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | Merge pull request #1773 from nextcloud/testing-characters-in-dbLukas Reschke2016-10-1920-33/+263
|\ \ \ | | | | | | | | MySQL 4byte support
| * | | Do not skip when mysql uses utf8mb4Joas Schilling2016-10-191-1/+2
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | Fix test of repair stepJoas Schilling2016-10-191-6/+10
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | test alternative drone syntax for command optionsMorris Jobke2016-10-192-3/+5
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>