summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
...
* | | show display name but internally use the user nameBjörn Schießle2015-12-146-6/+11
| | |
* | | don't allow to create a federated share if source and target server are the sameBjörn Schießle2015-12-141-0/+8
|/ /
* | Handle non existing files in version previewsRobin Appelman2015-12-141-7/+11
| |
* | Bring back delete permission in share overviewVincent Petry2015-12-142-27/+11
|/
* Merge pull request #21157 from owncloud/trashbin-loggedout-82Thomas Müller2015-12-142-2/+16
|\ | | | | [8.2] 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
| |
* | Bring back file delete action text to be based on contextVincent Petry2015-12-113-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-21109Roeland Douma2015-12-102-37/+10
|\ | | | | [stable8.2] 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 #21090 from owncloud/backport-20995-stable8.2Vincent Petry2015-12-101-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 #18734Arthur Schiwon2015-12-091-1/+5
| | |
* | | Merge pull request #21101 from owncloud/stable8.2_20989Morris Jobke2015-12-101-0/+41
|\ \ \ | |_|/ |/| | [Stable 8.2] Update parent when moving share into recieved share
| * | Update parent when moving share into recieved shareRoeland Jago Douma2015-12-101-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-82Vincent Petry2015-12-108-116/+311
|\ \ | | | | | | [8.2] Group share etag propagation
| * | fix etag propagation with group resharesRobin Appelman2015-12-094-13/+65
| | |
| * | Add test case for group share propagationRobin Appelman2015-12-094-103/+246
| | |
* | | Merge pull request #21080 from ↵Roeland Douma2015-12-103-4/+14
|\ \ \ | |_|/ |/| | | | | | | | owncloud/stable8.2-share-computesharepermissions-notstore [stable8.2] Fix (re)share permission checks in a few code paths
| * | 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
* | | Add testsRobin Appelman2015-12-091-0/+50
| | |
* | | Dont set the string storage id to the numeric storage id for personal mountsRobin Appelman2015-12-091-4/+4
|/ /
* / 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"
* Only return the exact match, when it's allowedJoas Schilling2015-12-032-12/+41
|
* update germand translation to fit into the UIMorris Jobke2015-12-014-4/+4
|
* Merge pull request #20488 from owncloud/backport-20487-8.2Thomas Müller2015-12-012-7/+23
|\ | | | | [8.2] 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-182-7/+10
| | | | | | | | So evaluate the condition directly and return 1 or 0
* | Fix the width of the share with inputMorris Jobke2015-11-301-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 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
* | Dont output paths in scan.phpRobin Appelman2015-11-261-8/+0
| |
* | Merge pull request #20535 from owncloud/stable8.2-fakelocking-for-macVincent Petry2015-11-252-2/+4
|\ \ | | | | | | [stable8.2] Add fake locker plugin
| * | [stable8.2] Add fake locker pluginLukas Reschke2015-11-162-2/+4
| |/
* / Use proper variableLukas Reschke2015-11-181-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 #20124Arthur Schiwon2015-11-105-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 beautifulArthur Schiwon2015-11-097-12/+26
|
* Merge pull request #20361 from ↵Vincent Petry2015-11-091-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_tokenVincent Petry2015-11-061-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-locking82Vincent Petry2015-11-091-26/+26
|\ \ | | | | | | [8.2] Don't lock if we're only reading cache metadata
| * | Split checkUpdateRobin Appelman2015-11-051-26/+26
| | |
* | | 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 #20338 from owncloud/l10n-8.2-backportMorris Jobke2015-11-05166-166/+490
|\ \ | | | | | | Backport translations for 8.2
| * | Backport translations for 8.2Joas Schilling2015-11-05166-166/+490
| | |
* | | Merge pull request #20245 from owncloud/backport-20192-stable8.2Vincent Petry2015-11-052-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 #20090Arthur Schiwon2015-11-022-0/+12
| | |
* | | [files_external] fix empty user mounts settingMorris Jobke2015-11-051-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 hostnameArthur Schiwon2015-11-041-3/+7
| |
* | Merge pull request #20221 from owncloud/files-filter-triger-once-82Morris Jobke2015-11-041-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 listRobin Appelman2015-11-021-2/+3
| |/