summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #21786 from owncloud/symfony-processThomas Müller2016-01-191-0/+0
|\
| * [3rdparty] Bump symfony/process to 2.8.1Roeland Jago Douma2016-01-191-0/+0
* | Merge pull request #21744 from owncloud/scrutinizer-patch-1Thomas Müller2016-01-197-5/+16
|\ \
| * | Scrutinizer Auto-FixesScrutinizer Auto-Fixer2016-01-157-5/+16
* | | Merge pull request #21774 from owncloud/test-autoload-encryptionThomas Müller2016-01-191-0/+3
|\ \ \
| * | | always allow autoloading encryption in unit testRobin Appelman2016-01-181-0/+3
* | | | Merge pull request #21788 from owncloud/fix-unit-confusionThomas Müller2016-01-197-25/+25
|\ \ \ \ | |_|_|/ |/| | |
| * | | update JS humanFileSize to use KB instead of kBMorris Jobke2016-01-195-22/+22
| * | | properly use standardMorris Jobke2016-01-192-3/+3
|/ / /
* | | Merge pull request #21781 from owncloud/symfony-routing-2.8.1Thomas Müller2016-01-181-0/+0
|\ \ \
| * | | [3rdparty] Bump symfony/routing to 2.8.1Roeland Jago Douma2016-01-181-0/+0
* | | | Merge pull request #21755 from owncloud/share2_hardening_creationThomas Müller2016-01-182-13/+84
|\ \ \ \
| * | | | [Share 2.0] Share Object creation is a fragile thingRoeland Jago Douma2016-01-182-13/+84
| |/ / /
* | | | Merge pull request #21700 from owncloud/update-system-addressbook-on-user-changeThomas Müller2016-01-187-78/+248
|\ \ \ \ | |/ / / |/| | |
| * | | Fix ctorThomas Müller2016-01-141-1/+4
| * | | Unit tests for updateUser and deleteUserThomas Müller2016-01-141-1/+35
| * | | Add test for ensureSystemAddressBookExistsThomas Müller2016-01-141-0/+11
| * | | Start updating system addressbookThomas Müller2016-01-146-77/+199
* | | | Merge pull request #21765 from owncloud/3rdparty_composer_consitencyThomas Müller2016-01-181-0/+0
|\ \ \ \
| * | | | [3rdparty] Composer consistency againRoeland Jago Douma2016-01-181-0/+0
* | | | | Merge pull request #21770 from owncloud/files_external-exportThomas Müller2016-01-183-20/+86
|\ \ \ \ \
| * | | | | Add files_external:export commandRobin Appelman2016-01-183-20/+86
| |/ / / /
* | | | | Merge pull request #21757 from owncloud/files-external-applicable-db-fixThomas Müller2016-01-182-2/+20
|\ \ \ \ \
| * | | | | Correctly remove global applicableRobin McCorkell2016-01-152-2/+20
* | | | | | Merge pull request #21754 from owncloud/ocs_share_api_add_share_ownerThomas Müller2016-01-182-11/+21
|\ \ \ \ \ \
| * | | | | | [Share 2.0] Add share owner information to OCS Share APIRoeland Jago Douma2016-01-152-11/+21
| |/ / / / /
* | | | | | Merge pull request #21519 from owncloud/propagate-folder-sizeThomas Müller2016-01-187-11/+54
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | handle noopscanner in shared scannerRobin Appelman2016-01-152-2/+29
| * | | | | propagate folder size in the same query for write updatesRobin Appelman2016-01-155-9/+25
| |/ / / /
* | | | | Merge pull request #21732 from owncloud/gdrive-stream-downloadThomas Müller2016-01-181-6/+16
|\ \ \ \ \
| * | | | | Use Guzzle stream to download files from GDriveVincent Petry2016-01-141-6/+16
* | | | | | Merge pull request #21769 from owncloud/sort-mimetype-list-before-savingRoeland Douma2016-01-182-13/+15
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Run the command once againJoas Schilling2016-01-181-13/+13
| * | | | | Sort the list before savingJoas Schilling2016-01-181-0/+2
|/ / / / /
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-01-184-0/+44
* | | | | Merge pull request #21759 from owncloud/symfony-console-2.8.1Thomas Müller2016-01-171-0/+0
|\ \ \ \ \
| * | | | | [3rdparty] Bump symfony/console to 2.8.1Roeland Jago Douma2016-01-171-0/+0
|/ / / / /
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-01-1720-6/+260
* | | | | Merge pull request #20882 from owncloud/backbone-webdavRoeland Douma2016-01-165-0/+736
|\ \ \ \ \
| * | | | | Backbone transport for WebdavVincent Petry2016-01-165-0/+736
|/ / / / /
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-01-164-0/+36
* | | | | Merge pull request #21753 from owncloud/add-question-about-code-signing-statusThomas Müller2016-01-151-0/+8
|\ \ \ \ \
| * | | | | Add question about code signing statusLukas Reschke2016-01-151-0/+8
| | |/ / / | |/| | |
* | | | | Merge pull request #21739 from owncloud/issue_21110Thomas Müller2016-01-151-25/+1
|\ \ \ \ \
| * | | | | Change icon only on WND and Sharepoint external storagesJesús Macias2016-01-151-25/+1
| * | | | | Fis bug issue 21110Jesús Macias2016-01-151-1/+1
* | | | | | Merge pull request #21705 from owncloud/improve-background-job-messageThomas Müller2016-01-154-6/+20
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Add message key to context of logExceptionThomas Müller2016-01-154-6/+15
| * | | | | use logException() to properly log the exceptionMorris Jobke2016-01-142-4/+9
| * | | | | Improved error message for failing background jobMorris Jobke2016-01-142-2/+2