summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | Merge pull request #23267 from owncloud/fix_22907_8.1Morris Jobke2016-03-162-2/+42
|\ \ | |/ |/|
| * allow group shares, even if not all public keys are availableBjoern Schiessle2016-03-152-2/+42
|/
* Merge pull request #22946 from owncloud/backport-22800-stable8.1Thomas Müller2016-03-141-0/+3
|\
| * don't hide server not available exception, fixes #20536Arthur Schiwon2016-03-081-0/+3
* | Merge pull request #23149 from owncloud/stable8.1-fix-broken-interfaceVincent Petry2016-03-141-1/+1
|\ \
| * | Fix broken scanner call in ajax/scan.phpMorris Jobke2016-03-111-1/+1
|/ /
* | Merge pull request #22843 from owncloud/stable81_22830Morris Jobke2016-03-092-3/+3
|\ \
| * | Rename and move permissions are set when a file is updatableRoeland Jago Douma2016-03-042-3/+3
* | | 8.1.6v8.1.6C Montero-Luque2016-03-081-2/+2
| |/ |/|
* | 8.1.6 RC2v8.1.6RC2C Montero-Luque2016-03-041-2/+2
* | Merge pull request #22863 from owncloud/stable8.1-trashbin-checkpathC. Montero Luque2016-03-041-1/+1
|\ \ | |/ |/|
| * Properly check path validity before deleting to trashVincent Petry2016-03-041-1/+1
|/
* 8.1.6 RC1v8.1.6RC1C Montero-Luque2016-03-012-3/+3
* Merge pull request #22409 from owncloud/stable8.1-gdrive-reindexarraytoduetod...Thomas Müller2016-03-011-0/+2
|\
| * Reindex array in GDrive after removing duplicatesVincent Petry2016-02-151-0/+2
* | Merge pull request #22617 from owncloud/backport-22358-stable8.1Morris Jobke2016-03-014-5/+32
|\ \
| * | Fix race condition when switching filter mode. Fixes #22278Arthur Schiwon2016-02-244-5/+32
* | | Merge pull request #22630 from owncloud/stable8.1-fedshare-testremote-after-404Roeland Douma2016-02-291-0/+3
|\ \ \
| * | | Properly trigger testRemote after getting a 404 from remote fed shareVincent Petry2016-02-241-0/+3
| |/ /
* | | Merge pull request #22634 from owncloud/stable8.1-backport-22565Vincent Petry2016-02-251-0/+4
|\ \ \
| * | | Avoids scanning the root storageMorris Jobke2016-02-241-0/+4
| |/ /
* | | Merge pull request #22632 from owncloud/stable8.1-backport-18762Morris Jobke2016-02-252-4/+4
|\ \ \
| * | | [user_ldap] properly decode cached objectsMorris Jobke2016-02-241-1/+1
| * | | Use "json_encode" and "json_decode" instead of unserializeLukas Reschke2016-02-242-4/+4
| |/ /
* | | Merge pull request #22627 from owncloud/fix_broken_unencrypted_size_8.1Björn Schießle2016-02-252-4/+286
|\ \ \ | |/ / |/| |
| * | recalculate unencrypted size if we assume that the size stored in the db is n...Bjoern Schiessle2016-02-252-4/+286
|/ /
* | Merge pull request #22572 from owncloud/stable8.1-backport-21544Morris Jobke2016-02-241-0/+3
|\ \
| * | set etag and permission fields for trashbin entriesRobin Appelman2016-02-221-0/+3
* | | Merge pull request #22558 from owncloud/backport-22496-share-group-problem-8.1Roeland Douma2016-02-221-1/+1
|\ \ \ | |/ / |/| |
| * | Fix on shared groups assignment.Leonardo Diez2016-02-221-1/+1
|/ /
* | Merge pull request #22373 from owncloud/stable8.1-backport-22369Morris Jobke2016-02-161-0/+1
|\ \
| * | Fix BMP supportMorris Jobke2016-02-141-0/+1
| |/
* | Merge pull request #22363 from owncloud/backport-20152-stable8.1Roeland Douma2016-02-151-4/+4
|\ \ | |/ |/|
| * Remove invalid type-castLukas Reschke2016-02-131-4/+4
|/
* Merge pull request #22173 from owncloud/stable8.1-backport-22143Morris Jobke2016-02-061-1/+1
|\
| * When a user is removed we should remove the right sharesRoeland Jago Douma2016-02-051-1/+1
|/
* Merge pull request #21864 from owncloud/sync-certificates-with-upstream-81Morris Jobke2016-01-251-119/+60
|\
| * Sync certificates with upstreamLukas Reschke2016-01-221-119/+60
|/
* Merge pull request #21748 from owncloud/stable8.1-backport-20927Thomas Müller2016-01-181-1/+9
|\
| * Handle return code of streamCopy in WebDAV putMorris Jobke2016-01-151-1/+9
|/
* Merge pull request #21694 from owncloud/stable8.1-users-scrolltopThomas Müller2016-01-151-1/+8
|\
| * Keep scroll position in users page when sortingVincent Petry2016-01-131-1/+8
|/
* Merge pull request #21665 from owncloud/smb-statcache-cap-81Vincent Petry2016-01-134-2/+163
|\
| * cap the number of entries we cache in smb's statcacheRobin Appelman2016-01-124-2/+163
* | Merge pull request #21632 from owncloud/backport-17924-stable8.1Morris Jobke2016-01-124-18/+178
|\ \
| * | always use an LDAP URL when connecting to LDAPArthur Schiwon2016-01-114-18/+178
|/ /
* | Merge pull request #21564 from owncloud/ext-smb-dep-stable8.1Morris Jobke2016-01-111-2/+4
|\ \
| * | Check libsmbclient-php as well as smbclient binaryRobin McCorkell2016-01-091-2/+4
|/ /
* | Merge pull request #21314 from owncloud/scanner-skip-not-available-81Vincent Petry2016-01-085-13/+36
|\ \
| * | also log exceptionRobin Appelman2016-01-071-0/+1