Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #5857 from nextcloud/database-exception-cleanup | Morris Jobke | 2017-07-24 | 2 | -13/+2 |
|\ | |||||
| * | Remove unneeded parameter in DatabaseException | Morris Jobke | 2017-07-24 | 2 | -13/+2 |
* | | Merge pull request #5835 from nextcloud/cleanup_testing_app | Morris Jobke | 2017-07-24 | 1 | -1/+3 |
|\ \ | |||||
| * | | Proper DI for ILockingProvider | Roeland Jago Douma | 2017-07-24 | 1 | -1/+3 |
| |/ | |||||
* | | Merge pull request #5855 from nextcloud/cleanup-legacy-user-class | Morris Jobke | 2017-07-24 | 1 | -67/+1 |
|\ \ | |||||
| * | | Cleanup legacy user class from unused methods | Morris Jobke | 2017-07-24 | 1 | -67/+1 |
| |/ | |||||
* | | Merge pull request #5854 from nextcloud/improve-personal-page-code | Morris Jobke | 2017-07-24 | 2 | -54/+3 |
|\ \ | |||||
| * | | Cleanup code of personal page to use public interfaces | Morris Jobke | 2017-07-24 | 2 | -54/+3 |
| |/ | |||||
* | | Merge pull request #5844 from nextcloud/phpstorm_inspect2 | Morris Jobke | 2017-07-24 | 29 | -99/+99 |
|\ \ | |||||
| * | | More phpstorm inspection fixes | Roeland Jago Douma | 2017-07-24 | 29 | -99/+99 |
| |/ | |||||
* | | Remove unneeded styles | Morris Jobke | 2017-07-24 | 1 | -1/+1 |
* | | Adjust to height=120 | Lukas Reschke | 2017-07-24 | 1 | -1/+1 |
* | | Revert "Set max-width of image to 100px in Outlook as well" | Lukas Reschke | 2017-07-24 | 1 | -3/+0 |
|/ | |||||
* | Merge pull request #5783 from nextcloud/outlook-max-width | Roeland Jago Douma | 2017-07-24 | 1 | -0/+3 |
|\ | |||||
| * | Set max-width of image to 100px in Outlook as well | Morris Jobke | 2017-07-23 | 1 | -0/+3 |
* | | Redesign jQuery UI datepicker | Marin Treselj | 2017-07-23 | 1 | -1/+1 |
* | | Merge pull request #5812 from MrJeos/master | Morris Jobke | 2017-07-22 | 1 | -1/+1 |
|\ \ | |||||
| * | | Fix for mb strlen | Artem Kochnev | 2017-07-20 | 1 | -1/+1 |
* | | | Merge pull request #5596 from nextcloud/mount-rename | Morris Jobke | 2017-07-21 | 1 | -8/+12 |
|\ \ \ | |||||
| * | | | non movable mounts can not be moved | Robin Appelman | 2017-07-17 | 1 | -8/+12 |
* | | | | Merge pull request #5785 from nextcloud/path-repair-steps-storage | Morris Jobke | 2017-07-21 | 2 | -5/+8 |
|\ \ \ \ | |||||
| * | | | | Also repair storage id's when repairing invalid entries | Robin Appelman | 2017-07-21 | 2 | -5/+8 |
* | | | | | Merge pull request #5821 from nextcloud/fix-theming-on-untrusted-domain | Lukas Reschke | 2017-07-21 | 1 | -1/+1 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Fix error message on untrusted domain error page | Morris Jobke | 2017-07-21 | 1 | -1/+1 |
* | | | | | Merge pull request #5820 from MarcelWaldvogel/minor-documentation-fixes | Roeland Jago Douma | 2017-07-21 | 3 | -3/+3 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Minor typos | Marcel Waldvogel | 2017-07-21 | 3 | -3/+3 |
* | | | | | Merge pull request #5818 from nextcloud/ocs_privatedata | Roeland Jago Douma | 2017-07-21 | 3 | -144/+0 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | PrivateData to app | Roeland Jago Douma | 2017-07-21 | 3 | -144/+0 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #5797 from paulijar/share20-postUnshareFromSelf | Morris Jobke | 2017-07-21 | 2 | -0/+17 |
|\ \ \ \ | |||||
| * | | | | Emit hook postUnshareFromSelf when the recipient of a share unshares it | Pauli Järvinen | 2017-07-20 | 2 | -0/+17 |
* | | | | | Add Phan plugin to check for SQL injections | Lukas Reschke | 2017-07-20 | 14 | -0/+31 |
| |/ / / |/| | | | |||||
* | | | | Merge pull request #5734 from nextcloud/only-readable-chars-in-share-tokens | Joas Schilling | 2017-07-19 | 2 | -8/+3 |
|\ \ \ \ | |||||
| * | | | | Only use readable chars in Share Tokens | Joas Schilling | 2017-07-18 | 2 | -8/+3 |
* | | | | | Merge pull request #5719 from nextcloud/improve-jscombiner | Morris Jobke | 2017-07-19 | 2 | -2/+16 |
|\ \ \ \ \ | |||||
| * | | | | | Properly handle if the deps file if for some reason empty | Morris Jobke | 2017-07-19 | 2 | -2/+16 |
* | | | | | | Add workaround for https://github.com/etsy/phan/issues/1033 | Lukas Reschke | 2017-07-19 | 2 | -0/+9 |
* | | | | | | Remove unused functions | Lukas Reschke | 2017-07-19 | 2 | -17/+0 |
* | | | | | | Run phan over code base | Lukas Reschke | 2017-07-19 | 4 | -2/+6 |
| |_|_|_|/ |/| | | | | |||||
* | | | | | Merge pull request #5744 from 1manprojects/patch-1 | Morris Jobke | 2017-07-18 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | changed direct cast to integer to numerical value | 1 Man Projects | 2017-07-17 | 1 | -1/+1 |
| * | | | | | Removed cast to integer in getSize | 1 Man Projects | 2017-07-15 | 1 | -1/+1 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge pull request #5770 from nextcloud/path-repair-steps-loop | Roeland Jago Douma | 2017-07-18 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | Fix invalid path repair step not getting all invalid entries | Robin Appelman | 2017-07-18 | 1 | -1/+1 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge pull request #5709 from nextcloud/null-user-exist | Joas Schilling | 2017-07-18 | 1 | -0/+3 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | null users dont exist | Robin Appelman | 2017-07-13 | 1 | -0/+3 |
* | | | | | Fix emitting of legacy hook post_unshare | Pauli Järvinen | 2017-07-16 | 1 | -1/+1 |
| |/ / / |/| | | | |||||
* | | | | Merge pull request #5699 from nextcloud/bruteforce_capability | Lukas Reschke | 2017-07-14 | 2 | -0/+55 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | Add bruteforce capabilities | Roeland Jago Douma | 2017-07-13 | 2 | -0/+55 |
* | | | | Merge pull request #5708 from nextcloud/nested-permissions-mask | Morris Jobke | 2017-07-13 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | Fix scan permissions with nested permissions masks | Robin Appelman | 2017-07-13 | 1 | -1/+1 |
| | |/ / | |/| | |