Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #21626 from owncloud/share-addressbooks-with-groups-2 | Thomas Müller | 2016-01-19 | 32 | -113/+587 |
|\ | |||||
| * | Fix test for ensureSystemAddressBookExists | Thomas Müller | 2016-01-18 | 2 | -5/+4 |
| * | Fix join condition for oracle | Thomas Müller | 2016-01-18 | 1 | -1/+1 |
| * | Adjust ctor call | Thomas Müller | 2016-01-18 | 1 | -1/+2 |
| * | Fix xml namespace in test | Thomas Müller | 2016-01-18 | 1 | -1/+1 |
| * | Readjust sharing methods | Thomas Müller | 2016-01-18 | 2 | -26/+55 |
| * | Save access properly | Thomas Müller | 2016-01-18 | 1 | -2/+5 |
| * | Fixing sharing unit test | Thomas Müller | 2016-01-18 | 1 | -6/+8 |
| * | Fix CalDAV test suite | Thomas Müller | 2016-01-18 | 1 | -1/+1 |
| * | Test ownCloud CardDAV sharing using CalDAVTester | Thomas Müller | 2016-01-18 | 21 | -32/+464 |
| * | Call ctors properly | Thomas Müller | 2016-01-18 | 1 | -1/+2 |
| * | Fix unit test - optimize code | Thomas Müller | 2016-01-18 | 2 | -11/+11 |
| * | Show group shared addressbooks | Thomas Müller | 2016-01-18 | 6 | -34/+41 |
* | | Merge pull request #21744 from owncloud/scrutinizer-patch-1 | Thomas Müller | 2016-01-19 | 2 | -3/+2 |
|\ \ | |||||
| * | | Scrutinizer Auto-Fixes | Scrutinizer Auto-Fixer | 2016-01-15 | 2 | -3/+2 |
* | | | update JS humanFileSize to use KB instead of kB | Morris Jobke | 2016-01-19 | 3 | -15/+15 |
| |/ |/| | |||||
* | | 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 #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 | 3 | -5/+33 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | 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 | 1 | -3/+4 |
| |/ / | |||||
* | | | 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 |
| | |/ | |/| | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-01-17 | 4 | -4/+70 |
* | | | 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 #20927 from owncloud/handle-return-code-on-webdav-put | Thomas Müller | 2016-01-15 | 1 | -1/+9 |
|\ \ \ | |||||
| * | | | Handle return code of streamCopy in WebDAV put | Morris Jobke | 2016-01-11 | 1 | -1/+9 |
* | | | | Merge pull request #21117 from owncloud/owner-file-exists | Thomas Müller | 2016-01-15 | 3 | -44/+23 |
|\ \ \ \ | |||||
| * | | | | removed unused imports | Robin Appelman | 2016-01-11 | 1 | -3/+0 |
| * | | | | improve handling of non existing files in the trashbin | Robin Appelman | 2016-01-11 | 1 | -10/+15 |
| * | | | | handle not found in trash hook | Robin Appelman | 2016-01-11 | 1 | -1/+5 |
| * | | | | de-deplicate getUidAndFilename | Robin Appelman | 2016-01-11 | 3 | -32/+5 |
* | | | | | Merge pull request #21544 from owncloud/trashbin-permissions | Thomas Müller | 2016-01-15 | 1 | -0/+3 |
|\ \ \ \ \ | |||||
| * | | | | | set etag and permission fields for trashbin entries | Robin Appelman | 2016-01-08 | 1 | -0/+3 |
* | | | | | | Merge pull request #21723 from owncloud/prevent-group-enable-for-apps | Thomas Müller | 2016-01-15 | 1 | -3/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Add a new app type that can not be enabled for groups | Joas Schilling | 2016-01-14 | 1 | -3/+2 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Merge pull request #21735 from owncloud/files-external-checkbox-settings | Thomas Müller | 2016-01-15 | 2 | -5/+15 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Consolidate user mounting check code | Robin McCorkell | 2016-01-14 | 2 | -5/+15 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #20898 from owncloud/cache-interfaces | Thomas Müller | 2016-01-15 | 10 | -26/+39 |
|\ \ \ \ \ \ |