Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | Merge pull request #22558 from owncloud/backport-22496-share-group-problem-8.1 | Roeland Douma | 2016-02-22 | 1 | -1/+1 | |
|\ \ \ | |/ / |/| | | [8.1] Fix on shared groups assignment. | |||||
| * | | Fix on shared groups assignment. | Leonardo Diez | 2016-02-22 | 1 | -1/+1 | |
|/ / | ||||||
* | | Merge pull request #22373 from owncloud/stable8.1-backport-22369 | Morris Jobke | 2016-02-16 | 1 | -0/+1 | |
|\ \ | | | | | | | [stable8.1] Fix BMP support | |||||
| * | | Fix BMP support | Morris Jobke | 2016-02-14 | 1 | -0/+1 | |
| |/ | | | | | | | * fixes #16461 | |||||
* | | Merge pull request #22363 from owncloud/backport-20152-stable8.1 | Roeland Douma | 2016-02-15 | 1 | -4/+4 | |
|\ \ | |/ |/| | [stable8.1] Remove invalid type-cast | |||||
| * | Remove invalid type-cast | Lukas Reschke | 2016-02-13 | 1 | -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-22143 | Morris Jobke | 2016-02-06 | 1 | -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 shares | Roeland Jago Douma | 2016-02-05 | 1 | -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-81 | Morris Jobke | 2016-01-25 | 1 | -119/+60 | |
|\ | | | | | [stable8.1] Sync certificates with upstream | |||||
| * | Sync certificates with upstream | Lukas Reschke | 2016-01-22 | 1 | -119/+60 | |
|/ | ||||||
* | Merge pull request #21748 from owncloud/stable8.1-backport-20927 | Thomas Müller | 2016-01-18 | 1 | -1/+9 | |
|\ | | | | | [stable8.1] Handle return code of streamCopy in WebDAV put | |||||
| * | Handle return code of streamCopy in WebDAV put | Morris Jobke | 2016-01-15 | 1 | -1/+9 | |
|/ | | | | * throw a different exception if streamCopy failed | |||||
* | Merge pull request #21694 from owncloud/stable8.1-users-scrolltop | Thomas Müller | 2016-01-15 | 1 | -1/+8 | |
|\ | | | | | [stable8.1] Keep scroll position in users page when sorting | |||||
| * | Keep scroll position in users page when sorting | Vincent Petry | 2016-01-13 | 1 | -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-81 | Vincent Petry | 2016-01-13 | 4 | -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 statcache | Robin Appelman | 2016-01-12 | 4 | -2/+163 | |
| | | ||||||
* | | Merge pull request #21632 from owncloud/backport-17924-stable8.1 | Morris Jobke | 2016-01-12 | 4 | -18/+178 | |
|\ \ | | | | | | | [backport] [stable8.1] always use an LDAP URL when connecting to LDAP | |||||
| * | | always use an LDAP URL when connecting to LDAP | Arthur Schiwon | 2016-01-11 | 4 | -18/+178 | |
|/ / | ||||||
* | | Merge pull request #21564 from owncloud/ext-smb-dep-stable8.1 | Morris Jobke | 2016-01-11 | 1 | -2/+4 | |
|\ \ | | | | | | | [stable8.1] Check libsmbclient-php as well as smbclient binary | |||||
| * | | Check libsmbclient-php as well as smbclient binary | Robin McCorkell | 2016-01-09 | 1 | -2/+4 | |
|/ / | ||||||
* | | Merge pull request #21314 from owncloud/scanner-skip-not-available-81 | Vincent Petry | 2016-01-08 | 5 | -13/+36 | |
|\ \ | | | | | | | [8.1] Skip unavailable storages in scanner | |||||
| * | | also log exception | Robin Appelman | 2016-01-07 | 1 | -0/+1 | |
| | | | ||||||
| * | | Skip unavailable storages in scanner | Robin Appelman | 2016-01-07 | 5 | -13/+35 | |
|/ / | ||||||
* | | Merge pull request #21463 from owncloud/stable8.1-fix-callable-ajax-scan | Morris Jobke | 2016-01-05 | 1 | -1/+3 | |
|\ \ | | | | | | | listen() requires a callable and not an array | |||||
| * | | listen() requires a callable and not an array | Morris Jobke | 2016-01-05 | 1 | -1/+3 | |
|/ / | | | | | | | | | * fixes #21350 * fixes regression introduced with #20764 | |||||
* | | Merge pull request #21296 from owncloud/stable8.1-prevent0bytedownloads | Morris Jobke | 2016-01-05 | 2 | -2/+23 | |
|\ \ | | | | | | | [stable8.1] prevent 0 byte downloads when storage returns false | |||||
| * | | add unit test | Robin Appelman | 2015-12-18 | 1 | -0/+18 | |
| | | | ||||||
| * | | prevent 0 byte downloads when storage returns false | Jörn Friedrich Dreyer | 2015-12-18 | 1 | -2/+5 | |
| | | | ||||||
* | | | Merge pull request #21263 from owncloud/backport-21260-stable8.1 | Vincent Petry | 2015-12-24 | 1 | -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 Schiwon | 2015-12-17 | 1 | -3/+1 | |
| |/ / | | | | | | | | | | a php error | |||||
* | | | Merge pull request #21340 from owncloud/fix-unit-tests | Thomas Müller | 2015-12-23 | 1 | -3/+3 | |
|\ \ \ | | | | | | | | | [stable8.1] Fix unit tests | |||||
| * | | | Fix unit tests | Lukas Reschke | 2015-12-22 | 1 | -3/+3 | |
|/ / / | ||||||
* | | | Merge pull request #21235 from owncloud/stable8.1-backport-21232 | Morris Jobke | 2015-12-22 | 2 | -1/+42 | |
|\ \ \ | | | | | | | | | [stable8.1] Use name of ICollection for exception message | |||||
| * | | | add unit test for #21230 | Morris Jobke | 2015-12-16 | 1 | -0/+41 | |
| | | | | ||||||
| * | | | Use name of ICollection for exception message | Morris Jobke | 2015-12-16 | 1 | -1/+1 | |
| |/ / | | | | | | | | | | * fixes #21230 | |||||
* | | | Merge pull request #21275 from owncloud/stable81_20884 | Morris Jobke | 2015-12-22 | 1 | -1/+4 | |
|\ \ \ | | | | | | | | | [Stable 8.1] [Sharing] Respect disabled incoming federated shares | |||||
| * | | | [Sharing] Respect disabled incoming federated shares | Roeland Jago Douma | 2015-12-18 | 1 | -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.1 | Morris Jobke | 2015-12-22 | 1 | -1/+1 | |
|\ \ \ | |_|/ |/| | | user management: show password error temporary (backport for stable8.1) | |||||
| * | | Update users.js | michag86 | 2015-12-18 | 1 | -1/+1 | |
| |/ | ||||||
* | | 8.1.5v8.1.5 | C Montero-Luque | 2015-12-21 | 1 | -2/+2 | |
| | | ||||||
* | | 8.1.5 RC2 | C Montero-Luque | 2015-12-18 | 1 | -2/+2 | |
|/ | ||||||
* | 8.1.5 RC1v8.1.5RC1 | C Montero-Luque | 2015-12-15 | 2 | -3/+3 | |
| | ||||||
* | Merge pull request #21207 from owncloud/backport-21133-stable8.1 | Vincent Petry | 2015-12-15 | 4 | -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 AD | Arthur Schiwon | 2015-12-14 | 1 | -13/+56 | |
| | | ||||||
| * | unit test on getHome in combination with OfflineUser | Arthur Schiwon | 2015-12-14 | 1 | -2/+52 | |
| | | ||||||
| * | adjust unit test | Arthur Schiwon | 2015-12-14 | 1 | -0/+8 | |
| | | ||||||
| * | look for DN changes before marking a user as deleted | Arthur Schiwon | 2015-12-14 | 3 | -3/+76 | |
| | | ||||||
| * | throw NoUserException in getHome when the requested user does not exist anymore | Arthur Schiwon | 2015-12-14 | 1 | -5/+25 | |
| | | ||||||
* | | Merge pull request #21210 from ↵ | Vincent Petry | 2015-12-15 | 2 | -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 setting | Morris Jobke | 2015-12-15 | 2 | -1/+9 | |
| |/ |