Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #19346 from owncloud/drop-passwords-from-exception-log | Thomas Müller | 2015-09-25 | 3 | -9/+33 |
|\ | | | | | Remove passwords from logged exception stack traces | ||||
| * | Remove passwords from logged exception stack traces | Morris Jobke | 2015-09-24 | 3 | -9/+33 |
| | | | | | | | | | | | | * fixed #16318 * create logException in ILogger * add unit tests | ||||
* | | Merge pull request #19297 from owncloud/fix_19119 | Thomas Müller | 2015-09-25 | 1 | -1/+0 |
|\ \ | | | | | | | Do not blindy copy expiration date on reshare | ||||
| * | | Do not blindy copy expiration date on reshare | Roeland Jago Douma | 2015-09-25 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a file/folder is reshared we should not blindly copy the expiration date of the parent share. User/Group shares do not have expiration dates currently, and thus this is always set to null. Fixes #19119 * Added testcase | ||||
* | | | Merge pull request #19030 from owncloud/oparoz-smarter-logger | Thomas Müller | 2015-09-25 | 1 | -1/+14 |
|\ \ \ | | | | | | | | | [jenkins] Dump Arrays, Objects and Exceptions to the log | ||||
| * | | | Use a 3rd party normalizer for the logger | Olivier Paroz | 2015-09-24 | 1 | -1/+14 |
| | |/ | |/| | |||||
* | | | Merge pull request #19360 from owncloud/move-filter-method-into-config-object | Thomas Müller | 2015-09-25 | 3 | -0/+80 |
|\ \ \ | | | | | | | | | Move the filtering of sensitive data to the config class | ||||
| * | | | Deduplicate constant | Joas Schilling | 2015-09-25 | 1 | -3/+4 |
| | | | | |||||
| * | | | Move the filtering of sensitive data to the config class | Joas Schilling | 2015-09-25 | 3 | -0/+79 |
| | |/ | |/| | |||||
* | | | Merge pull request #19293 from owncloud/individual-it-move_initTemplate | Thomas Müller | 2015-09-25 | 4 | -91/+146 |
|\ \ \ | | | | | | | | | [jenkins] do not load unnecessary code in case of webdav | ||||
| * | | | Todo for myself to eliminate double code | Individual IT Services | 2015-09-25 | 1 | -0/+5 |
| | | | | | | | | | | | | This will be in a new PR | ||||
| * | | | add $prepend option to addStyle() & addVendorStyle() | Individual IT Services | 2015-09-25 | 2 | -18/+28 |
| | | | | |||||
| * | | | Clean code | Thomas Müller | 2015-09-24 | 1 | -56/+66 |
| | | | | |||||
| * | | | getService() is not needed -> remove | Thomas Müller | 2015-09-23 | 1 | -20/+0 |
| | | | | |||||
| * | | | do not load unnecessary code in case of webdav | Individual IT Services | 2015-09-23 | 4 | -72/+122 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | changing from "protected static" to "protected" as suggested by @nickvergessen https://github.com/owncloud/core/pull/19114#discussion_r39719851 moving initTemplate() into template constr. reduce to move initTemplate only cleanup spaces | ||||
* | | | | Add the L10N Factory to the container interface | Joas Schilling | 2015-09-25 | 1 | -0/+6 |
| |/ / |/| | | |||||
* | | | Merge pull request #15098 from owncloud/fix_preview_versions_revert_issue | Thomas Müller | 2015-09-24 | 2 | -1/+9 |
|\ \ \ | | | | | | | | | fix issue with version rollback and thumbnails | ||||
| * | | | delete cached preview when rolling back file's version | Georg Ehrke | 2015-09-20 | 2 | -1/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add random number using OC.parseQueryString and _.extend() version rollback: add missing prefix to OC\Preview::post_delete add test to assure that the rollback hook is called | ||||
* | | | | Merge pull request #19306 from owncloud/app-code-check-version | Thomas Müller | 2015-09-24 | 1 | -0/+146 |
|\ \ \ \ | |_|_|/ |/| | | | [App Code Check] add check for version and mandatory fields | ||||
| * | | | public, remote and default_enable are not deprecated | Morris Jobke | 2015-09-24 | 1 | -3/+3 |
| | | | | |||||
| * | | | encode arrays as string | Morris Jobke | 2015-09-24 | 1 | -1/+6 |
| | | | | |||||
| * | | | [App Code Check] add check for version and mandatory fields | Morris Jobke | 2015-09-24 | 1 | -0/+141 |
| | | | | | | | | | | | | | | | | | | | | * ref #17598 * including unit tests for mandatory fields/versions | ||||
* | | | | Merge pull request #19337 from owncloud/fix-shipped-check-for-apps | Thomas Müller | 2015-09-24 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | Correctly check whether an app is shipped | ||||
| * | | | | Correctly check whether an app is shipped | Joas Schilling | 2015-09-24 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge pull request #19340 from owncloud/enc_fix_user_check | Thomas Müller | 2015-09-24 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | only check if the user exists if a user was added as parameter | ||||
| * | | | | | only check if the user exists if a user was added as parameter | Bjoern Schiessle | 2015-09-24 | 1 | -1/+1 |
| |/ / / / | |||||
* | | | | | Merge pull request #19248 from ↵ | Thomas Müller | 2015-09-24 | 3 | -1/+134 |
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | owncloud/allow-status-code-403-and-503-for-listeners Convert exceptions to SabreExceptions for the HTTP status code | ||||
| * | | | | Add since-tag | Joas Schilling | 2015-09-23 | 2 | -0/+14 |
| | | | | | |||||
| * | | | | Allow listeners to set status code and message | Joas Schilling | 2015-09-23 | 3 | -1/+120 |
| | | | | | |||||
* | | | | | Merge pull request #19303 from owncloud/usecorrectvariable | Thomas Müller | 2015-09-24 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | Use correct variable | ||||
| * | | | | | use correct variable | Jörn Friedrich Dreyer | 2015-09-23 | 1 | -1/+1 |
| | |/ / / | |/| | | | | | | | | | | | | | wow ... just wow ... | ||||
* | | | | | Merge pull request #19326 from owncloud/issue-19314-querybuilder-set-null | Thomas Müller | 2015-09-24 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | Allow `set('column', 'null')` to work like in Doctrine's QueryBuilder | ||||
| * | | | | | Allow `set('column', 'null')` to work like in Doctrine | Joas Schilling | 2015-09-24 | 1 | -1/+1 |
| |/ / / / | |||||
* | | | | | Merge pull request #16479 from owncloud/core-fixgetrelativepathwrongmatches | Thomas Müller | 2015-09-24 | 1 | -1/+4 |
|\ \ \ \ \ | |/ / / / |/| | | | | Prevent wrong matches in getRelativePath | ||||
| * | | | | Prevent wrong matches in getRelativePath | Vincent Petry | 2015-09-22 | 1 | -1/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Before this fix, the root "/files" with path "/files_trashbin" would return "_trashbin" as relative path... | ||||
* | | | | | Show 'Apps' in the browser title when app management is open | Thomas Müller | 2015-09-23 | 2 | -3/+8 |
| |/ / / |/| | | | |||||
* | | | | Revert "use correct variable" | Jörn Friedrich Dreyer | 2015-09-23 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | This reverts commit 52cbaff061b93cb1a5e81623e58e14867c818810. | ||||
* | | | | use correct variable | Jörn Friedrich Dreyer | 2015-09-23 | 1 | -1/+1 |
| | | | | | | | | | | | | wow ... just wow ... | ||||
* | | | | Merge pull request #19289 from owncloud/fix-type-hint-errors-container | Thomas Müller | 2015-09-23 | 2 | -2/+3 |
|\ \ \ \ | | | | | | | | | | | Fix type hint errors in the container and the interface | ||||
| * \ \ \ | Merge branch 'master' into fix-type-hint-errors-container | Morris Jobke | 2015-09-23 | 1 | -12/+24 |
| |\ \ \ \ | |||||
| * | | | | | Fix type hint errors in the container and the interface | Joas Schilling | 2015-09-23 | 2 | -2/+3 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge pull request #19236 from owncloud/call_dot_directories_function | Thomas Müller | 2015-09-23 | 5 | -6/+6 |
|\ \ \ \ \ | | | | | | | | | | | | | Replaces if ($file === '.' || $file === '..') by public function call isIgnoredDir | ||||
| * | | | | | Replaces if ($file === '.' || $file === '..') by ↵ | Martin | 2015-09-22 | 5 | -6/+6 |
| |/ / / / | | | | | | | | | | | | | | | | if(\OC\Files\Filesystem::isIgnoredDir($file)). Eases to find where this operation is used. | ||||
* | | | | | Merge pull request #19247 from owncloud/fix_locking_copy_operation | Thomas Müller | 2015-09-23 | 1 | -42/+55 |
|\ \ \ \ \ | |_|/ / / |/| | | | | locking: handle exceptions correctly during copy operation | ||||
| * | | | | catch excexptions during the copy operation and make sure that we free the ↵ | Bjoern Schiessle | 2015-09-22 | 1 | -42/+55 |
| | |/ / | |/| | | | | | | | | | | lock correctly | ||||
* | | | | Merge pull request #19267 from ↵ | Thomas Müller | 2015-09-23 | 1 | -12/+24 |
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | owncloud/individual-it-reduce_db_calls_for_filelocks [jenkins] Individual it reduce db calls for filelocks | ||||
| * | | | reduce amount of db calls needed for file-locks | Individual IT Services | 2015-09-22 | 1 | -12/+24 |
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | return result of insertIfNotExist() reducing initLockField, throwing exeption in releaseLock don't throw exception in releaseLock() cleaning up whitespaces | ||||
* | | | Move mimetype files into /resources/config/ | Lukas Reschke | 2015-09-22 | 2 | -14/+25 |
| | | | |||||
* | | | Move certificate bundle into resources/config/ | Lukas Reschke | 2015-09-22 | 3 | -9/+2 |
| | | | |||||
* | | | Merge pull request #19268 from owncloud/revert-18911 | Robin Appelman | 2015-09-22 | 1 | -6/+0 |
|\ \ \ | | | | | | | | | Revert "Show cached previews directly" |