summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* Combine OCS API getUser method code into provisioning_api appRoeland Jago Douma2015-10-131-27/+10
* Merge pull request #19414 from owncloud/swift_primary_storage_testsThomas Müller2015-10-083-1/+9
|\
| * test objectstore with ceph dockerJörn Friedrich Dreyer2015-10-063-1/+9
* | Merge pull request #19611 from owncloud/fix-public-scrollThomas Müller2015-10-082-33/+38
|\ \
| * | 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
|\ \ \
| * | | 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 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 storagesVincent Petry2015-10-063-4/+94
| | |_|/ / | |/| | |
* | | | | Merge pull request #19511 from owncloud/etag-share-permissions-updateRobin Appelman2015-10-064-4/+28
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | 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 setVictor Dubiniuk2015-10-051-1/+1
| |/ /
* | | Merge pull request #19597 from owncloud/update-license-headersThomas Müller2015-10-06204-134/+274
|\ \ \
| * | | 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
|\ \ \
| * | | 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
|\
| * sharingcheckmiddleware now handles externalshares as wellRoeland Jago Douma2015-10-028-66/+195
| * Split files_sharing middelwareRoeland Jago Douma2015-10-022-29/+43
* | Merge pull request #19552 from owncloud/inline_fileactions_alttextThomas Müller2015-10-052-1/+58
|\ \
| * | If an inline files action provides an alt text show itRoeland Jago Douma2015-10-032-1/+58
* | | Merge pull request #19539 from owncloud/fix-multiselect-overlap-shorterThomas Müller2015-10-051-0/+4
|\ \ \
| * | | Fix filelist size issues, breadcrumb, multiselectVincent Petry2015-10-021-0/+4
| | |/ | |/|
* | | Merge pull request #19547 from owncloud/fix-16154Thomas Müller2015-10-051-4/+5
|\ \ \
| * | | LDAP Wizard: do not be picky about credentials when only looking for the portArthur Schiwon2015-10-031-4/+5
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-10-052-0/+10
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-10-0428-0/+172
| |_|/ |/| |
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-10-0338-26/+362
|/ /