summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Update AUTHOR fileLukas Reschke2015-10-261-22/+177
* Update license headersLukas Reschke2015-10-26135-108/+141
* Update .mailmapLukas Reschke2015-10-261-1/+2
* Generate AUTHORS file from commitsLukas Reschke2015-10-261-1/+20
* Merge pull request #20010 from owncloud/add-tests-auth-pluginThomas Müller2015-10-263-21/+399
|\
| * Add tests for Sabre Auth plugin + make getCurrentUser compatibleLukas Reschke2015-10-233-21/+399
* | Merge pull request #20037 from owncloud/phpseclib-dev-to-2.0.0Thomas Müller2015-10-261-0/+0
|\ \
| * | Bump 3rdparty for phpseclib-2.0.0Roeland Jago Douma2015-10-261-0/+0
* | | Merge pull request #20031 from owncloud/remove-dead-codeThomas Müller2015-10-261-8/+7
|\ \ \
| * | | Remove dead codeLukas Reschke2015-10-251-8/+7
* | | | Merge pull request #19982 from owncloud/fix-link-sharing-regression-masterThomas Müller2015-10-265-18/+60
|\ \ \ \ | |_|/ / |/| | |
| * | | Fix for broken ajax/share.php endpointRoeland Jago Douma2015-10-234-16/+47
| * | | Ensure the password is only hashed in case it's changed on the client - fixes...Thomas Müller2015-10-222-9/+20
* | | | Merge pull request #20030 from owncloud/autoload-files-external-optimizeThomas Müller2015-10-263-1/+49
|\ \ \ \
| * | | | Use optimized autoloader for files_externalLukas Reschke2015-10-253-1/+49
| | |/ / | |/| |
* / | | [tx-robot] updated from transifexJenkins for ownCloud2015-10-2610-0/+184
|/ / /
* | | Merge pull request #20026 from owncloud/LukasReschke-patch-1Lukas Reschke2015-10-251-1/+1
|\ \ \
| * | | Add HackerOne page to CONTRIBUTING.mdLukas Reschke2015-10-251-1/+1
|/ / /
* | | Merge pull request #20024 from owncloud/optimized-autoloaderLukas Reschke2015-10-251-0/+0
|\ \ \
| * | | Use optimized autoloader for 3rdpartyLukas Reschke2015-10-251-0/+0
|/ / /
* | | Merge pull request #16957 from owncloud/throw-exception-if-file-does-not-existLukas Reschke2015-10-2514-54/+121
|\ \ \
| * | | Throw exception on `getPath` if file does not existLukas Reschke2015-10-2514-54/+121
|/ / /
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-10-2524-26/+100
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-10-24142-150/+124
* | | Merge pull request #20013 from owncloud/guzzlehttp-guzzle-5.3.0Thomas Müller2015-10-231-0/+0
|\ \ \ | |_|/ |/| |
| * | Bump 3rdparty for guzzlehttp/http to 5.3.0Roeland Jago Douma2015-10-231-0/+0
|/ /
* | Merge pull request #20004 from owncloud/dont-lock-user-filesThomas Müller2015-10-231-1/+1
|\ \
| * | Dont lock /$user/filesRobin Appelman2015-10-231-1/+1
* | | Merge pull request #19987 from owncloud/full_sabre_2.1.7Thomas Müller2015-10-231-0/+0
|\ \ \
| * | | Bump 3rdparty to have full sabre/dav-2.1.7Roeland Jago Douma2015-10-231-0/+0
|/ / /
* | | Merge pull request #19977 from owncloud/provisioning_api_integration_tests_ap...Thomas Müller2015-10-232-11/+118
|\ \ \ | |/ / |/| |
| * | added tests for appsSergio Bertolin2015-10-222-0/+94
| * | added test for getting users of a group being subadminSergio Bertolin2015-10-222-11/+24
* | | Merge pull request #19957 from owncloud/volter-masterThomas Müller2015-10-232-1/+9
|\ \ \
| * | | Add syslog_tag docu to sample configSteffen Lindner2015-10-231-0/+8
| * | | Expose syslog tag in the configurationVolker Fröhlich2015-10-221-1/+1
* | | | Merge pull request #19970 from owncloud/encryption-getuidonbooleanThomas Müller2015-10-231-4/+4
|\ \ \ \
| * | | | Fix "Call to a member function getUID() on boolean" in CryptJoas Schilling2015-10-221-4/+4
* | | | | Merge pull request #19990 from owncloud/stay-logged-in-wordingThomas Müller2015-10-231-1/+1
|\ \ \ \ \
| * | | | | change wording from 'remember' to more understandable 'Stay logged in'Jan-Christoph Borchardt2015-10-231-1/+1
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-10-2330-8/+202
* | | | | | Merge pull request #19980 from owncloud/fix-deleted-ldap-user-sharingThomas Müller2015-10-221-1/+7
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | handle NoUserException in sharing codeMorris Jobke2015-10-221-1/+7
| | |_|_|/ | |/| | |
* | | | | Merge pull request #19973 from owncloud/pear_archive_tar-1.4.1Thomas Müller2015-10-221-0/+0
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Bump 3rdparty for pear/archive_tar-1.4.1Roeland Jago Douma2015-10-221-0/+0
|/ / / /
* | | | Merge pull request #19967 from owncloud/assetic_1.3.1Thomas Müller2015-10-221-0/+0
|\ \ \ \ | |_|_|/ |/| | |
| * | | 3rdparty bump for assetic-1.3.1Roeland Jago Douma2015-10-221-0/+0
* | | | Merge pull request #19890 from owncloud/db-keep-shared-locksThomas Müller2015-10-222-18/+107
|\ \ \ \
| * | | | add phpdocRobin Appelman2015-10-212-0/+13
| * | | | Keep shared locks until the end of the request so we can reuse themRobin Appelman2015-10-212-18/+94