summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2015-10-1314-2/+58
|
* Revert "Debounce cancel upload message"Thomas Müller2015-10-121-5/+6
|
* Merge pull request #19628 from owncloud/files-canceluploaddebounceRobin Appelman2015-10-121-6/+5
|\ | | | | Debounce cancel upload message
| * Debounce cancel upload messageVincent Petry2015-10-071-6/+5
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2015-10-126-8/+8
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2015-10-114-22/+38
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2015-10-1010-6/+22
| |
* | Merge pull request #19643 from owncloud/public-download-spinnerThomas Müller2015-10-091-1/+15
|\ \ | | | | | | Set download cookie on public download
| * | Set download cookie on public downloadVincent Petry2015-10-081-1/+15
| |/
* | [tx-robot] updated from transifexJenkins for ownCloud2015-10-0910-0/+30
| |
* | Merge pull request #19414 from owncloud/swift_primary_storage_testsThomas Müller2015-10-083-1/+9
|\ \ | | | | | | Swift primary storage tests
| * | test objectstore with ceph dockerJörn Friedrich Dreyer2015-10-063-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | use default config for swift primary storage test config allow testsuite to complete fix timeout, script cleanup, enable debug for now use btrfs loopback device, requires privileged container and absolute path throw exception when storage has problems debug by echo ... sleep more, more debug
* | | Merge pull request #19611 from owncloud/fix-public-scrollThomas Müller2015-10-082-33/+38
|\ \ \ | | | | | | | | Fix scrollbars in public template
| * | | move footer to bottom of public pageHendrik Leppelsack2015-10-071-0/+2
| | | |
| * | | fix public empty messageHendrik Leppelsack2015-10-061-1/+0
| | | |
| * | | fix scrollbars in public templateHendrik Leppelsack2015-10-062-32/+36
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-10-0820-2/+122
| | | |
* | | | Merge pull request #19589 from owncloud/shares-external-mount-providerThomas Müller2015-10-076-55/+123
|\ \ \ \ | | | | | | | | | | Move the setup of external share mounts to a mountprovider
| * | | | Fix getEtag for roots of shared storagesRobin Appelman2015-10-061-3/+0
| | | | |
| * | | | sanitize mountpointRobin Appelman2015-10-051-1/+1
| | | | |
| * | | | fix testRobin Appelman2015-10-051-1/+6
| | | | |
| * | | | extract the mount provider from the managerRobin Appelman2015-10-053-24/+91
| | | | |
| * | | | register the external share mount providerRobin Appelman2015-10-051-0/+1
| | | | |
| * | | | Make the external share manager a mount providerRobin Appelman2015-10-053-46/+44
| | | | |
* | | | | Merge pull request #19489 from owncloud/fix-18297Thomas Müller2015-10-073-1/+106
|\ \ \ \ \ | |_|_|_|/ |/| | | | fix possible infinite loop when reading groups in the wizard
| * | | | fix possible infinite loop when reading groups in the wizardArthur Schiwon2015-10-053-1/+106
| | | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-10-0726-14/+384
| | | | |
* | | | | Merge pull request #19610 from owncloud/ext-deletestoragefromdatabaseThomas Müller2015-10-063-4/+94
|\ \ \ \ \ | | | | | | | | | | | | Remove oc_storages entries after removing ext storages
| * | | | | Remove oc_storages entries after removing ext storagesVincent Petry2015-10-063-4/+94
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When removing external storages, either system-wide or user-wide, automatically remove the matching oc_storages and oc_filecache entries. This can only work if the backend configuration doesn't contain any substitution variable $user in which case the storage id cannot be computed, so this case is ignored for now.
* | | | | Merge pull request #19511 from owncloud/etag-share-permissions-updateRobin Appelman2015-10-064-4/+28
|\ \ \ \ \ | |/ / / / |/| | | | Mark shares as dirty when changing permissions
| * | | | fix phpdocRobin Appelman2015-10-061-1/+1
| | | | |
| * | | | use microtimeRobin Appelman2015-10-061-1/+1
| | | | |
| * | | | clear hooks for testsRobin Appelman2015-10-061-0/+1
| | | | |
| * | | | Mark shares as dirty when changing permissionsRobin Appelman2015-10-063-3/+26
| | | | |
* | | | | Propagate shares etag when group membership changedVincent Petry2015-10-064-0/+336
| |_|_|/ |/| | |
* | | | Merge pull request #19595 from owncloud/fix-versions-log-entryThomas Müller2015-10-061-1/+1
|\ \ \ \ | |/ / / |/| | | Reset to auto if not set
| * | | Reset to auto if not setVictor Dubiniuk2015-10-051-1/+1
| |/ /
* | | Merge pull request #19597 from owncloud/update-license-headersThomas Müller2015-10-06204-134/+274
|\ \ \ | | | | | | | | update licence headers via script
| * | | deduplicate @xenopathicMorris Jobke2015-10-0685-85/+77
| | | |
| * | | update licence headers via scriptMorris Jobke2015-10-05168-96/+244
| |/ /
* | | Merge pull request #18484 from owncloud/fix-17964Thomas Müller2015-10-062-7/+152
|\ \ \ | | | | | | | | Remove whitespace from base-DNs
| * | | trim by default, add unit testsArthur Schiwon2015-10-052-16/+140
| | | |
| * | | Spaces -> Tabs, Update PHP-Doc and function logicLennart Rosam2015-10-051-12/+27
| | | |
| * | | Remove whitespace from base-DNsLennart Rosam2015-10-051-6/+12
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-10-0626-16/+164
| |/ / |/| |
* | | Fix tooltip placement on rename errorVincent Petry2015-10-051-2/+2
| |/ |/|
* | add some output to explain the pre-conditions for decrypt-allBjoern Schiessle2015-10-051-0/+6
|/
* Merge pull request #19487 from owncloud/split_share_middlewareThomas Müller2015-10-058-86/+229
|\ | | | | Split files_sharing middelware
| * sharingcheckmiddleware now handles externalshares as wellRoeland Jago Douma2015-10-028-66/+195
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added new annotations for the externalsharescontroller class * @NoOutgoingFederatedSharingRequired * @NoIncomingFederatedSharingRequired By default both are required for all functions in the externalSharesController. A proper exception is thrown and then a 405 is returned instead of the default error page. Since it is only an API endpoint this makes more sense. Unit tests added and updated
| * Split files_sharing middelwareRoeland Jago Douma2015-10-022-29/+43
| | | | | | | | | | | | | | | | | | | | | | Since for external shares there is no need for link shares to be enabled we should check which controller is actually being called. This makes sure that in all cases we verify that the files_sharing app is enabled. But only for the share controller (public shares) we check if the API is enabled and if links are enabled. TODO: add checks for federated sharing as well