Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #21786 from owncloud/symfony-process | Thomas Müller | 2016-01-19 | 1 | -0/+0 |
|\ | |||||
| * | [3rdparty] Bump symfony/process to 2.8.1 | Roeland Jago Douma | 2016-01-19 | 1 | -0/+0 |
* | | Merge pull request #21744 from owncloud/scrutinizer-patch-1 | Thomas Müller | 2016-01-19 | 7 | -5/+16 |
|\ \ | |||||
| * | | Scrutinizer Auto-Fixes | Scrutinizer Auto-Fixer | 2016-01-15 | 7 | -5/+16 |
* | | | Merge pull request #21774 from owncloud/test-autoload-encryption | Thomas Müller | 2016-01-19 | 1 | -0/+3 |
|\ \ \ | |||||
| * | | | always allow autoloading encryption in unit test | Robin Appelman | 2016-01-18 | 1 | -0/+3 |
* | | | | Merge pull request #21788 from owncloud/fix-unit-confusion | Thomas Müller | 2016-01-19 | 7 | -25/+25 |
|\ \ \ \ | |_|_|/ |/| | | | |||||
| * | | | update JS humanFileSize to use KB instead of kB | Morris Jobke | 2016-01-19 | 5 | -22/+22 |
| * | | | properly use standard | Morris Jobke | 2016-01-19 | 2 | -3/+3 |
|/ / / | |||||
* | | | Merge pull request #21781 from owncloud/symfony-routing-2.8.1 | Thomas Müller | 2016-01-18 | 1 | -0/+0 |
|\ \ \ | |||||
| * | | | [3rdparty] Bump symfony/routing to 2.8.1 | Roeland Jago Douma | 2016-01-18 | 1 | -0/+0 |
* | | | | Merge pull request #21755 from owncloud/share2_hardening_creation | Thomas Müller | 2016-01-18 | 2 | -13/+84 |
|\ \ \ \ | |||||
| * | | | | [Share 2.0] Share Object creation is a fragile thing | Roeland Jago Douma | 2016-01-18 | 2 | -13/+84 |
| |/ / / | |||||
* | | | | Merge pull request #21700 from owncloud/update-system-addressbook-on-user-change | Thomas Müller | 2016-01-18 | 7 | -78/+248 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Fix ctor | Thomas Müller | 2016-01-14 | 1 | -1/+4 |
| * | | | Unit tests for updateUser and deleteUser | Thomas Müller | 2016-01-14 | 1 | -1/+35 |
| * | | | Add test for ensureSystemAddressBookExists | Thomas Müller | 2016-01-14 | 1 | -0/+11 |
| * | | | Start updating system addressbook | Thomas Müller | 2016-01-14 | 6 | -77/+199 |
* | | | | Merge pull request #21765 from owncloud/3rdparty_composer_consitency | Thomas Müller | 2016-01-18 | 1 | -0/+0 |
|\ \ \ \ | |||||
| * | | | | [3rdparty] Composer consistency again | Roeland Jago Douma | 2016-01-18 | 1 | -0/+0 |
* | | | | | Merge pull request #21770 from owncloud/files_external-export | Thomas Müller | 2016-01-18 | 3 | -20/+86 |
|\ \ \ \ \ | |||||
| * | | | | | Add files_external:export command | Robin Appelman | 2016-01-18 | 3 | -20/+86 |
| |/ / / / | |||||
* | | | | | Merge pull request #21757 from owncloud/files-external-applicable-db-fix | Thomas Müller | 2016-01-18 | 2 | -2/+20 |
|\ \ \ \ \ | |||||
| * | | | | | Correctly remove global applicable | Robin McCorkell | 2016-01-15 | 2 | -2/+20 |
* | | | | | | Merge pull request #21754 from owncloud/ocs_share_api_add_share_owner | Thomas Müller | 2016-01-18 | 2 | -11/+21 |
|\ \ \ \ \ \ | |||||
| * | | | | | | [Share 2.0] Add share owner information to OCS Share API | Roeland Jago Douma | 2016-01-15 | 2 | -11/+21 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #21519 from owncloud/propagate-folder-size | Thomas Müller | 2016-01-18 | 7 | -11/+54 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| * | | | | | handle noopscanner in shared scanner | Robin Appelman | 2016-01-15 | 2 | -2/+29 |
| * | | | | | propagate folder size in the same query for write updates | Robin Appelman | 2016-01-15 | 5 | -9/+25 |
| |/ / / / | |||||
* | | | | | Merge pull request #21732 from owncloud/gdrive-stream-download | Thomas Müller | 2016-01-18 | 1 | -6/+16 |
|\ \ \ \ \ | |||||
| * | | | | | Use Guzzle stream to download files from GDrive | Vincent Petry | 2016-01-14 | 1 | -6/+16 |
* | | | | | | Merge pull request #21769 from owncloud/sort-mimetype-list-before-saving | Roeland Douma | 2016-01-18 | 2 | -13/+15 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | |||||
| * | | | | | Run the command once again | Joas Schilling | 2016-01-18 | 1 | -13/+13 |
| * | | | | | Sort the list before saving | Joas Schilling | 2016-01-18 | 1 | -0/+2 |
|/ / / / / | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-01-18 | 4 | -0/+44 |
* | | | | | Merge pull request #21759 from owncloud/symfony-console-2.8.1 | Thomas Müller | 2016-01-17 | 1 | -0/+0 |
|\ \ \ \ \ | |||||
| * | | | | | [3rdparty] Bump symfony/console to 2.8.1 | Roeland Jago Douma | 2016-01-17 | 1 | -0/+0 |
|/ / / / / | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-01-17 | 20 | -6/+260 |
* | | | | | Merge pull request #20882 from owncloud/backbone-webdav | Roeland Douma | 2016-01-16 | 5 | -0/+736 |
|\ \ \ \ \ | |||||
| * | | | | | Backbone transport for Webdav | Vincent Petry | 2016-01-16 | 5 | -0/+736 |
|/ / / / / | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-01-16 | 4 | -0/+36 |
* | | | | | Merge pull request #21753 from owncloud/add-question-about-code-signing-status | Thomas Müller | 2016-01-15 | 1 | -0/+8 |
|\ \ \ \ \ | |||||
| * | | | | | Add question about code signing status | Lukas Reschke | 2016-01-15 | 1 | -0/+8 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge pull request #21739 from owncloud/issue_21110 | Thomas Müller | 2016-01-15 | 1 | -25/+1 |
|\ \ \ \ \ | |||||
| * | | | | | Change icon only on WND and Sharepoint external storages | Jesús Macias | 2016-01-15 | 1 | -25/+1 |
| * | | | | | Fis bug issue 21110 | Jesús Macias | 2016-01-15 | 1 | -1/+1 |
* | | | | | | Merge pull request #21705 from owncloud/improve-background-job-message | Thomas Müller | 2016-01-15 | 4 | -6/+20 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| * | | | | | Add message key to context of logException | Thomas Müller | 2016-01-15 | 4 | -6/+15 |
| * | | | | | use logException() to properly log the exception | Morris Jobke | 2016-01-14 | 2 | -4/+9 |
| * | | | | | Improved error message for failing background job | Morris Jobke | 2016-01-14 | 2 | -2/+2 |