summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [Share 2.0] Let the factory do the factory stuffRoeland Jago Douma2016-01-136-315/+94
| | | | * Updated unit tests (bit cleaner now)
* [Share 2.0] Use full share id (providerId:shareId)Roeland Jago Douma2016-01-139-83/+186
| | | | | | | | | | | | Now that we support multiple managers we communicate shares to the outside as 'providerId:shareId'. This makes sures that id's are unique when references from the OCS API. However, since we do not want to break the OCS API v1 we need to somewhat hack around this. When we switch to OCS API v2 (which we should when we support more custom providers). We will change the id to always be the fullShareId.
* [Share 2.0] Add share provider factoryRoeland Jago Douma2016-01-139-359/+351
| | | | | | | * Add providers * Add share manager to server container * Use share manager from server container * Properly get the share manager
* [Share 2.0] Allow registering of share providersRoeland Jago Douma2016-01-134-39/+428
| | | | * Properly register the default share provider
* Merge pull request #20018 from owncloud/cache_group_backendThomas Müller2016-01-133-87/+213
|\ | | | | The group database backend should cache groups
| * Properly close cursorsRoeland Jago Douma2016-01-121-6/+13
| |
| * Cache if a group existsRoeland Jago Douma2016-01-121-0/+1
| |
| * Inject DBConnectionRoeland Jago Douma2016-01-123-82/+173
| | | | | | | | | | * Use query builder * Minor unit tests additions
| * The group database backend should cache groupsRoeland Jago Douma2016-01-121-12/+39
| | | | | | | | | | | | | | | | | | This avoids duplicated queries like first checking the group_users db and then just doing a select on the group db. Those enries are linked (and should be using foreign keys!) This commit makes sure we cache those entries. If a user is part of N groups this saves N queries on webdav access
* | Merge pull request #21599 from owncloud/ErikPel-masterThomas Müller2016-01-131-1/+7
|\ \ | | | | | | [CI] Fixed issue #21452
| * | Fixed issue #21452Erik Pellikka2016-01-131-1/+7
|/ / | | | | | | | | | | | | | | removed whitespace removed whitespace Changed it based on PVince81's suggestion
* | Merge pull request #21676 from owncloud/fix-setup-login-input-shadowsThomas Müller2016-01-131-2/+3
|\ \ | | | | | | fix login/setup page input shadows
| * | fix login/setup page input shadowsChristoph Wurst2016-01-131-2/+3
| | | | | | | | | | | | fixes #21658
* | | Merge pull request #21682 from owncloud/fix_synservicetest_mockThomas Müller2016-01-131-1/+1
|\ \ \ | | | | | | | | Fix mock call to download
| * | | Fix mock call to downloadRoeland Jago Douma2016-01-131-1/+1
|/ / / | | | | | | | | | We can only mock public and protected functions in phpunit.
* | | Merge pull request #21684 from owncloud/fix-missing-dispatcherThomas Müller2016-01-131-0/+1
|\ \ \ | | | | | | | | Add missing dispatcher
| * | | Add missing dispatcherThomas Müller2016-01-131-0/+1
|/ / /
* | | Merge pull request #21681 from owncloud/fix-unittestThomas Müller2016-01-131-0/+10
|\ \ \ | | | | | | | | Fix unit test
| * | | Fix unit testLukas Reschke2016-01-131-0/+10
|/ / / | | | | | | | | | No idea why they passed locally before as well on the branch on the PR. Scary...
* | | Merge pull request #21662 from owncloud/external-list-non-adminThomas Müller2016-01-131-0/+11
|\ \ \ | | | | | | | | Allow non admins to list their own mounts
| * | | Allow non admins to list their own mountsRobin Appelman2016-01-121-0/+11
| | | |
* | | | Merge pull request #21509 from owncloud/users-scrolltopThomas Müller2016-01-131-1/+8
|\ \ \ \ | | | | | | | | | | Keep scroll position in users page when sorting
| * | | | Keep scroll position in users page when sortingVincent Petry2016-01-071-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When sorting, some browsers like Chrome will lose the scroll position, possibly because the sorting code is touching the DOM elements. This fix saves the scroll position before sorting and sets it back afterwards.
* | | | | Merge pull request #21606 from owncloud/special_characters_testsThomas Müller2016-01-131-0/+19
|\ \ \ \ \ | | | | | | | | | | | | Added test with special chars in group
| * | | | | Added test case about deleting a group with special charactersSergio Bertolín2016-01-131-0/+8
| | | | | |
| * | | | | Added test with spcial chars in groupSergio Bertolín2016-01-131-0/+11
| | |_|/ / | |/| | |
* | | | | Merge pull request #21659 from ErikPel/cssfixThomas Müller2016-01-131-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Fixed #21542
| * | | | | Fixed #21542Erik Pellikka2016-01-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Changed to 5 pixel
* | | | | | Merge pull request #21655 from owncloud/remove-listener-pluginThomas Müller2016-01-136-82/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | Remove the listener dav plugin
| * | | | | | Remove the listener pluginJoas Schilling2016-01-136-82/+0
| | | | | | |
* | | | | | | Merge pull request #21392 from owncloud/files_external-importThomas Müller2016-01-134-0/+287
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Add import command for files external
| * | | | | | | Add import command for files externalRobin Appelman2016-01-114-0/+287
| | | | | | | |
* | | | | | | | Merge pull request #21591 from owncloud/add-code-checking-for-appsThomas Müller2016-01-137-15/+267
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Verify signature of apps with level "Official" coming from the appstore
| * | | | | | | | Verify signature of apps with level "Official" coming from the appstoreLukas Reschke2016-01-107-15/+267
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change will verify the signature of all apps with the level "Official" coming from the appstore or if they have been signed before.
* | | | | | | | | Merge pull request #21612 from owncloud/fix_21598Thomas Müller2016-01-132-16/+69
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | fix public link sharing if the master key is enabled
| * | | | | | | | | only use master key ID if a user is logged in. Otherwise keep the public ↵Björn Schießle2016-01-112-16/+69
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | link share key
* | | | | | | | | Merge pull request #21615 from owncloud/shared-islocalThomas Müller2016-01-131-0/+7
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | implement isLocal for shared storage
| * | | | | | | | | implement isLocal for shared storageRobin Appelman2016-01-111-0/+7
| |/ / / / / / / /
* | | | | | | | | Merge pull request #21620 from owncloud/fix-wrong-classname-in-phpdocThomas Müller2016-01-131-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | fix wrong class name in phpdoc
| * | | | | | | | | fix wrong class name in phpdocblizzz2016-01-111-1/+1
| | | | | | | | | |
* | | | | | | | | | Merge pull request #21630 from owncloud/add-some-security-headers-as-hardeningThomas Müller2016-01-134-12/+45
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Add X-Download-Options and X-Permitted-Cross-Domain-Policies
| * | | | | | | | | | Add X-Download-Options and X-Permitted-Cross-Domain-PoliciesLukas Reschke2016-01-124-12/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Two small security hardenings for our IE users and those with Adobe products. Aligns it more with https://github.com/twitter/secureheaders#secureheaders---
* | | | | | | | | | | Merge pull request #21648 from owncloud/smb-statcache-capThomas Müller2016-01-134-2/+163
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / |/| | | | | | | | | | cap the number of entries we cache in smb's statcache
| * | | | | | | | | | cap the number of entries we cache in smb's statcacheRobin Appelman2016-01-124-2/+163
| | | | | | | | | | |
* | | | | | | | | | | Merge pull request #21663 from owncloud/occ-external-mountpointThomas Müller2016-01-131-2/+10
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | allow setting mountpoint with occ files_external:config
| * | | | | | | | | | | allow setting mountpoint with occ files_external:configRobin Appelman2016-01-121-2/+10
| | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | |
* | | | | | | | | | | Merge pull request #21668 from ↵Thomas Müller2016-01-135-4/+248
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | owncloud/add-super-evil-and-hidden-config-switch-to-disable-integrity-checks-really-just-do-not-use-this Add hidden config switch to disable code integrity checking
| * | | | | | | | | | | Add hidden config switch to disable code integrity checkingLukas Reschke2016-01-125-4/+248
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds a hidden config flag that allows somebody to disable the code integrity check. If `integrity.check.disabled` is set to `true` in the config file: 1. The integrity check functions will return always an empty result 2. The integrity check is not performed when installing apps 3. The integrity check is not performed when updating apps 4. The integrity check is not performed when updating the core Furthermore this adds support for a list of channels that the code checker will run on. At the moment this is only stable because I didn't want to break any build scripts that we have. Once we have a proper CA setup and updated the build process to sign the releases we can add the RC, alpha, beta as well as daily releases. So everything except "git" basically.
* | | | | | | | | | | Merge pull request #21671 from owncloud/fix-setup-on-masterThomas Müller2016-01-131-1/+8
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Use legacy method when ownCloud is not yet installed
| * | | | | | | | | | | Use legacy method when ownCloud is not yet installedLukas Reschke2016-01-121-1/+8
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The new `\OCP\ICertificateManager::getAbsoluteBundlePath` API instantiiates an ownCloud view which makes the installation fail as it queries the DB before it actually is setup. This change uses the old approach again for the case that the installation is not yet setup. The client service is required for the `.htaccess` effectivity check in the setup. In the future we could move this to a JS based one (as we have for the other setupchecks) so we can get rid of such hacks. Fixes https://github.com/owncloud/core/issues/21669 which was a regression in master caused by https://github.com/owncloud/core/issues/21336
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-13 18:54:26 +0000