summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2016-01-0934-48/+466
|
* Merge pull request #19676 from owncloud/fix_15253Morris Jobke2016-01-082-46/+333
|\ | | | | Make sure that permissions stay in sync for share_type 2
| * Properly close db cursorsRoeland Jago Douma2016-01-082-4/+7
| |
| * Make sure to respect deleted group shares by userRoeland Jago Douma2016-01-082-1/+82
| |
| * Moved to the query builderRoeland Jago Douma2016-01-081-17/+56
| | | | | | | | Anything to keep Lukas happy
| * Make sure that permissions stay in sync for share_type 2Roeland Jago Douma2016-01-082-44/+208
|/ | | | | | | | | | 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 #21458 from owncloud/login-gradientThomas Müller2016-01-081-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | add back gradient for log in page in Firefox, fix accidental removal
| * | | | | | add back gradient for log in page in Firefox, fix accidental removalJan-Christoph Borchardt2016-01-051-0/+1
| | | | | | |
* | | | | | | 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 #21548 from ↵Thomas Müller2016-01-083-3/+10
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | owncloud/issue-21511-correctly-display-notify-option-for-shares Check the correct config for displaying the "notify by email" option
| * | | | | | | | Check the correct config for displaying the "notify by email" optionJoas Schilling2016-01-083-3/+10
| | |/ / / / / / | |/| | | | | |
* | | | | | | | 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 #21447 from owncloud/leave-disabled-apps-offThomas Müller2016-01-081-2/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Only enable apps that are not intentionally disabled
| * | | | | | | | Only enable apps that are not intentionally disabledJoas Schilling2016-01-041-2/+3
| | | | | | | | |
* | | | | | | | | Merge pull request #21494 from owncloud/underscores-in-class-namesThomas Müller2016-01-084-38/+41
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Remove underscores from class names - part 1
| * | | | | | | | | OC_TemplateLayout -> OC\TemplateLayoutMorris Jobke2016-01-072-32/+27
| | | | | | | | | |
| * | | | | | | | | OC_DB_MDB2SchemaManager -> OC\DB\MDB2SchemaManagerMorris Jobke2016-01-072-6/+14
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge pull request #21286 from ↵Thomas Müller2016-01-084-3/+214
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-084-3/+214
| | | | | | | | | |
* | | | | | | | | | Merge pull request #21538 from owncloud/remove-csp-stuffThomas Müller2016-01-081-7/+0
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Remove CSP stuff from .htaccess
| * | | | | | | | | | Remove CSP stuff from .htaccessLukas Reschke2016-01-081-7/+0
| | |_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | :cry: Seems like Apache is inconsistent fun between versions. Let's remove it thus for now.
* | | | | | | | | | Merge pull request #21479 from owncloud/fix-broken-state-in-htaccess-testThomas Müller2016-01-081-4/+0
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | | Remove unneeded check if htaccess test file already exists
| * | | | | | | | | Remove unneeded check if htaccess test file already existsMorris Jobke2016-01-061-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * fixes #20199
* | | | | | | | | | 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 #21292 from owncloud/checkAppEnabled-not-needed-anymoreThomas Müller2016-01-082-15/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | core will handle invalid URLs and redirects properly
| * | | | | | | | | | core will handle invalid URLs and redirects properlyMorris Jobke2015-12-182-15/+1
| | | | | | | | | | |
* | | | | | | | | | | Merge pull request #21536 from owncloud/avatar_verify_posted_pathThomas Müller2016-01-083-1/+21
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | Verify the path is a file on avatar update
| * | | | | | | | | | fix warning box size for avatar changeMorris Jobke2016-01-081-1/+1
| | | | | | | | | | |
| * | | | | | | | | | Verify the path is a file on avatar updateRoeland Jago Douma2016-01-082-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #21533 Before we just assumed that the passed path was a file. This does not have to be the case. Thus check if it actually is a file before doing any more tests.
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-28 17:03:40 +0000