summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into mastermbi2015-12-08192-459/+3400
|\
| * Merge pull request #21037 from owncloud/fix-irritating-ldap-log-entryThomas Müller2015-12-081-1/+1
| |\
| | * passing an empty base in this diagnosis call will not result in LDAP errorsArthur Schiwon2015-12-081-1/+1
| * | Merge pull request #21018 from owncloud/scrutinizer-patch-1Thomas Müller2015-12-087-16/+66
| |\ \
| | * | More fixes to the docsJoas Schilling2015-12-083-6/+20
| | * | Scrutinizer Auto-FixesScrutinizer Auto-Fixer2015-12-077-10/+46
| * | | Merge pull request #21031 from owncloud/sanitize-findAppInDirectoriesThomas Müller2015-12-081-1/+5
| |\ \ \
| | * | | Sanitize the appId passed to `findAppInDirectories`Lukas Reschke2015-12-081-1/+5
| * | | | Merge pull request #21030 from owncloud/querybuilder-new-featuresThomas Müller2015-12-084-7/+177
| |\ \ \ \
| | * | | | Add a method to the get "to use" table and column nameJoas Schilling2015-12-084-3/+59
| | * | | | Add select distinct to the query builderJoas Schilling2015-12-083-4/+70
| | * | | | Allow getting the last insert id without much hassleJoas Schilling2015-12-083-0/+48
| * | | | | Merge pull request #20786 from owncloud/systemtags-davThomas Müller2015-12-0820-8/+1888
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | Fixed system tags DAV and API and docsVincent Petry2015-12-0412-48/+57
| | * | | | Unit test for system tags pluginVincent Petry2015-12-0310-14/+988
| | * | | | Fix PHPDoc ...Thomas Müller2015-12-037-16/+20
| | * | | | Added dav endpoints for system tagsVincent Petry2015-12-0310-0/+893
| * | | | | Merge pull request #21022 from owncloud/get-rid-of-by-referenceThomas Müller2015-12-088-21/+29
| |\ \ \ \ \
| | * | | | | Add unit test for nested arraysLukas Reschke2015-12-081-6/+12
| | * | | | | Use \OCP\Util::sanitizeHTML instead of \OC_Util::sanitizeHTMLLukas Reschke2015-12-086-11/+11
| | * | | | | Get rid of passing a referenceLukas Reschke2015-12-081-4/+6
| | | |_|/ / | | |/| | |
| * | | | | Merge pull request #20979 from owncloud/settings-groups-entryThomas Müller2015-12-081-0/+1
| |\ \ \ \ \
| | * | | | | Add 'my groups' anchor to the personal page sidebarPatrick Robertson2015-12-071-0/+1
| * | | | | | Merge pull request #21025 from owncloud/remove-legacy-trusted-domain-supportThomas Müller2015-12-084-91/+5
| |\ \ \ \ \ \
| | * | | | | | Do not trust castingLukas Reschke2015-12-082-1/+3
| | * | | | | | Remove unused repair stepsLukas Reschke2015-12-082-85/+2
| | * | | | | | Remove legacy checkLukas Reschke2015-12-081-5/+0
| | | |/ / / / | | |/| | | |
| * | | | | | Merge pull request #20951 from owncloud/Make_showing_logs_optionalThomas Müller2015-12-081-2/+7
| |\ \ \ \ \ \
| | * | | | | | forgotten variableSergio Bertolin2015-12-041-1/+1
| | * | | | | | Controlled arguments for run scriptSergio Bertolin2015-12-041-1/+6
| * | | | | | | Merge pull request #21028 from owncloud/fix-php-doc-for-storage-configThomas Müller2015-12-081-2/+2
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| | * | | | | | Use proper PHPDoc referenceLukas Reschke2015-12-081-2/+2
| |/ / / / / /
| * | | | | | Merge pull request #21014 from owncloud/share-unsharelinkpapercutThomas Müller2015-12-081-3/+5
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| | * | | | | Fix unshare link click elementVincent Petry2015-12-071-3/+5
| * | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-12-0814-8/+54
| | |_|_|_|/ | |/| | | |
| * | | | | Merge pull request #21015 from owncloud/update-redirecttocorrectpageThomas Müller2015-12-071-1/+1
| |\ \ \ \ \
| | * | | | | Redirect to correct URL after updatingVincent Petry2015-12-071-1/+1
| * | | | | | Merge pull request #20996 from owncloud/issue-12215-remove-password-reset-whe...Thomas Müller2015-12-075-6/+31
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Allow specifying a custom reset-password-urlJoas Schilling2015-12-074-7/+22
| | * | | | | Remove password reset when the user can not change the passwordJoas Schilling2015-12-072-2/+12
| * | | | | | Merge pull request #21006 from owncloud/scrutinizer-patch-1Thomas Müller2015-12-078-11/+0
| |\ \ \ \ \ \
| | * | | | | | Scrutinizer Auto-FixesScrutinizer Auto-Fixer2015-12-078-11/+0
| | | |/ / / / | | |/| | | |
| * | | | | | Merge pull request #21009 from owncloud/share-forbidlinkshare-duplicatefieldThomas Müller2015-12-072-6/+10
| |\ \ \ \ \ \
| | * | | | | | Fix duplicate bogus share field when link sharing is not allowedVincent Petry2015-12-072-6/+10
| | |/ / / / /
| * | | | | | Merge pull request #21011 from owncloud/allow-icoThomas Müller2015-12-071-0/+1
| |\ \ \ \ \ \
| | * | | | | | Allow .ico filesLukas Reschke2015-12-071-0/+1
| * | | | | | | Merge pull request #18212 from ryno83/treat_LDAP_users_not_available_by_user_...Thomas Müller2015-12-072-2/+2
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Remove of useless codeRenaud Fortier2015-11-261-5/+1
| | * | | | | | if define, check the userfilter if the user is still allowedRenaud Fortier2015-08-112-2/+6
| * | | | | | | Merge pull request #20991 from owncloud/disabled-checked-checkbox-css-rulesThomas Müller2015-12-071-0/+16
| |\ \ \ \ \ \ \
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-14 02:42:16 +0000