summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #5857 from nextcloud/database-exception-cleanupMorris Jobke2017-07-242-13/+2
|\
| * Remove unneeded parameter in DatabaseExceptionMorris Jobke2017-07-242-13/+2
* | Merge pull request #5835 from nextcloud/cleanup_testing_appMorris Jobke2017-07-241-1/+3
|\ \
| * | Proper DI for ILockingProviderRoeland Jago Douma2017-07-241-1/+3
| |/
* | Merge pull request #5855 from nextcloud/cleanup-legacy-user-classMorris Jobke2017-07-241-67/+1
|\ \
| * | Cleanup legacy user class from unused methodsMorris Jobke2017-07-241-67/+1
| |/
* | Merge pull request #5854 from nextcloud/improve-personal-page-codeMorris Jobke2017-07-242-54/+3
|\ \
| * | Cleanup code of personal page to use public interfacesMorris Jobke2017-07-242-54/+3
| |/
* | Merge pull request #5844 from nextcloud/phpstorm_inspect2Morris Jobke2017-07-2429-99/+99
|\ \
| * | More phpstorm inspection fixesRoeland Jago Douma2017-07-2429-99/+99
| |/
* | Remove unneeded stylesMorris Jobke2017-07-241-1/+1
* | Adjust to height=120Lukas Reschke2017-07-241-1/+1
* | Revert "Set max-width of image to 100px in Outlook as well"Lukas Reschke2017-07-241-3/+0
|/
* 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 wellMorris Jobke2017-07-231-0/+3
* | [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 datepickerMarin Treselj2017-07-231-1/+1
* | | Merge pull request #5840 from nextcloud/phpstorm_inspectMorris Jobke2017-07-2313-181/+179
|\ \ \ | |/ / |/| |
| * | Some phpstorm inspection fixesRoeland Jago Douma2017-07-2213-181/+179
* | | [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 strlenArtem Kochnev2017-07-201-1/+1
* | | Merge pull request #5596 from nextcloud/mount-renameMorris Jobke2017-07-211-8/+12
|\ \ \
| * | | non movable mounts can not be movedRobin Appelman2017-07-171-8/+12
* | | | Merge pull request #5785 from nextcloud/path-repair-steps-storageMorris Jobke2017-07-212-5/+8
|\ \ \ \
| * | | | Also repair storage id's when repairing invalid entriesRobin Appelman2017-07-212-5/+8
* | | | | Merge pull request #5821 from nextcloud/fix-theming-on-untrusted-domainLukas Reschke2017-07-211-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix error message on untrusted domain error pageMorris Jobke2017-07-211-1/+1
* | | | | Merge pull request #5820 from MarcelWaldvogel/minor-documentation-fixesRoeland Jago Douma2017-07-213-3/+3
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Minor typosMarcel Waldvogel2017-07-213-3/+3
* | | | | Merge pull request #5802 from nextcloud/rm_dep_controller_functionsLukas Reschke2017-07-211-105/+1
|\ \ \ \ \
| * | | | | Remove deprecated Controller FunctionsRoeland Jago Douma2017-07-201-105/+1
| | |_|/ / | |/| | |
* | | | | Merge pull request #5818 from nextcloud/ocs_privatedataRoeland Jago Douma2017-07-215-146/+0
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | PrivateData to appRoeland Jago Douma2017-07-215-146/+0
| |/ / /
* | | | Merge pull request #5797 from paulijar/share20-postUnshareFromSelfMorris Jobke2017-07-212-0/+17
|\ \ \ \
| * | | | Emit hook postUnshareFromSelf when the recipient of a share unshares itPauli Järvinen2017-07-202-0/+17
* | | | | Add Phan plugin to check for SQL injectionsLukas Reschke2017-07-2014-0/+31
| |/ / / |/| | |
* | | | Merge pull request #5734 from nextcloud/only-readable-chars-in-share-tokensJoas Schilling2017-07-192-8/+3
|\ \ \ \
| * | | | Only use readable chars in Share TokensJoas Schilling2017-07-182-8/+3
* | | | | Merge pull request #5719 from nextcloud/improve-jscombinerMorris Jobke2017-07-192-2/+16
|\ \ \ \ \
| * | | | | Properly handle if the deps file if for some reason emptyMorris Jobke2017-07-192-2/+16
* | | | | | Add workaround for https://github.com/etsy/phan/issues/1033Lukas Reschke2017-07-192-0/+9
* | | | | | Remove unused functionsLukas Reschke2017-07-192-17/+0
* | | | | | Run phan over code baseLukas Reschke2017-07-194-2/+6
| |_|_|_|/ |/| | | |
* | | | | Merge pull request #5744 from 1manprojects/patch-1Morris Jobke2017-07-181-1/+1
|\ \ \ \ \
| * | | | | 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
| | |_|_|/ | |/| | |
* | | | | 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 entriesRobin Appelman2017-07-181-1/+1
| | |_|_|/ | |/| | |