Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-01-10 | 10 | -28/+154 |
| | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-01-09 | 16 | -8/+160 |
| | |||||
* | Properly close db cursors | Roeland Jago Douma | 2016-01-08 | 1 | -1/+1 |
| | |||||
* | Make sure to respect deleted group shares by user | Roeland Jago Douma | 2016-01-08 | 1 | -0/+79 |
| | |||||
* | Make sure that permissions stay in sync for share_type 2 | Roeland Jago Douma | 2016-01-08 | 1 | -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üller | 2016-01-08 | 1 | -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 ACL | Tim Dettrick | 2016-01-08 | 1 | -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-char | Thomas Müller | 2016-01-08 | 2 | -2/+23 |
|\ \ | | | | | | | Remove unnecessary group name validation in provisioning_api | ||||
| * | | Update log message when error occurs during addGroup | Tom Needham | 2016-01-08 | 1 | -1/+1 |
| | | | |||||
| * | | Fix provisioning API unit test | Roeland Jago Douma | 2016-01-08 | 1 | -1/+1 |
| | | | |||||
| * | | Remove unnecessary group name validation | Tom Needham | 2016-01-08 | 2 | -1/+22 |
| |/ | |||||
* | | Merge pull request #21491 from owncloud/webdav_auth_no_basic_auth | Thomas Müller | 2016-01-08 | 2 | -4/+19 |
|\ \ | | | | | | | Also allow 'only cookie' auth to webdav | ||||
| * | | Allow only cookie auth to webdav | Roeland Jago Douma | 2016-01-07 | 2 | -4/+19 |
| | | | |||||
* | | | Merge pull request #21546 from owncloud/jsunit-stubportinpublicappspec | Thomas Müller | 2016-01-08 | 1 | -1/+3 |
|\ \ \ | | | | | | | | | Fix public page URL JS test | ||||
| * | | | Fix public page URL JS test | Vincent Petry | 2016-01-08 | 1 | -1/+3 |
| | | | | | | | | | | | | | | | | Stub the port so it doesn't use the one configured by karma | ||||
* | | | | Merge pull request #21553 from owncloud/gwdg-master | Thomas Müller | 2016-01-08 | 1 | -2/+19 |
|\ \ \ \ | | | | | | | | | | | Respect user enumeration | ||||
| * | | | | Respect user enumeration | Ralph Krimmel | 2016-01-08 | 1 | -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-userglobal | Thomas Müller | 2016-01-08 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | Fix checking external storage status as non admin user | ||||
| * | | | | | Fix checking external storage status as non admin user | Robin Appelman | 2016-01-08 | 1 | -1/+1 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge pull request #21468 from owncloud/getmount-id-filter | Thomas Müller | 2016-01-08 | 7 | -4/+102 |
|\ \ \ \ \ | | | | | | | | | | | | | Filter getStorage to make sure the user has access to it | ||||
| * | | | | | Filter getStorage to make sure the user has access to it | Robin Appelman | 2016-01-08 | 7 | -4/+102 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge pull request #21540 from owncloud/group-principals | Thomas Müller | 2016-01-08 | 8 | -33/+459 |
|\ \ \ \ \ | | | | | | | | | | | | | Adding group principals to new dav endpoint | ||||
| * | | | | | Adding unit tests for SystemPrincipalBackend | Thomas Müller | 2016-01-08 | 3 | -6/+133 |
| | | | | | | |||||
| * | | | | | Adding group principals to new dav endpoint | Thomas Müller | 2016-01-08 | 5 | -27/+326 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge pull request #21286 from ↵ | Thomas Müller | 2016-01-08 | 3 | -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 delivery | Thomas Müller | 2016-01-08 | 3 | -3/+204 |
| | | | | | |||||
* | | | | | Merge pull request #21215 from owncloud/files_external-db-set-mountpoint | Thomas Müller | 2016-01-08 | 7 | -2/+112 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | fix setting mountpoint and auth backend of external storages | ||||
| * | | | | correctly set applicables when updating user storage | Robin Appelman | 2016-01-08 | 1 | -0/+13 |
| | | | | | |||||
| * | | | | update tests | Robin Appelman | 2016-01-08 | 2 | -1/+5 |
| | | | | | |||||
| * | | | | improve setting applicable for personal mounts | Robin Appelman | 2016-01-08 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | fix setting mountpoint and auth backend of external storages | Robin Appelman | 2016-01-08 | 4 | -0/+93 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #21027 from owncloud/fix-undefined-behaviour | Thomas Müller | 2016-01-08 | 3 | -13/+69 |
|\ \ \ \ | | | | | | | | | | | Fix PHPDoc + Add handling for error cases | ||||
| * | | | | Remove undefined variable | Lukas Reschke | 2016-01-07 | 1 | -4/+0 |
| | | | | | |||||
| * | | | | Fix PHPDoc + Add handling for error cases | Lukas Reschke | 2016-01-07 | 3 | -9/+69 |
| | | | | | | | | | | | | | | | | | | | | Makes static code analyzers happier. | ||||
* | | | | | Merge pull request #17924 from owncloud/ldap-fix-appending-port | Thomas Müller | 2016-01-08 | 4 | -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 LDAPv3 | Arthur Schiwon | 2015-12-05 | 1 | -0/+3 |
| | | | | | |||||
| * | | | | always use an LDAP URL when connecting to LDAP | Arthur Schiwon | 2015-12-05 | 4 | -18/+178 |
| | | | | | |||||
* | | | | | Bump vobject version in carddav unittest | Roeland Jago Douma | 2016-01-08 | 1 | -7/+7 |
| |_|/ / |/| | | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-01-08 | 68 | -64/+12 |
| |/ / |/| | | |||||
* | | | Merge pull request #21498 from owncloud/cleanup-OC_DB | Thomas Müller | 2016-01-07 | 2 | -11/+0 |
|\ \ \ | | | | | | | | | Cleanup OC_DB methods | ||||
| * | | | Remove OC_DB::dropTable | Morris Jobke | 2016-01-07 | 2 | -11/+0 |
| | | | | |||||
* | | | | Merge pull request #21066 from ↵ | Thomas Müller | 2016-01-07 | 3 | -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 exec | Joas Schilling | 2015-12-11 | 3 | -0/+128 |
| | | | | | |||||
* | | | | | Merge pull request #21506 from ↵ | Thomas Müller | 2016-01-07 | 10 | -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 anymore | Joas Schilling | 2016-01-07 | 9 | -9/+0 |
| | | | | | | |||||
| * | | | | | Add ownCloud min and max version for shipped apps | Joas Schilling | 2016-01-07 | 10 | -12/+14 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge pull request #21481 from owncloud/ext-smb-dependencies | Thomas Müller | 2016-01-07 | 1 | -2/+4 |
|\ \ \ \ \ | | | | | | | | | | | | | Check libsmbclient-php as well as smbclient binary | ||||
| * | | | | | Check libsmbclient-php as well as smbclient binary | Robin McCorkell | 2016-01-07 | 1 | -2/+4 |
| |/ / / / | |||||
* | | | | | Merge pull request #21455 from owncloud/fix-method-signature | Thomas Müller | 2016-01-07 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | Fix method call + undefined variable | ||||
| * | | | | | Fix method call + undefined variable | Lukas Reschke | 2016-01-07 | 1 | -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 ``` |