summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
...
| * ensure multiselect always receives an array when setting its value, fixes #18734Arthur Schiwon2015-12-091-1/+5
| |
* | 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.
* | Add reshare permission checksVincent Petry2015-12-092-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 viewVincent Petry2015-12-091-3/+6
|/ | | | | The share permissions are now computed in the View/FileInfo instead of storing them directly/permanently on the storage
* 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"
* ILogger has no logException() - fixes #20797Thomas Müller2015-12-071-1/+1
|
* Merge pull request #20795 from owncloud/stable8.1-backport-20790Vincent Petry2015-12-043-26/+12
|\ | | | | [stable8.1] Deduplicate queued trashbin expire jobs
| * Deduplicate queued trashbin expire jobsMorris Jobke2015-11-273-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
* | Merge pull request #20489 from owncloud/backport-20487-8.1Vincent Petry2015-12-032-7/+23
|\ \ | |/ |/| [8.1] Activity oracle sql error for favorites
| * Add a unit test that executes the queryJoas Schilling2015-11-181-0/+13
| |
| * Oracle can not return statements but only valuesJoas Schilling2015-11-132-7/+10
| | | | | | | | So evaluate the condition directly and return 1 or 0
* | Dont output paths in scan.phpRobin Appelman2015-11-261-8/+0
|/
* Merge pull request #20395 from ↵Morris Jobke2015-11-091-0/+1
|\ | | | | | | | | owncloud/stable8.1-extstorage-gdrive-forceapproval [stable8.1] Force approval in GDrive oauth to get refresh_token
| * Force approval in GDrive oauth to get refresh_tokenVincent Petry2015-11-091-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.
* | integration testsArthur Schiwon2015-11-061-0/+118
| |
* | LDAP: attempt to connect to backup server again, if main server is not ↵Arthur Schiwon2015-11-061-20/+31
|/ | | | available. Fixes #18701
* Merge pull request #20246 from owncloud/backport-20192-stable8.1Vincent Petry2015-11-052-0/+12
|\ | | | | [backport] [stable8.1] 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 #20090Arthur Schiwon2015-11-022-0/+12
| | | | | | | | | | Conflicts: apps/user_ldap/lib/access.php
* | add port to host only, if an URL is used instead of a plain hostnameArthur Schiwon2015-11-041-3/+7
| |
* | fix possible infinite loop when reading groups in the wizardArthur Schiwon2015-10-293-1/+106
|/
* fixing typoThomas Müller2015-10-281-2/+1
|
* memberOf resembles a DN as well and is actively usedArthur Schiwon2015-10-282-1/+37
| | | | | Conflicts: apps/user_ldap/tests/access.php
* Merge pull request #19972 from owncloud/stable8.1-backport-19635Morris Jobke2015-10-2711-149/+644
|\ | | | | [stable8.1] allow an attribute to return more than one value
| * Adjust unit testsLukas Reschke2015-10-261-8/+3
| |
| * Fix styleLukas Reschke2015-10-261-1/+1
| |
| * Revert "adjust to nested group fixFrédéric Fortier2015-10-261-6/+1
| | | | | | | | This reverts commit 845485cfe, which fixes #19816 regression.
| * adjust fetchList with a single requested attribute accordinglyArthur Schiwon2015-10-221-1/+3
| |
| * adjust testsArthur Schiwon2015-10-222-4/+4
| |
| * fix primary group retrievalArthur Schiwon2015-10-221-1/+1
| |
| * treat dn as any other attribute when building the search() return arrayArthur Schiwon2015-10-223-5/+5
| |
| * adjust handling changed return array structure from search() and fetchList()Arthur Schiwon2015-10-224-13/+33
| |
| * allow an attribute to return more than one valueArthur Schiwon2015-10-222-29/+14
| |
| * lowercase configured displayname attribute so isset works - all attribute ↵Arthur Schiwon2015-10-222-5/+17
| | | | | | | | names coming from ldap are lowercased for easy comparison
| * fix update quota with known valueArthur Schiwon2015-10-222-3/+42
| |
| * stable8.1 related adjustments to #18469 backportArthur Schiwon2015-10-222-7/+33
| |
| * Backport #18469 (read all relevant user attributes on login and user search, ↵Arthur Schiwon2015-10-2210-93/+514
| | | | | | | | | | | | | | | | | | | | | | | | | | in one query) read all relevant user attributes on login and user search, in one query. saves us some. Conflicts: apps/user_ldap/user_ldap.php adjust to nested group fix do not throw exception when no attribute is specified
* | Merge pull request #19998 from ↵Thomas Müller2015-10-231-1/+7
|\ \ | | | | | | | | | | | | owncloud/backport-fix-deleted-ldap-user-sharing-stable8.1 [8.1] handle NoUserException in sharing code
| * | handle NoUserException in sharing codeMorris Jobke2015-10-231-1/+7
| |/ | | | | | | | | | | | | | | | | * setup LDAP users * share from an LDAP user * delete that LDAP user * log in as share recipient * before: unhandled NoUserException * after: NoUserEception is logged and share is not shown anymore
* / Fix "Call to a member function getUID() on boolean" in CryptJoas Schilling2015-10-231-4/+4
|/
* Allow public auth to recognize sesssionVincent Petry2015-10-161-1/+4
| | | | | | | When a public link password has been input, its auth is stored in the session. This fix makes it possible to recognize the session when using public webdav from the files UI.
* sharingcheckmiddleware now handles externalshares as wellRoeland Jago Douma2015-10-088-34/+279
| | | | | | | | | | | | | | | Added new annotations for the externalsharescontroller class * @NoOutgoingFederatedSharingRequired * @NoIncomingFederatedSharingRequired By default both are required for all functions in the externalSharesController. A proper exception is thrown and then a 405 is returned instead of the default error page. Since it is only an API endpoint this makes more sense. Unit tests added and updated
* Split files_sharing middelwareRoeland Jago Douma2015-10-082-29/+43
| | | | | | | | | | | Since for external shares there is no need for link shares to be enabled we should check which controller is actually being called. This makes sure that in all cases we verify that the files_sharing app is enabled. But only for the share controller (public shares) we check if the API is enabled and if links are enabled. TODO: add checks for federated sharing as well
* Only intercept exceptions of type "NotFoundException" instead of any ExceptionLukas Reschke2015-10-083-10/+76
| | | | | | The sharing backend may throw another exception for example when the activity app encounters a problem. Previously this just triggered a 404 error page and the exception got not logged at all. With this change such exceptions get not intercepted and regularly handled as exceptions so that we have meaningful log data. Also the user will be shown a window informing him that an error happened. Helps to debug cases such as https://github.com/owncloud/core/issues/19465
* Respect disabled sharing API settingsRoeland Jago Douma2015-10-082-3/+37
| | | | | | | | | If the sharing API setting is disabled that sharing check middle ware should block the request. Thus making link shares unavailable. Fixes #18970 * Unit test added * Unit tests updated
* Do not register JS share plugin if core sharing API is disabledVincent Petry2015-09-291-0/+4
|
* Merge pull request #18747 from owncloud/fix_password_reset_8.1Björn Schießle2015-09-223-11/+40
|\ | | | | [stable8.1] use login name for password reset
| * use login name for password resetBjoern Schiessle2015-09-013-11/+40
| |
* | Merge pull request #18123 from GreenArchon/backport-17759-stable8.1blizzz2015-09-212-7/+35
|\ \ | | | | | | [stable8.1]Properly nest groups when using memberOf to detect group membership, fixes #17759