summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Merge pull request #22558 from owncloud/backport-22496-share-group-problem-8.1Roeland Douma2016-02-221-1/+1
|\ \ \ | |/ / |/| | [8.1] Fix on shared groups assignment.
| * | 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
|\ \ | | | | | | [stable8.1] Fix BMP support
| * | Fix BMP supportMorris Jobke2016-02-141-0/+1
| |/ | | | | | | * fixes #16461
* | Merge pull request #22363 from owncloud/backport-20152-stable8.1Roeland Douma2016-02-151-4/+4
|\ \ | |/ |/| [stable8.1] Remove invalid type-cast
| * Remove invalid type-castLukas Reschke2016-02-131-4/+4
|/ | | | | | This is an `is_array` operation and not a `in_array` one. Thus this typecast is not required. Fixes https://github.com/owncloud/core/issues/20095
* Merge pull request #22173 from owncloud/stable8.1-backport-22143Morris Jobke2016-02-061-1/+1
|\ | | | | [Stable 8.1] When a user is removed we should remove the right shares
| * When a user is removed we should remove the right sharesRoeland Jago Douma2016-02-051-1/+1
|/ | | | | | | | | | | | | | | * This means all the shares directly shared with them * Or all group shares having a special share with them This patch fixes the operator precedece (AND before OR). So before this patch: (share_with = <deleted user> AND share_type = 0) OR share_type=2 So it deleted all user specific shares Now: share_with = <deleted user> AND (share_type = 0 OR (share_type=2)
* Merge pull request #21864 from owncloud/sync-certificates-with-upstream-81Morris Jobke2016-01-251-119/+60
|\ | | | | [stable8.1] Sync certificates with upstream
| * 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
|\ | | | | [stable8.1] Handle return code of streamCopy in WebDAV put
| * Handle return code of streamCopy in WebDAV putMorris Jobke2016-01-151-1/+9
|/ | | | * throw a different exception if streamCopy failed
* Merge pull request #21694 from owncloud/stable8.1-users-scrolltopThomas Müller2016-01-151-1/+8
|\ | | | | [stable8.1] Keep scroll position in users page when sorting
| * Keep scroll position in users page when sortingVincent Petry2016-01-131-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 #21665 from owncloud/smb-statcache-cap-81Vincent Petry2016-01-134-2/+163
|\ | | | | [8.1] 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 #21632 from owncloud/backport-17924-stable8.1Morris Jobke2016-01-124-18/+178
|\ \ | | | | | | [backport] [stable8.1] always use an LDAP URL when connecting to LDAP
| * | 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
|\ \ | | | | | | [stable8.1] Check libsmbclient-php as well as smbclient binary
| * | 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
|\ \ | | | | | | [8.1] Skip unavailable storages in scanner
| * | also log exceptionRobin Appelman2016-01-071-0/+1
| | |
| * | Skip unavailable storages in scannerRobin Appelman2016-01-075-13/+35
|/ /
* | Merge pull request #21463 from owncloud/stable8.1-fix-callable-ajax-scanMorris Jobke2016-01-051-1/+3
|\ \ | | | | | | listen() requires a callable and not an array
| * | listen() requires a callable and not an arrayMorris Jobke2016-01-051-1/+3
|/ / | | | | | | | | * fixes #21350 * fixes regression introduced with #20764
* | Merge pull request #21296 from owncloud/stable8.1-prevent0bytedownloadsMorris Jobke2016-01-052-2/+23
|\ \ | | | | | | [stable8.1] prevent 0 byte downloads when storage returns false
| * | add unit testRobin Appelman2015-12-181-0/+18
| | |
| * | prevent 0 byte downloads when storage returns falseJörn Friedrich Dreyer2015-12-181-2/+5
| | |
* | | Merge pull request #21263 from owncloud/backport-21260-stable8.1Vincent Petry2015-12-241-3/+1
|\ \ \ | | | | | | | | [backport] [stable8.1] initialize l10n instance earlier, fixes an undefined var warning foll…
| * | | initialize l10n instance earlier, fixes an undefined var warning followed by ↵Arthur Schiwon2015-12-171-3/+1
| |/ / | | | | | | | | | a php error
* | | Merge pull request #21340 from owncloud/fix-unit-testsThomas Müller2015-12-231-3/+3
|\ \ \ | | | | | | | | [stable8.1] Fix unit tests
| * | | Fix unit testsLukas Reschke2015-12-221-3/+3
|/ / /
* | | Merge pull request #21235 from owncloud/stable8.1-backport-21232Morris Jobke2015-12-222-1/+42
|\ \ \ | | | | | | | | [stable8.1] Use name of ICollection for exception message
| * | | add unit test for #21230Morris Jobke2015-12-161-0/+41
| | | |
| * | | Use name of ICollection for exception messageMorris Jobke2015-12-161-1/+1
| |/ / | | | | | | | | | * fixes #21230
* | | Merge pull request #21275 from owncloud/stable81_20884Morris Jobke2015-12-221-1/+4
|\ \ \ | | | | | | | | [Stable 8.1] [Sharing] Respect disabled incoming federated shares
| * | | [Sharing] Respect disabled incoming federated sharesRoeland Jago Douma2015-12-181-1/+4
| |/ / | | | | | | | | | | | | | | | | | | Only fetch the incoming federated shares if incoming shares are actually enabled. Fixes #20713
* | | Merge pull request #21294 from owncloud/backport-21255-stable8.1Morris Jobke2015-12-221-1/+1
|\ \ \ | |_|/ |/| | user management: show password error temporary (backport for stable8.1)
| * | Update users.jsmichag862015-12-181-1/+1
| |/
* | 8.1.5v8.1.5C Montero-Luque2015-12-211-2/+2
| |
* | 8.1.5 RC2C Montero-Luque2015-12-181-2/+2
|/
* 8.1.5 RC1v8.1.5RC1C Montero-Luque2015-12-152-3/+3
|
* Merge pull request #21207 from owncloud/backport-21133-stable8.1Vincent Petry2015-12-154-9/+203
|\ | | | | [backport] [stable8.1] Fix shared files of deleted users, detect DN change when checking for existence on LDAP
| * fix find DN by UUID for ADArthur Schiwon2015-12-141-13/+56
| |
| * unit test on getHome in combination with OfflineUserArthur Schiwon2015-12-141-2/+52
| |
| * adjust unit testArthur Schiwon2015-12-141-0/+8
| |
| * look for DN changes before marking a user as deletedArthur Schiwon2015-12-143-3/+76
| |
| * throw NoUserException in getHome when the requested user does not exist anymoreArthur Schiwon2015-12-141-5/+25
| |
* | Merge pull request #21210 from ↵Vincent Petry2015-12-152-1/+9
|\ \ | | | | | | | | | | | | owncloud/stable8.1-handle-enforce-home-folder-rule-setting [stable8.1] Properly handle enforce home folder naming rule setting
| * | Properly handle enforce home folder naming rule settingMorris Jobke2015-12-152-1/+9
| |/