summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2016-01-1010-28/+154
|
* [tx-robot] updated from transifexJenkins for ownCloud2016-01-0916-8/+160
|
* Properly close db cursorsRoeland Jago Douma2016-01-081-1/+1
|
* Make sure to respect deleted group shares by userRoeland Jago Douma2016-01-081-0/+79
|
* Make sure that permissions stay in sync for share_type 2Roeland Jago Douma2016-01-081-0/+135
| | | | | | | | | | When a file/folder is shared with a group and one of the group members moves this file/folder an extra entry is created in the share table. When the permission of the group share is updated we used to only sometimes update the shares for individual users. * Added intergration tests
* Merge pull request #21008 from ↵Thomas Müller2016-01-081-2/+19
|\ | | | | | | | | owncloud/UoM-ResPlat-DevOps-swift-acl-shared-containers Allowing access to Swift containers shared by ACL
| * Allowing access to Swift containers shared by ACLTim Dettrick2016-01-081-2/+19
| | | | | | | | | | To avoid a confusing extra field, the bucket field is overloaded to optionally take a URL.
* | Merge pull request #20961 from owncloud/provis-api-group-special-charThomas Müller2016-01-082-2/+23
|\ \ | | | | | | Remove unnecessary group name validation in provisioning_api
| * | Update log message when error occurs during addGroupTom Needham2016-01-081-1/+1
| | |
| * | Fix provisioning API unit testRoeland Jago Douma2016-01-081-1/+1
| | |
| * | Remove unnecessary group name validationTom Needham2016-01-082-1/+22
| |/
* | Merge pull request #21491 from owncloud/webdav_auth_no_basic_authThomas Müller2016-01-082-4/+19
|\ \ | | | | | | Also allow 'only cookie' auth to webdav
| * | Allow only cookie auth to webdavRoeland Jago Douma2016-01-072-4/+19
| | |
* | | Merge pull request #21546 from owncloud/jsunit-stubportinpublicappspecThomas Müller2016-01-081-1/+3
|\ \ \ | | | | | | | | Fix public page URL JS test
| * | | Fix public page URL JS testVincent Petry2016-01-081-1/+3
| | | | | | | | | | | | | | | | Stub the port so it doesn't use the one configured by karma
* | | | Merge pull request #21553 from owncloud/gwdg-masterThomas Müller2016-01-081-2/+19
|\ \ \ \ | | | | | | | | | | Respect user enumeration
| * | | | Respect user enumerationRalph Krimmel2016-01-081-2/+19
| | | | | | | | | | | | | | | | | | | | | | | | | Respect shareapi_allow_share_dialog_user_enumeration in user_ldap filter generation function to increase search performance in sharing dialog.
* | | | | Merge pull request #21467 from owncloud/external-status-check-userglobalThomas Müller2016-01-081-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Fix checking external storage status as non admin user
| * | | | | Fix checking external storage status as non admin userRobin Appelman2016-01-081-1/+1
| | |_|_|/ | |/| | |
* | | | | Merge pull request #21468 from owncloud/getmount-id-filterThomas Müller2016-01-087-4/+102
|\ \ \ \ \ | | | | | | | | | | | | Filter getStorage to make sure the user has access to it
| * | | | | Filter getStorage to make sure the user has access to itRobin Appelman2016-01-087-4/+102
| | |/ / / | |/| | |
* | | | | Merge pull request #21540 from owncloud/group-principalsThomas Müller2016-01-088-33/+459
|\ \ \ \ \ | | | | | | | | | | | | Adding group principals to new dav endpoint
| * | | | | Adding unit tests for SystemPrincipalBackendThomas Müller2016-01-083-6/+133
| | | | | |
| * | | | | Adding group principals to new dav endpointThomas Müller2016-01-085-27/+326
| | |/ / / | |/| | |
* | | | | Merge pull request #21286 from ↵Thomas Müller2016-01-083-3/+204
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | owncloud/use-owncloud-mail-when-sending-caldav-schedule-mails Adding IMip scheduling which uses ownClouds mail delivery
| * | | | Adding IMip scheduling which uses ownClouds mail deliveryThomas Müller2016-01-083-3/+204
| | | | |
* | | | | Merge pull request #21215 from owncloud/files_external-db-set-mountpointThomas Müller2016-01-087-2/+112
|\ \ \ \ \ | |_|_|/ / |/| | | | fix setting mountpoint and auth backend of external storages
| * | | | correctly set applicables when updating user storageRobin Appelman2016-01-081-0/+13
| | | | |
| * | | | update testsRobin Appelman2016-01-082-1/+5
| | | | |
| * | | | improve setting applicable for personal mountsRobin Appelman2016-01-081-1/+1
| | | | |
| * | | | fix setting mountpoint and auth backend of external storagesRobin Appelman2016-01-084-0/+93
| | |/ / | |/| |
* | | | Merge pull request #21027 from owncloud/fix-undefined-behaviourThomas Müller2016-01-083-13/+69
|\ \ \ \ | | | | | | | | | | Fix PHPDoc + Add handling for error cases
| * | | | Remove undefined variableLukas Reschke2016-01-071-4/+0
| | | | |
| * | | | Fix PHPDoc + Add handling for error casesLukas Reschke2016-01-073-9/+69
| | | | | | | | | | | | | | | | | | | | Makes static code analyzers happier.
* | | | | Merge pull request #17924 from owncloud/ldap-fix-appending-portThomas Müller2016-01-084-18/+181
|\ \ \ \ \ | |_|_|/ / |/| | | | ensure an LDAP URL is used, append the port to the host URL when necessary, and just in one place
| * | | | wizard should also detect protocol errors, as side effect enforces LDAPv3Arthur Schiwon2015-12-051-0/+3
| | | | |
| * | | | always use an LDAP URL when connecting to LDAPArthur Schiwon2015-12-054-18/+178
| | | | |
* | | | | Bump vobject version in carddav unittestRoeland Jago Douma2016-01-081-7/+7
| |_|/ / |/| | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2016-01-0868-64/+12
| |/ / |/| |
* | | Merge pull request #21498 from owncloud/cleanup-OC_DBThomas Müller2016-01-072-11/+0
|\ \ \ | | | | | | | | Cleanup OC_DB methods
| * | | Remove OC_DB::dropTableMorris Jobke2016-01-072-11/+0
| | | |
* | | | Merge pull request #21066 from ↵Thomas Müller2016-01-073-0/+128
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | owncloud/behat_capabilities_changing_server_configuration Added new capabilities test with changes in server configuration
| * | | | Add an OCS app for testing instead of using sudo and execJoas Schilling2015-12-113-0/+128
| | | | |
* | | | | Merge pull request #21506 from ↵Thomas Müller2016-01-0710-21/+14
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | owncloud/issue-20218-min-max-owncloud-version-warning Issue 20218 min max owncloud version warning
| * | | | | Remove deprecated shipped flag from info.xml which has no use anymoreJoas Schilling2016-01-079-9/+0
| | | | | |
| * | | | | Add ownCloud min and max version for shipped appsJoas Schilling2016-01-0710-12/+14
| | |_|_|/ | |/| | |
* | | | | Merge pull request #21481 from owncloud/ext-smb-dependenciesThomas Müller2016-01-071-2/+4
|\ \ \ \ \ | | | | | | | | | | | | Check libsmbclient-php as well as smbclient binary
| * | | | | Check libsmbclient-php as well as smbclient binaryRobin McCorkell2016-01-071-2/+4
| |/ / / /
* | | | | Merge pull request #21455 from owncloud/fix-method-signatureThomas Müller2016-01-071-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Fix method call + undefined variable
| * | | | | Fix method call + undefined variableLukas Reschke2016-01-071-1/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Variable is not defined 2. Method does not expect any parameters ``` Undefined variable: user at /Users/lukasreschke/Documents/Programming/master/apps/encryption/settings/settings-admin.php#45 ```