summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* testing app: fix app name capitalizationJan-Christoph Borchardt2016-01-211-1/+1
|
* testing app: add max versionJan-Christoph Borchardt2016-01-211-1/+1
|
* testing app: add logoJan-Christoph Borchardt2016-01-211-0/+4
|
* [tx-robot] updated from transifexJenkins for ownCloud2016-01-21134-222/+154
|
* Merge pull request #21782 from ↵Thomas Müller2016-01-2122-138/+207
|\ | | | | | | | | owncloud/update-system-addressbook-on-user-change-2 Introduce IUser::setEMailAddress and add hook mechanism
| * Use IUser::setEMailAddress in ldap as wellThomas Müller2016-01-2011-103/+132
| |
| * Emit OC\User::changeUser on change of display nameThomas Müller2016-01-201-1/+6
| |
| * React on OC_User::changeUser hook and update the user's vcardThomas Müller2016-01-201-0/+9
| |
| * Introduce IUser::setEMailAddress and add hook mechanismThomas Müller2016-01-2011-37/+63
| |
* | Merge pull request #21775 from owncloud/apcu-iterator-constructorThomas Müller2016-01-201-1/+1
|\ \ | | | | | | Fix constructor arguments for APCUIterator
| * | Fix constructor arguments for APCUIteratorRobin Appelman2016-01-181-1/+1
| | |
* | | Merge pull request #21805 from owncloud/app-dependency-spacingFrank Karlitschek2016-01-201-1/+0
|\ \ \ | |_|/ |/| | remove unneeded margin of app dependencies in app mgmt
| * | remove unneeded margin of app dependencies in app mgmtJan-Christoph Borchardt2016-01-201-1/+0
|/ /
* | Merge pull request #20804 from owncloud/fix-ldap-process-user-wo-displaynameThomas Müller2016-01-205-1/+141
|\ \ | | | | | | LDAP: do not attempt to process user records without display name, fi…
| * | LDAP: do not attempt to process user records without display name, fixes ↵Arthur Schiwon2016-01-115-1/+141
| | | | | | | | | | | | fatal error
* | | Merge pull request #21793 from owncloud/di_shareproviderfactoryThomas Müller2016-01-204-6/+28
|\ \ \ | | | | | | | | Properly DI the servercontainer into share provider factory
| * | | Properly DI the servercontainerRoeland Jago Douma2016-01-204-6/+28
| | | |
* | | | Merge pull request #21795 from owncloud/remove-unneeded-markupThomas Müller2016-01-202-10/+0
|\ \ \ \ | |/ / / |/| | | Remove unneeded markup for scan process - ref #20545
| * | | Remove unneeded markup for scan process - ref #20545Morris Jobke2016-01-202-10/+0
| | | |
* | | | [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
|\ \ \ \ | | | | | | | | | | 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