| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | | | properly preserve home folder naming enforcement setting | Morris Jobke | 2015-12-15 | 2 | -2/+7 | |
| | | | | | ||||||
| * | | | | Merge pull request #21198 from owncloud/fix_20296_8.2 | Thomas Müller | 2015-12-15 | 10 | -8/+105 | |
| |\ \ \ \ | |/ / / |/| | | | [stable8.2] don't allow to create a federated share if source and target are the same | |||||
| | * | | | Fixed JS unit tests for fed owner display name | Vincent Petry | 2015-12-14 | 1 | -0/+4 | |
| | | | | | ||||||
| | * | | | show display name but internally use the user name | Björn Schießle | 2015-12-14 | 6 | -6/+11 | |
| | | | | | ||||||
| | * | | | don't allow to create a federated share if source and target server are the same | Björn Schießle | 2015-12-14 | 4 | -2/+90 | |
| |/ / / | ||||||
| * | | | Merge pull request #21152 from owncloud/backport-20978-stable8.2 | Morris Jobke | 2015-12-14 | 1 | -3/+5 | |
| |\ \ \ | | | | | | | | | reset mailadress/displayname on blur (backport for stable8.2) | |||||
| | * | | | reset mailadress/displayname on blur | michag86 | 2015-12-11 | 1 | -3/+5 | |
| | | | | | ||||||
| * | | | | Merge pull request #21194 from owncloud/preview-non-existing-82 | Lukas Reschke | 2015-12-14 | 1 | -7/+11 | |
| |\ \ \ \ | | | | | | | | | | | [8.2] Handle non existing files in version previews | |||||
| | * | | | | Handle non existing files in version previews | Robin Appelman | 2015-12-14 | 1 | -7/+11 | |
| |/ / / / | ||||||
| * | | | | Merge pull request #21182 from ↵ | Vincent Petry | 2015-12-14 | 2 | -27/+11 | |
| |\ \ \ \ | |_|/ / |/| | | | | | | | | | | | owncloud/stable8.2-share-allowdeleteinshareoverview [stable8.2] Bring back delete permission in share overview | |||||
| | * | | | Bring back delete permission in share overview | Vincent Petry | 2015-12-14 | 2 | -27/+11 | |
| |/ / / | ||||||
| * | | | Merge pull request #21157 from owncloud/trashbin-loggedout-82 | Thomas Müller | 2015-12-14 | 2 | -2/+16 | |
| |\ \ \ | | | | | | | | | [8.2] Fix trashbin wrapper when no user is loggedin | |||||
| | * | | | skip test if we cant use the filesystem when not logged in | Robin Appelman | 2015-12-11 | 1 | -2/+5 | |
| | | | | | ||||||
| | * | | | Fix thrashbin wrapper when no user is loggedin | Robin Appelman | 2015-12-11 | 2 | -2/+13 | |
| | |/ / | ||||||
| * | | | Use XMLWriter to generate response | Lukas Reschke | 2015-12-14 | 1 | -17/+26 | |
| | | | | | | | | | | | | | Gets rid of manual XML generation. | |||||
| * | | | Merge pull request #21154 from owncloud/stable8.2-files-deleteactiontext | Morris Jobke | 2015-12-11 | 3 | -5/+49 | |
| |\ \ \ | |/ / |/| | | [stable8.2] Stable8.2 files deleteactiontext | |||||
| | * | | Bring back file delete action text to be based on context | Vincent Petry | 2015-12-11 | 3 | -5/+49 | |
| |/ / | | | | | | | | | | | | | | | For received shares, the delete action becomes "Unshare" and for personal mounts it becomes "Disconnect storage". This also makes it possible from now on to pass a function to a file action's "displayName" attribute. | |||||
| * | | Merge pull request #21127 from owncloud/stable8.2-backport-21119 | Lukas Reschke | 2015-12-11 | 1 | -0/+7 | |
| |\ \ | | | | | | | [stable8.2] Make AppManager->checkAppForUser more robust | |||||
| | * | | Make AppManager->checkAppForUser more robust | Morris Jobke | 2015-12-10 | 1 | -0/+7 | |
| | | | | | | | | | | | | | | | | * if the JSON that is stored in the DB is corrupt an error was thrown * with this change it is properly handled and the app is disabled | |||||
| * | | | Merge pull request #21046 from ↵ | Thomas Müller | 2015-12-11 | 2 | -3/+34 | |
| |\ \ \ | | | | | | | | | | | | | | | | | owncloud/stable8.2-catchexceptionindirectdownloadurl [stable8.2] Catch exception when querying direct download link | |||||
| | * | | | Catch exception when querying direct download link | Vincent Petry | 2015-12-09 | 2 | -3/+34 | |
| | | |/ | |/| | ||||||
| * | | | Merge pull request #21115 from owncloud/stable8.2-backport-21109 | Roeland Douma | 2015-12-10 | 2 | -37/+10 | |
| |\ \ \ | | | | | | | | | [stable8.2] Deduplicate version expire jobs | |||||
| | * | | | Deduplicate version expire jobs | Morris Jobke | 2015-12-10 | 2 | -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 #21113 from owncloud/memcache-lock-ttl-82 | Morris Jobke | 2015-12-10 | 5 | -4/+55 | |
| |\ \ \ \ | | | | | | | | | | | [8.2] Add ttl for redis based locking | |||||
| | * | | | | ttl for memcache locking backends that support it | Robin Appelman | 2015-12-10 | 3 | -2/+11 | |
| | | | | | | ||||||
| | * | | | | Add interface for memcache backends that support setting ttl on exisiting keys | Robin Appelman | 2015-12-10 | 2 | -2/+44 | |
| | |/ / / | ||||||
| * | | | | Merge pull request #21124 from ↵ | Vincent Petry | 2015-12-10 | 1 | -7/+1 | |
| |\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | owncloud/remove-db-locking-performance-warning-stable8.2 Remove info about database locking performance | |||||
| | * | | | Remove info about database locking performance | Thomas Müller | 2015-12-10 | 1 | -7/+1 | |
| |/ / / | ||||||
| * | | | Merge pull request #21090 from owncloud/backport-20995-stable8.2 | Vincent Petry | 2015-12-10 | 1 | -1/+5 | |
| |\ \ \ | | | | | | | | | [backport] [stable8.2] ensure multiselect always receives an array when setting its value, f… | |||||
| | * | | | ensure multiselect always receives an array when setting its value, fixes #18734 | Arthur Schiwon | 2015-12-09 | 1 | -1/+5 | |
| | | | | | ||||||
| * | | | | Merge pull request #21101 from owncloud/stable8.2_20989 | Morris Jobke | 2015-12-10 | 1 | -0/+41 | |
| |\ \ \ \ | | | | | | | | | | | [Stable 8.2] Update parent when moving share into recieved share | |||||
| | * | | | | Update parent when moving share into recieved share | Roeland Jago Douma | 2015-12-10 | 1 | -0/+41 | |
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 #21112 from owncloud/db-lock-ttl-82 | Vincent Petry | 2015-12-10 | 2 | -10/+4 | |
| |\ \ \ \ | | | | | | | | | | | [8.2] Remove all locks after ttl from the db | |||||
| | * | | | | Remove all locks after ttl from the db | Robin Appelman | 2015-12-10 | 2 | -10/+4 | |
| | | |/ / | |/| | | ||||||
| * | | | | Merge pull request #21100 from owncloud/stable8.2_21005 | Vincent Petry | 2015-12-10 | 1 | -0/+5 | |
| |\ \ \ \ | |/ / / |/| | | | [Stable 8.2] The ajax code path unshares a link share when updating the password | |||||
| | * | | | The ajax code path unshares a link share when updating the password | Roeland Jago Douma | 2015-12-10 | 1 | -0/+5 | |
| | |/ / | | | | | | | | | | | | | In order to not mess up existing shares if the password gets verified we should first fire this validation. | |||||
| * | | | Merge pull request #21044 from owncloud/group-propagation-82 | Vincent Petry | 2015-12-10 | 8 | -116/+311 | |
| |\ \ \ | | | | | | | | | [8.2] Group share etag propagation | |||||
| | * | | | fix etag propagation with group reshares | Robin Appelman | 2015-12-09 | 4 | -13/+65 | |
| | | | | | ||||||
| | * | | | Add test case for group share propagation | Robin Appelman | 2015-12-09 | 4 | -103/+246 | |
| | | | | | ||||||
| * | | | | Merge pull request #21099 from owncloud/stable8.2_20949 | Roeland Douma | 2015-12-10 | 1 | -4/+2 | |
| |\ \ \ \ | | | | | | | | | | | [Stable 8.2] [Sharing] Properly check if a group already has access | |||||
| | * | | | | [Sharing] Properly check if a group already has access | Roeland Jago Douma | 2015-12-10 | 1 | -4/+2 | |
| | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | The old code check was to liberal resulting in wrong matches if a user with the same name as the group already had access. Fixes 20892 | |||||
| * | | | | Merge pull request #20985 from owncloud/fix-mysql-setup-unix-socket-stable8.2 | Thomas Müller | 2015-12-10 | 1 | -6/+19 | |
| |\ \ \ \ | | | | | | | | | | | Add unix_socket support for mysql during initial installation - fixes… | |||||
| | * | | | | Add unix_socket support for mysql during initial installation - fixes #20210 | Thomas Müller | 2015-12-07 | 1 | -6/+19 | |
| | | | | | | ||||||
| * | | | | | Merge pull request #21080 from ↵ | Roeland Douma | 2015-12-10 | 10 | -29/+76 | |
| |\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | owncloud/stable8.2-share-computesharepermissions-notstore [stable8.2] Fix (re)share permission checks in a few code paths | |||||
| | * | | | | Add explicit check for groups excluded from sharing | Vincent Petry | 2015-12-09 | 1 | -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 FileInfo | Vincent Petry | 2015-12-09 | 4 | -19/+54 | |
| | | | | | | ||||||
| | * | | | | Add reshare permission checks | Vincent Petry | 2015-12-09 | 3 | -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 view | Vincent Petry | 2015-12-09 | 3 | -8/+13 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | The share permissions are now computed in the View/FileInfo instead of storing them directly/permanently on the storage | |||||
| * | | | | | Merge pull request #21069 from owncloud/personal-mount-mountid-82 | Vincent Petry | 2015-12-09 | 2 | -4/+54 | |
| |\ \ \ \ \ | | | | | | | | | | | | | [8.2] Dont set the string storage id to the numeric storage id for personal mounts | |||||
| | * | | | | | Add tests | Robin Appelman | 2015-12-09 | 1 | -0/+50 | |
| | | | | | | | ||||||
 |
index : nextcloud-server.git | |
| Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server | www-data |
| summaryrefslogtreecommitdiffstats |