summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* merge vendor jsRobin Appelman2017-09-181-0/+7
| | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* fix path styleRobin Appelman2017-09-181-3/+1
| | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* disable part files for s3 external storageRobin Appelman2017-09-181-0/+4
| | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* add stat cache for s3 external storageRobin Appelman2017-09-181-7/+56
| | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* more efficient is_dirRobin Appelman2017-09-181-0/+10
| | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* more efficient permissions for s3 external storageRobin Appelman2017-09-181-0/+8
| | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* more efficient write only fopenRobin Appelman2017-09-181-1/+9
| | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* reuse object read/write/delete logic in s3 implementationsRobin Appelman2017-09-183-84/+97
| | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* update aws sdk and move it to 3rdpartyRobin Appelman2017-09-184-58/+42
| | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* remove non composer aws sdkRobin Appelman2017-09-18613-58632/+0
| | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* Merge pull request #6490 from nextcloud/share_pagination_queryRoeland Jago Douma2017-09-181-0/+5
|\ | | | | Improve sharing pagination
| * Improve sharing paginationRoeland Jago Douma2017-09-151-0/+5
| | | | | | | | | | | | | | Basically we did in almost all cases did a query to much. This resulted in an extra query for each share type. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #6518 from nextcloud/allow-apps-to-control-versionsMorris Jobke2017-09-182-0/+93
|\ \ | | | | | | allow apps to disable versions for some files
| * | allow apps to disable versions for some filesBjoern Schiessle2017-09-152-0/+93
| | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | | Merge pull request #6549 from nextcloud/fix-6534Morris Jobke2017-09-181-1/+2
|\ \ \ | | | | | | | | don't pass User object when uid string is expected
| * | | don't pass User object when uid string is expectedArthur Schiwon2017-09-181-1/+2
| | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | | Merge pull request #5462 from nextcloud/add-frameancestor-supportLukas Reschke2017-09-184-0/+89
|\ \ \ \ | | | | | | | | | | Add CSP frame-ancestors support
| * | | | fix typo and set @since properlyThomas Citharel2017-09-152-6/+6
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr>
| * | | | Add CSP frame-ancestors supportThomas Citharel2017-09-154-0/+89
| | |/ / | |/| | | | | | | | | | | | | | | | | | Didn't set the @since annotation yet. Signed-off-by: Thomas Citharel <tcit@tcit.fr>
* | | | Merge pull request #5585 from nextcloud/contacts_menu_privacyMorris Jobke2017-09-184-27/+377
|\ \ \ \ | | | | | | | | | | Enhance privacy of contactsmenu fixes #5107
| * | | | Add filter for `shareapi_allow_share_dialog_user_enumeration`Lukas Reschke2017-09-153-47/+174
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adjusts the contacts menu to also support searching by email address which is relevant in scenarios where no UID is known such as LDAP, etc. Furthermore, if `shareapi_allow_share_dialog_user_enumeration` is disabled only results are shown that match the full user ID or email address. Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | | | Revert "Do not list system users in contacts menu if sharing autocompletion ↵Lukas Reschke2017-09-151-8/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is disabled" This reverts commit 56a9084dd2f9a5726a74e1e789773558fade8b44.
| * | | | Fix issue when disabling the shareapi_only_share_with_group_members option + ↵Tobia De Koninck2017-09-151-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix findOne Signed-off-by: Tobia De Koninck <tobia@ledfan.be>
| * | | | Improve code styleTobia De Koninck2017-09-151-5/+7
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Tobia De Koninck <tobia@ledfan.be>
| * | | | Some code improvementsTobia De Koninck2017-09-151-4/+5
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Tobia De Koninck <tobia@ledfan.be>
| * | | | Add testsTobia De Koninck2017-09-152-1/+130
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Tobia De Koninck <tobia@ledfan.be>
| * | | | Fix testsTobia De Koninck2017-09-152-3/+23
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Tobia De Koninck <tobia@ledfan.be>
| * | | | Privacy enhancements for contacts menuTobia De Koninck2017-09-151-4/+71
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | - Groups, which are excluded from sharing should not see local users at all - If sharing is restricted to users own groups, he should only see contacts from his groups: Signed-off-by: Tobia De Koninck <tobia@ledfan.be>
* | | | Merge pull request #6014 from nextcloud/add-copy-actionMorris Jobke2017-09-188-26/+368
|\ \ \ \ | | | | | | | | | | Allows files/folders to be copied.
| * | | | Add tests for FileListThomas Citharel2017-09-151-0/+98
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr>
| * | | | Don't show success notifications for failed copy actions and update folder sizesThomas Citharel2017-09-151-33/+59
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr>
| * | | | Change move copy order and debug leftoverThomas Citharel2017-09-153-4/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr>
| * | | | typoThomas Citharel2017-09-151-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr>
| * | | | [WIP] Added copy and move buttonsThomas Citharel2017-09-156-43/+119
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr>
| * | | | Allow files to be copied through action menu & multiple files actionsThomas Citharel2017-09-153-1/+144
| |/ / / | | | | | | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr>
* | | | Merge pull request #6537 from nextcloud/fix-2332-breadcrumb-refresh-current-dirMorris Jobke2017-09-181-1/+1
|\ \ \ \ | |_|/ / |/| | | Force refresh file list when clicking on breadcrumb even if target directory equals current directory.
| * | | Force refresh file list when clicking on breadcrumb even if target directory ↵Chon Kou2017-09-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | equals current directory. Signed-off-by: Chon Kou <k.kou@alumni.ubc.ca>
* | | | Merge pull request #6545 from nextcloud/provapi-fix-empty-gid-exceptionblizzz2017-09-182-1/+15
|\ \ \ \ | | | | | | | | | | throw 101 when an empty group string is provided
| * | | | throw 101 when an empty group string is providedArthur Schiwon2017-09-182-1/+15
|/ / / / | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* / / / [tx-robot] updated from transifexNextcloud bot2017-09-1816-114/+212
|/ / /
* | | [tx-robot] updated from transifexNextcloud bot2017-09-178-28/+322
| | |
* | | [tx-robot] updated from transifexNextcloud bot2017-09-1624-26/+350
| |/ |/|
* | Merge pull request #6488 from nextcloud/vendor-davclient.js-0.1.2Morris Jobke2017-09-153-8/+14
|\ \ | | | | | | vendor: Update davclient.js to 0.1.2
| * | vendor: Update davclient.js to 0.1.2Leon Klingele2017-09-153-8/+14
| |/ | | | | | | Signed-off-by: Leon Klingele <leon@struktur.de>
* | Merge pull request #6453 from nextcloud/fix-5273Morris Jobke2017-09-154-25/+72
|\ \ | | | | | | Fix initializing paged search under some circumstances
| * | adapted integration testsArthur Schiwon2017-09-142-13/+35
| | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | fix counting found results in search opArthur Schiwon2017-09-141-3/+6
| | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | improve and extend paging integration testArthur Schiwon2017-09-142-11/+28
| | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | replace hard-coded attribute with the corresponding settings optionArthur Schiwon2017-09-141-1/+1
| | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | fix limit-flaw in search on paged resultsArthur Schiwon2017-09-142-12/+17
| | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>