summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #20698 from owncloud/stable8.1-backport-19530Morris Jobke2015-11-252-1/+36
|\
| * Add a unit test for "share a file inside a folder that is already shared"Joas Schilling2015-11-241-0/+33
| * Make sure all variables are definedJoas Schilling2015-11-241-0/+2
| * Make sure the share we found is for the same itemJoas Schilling2015-11-241-1/+1
|/
* Merge pull request #20678 from owncloud/backport-joblist-fix-8.1Morris Jobke2015-11-231-11/+23
|\
| * Make the JobList test more robust by sorting the result of getAll before comp...Joas Schilling2015-11-231-11/+23
|/
* Merge pull request #20637 from owncloud/cache-escape-like-81Morris Jobke2015-11-204-1/+52
|\
| * escape like parameter in cache moveRobin Appelman2015-11-201-1/+2
| * Add test for special character during moveRobin Appelman2015-11-201-0/+48
| * define escape character for like statements on oracleRobin Appelman2015-11-201-0/+1
| * define escape character for like statements on sqliteRobin Appelman2015-11-201-0/+1
|/
* Merge pull request #20307 from owncloud/stable8.1-backport-use-actual-mimetyp...Morris Jobke2015-11-101-9/+9
|\
| * Use actual mimetype detection instead of extensionLukas Reschke2015-11-101-9/+9
* | Merge pull request #20395 from owncloud/stable8.1-extstorage-gdrive-forceappr...Morris Jobke2015-11-091-0/+1
|\ \
| * | Force approval in GDrive oauth to get refresh_tokenVincent Petry2015-11-091-0/+1
* | | Merge pull request #20367 from owncloud/stable8.1-backport-20346Morris Jobke2015-11-091-0/+8
|\ \ \
| * | | Show the language code in personal settings for unknown languagesMorris Jobke2015-11-061-0/+8
| |/ /
* | | Merge pull request #20362 from owncloud/backport-20271-stable8.1Morris Jobke2015-11-062-20/+149
|\ \ \ | |/ / |/| |
| * | integration testsArthur Schiwon2015-11-061-0/+118
| * | LDAP: attempt to connect to backup server again, if main server is not availa...Arthur Schiwon2015-11-061-20/+31
|/ /
* | Merge pull request #20246 from owncloud/backport-20192-stable8.1Vincent Petry2015-11-052-0/+12
|\ \
| * | if a user that is flag as deleted shows up again, remove that flag. Fixes #20090Arthur Schiwon2015-11-022-0/+12
* | | Merge pull request #20286 from owncloud/stable8.1-share-preventmovemountpoint...Vincent Petry2015-11-052-27/+141
|\ \ \ | |_|/ |/| |
| * | Prevent moving mount point into already shared folder (outgoing)Vincent Petry2015-11-042-27/+141
* | | Merge pull request #20298 from owncloud/backport-20155-8.1Morris Jobke2015-11-041-3/+7
|\ \ \ | |/ / |/| |
| * | add port to host only, if an URL is used instead of a plain hostnameArthur Schiwon2015-11-041-3/+7
|/ /
* | Merge pull request #20163 from owncloud/backport-19489Morris Jobke2015-11-033-1/+106
|\ \ | |/ |/|
| * fix possible infinite loop when reading groups in the wizardArthur Schiwon2015-10-293-1/+106
* | Merge pull request #19773 from owncloud/stable8.1-proppatch-lastmodifiedMorris Jobke2015-11-022-6/+6
|\ \
| * | Fix mtime PROPPATCH to be "lastmodified" instead of "getlastmodified"Vincent Petry2015-10-142-6/+6
* | | Merge pull request #20137 from owncloud/LukasReschke-patch-2Morris Jobke2015-11-021-118/+82
|\ \ \
| * | | [stable8.1] Update certificate bundleLukas Reschke2015-10-291-118/+82
| | |/ | |/|
* / | 8.1.4v8.1.4C Montero-Luque2015-10-301-2/+2
|/ /
* | 8.1.4 RC2v8.1.4RC2C Montero-Luque2015-10-281-2/+2
* | Merge pull request #19512 from owncloud/backport-19419-stable8.1Thomas Müller2015-10-282-1/+36
|\ \
| * | fixing typoThomas Müller2015-10-281-2/+1
| * | memberOf resembles a DN as well and is actively usedArthur Schiwon2015-10-282-1/+37
|/ /
* | Merge pull request #19972 from owncloud/stable8.1-backport-19635Morris Jobke2015-10-2711-149/+644
|\ \
| * | Adjust unit testsLukas Reschke2015-10-261-8/+3
| * | Fix styleLukas Reschke2015-10-261-1/+1
| * | Revert "adjust to nested group fixFrédéric Fortier2015-10-261-6/+1
| * | adjust fetchList with a single requested attribute accordinglyArthur Schiwon2015-10-221-1/+3
| * | adjust testsArthur Schiwon2015-10-222-4/+4
| * | fix primary group retrievalArthur Schiwon2015-10-221-1/+1
| * | treat dn as any other attribute when building the search() return arrayArthur Schiwon2015-10-223-5/+5
| * | adjust handling changed return array structure from search() and fetchList()Arthur Schiwon2015-10-224-13/+33
| * | allow an attribute to return more than one valueArthur Schiwon2015-10-222-29/+14
| * | lowercase configured displayname attribute so isset works - all attribute nam...Arthur Schiwon2015-10-222-5/+17
| * | fix update quota with known valueArthur Schiwon2015-10-222-3/+42
| * | stable8.1 related adjustments to #18469 backportArthur Schiwon2015-10-222-7/+33