summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* fix error message and commentMorris Jobke2016-01-201-2/+2
* Added ' to characters allowed in the usernameMichael U2016-01-201-2/+2
* [tx-robot] updated from transifexJenkins for ownCloud2016-01-2026-30/+390
* Merge pull request #21785 from owncloud/cron-sync-system-addressbookThomas Müller2016-01-206-5/+102
|\
| * 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
|\ \
| * | 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 t...Joas Schilling2016-01-192-3/+16
| * | Make sure to list "group enabled" apps as enabledJoas Schilling2016-01-192-5/+17
|/ /
* | Merge pull request #21626 from owncloud/share-addressbooks-with-groups-2Thomas Müller2016-01-1932-113/+587
|\ \
| * | 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.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
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |