summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #21785 from owncloud/cron-sync-system-addressbookThomas Müller2016-01-206-5/+102
|\ | | | | Add daily cron job to sync system address book
| * Install cron job on install and updateThomas Müller2016-01-193-4/+52
| |
| * Add daily cron job to sync system address bookThomas Müller2016-01-184-2/+51
| |
* | Merge pull request #21724 from owncloud/fix-occ-app-management-for-group-appsThomas Müller2016-01-194-14/+70
|\ \ | | | | | | Fix occ app management for group apps
| * | Make it possible to enable apps for groups only via occJoas Schilling2016-01-192-6/+37
| | |
| * | Make it possible to disable apps via the console, which are not enabled for ↵Joas Schilling2016-01-192-3/+16
| | | | | | | | | | | | the current user
| * | Make sure to list "group enabled" apps as enabledJoas Schilling2016-01-192-5/+17
|/ / | | | | | | also when they are not enabled for the current user
* | Merge pull request #21626 from owncloud/share-addressbooks-with-groups-2Thomas Müller2016-01-1932-113/+587
|\ \ | | | | | | Show group shared addressbooks
| * | Fix test for ensureSystemAddressBookExistsThomas Müller2016-01-182-5/+4
| | |
| * | Fix join condition for oracleThomas Müller2016-01-181-1/+1
| | |
| * | Adjust ctor callThomas Müller2016-01-181-1/+2
| | |
| * | Fix xml namespace in testThomas Müller2016-01-181-1/+1
| | |
| * | Readjust sharing methodsThomas Müller2016-01-182-26/+55
| | |
| * | Save access properlyThomas Müller2016-01-181-2/+5
| | |
| * | Fixing sharing unit testThomas Müller2016-01-181-6/+8
| | |
| * | Fix CalDAV test suiteThomas Müller2016-01-181-1/+1
| | |
| * | Test ownCloud CardDAV sharing using CalDAVTesterThomas Müller2016-01-1821-32/+464
| | |
| * | Call ctors properlyThomas Müller2016-01-181-1/+2
| | |
| * | Fix unit test - optimize codeThomas Müller2016-01-182-11/+11
| | |
| * | Show group shared addressbooksThomas Müller2016-01-186-34/+41
| |/
* | Merge pull request #21786 from owncloud/symfony-processThomas Müller2016-01-191-0/+0
|\ \ | | | | | | [3rdparty] Bump symfony/process to 2.8.1
| * | [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-Fixes
| * | | Scrutinizer Auto-FixesScrutinizer Auto-Fixer2016-01-157-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-encryptionThomas Müller2016-01-191-0/+3
|\ \ \ \ | | | | | | | | | | always allow autoloading encryption in unit test
| * | | | 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
|\ \ \ \ \ | |_|_|/ / |/| | | | properly use standard
| * | | | update JS humanFileSize to use KB instead of kBMorris Jobke2016-01-195-22/+22
| | | | |
| * | | | properly use standardMorris Jobke2016-01-192-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.1Thomas Müller2016-01-181-0/+0
|\ \ \ \ | |_|_|/ |/| | | [3rdparty] Bump symfony/routing to 2.8.1
| * | | [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] Additional checks for share object creation
| * | | | [Share 2.0] Share Object creation is a fragile thingRoeland Jago Douma2016-01-182-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-changeThomas Müller2016-01-187-78/+248
|\ \ \ \ | |/ / / |/| | | Updating system addressbook as soon as a user is added or removed
| * | | 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 again
| * | | | [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 command
| * | | | | 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 applicable
| * | | | | 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 API
| * | | | | | [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
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | propagate folder size in the same query for write updates
| * | | | | 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 GDrive