summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Cleanup code of personal page to use public interfacesMorris Jobke2017-07-242-54/+3
| | | | | | | * public interfaces instead of static code calls * drop static private namespace methods Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* Merge pull request #5783 from nextcloud/outlook-max-widthRoeland Jago Douma2017-07-241-0/+3
|\ | | | | Set max-width of image to 100px in Outlook as well
| * Set max-width of image to 100px in Outlook as wellMorris Jobke2017-07-231-0/+3
| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | [tx-robot] updated from transifexNextcloud bot2017-07-242-0/+2
| |
* | Merge pull request #5713 from nextcloud/datepicker-redesignMarius Blüm2017-07-231-1/+1
|\ \ | | | | | | Redesign jQuery UI datepicker
| * | Redesign jQuery UI datepickerMarin Treselj2017-07-231-1/+1
| | | | | | | | | | | | Signed-off-by: Marin Treselj <marin@pixelipo.com>
* | | Merge pull request #5840 from nextcloud/phpstorm_inspectMorris Jobke2017-07-2313-181/+179
|\ \ \ | |/ / |/| | Some phpstorm inspection fixes
| * | Some phpstorm inspection fixesRoeland Jago Douma2017-07-2213-181/+179
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | [tx-robot] updated from transifexNextcloud bot2017-07-232-0/+4
|/ /
* | Merge pull request #5812 from MrJeos/masterMorris Jobke2017-07-221-1/+1
|\ \ | | | | | | Fix for mb strlen
| * | Fix for mb strlenArtem Kochnev2017-07-201-1/+1
| | | | | | | | | Error with moving files with long names in UTF-8
* | | Merge pull request #5596 from nextcloud/mount-renameMorris Jobke2017-07-211-8/+12
|\ \ \ | | | | | | | | Fix renaming of non-renamble mounts
| * | | non movable mounts can not be movedRobin Appelman2017-07-171-8/+12
| | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | Merge pull request #5785 from nextcloud/path-repair-steps-storageMorris Jobke2017-07-212-5/+8
|\ \ \ \ | | | | | | | | | | Also repair storage id's when repairing invalid entries
| * | | | Also repair storage id's when repairing invalid entriesRobin Appelman2017-07-212-5/+8
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | Merge pull request #5821 from nextcloud/fix-theming-on-untrusted-domainLukas Reschke2017-07-211-1/+1
|\ \ \ \ \ | |/ / / / |/| | | | Fix error message on untrusted domain error page
| * | | | Fix error message on untrusted domain error pageMorris Jobke2017-07-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #5347 Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | Merge pull request #5820 from MarcelWaldvogel/minor-documentation-fixesRoeland Jago Douma2017-07-213-3/+3
|\ \ \ \ \ | |/ / / / |/| | | | Minor documentation fixes
| * | | | Minor typosMarcel Waldvogel2017-07-213-3/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Marcel Waldvogel <marcel.waldvogel@uni-konstanz.de>
* | | | | Merge pull request #5802 from nextcloud/rm_dep_controller_functionsLukas Reschke2017-07-211-105/+1
|\ \ \ \ \ | | | | | | | | | | | | Remove deprecated Controller Functions
| * | | | | Remove deprecated Controller FunctionsRoeland Jago Douma2017-07-201-105/+1
| | |_|/ / | |/| | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | Merge pull request #5818 from nextcloud/ocs_privatedataRoeland Jago Douma2017-07-215-146/+0
|\ \ \ \ \ | |_|/ / / |/| | | | PrivateData to app
| * | | | PrivateData to appRoeland Jago Douma2017-07-215-146/+0
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | * PrivateData is an app now: https://github.com/nextcloud/privatedata * No need to load the OCS routes.php (as there is none!) Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | Merge pull request #5797 from paulijar/share20-postUnshareFromSelfMorris Jobke2017-07-212-0/+17
|\ \ \ \ | | | | | | | | | | Dispatch event postUnshareFromSelf when the recipient of a share unshares it
| * | | | Emit hook postUnshareFromSelf when the recipient of a share unshares itPauli Järvinen2017-07-202-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - This kind of hook signal used to be emitted in the old Share library but it was missing from Share 2.0 Signed-off-by: Pauli Järvinen <pauli.jarvinen@gmail.com>
* | | | | Add Phan plugin to check for SQL injectionsLukas Reschke2017-07-2014-0/+31
| |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds a phan plugin which checks for SQL injections on code using our QueryBuilder, while it isn't perfect it should already catch most potential issues. As always, static analysis will sometimes have false positives and this is also here the case. So in some cases the analyzer just doesn't know if something is potential user input or not, thus I had to add some `@suppress SqlInjectionChecker` in front of those potential injections. The Phan plugin hasn't the most awesome code but it works and I also added a file with test cases. Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | Merge pull request #5734 from nextcloud/only-readable-chars-in-share-tokensJoas Schilling2017-07-192-8/+3
|\ \ \ \ | | | | | | | | | | Only use readable chars in Share Tokens
| * | | | Only use readable chars in Share TokensJoas Schilling2017-07-182-8/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | Merge pull request #5719 from nextcloud/improve-jscombinerMorris Jobke2017-07-192-2/+16
|\ \ \ \ \ | | | | | | | | | | | | Properly handle if the deps file if for some reason empty
| * | | | | Properly handle if the deps file if for some reason emptyMorris Jobke2017-07-192-2/+16
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | Add workaround for https://github.com/etsy/phan/issues/1033Lukas Reschke2017-07-192-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | | | Remove unused functionsLukas Reschke2017-07-192-17/+0
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | | | Run phan over code baseLukas Reschke2017-07-194-2/+6
| |_|_|_|/ |/| | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | | Merge pull request #5744 from 1manprojects/patch-1Morris Jobke2017-07-181-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Removed cast to integer in getSize
| * | | | | changed direct cast to integer to numerical value1 Man Projects2017-07-171-1/+1
| | | | | |
| * | | | | Removed cast to integer in getSize1 Man Projects2017-07-151-1/+1
| | |_|_|/ | |/| | | | | | | | Fixes - Wrong or no sizes of files/folders #5031
* | | | | Merge pull request #5770 from nextcloud/path-repair-steps-loopRoeland Jago Douma2017-07-181-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Fix invalid path repair step not getting all invalid entries
| * | | | | Fix invalid path repair step not getting all invalid entriesRobin Appelman2017-07-181-1/+1
| | |_|_|/ | |/| | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | Merge pull request #5709 from nextcloud/null-user-existJoas Schilling2017-07-181-0/+3
|\ \ \ \ \ | |/ / / / |/| | | | null users dont exist
| * | | | null users dont existRobin Appelman2017-07-131-0/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | Fix emitting of legacy hook post_unsharePauli Järvinen2017-07-161-1/+1
| |/ / / |/| | | | | | | | | | | | | | | | | | | - When a file was unshared, the legacy hook pre_unshare fired twice and the hook post_unshare did not fire at all. This was obviously a copy-paste error. Signed-off-by: Pauli Järvinen <pauli.jarvinen@gmail.com>
* | | | [tx-robot] updated from transifexNextcloud bot2017-07-152-6/+6
| | | |
* | | | Merge pull request #5699 from nextcloud/bruteforce_capabilityLukas Reschke2017-07-144-0/+57
|\ \ \ \ | | | | | | | | | | Add bruteforce capabilities
| * | | | Update autoloaderRoeland Jago Douma2017-07-132-0/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | Add bruteforce capabilitiesRoeland Jago Douma2017-07-132-0/+55
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | [tx-robot] updated from transifexNextcloud bot2017-07-142-38/+38
| |_|/ / |/| | |
* | | | Merge pull request #5708 from nextcloud/nested-permissions-maskMorris Jobke2017-07-131-1/+1
|\ \ \ \ | | | | | | | | | | Fix scan permissions with nested permissions masks
| * | | | Fix scan permissions with nested permissions masksRobin Appelman2017-07-131-1/+1
| | |/ / | |/| | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | Merge pull request #5715 from nextcloud/master-5655Morris Jobke2017-07-131-25/+66
|\ \ \ \ | | | | | | | | | | Fixed repair step
| * | | | chunk getting invalid paths and reuse queriesRobin Appelman2017-07-131-27/+61
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>