Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #21785 from owncloud/cron-sync-system-addressbook | Thomas Müller | 2016-01-20 | 6 | -5/+102 |
|\ | | | | | Add daily cron job to sync system address book | ||||
| * | Install cron job on install and update | Thomas Müller | 2016-01-19 | 3 | -4/+52 |
| | | |||||
| * | Add daily cron job to sync system address book | Thomas Müller | 2016-01-18 | 4 | -2/+51 |
| | | |||||
* | | Merge pull request #21724 from owncloud/fix-occ-app-management-for-group-apps | Thomas Müller | 2016-01-19 | 4 | -14/+70 |
|\ \ | | | | | | | Fix occ app management for group apps | ||||
| * | | Make it possible to enable apps for groups only via occ | Joas Schilling | 2016-01-19 | 2 | -6/+37 |
| | | | |||||
| * | | Make it possible to disable apps via the console, which are not enabled for ↵ | Joas Schilling | 2016-01-19 | 2 | -3/+16 |
| | | | | | | | | | | | | the current user | ||||
| * | | Make sure to list "group enabled" apps as enabled | Joas Schilling | 2016-01-19 | 2 | -5/+17 |
|/ / | | | | | | | also when they are not enabled for the current user | ||||
* | | Merge pull request #21626 from owncloud/share-addressbooks-with-groups-2 | Thomas Müller | 2016-01-19 | 32 | -113/+587 |
|\ \ | | | | | | | Show group shared addressbooks | ||||
| * | | 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 #21786 from owncloud/symfony-process | Thomas Müller | 2016-01-19 | 1 | -0/+0 |
|\ \ | | | | | | | [3rdparty] Bump symfony/process to 2.8.1 | ||||
| * | | [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-Fixes | Scrutinizer Auto-Fixer | 2016-01-15 | 7 | -5/+16 |
| | | | | | | | | | | | | | | | | This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com | ||||
* | | | | 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 | ||||
| * | | | | 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 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | properly use standard | ||||
| * | | | | 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 |
|/ / / / | | | | | | | | | | | | | * JEDEC standard - https://en.wikipedia.org/wiki/JEDEC_memory_standards#Unit_prefixes_for_semiconductor_storage_capacity | ||||
* | | | | 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 | ||||
| * | | | [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] Additional checks for share object creation | ||||
| * | | | | [Share 2.0] Share Object creation is a fragile thing | Roeland Jago Douma | 2016-01-18 | 2 | -13/+84 |
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | * We can't assume that the file still exists * We can't assume that the user/group still exists Basically we do not always nicely cleanup shares. | ||||
* | | | | Merge pull request #21700 from owncloud/update-system-addressbook-on-user-change | Thomas Müller | 2016-01-18 | 7 | -78/+248 |
|\ \ \ \ | |/ / / |/| | | | Updating system addressbook as soon as a user is added or removed | ||||
| * | | | 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 | ||||
| * | | | | [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 | ||||
| * | | | | | 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 | ||||
| * | | | | | 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 | ||||
| * | | | | | | [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 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | propagate folder size in the same query for write updates | ||||
| * | | | | | 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 |