summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | 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
| |/
* | Merge pull request #21199 from owncloud/fix_20296_8.1Björn Schießle2015-12-1510-8/+97
|\ \ | |/ |/| [stable8.1] don't allow to create a federated share if source and target are the same
| * Fixed JS unit tests for fed owner display nameVincent Petry2015-12-151-0/+4
| |
| * show display name but internally use the user nameBjörn Schießle2015-12-156-6/+12
| |
| * don't allow to create a federated share if source and target server are the sameBjörn Schießle2015-12-154-2/+81
|/
* Merge pull request #21151 from owncloud/backport-20978-stable8.1Morris Jobke2015-12-141-3/+5
|\ | | | | reset mailadress/displayname on blur (backport for stable8.1)
| * reset mailadress/displayname on blurmichag862015-12-111-3/+5
| |
* | Merge pull request #21193 from owncloud/preview-non-existing-81Lukas Reschke2015-12-141-7/+11
|\ \ | | | | | | [8.1] Handle non existing files in version previews
| * | Handle non existing files in version previewsRobin Appelman2015-12-141-7/+11
| |/
* | Merge pull request #21156 from owncloud/trashbin-loggedout-81Thomas Müller2015-12-142-2/+16
|\ \ | | | | | | [8.1] Fix trashbin wrapper when no user is loggedin
| * | skip test if we cant use the filesystem when not logged inRobin Appelman2015-12-111-2/+5
| | |
| * | Fix thrashbin wrapper when no user is loggedinRobin Appelman2015-12-112-2/+13
| |/
* / Use XMLWriter to generate responseLukas Reschke2015-12-141-17/+26
|/ | | | Gets rid of manual XML generation.
* Merge pull request #21091 from owncloud/backport-20995-stable8.1Vincent Petry2015-12-101-1/+5
|\ | | | | [backport] [stable8.1] ensure multiselect always receives an array when setting its value, f…
| * ensure multiselect always receives an array when setting its value, fixes #18734Arthur Schiwon2015-12-091-1/+5
| |
* | Merge pull request #21116 from owncloud/stable8.1-backport-21109Vincent Petry2015-12-102-37/+10
|\ \ | | | | | | [stable8.1] Deduplicate version expire jobs
| * | Deduplicate version expire jobsMorris Jobke2015-12-102-37/+10
|/ / | | | | | | | | | | * versionSize is calculated anyway in the expire job - > dropped * offset/neededSpace was needed for expiry before the file is moved to the versions -> now this is included already in the currently used space because the expiry job is defered to a point in time after the version creation * fixes #21108
* | Merge pull request #21102 from owncloud/stable8.1_20989Vincent Petry2015-12-101-0/+38
|\ \ | | | | | | [Stable8.1] Update parent when moving share into recieved share
| * | Update parent when moving share into recieved shareRoeland Jago Douma2015-12-101-0/+38
| |/ | | | | | | | | | | | | | | | | Fixes #20769 When I receive a share and move a share of myself into that share (which is allowed currently) I effectively hand over ownership of the files I move. So we need to update the share I move to have as a parent the share I move it into. Else our mounting system gets confused.
* | Merge pull request #21081 from ↵Morris Jobke2015-12-1010-29/+75
|\ \ | |/ |/| | | | | owncloud/stable8.1-share-computesharepermissions-notstore [stable8.1] Fix (re)share permission checks in a few code paths
| * Add explicit check for groups excluded from sharingVincent Petry2015-12-091-1/+1
| | | | | | | | | | Since isSharable() doesn't do the check for groups excluded from sharing, adding an explicit check in the sharing code.
| * Fix more unit tests to pass a mock storage instead of null to FileInfoVincent Petry2015-12-094-19/+53
| |
| * Add reshare permission checksVincent Petry2015-12-093-2/+9
| | | | | | | | | | | | | | Added in isSharable() in incoming remote share. Added in isSharable() in regular incoming share. Added in FileInfo to make sure the proper attributes are returned to the clients.
| * Compute share permissions in the viewVincent Petry2015-12-093-8/+13
| | | | | | | | | | The share permissions are now computed in the View/FileInfo instead of storing them directly/permanently on the storage
* | Merge pull request #21085 from ↵Vincent Petry2015-12-091-3/+5
|\ \ | |/ |/| | | | | owncloud/occ-shall-not-fail-hard-in-maintenance-mode-stable8.1 Don't load commands of apps when in maintenance mode
| * Don't load commands of apps when in maintenance mode - fixes #20939Thomas Müller2015-12-091-3/+5
|/
* Merge pull request #21042 from owncloud/backport-21037-stable8.1Morris Jobke2015-12-081-1/+1
|\ | | | | [backport][stable8.1] passing an empty base in this diagnosis call will not result in LDAP…
| * passing an empty base in this diagnosis call will not result in LDAP errorsArthur Schiwon2015-12-081-1/+1
|/ | | | Neither in "Invalid DN syntax" nor in "Object not found"
* Merge pull request #20999 from ↵Morris Jobke2015-12-072-4/+22
|\ | | | | | | | | owncloud/backport-20981-multiple-emails-for-sharelink-8.1 [8.1] Allow sending a share email to multiple users
| * Add a unit test for single user case as wellJoas Schilling2015-12-071-7/+9
| |
| * Allow sending a share email to multiple usersJoas Schilling2015-12-072-4/+20
| |
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-25 00:38:29 +0000