Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | 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 | 1 | -0/+8 | |
|/ / | ||||||
* | | Handle non existing files in version previews | Robin Appelman | 2015-12-14 | 1 | -7/+11 | |
| | | ||||||
* | | 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 | |
| | | ||||||
* | | 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 #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 #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 #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 #21080 from ↵ | Roeland Douma | 2015-12-10 | 3 | -4/+14 | |
|\ \ \ | |_|/ |/| | | | | | | | | owncloud/stable8.2-share-computesharepermissions-notstore [stable8.2] Fix (re)share permission checks in a few code paths | |||||
| * | | Add reshare permission checks | Vincent Petry | 2015-12-09 | 2 | -1/+8 | |
| | | | | | | | | | | | | | | | | | | | | | 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 | 1 | -3/+6 | |
| | | | | | | | | | | | | | | | The share permissions are now computed in the View/FileInfo instead of storing them directly/permanently on the storage | |||||
* | | | Add tests | Robin Appelman | 2015-12-09 | 1 | -0/+50 | |
| | | | ||||||
* | | | Dont set the string storage id to the numeric storage id for personal mounts | Robin Appelman | 2015-12-09 | 1 | -4/+4 | |
|/ / | ||||||
* / | passing an empty base in this diagnosis call will not result in LDAP errors | Arthur Schiwon | 2015-12-08 | 1 | -1/+1 | |
|/ | | | | Neither in "Invalid DN syntax" nor in "Object not found" | |||||
* | Only return the exact match, when it's allowed | Joas Schilling | 2015-12-03 | 2 | -12/+41 | |
| | ||||||
* | update germand translation to fit into the UI | Morris Jobke | 2015-12-01 | 4 | -4/+4 | |
| | ||||||
* | Merge pull request #20488 from owncloud/backport-20487-8.2 | Thomas Müller | 2015-12-01 | 2 | -7/+23 | |
|\ | | | | | [8.2] Activity oracle sql error for favorites | |||||
| * | Add a unit test that executes the query | Joas Schilling | 2015-11-18 | 1 | -0/+13 | |
| | | ||||||
| * | Oracle can not return statements but only values | Joas Schilling | 2015-11-18 | 2 | -7/+10 | |
| | | | | | | | | So evaluate the condition directly and return 1 or 0 | |||||
* | | Fix the width of the share with input | Morris Jobke | 2015-11-30 | 1 | -1/+1 | |
| | | | | | | | | | | | | * the ID of this has changed to #shareWith-viewNUMBER and shouldn't be used in CSS * now uses the proper classes | |||||
* | | Deduplicate queued trashbin expire jobs | Morris Jobke | 2015-11-27 | 3 | -26/+12 | |
| | | | | | | | | | | | | | | | | * fixes #20425 * this removes the argument trashbin size from the expire job - it is now calculated in the expire job * the queue now detects properly that the job is already queue and doesn't add it again | |||||
* | | Dont output paths in scan.php | Robin Appelman | 2015-11-26 | 1 | -8/+0 | |
| | | ||||||
* | | Merge pull request #20535 from owncloud/stable8.2-fakelocking-for-mac | Vincent Petry | 2015-11-25 | 2 | -2/+4 | |
|\ \ | | | | | | | [stable8.2] Add fake locker plugin | |||||
| * | | [stable8.2] Add fake locker plugin | Lukas Reschke | 2015-11-16 | 2 | -2/+4 | |
| |/ | ||||||
* / | Use proper variable | Lukas Reschke | 2015-11-18 | 1 | -1/+1 | |
|/ | | | | `$shares` is not defined. Introduced with https://github.com/owncloud/core/commit/c3e7d324c5e61eb087fb2ea5102d332f9f08db3d and thus also in stable8.2 | |||||
* | Backport of #20093 and #20124 | Arthur Schiwon | 2015-11-10 | 5 | -9/+59 | |
| | | | | | | | | | | | #20093 LDAP fix quota and case #20124 remove uselessly used parameter, read all user attributes also when looking up users in groups fix update quota with known value fix attribute casing to ensure array keys work remove uselessly used parameter, read all user attributes also when looking up users in groups | |||||
* | make all the buttons beautiful | Arthur Schiwon | 2015-11-09 | 7 | -12/+26 | |
| | ||||||
* | Merge pull request #20361 from ↵ | Vincent Petry | 2015-11-09 | 1 | -0/+1 | |
|\ | | | | | | | | | owncloud/stable8.2-extstorage-gdrive-forceapproval [stable8.2] Force approval in GDrive oauth to get refresh_token | |||||
| * | Force approval in GDrive oauth to get refresh_token | Vincent Petry | 2015-11-06 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | Forcing the approval of app permissions makes sure that the GDrive API will always return a refresh_token. In the case of apps that were already authorized for the current user/domain, the API doesn't return the refresh_token which causes expiration issues. | |||||
* | | Merge pull request #20326 from owncloud/getfileinfo-locking82 | Vincent Petry | 2015-11-09 | 1 | -26/+26 | |
|\ \ | | | | | | | [8.2] Don't lock if we're only reading cache metadata | |||||
| * | | Split checkUpdate | Robin Appelman | 2015-11-05 | 1 | -26/+26 | |
| | | | ||||||
* | | | integration tests | Arthur Schiwon | 2015-11-06 | 1 | -0/+118 | |
| | | | ||||||
* | | | LDAP: attempt to connect to backup server again, if main server is not ↵ | Arthur Schiwon | 2015-11-06 | 1 | -20/+31 | |
| |/ |/| | | | | | available. Fixes #18701 | |||||
* | | Merge pull request #20338 from owncloud/l10n-8.2-backport | Morris Jobke | 2015-11-05 | 166 | -166/+490 | |
|\ \ | | | | | | | Backport translations for 8.2 | |||||
| * | | Backport translations for 8.2 | Joas Schilling | 2015-11-05 | 166 | -166/+490 | |
| | | | ||||||
* | | | Merge pull request #20245 from owncloud/backport-20192-stable8.2 | Vincent Petry | 2015-11-05 | 2 | -0/+12 | |
|\ \ \ | |/ / |/| | | [backport] [stable8.2] if a user that is flag as deleted shows up again, remove that flag. F… | |||||
| * | | if a user that is flag as deleted shows up again, remove that flag. Fixes #20090 | Arthur Schiwon | 2015-11-02 | 2 | -0/+12 | |
| | | | ||||||
* | | | [files_external] fix empty user mounts setting | Morris Jobke | 2015-11-05 | 1 | -0/+5 | |
| |/ |/| | | | | | | | * fixes #19858 * if no backend is allowed to be mounted also the user mount setting should be disabled | |||||
* | | add port to host only, if an URL is used instead of a plain hostname | Arthur Schiwon | 2015-11-04 | 1 | -3/+7 | |
| | | ||||||
* | | Merge pull request #20221 from owncloud/files-filter-triger-once-82 | Morris Jobke | 2015-11-04 | 1 | -2/+3 | |
|\ \ | | | | | | | [8.2] dont trigger the scroll event of every single item we filter in the file list | |||||
| * | | dont trigger the scroll event of every single item we filter in the file list | Robin Appelman | 2015-11-02 | 1 | -2/+3 | |
| |/ |