Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #21037 from owncloud/fix-irritating-ldap-log-entry | Thomas Müller | 2015-12-08 | 1 | -1/+1 |
|\ | |||||
| * | passing an empty base in this diagnosis call will not result in LDAP errors | Arthur Schiwon | 2015-12-08 | 1 | -1/+1 |
* | | Merge pull request #21018 from owncloud/scrutinizer-patch-1 | Thomas Müller | 2015-12-08 | 7 | -16/+66 |
|\ \ | |||||
| * | | More fixes to the docs | Joas Schilling | 2015-12-08 | 3 | -6/+20 |
| * | | Scrutinizer Auto-Fixes | Scrutinizer Auto-Fixer | 2015-12-07 | 7 | -10/+46 |
* | | | Merge pull request #21031 from owncloud/sanitize-findAppInDirectories | Thomas Müller | 2015-12-08 | 1 | -1/+5 |
|\ \ \ | |||||
| * | | | Sanitize the appId passed to `findAppInDirectories` | Lukas Reschke | 2015-12-08 | 1 | -1/+5 |
* | | | | Merge pull request #21030 from owncloud/querybuilder-new-features | Thomas Müller | 2015-12-08 | 4 | -7/+177 |
|\ \ \ \ | |||||
| * | | | | Add a method to the get "to use" table and column name | Joas Schilling | 2015-12-08 | 4 | -3/+59 |
| * | | | | Add select distinct to the query builder | Joas Schilling | 2015-12-08 | 3 | -4/+70 |
| * | | | | Allow getting the last insert id without much hassle | Joas Schilling | 2015-12-08 | 3 | -0/+48 |
* | | | | | Merge pull request #20786 from owncloud/systemtags-dav | Thomas Müller | 2015-12-08 | 20 | -8/+1888 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | |||||
| * | | | | Fixed system tags DAV and API and docs | Vincent Petry | 2015-12-04 | 12 | -48/+57 |
| * | | | | Unit test for system tags plugin | Vincent Petry | 2015-12-03 | 10 | -14/+988 |
| * | | | | Fix PHPDoc ... | Thomas Müller | 2015-12-03 | 7 | -16/+20 |
| * | | | | Added dav endpoints for system tags | Vincent Petry | 2015-12-03 | 10 | -0/+893 |
* | | | | | Merge pull request #21022 from owncloud/get-rid-of-by-reference | Thomas Müller | 2015-12-08 | 8 | -21/+29 |
|\ \ \ \ \ | |||||
| * | | | | | Add unit test for nested arrays | Lukas Reschke | 2015-12-08 | 1 | -6/+12 |
| * | | | | | Use \OCP\Util::sanitizeHTML instead of \OC_Util::sanitizeHTML | Lukas Reschke | 2015-12-08 | 6 | -11/+11 |
| * | | | | | Get rid of passing a reference | Lukas Reschke | 2015-12-08 | 1 | -4/+6 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge pull request #20979 from owncloud/settings-groups-entry | Thomas Müller | 2015-12-08 | 1 | -0/+1 |
|\ \ \ \ \ | |||||
| * | | | | | Add 'my groups' anchor to the personal page sidebar | Patrick Robertson | 2015-12-07 | 1 | -0/+1 |
* | | | | | | Merge pull request #21025 from owncloud/remove-legacy-trusted-domain-support | Thomas Müller | 2015-12-08 | 4 | -91/+5 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Do not trust casting | Lukas Reschke | 2015-12-08 | 2 | -1/+3 |
| * | | | | | | Remove unused repair steps | Lukas Reschke | 2015-12-08 | 2 | -85/+2 |
| * | | | | | | Remove legacy check | Lukas Reschke | 2015-12-08 | 1 | -5/+0 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge pull request #20951 from owncloud/Make_showing_logs_optional | Thomas Müller | 2015-12-08 | 1 | -2/+7 |
|\ \ \ \ \ \ | |||||
| * | | | | | | forgotten variable | Sergio Bertolin | 2015-12-04 | 1 | -1/+1 |
| * | | | | | | Controlled arguments for run script | Sergio Bertolin | 2015-12-04 | 1 | -1/+6 |
* | | | | | | | Merge pull request #21028 from owncloud/fix-php-doc-for-storage-config | Thomas Müller | 2015-12-08 | 1 | -2/+2 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | |||||
| * | | | | | | Use proper PHPDoc reference | Lukas Reschke | 2015-12-08 | 1 | -2/+2 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #21014 from owncloud/share-unsharelinkpapercut | Thomas Müller | 2015-12-08 | 1 | -3/+5 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | |||||
| * | | | | | Fix unshare link click element | Vincent Petry | 2015-12-07 | 1 | -3/+5 |
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-12-08 | 14 | -8/+54 |
| |_|_|_|/ |/| | | | | |||||
* | | | | | Merge pull request #21015 from owncloud/update-redirecttocorrectpage | Thomas Müller | 2015-12-07 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | Redirect to correct URL after updating | Vincent Petry | 2015-12-07 | 1 | -1/+1 |
* | | | | | | Merge pull request #20996 from owncloud/issue-12215-remove-password-reset-whe... | Thomas Müller | 2015-12-07 | 5 | -6/+31 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Allow specifying a custom reset-password-url | Joas Schilling | 2015-12-07 | 4 | -7/+22 |
| * | | | | | Remove password reset when the user can not change the password | Joas Schilling | 2015-12-07 | 2 | -2/+12 |
* | | | | | | Merge pull request #21006 from owncloud/scrutinizer-patch-1 | Thomas Müller | 2015-12-07 | 8 | -11/+0 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Scrutinizer Auto-Fixes | Scrutinizer Auto-Fixer | 2015-12-07 | 8 | -11/+0 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge pull request #21009 from owncloud/share-forbidlinkshare-duplicatefield | Thomas Müller | 2015-12-07 | 2 | -6/+10 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix duplicate bogus share field when link sharing is not allowed | Vincent Petry | 2015-12-07 | 2 | -6/+10 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #21011 from owncloud/allow-ico | Thomas Müller | 2015-12-07 | 1 | -0/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Allow .ico files | Lukas Reschke | 2015-12-07 | 1 | -0/+1 |
* | | | | | | | Merge pull request #18212 from ryno83/treat_LDAP_users_not_available_by_user_... | Thomas Müller | 2015-12-07 | 2 | -2/+2 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | Remove of useless code | Renaud Fortier | 2015-11-26 | 1 | -5/+1 |
| * | | | | | | if define, check the userfilter if the user is still allowed | Renaud Fortier | 2015-08-11 | 2 | -2/+6 |
* | | | | | | | Merge pull request #20991 from owncloud/disabled-checked-checkbox-css-rules | Thomas Müller | 2015-12-07 | 1 | -0/+16 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Add rules for checked+disabled and disabled checkbox style | Joas Schilling | 2015-12-07 | 1 | -0/+16 |
| | |_|/ / / / | |/| | | | | |