aboutsummaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #19346 from owncloud/drop-passwords-from-exception-logThomas Müller2015-09-253-9/+33
|\
| * Remove passwords from logged exception stack tracesMorris Jobke2015-09-243-9/+33
* | Merge pull request #19297 from owncloud/fix_19119Thomas Müller2015-09-251-1/+0
|\ \
| * | Do not blindy copy expiration date on reshareRoeland Jago Douma2015-09-251-1/+0
* | | Merge pull request #19030 from owncloud/oparoz-smarter-loggerThomas Müller2015-09-251-1/+14
|\ \ \
| * | | Use a 3rd party normalizer for the loggerOlivier Paroz2015-09-241-1/+14
| | |/ | |/|
* | | Merge pull request #19360 from owncloud/move-filter-method-into-config-objectThomas Müller2015-09-253-0/+80
|\ \ \
| * | | Deduplicate constantJoas Schilling2015-09-251-3/+4
| * | | Move the filtering of sensitive data to the config classJoas Schilling2015-09-253-0/+79
| | |/ | |/|
* | | Merge pull request #19293 from owncloud/individual-it-move_initTemplateThomas Müller2015-09-254-91/+146
|\ \ \
| * | | Todo for myself to eliminate double codeIndividual IT Services2015-09-251-0/+5
| * | | add $prepend option to addStyle() & addVendorStyle()Individual IT Services2015-09-252-18/+28
| * | | Clean codeThomas Müller2015-09-241-56/+66
| * | | getService() is not needed -> removeThomas Müller2015-09-231-20/+0
| * | | do not load unnecessary code in case of webdavIndividual IT Services2015-09-234-72/+122
* | | | Add the L10N Factory to the container interfaceJoas Schilling2015-09-251-0/+6
| |/ / |/| |
* | | Merge pull request #15098 from owncloud/fix_preview_versions_revert_issueThomas Müller2015-09-242-1/+9
|\ \ \
| * | | delete cached preview when rolling back file's versionGeorg Ehrke2015-09-202-1/+9
* | | | Merge pull request #19306 from owncloud/app-code-check-versionThomas Müller2015-09-241-0/+146
|\ \ \ \ | |_|_|/ |/| | |
| * | | public, remote and default_enable are not deprecatedMorris Jobke2015-09-241-3/+3
| * | | encode arrays as stringMorris Jobke2015-09-241-1/+6
| * | | [App Code Check] add check for version and mandatory fieldsMorris Jobke2015-09-241-0/+141
* | | | Merge pull request #19337 from owncloud/fix-shipped-check-for-appsThomas Müller2015-09-241-1/+1
|\ \ \ \
| * | | | Correctly check whether an app is shippedJoas Schilling2015-09-241-1/+1
* | | | | Merge pull request #19340 from owncloud/enc_fix_user_checkThomas Müller2015-09-241-1/+1
|\ \ \ \ \
| * | | | | only check if the user exists if a user was added as parameterBjoern Schiessle2015-09-241-1/+1
| |/ / / /
* | | | | Merge pull request #19248 from owncloud/allow-status-code-403-and-503-for-lis...Thomas Müller2015-09-243-1/+134
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Add since-tagJoas Schilling2015-09-232-0/+14
| * | | | Allow listeners to set status code and messageJoas Schilling2015-09-233-1/+120
* | | | | Merge pull request #19303 from owncloud/usecorrectvariableThomas Müller2015-09-241-1/+1
|\ \ \ \ \
| * | | | | use correct variableJörn Friedrich Dreyer2015-09-231-1/+1
| | |/ / / | |/| | |
* | | | | Merge pull request #19326 from owncloud/issue-19314-querybuilder-set-nullThomas Müller2015-09-241-1/+1
|\ \ \ \ \
| * | | | | Allow `set('column', 'null')` to work like in DoctrineJoas Schilling2015-09-241-1/+1
| |/ / / /
* | | | | Merge pull request #16479 from owncloud/core-fixgetrelativepathwrongmatchesThomas Müller2015-09-241-1/+4
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Prevent wrong matches in getRelativePathVincent Petry2015-09-221-1/+4
* | | | | Show 'Apps' in the browser title when app management is openThomas Müller2015-09-232-3/+8
| |/ / / |/| | |
* | | | Revert "use correct variable"Jörn Friedrich Dreyer2015-09-231-1/+1
* | | | use correct variableJörn Friedrich Dreyer2015-09-231-1/+1
* | | | Merge pull request #19289 from owncloud/fix-type-hint-errors-containerThomas Müller2015-09-232-2/+3
|\ \ \ \
| * \ \ \ Merge branch 'master' into fix-type-hint-errors-containerMorris Jobke2015-09-231-12/+24
| |\ \ \ \
| * | | | | Fix type hint errors in the container and the interfaceJoas Schilling2015-09-232-2/+3
| | |_|_|/ | |/| | |
* | | | | Merge pull request #19236 from owncloud/call_dot_directories_functionThomas Müller2015-09-235-6/+6
|\ \ \ \ \
| * | | | | Replaces if ($file === '.' || $file === '..') by if(\OC\Files\Filesystem::isI...Martin2015-09-225-6/+6
| |/ / / /
* | | | | Merge pull request #19247 from owncloud/fix_locking_copy_operationThomas Müller2015-09-231-42/+55
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | catch excexptions during the copy operation and make sure that we free the lo...Bjoern Schiessle2015-09-221-42/+55
| | |/ / | |/| |
* | | | Merge pull request #19267 from owncloud/individual-it-reduce_db_calls_for_fil...Thomas Müller2015-09-231-12/+24
|\ \ \ \ | |_|/ / |/| | |
| * | | reduce amount of db calls needed for file-locksIndividual IT Services2015-09-221-12/+24
| |/ /
* | | Move mimetype files into /resources/config/Lukas Reschke2015-09-222-14/+25
* | | Move certificate bundle into resources/config/Lukas Reschke2015-09-223-9/+2
* | | Merge pull request #19268 from owncloud/revert-18911Robin Appelman2015-09-221-6/+0
|\ \ \