summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #31910 from MSe1969/masterSimon L2022-04-123-6/+6
|\ | | | | Fix accept/reject remote share action #31301
| * Fix accept/reject remote share actionMSe19692022-04-123-6/+6
|/ | | | | | | This is the fix for the described problem in https://github.com/nextcloud/server/issues/31301 Signed-off-by: MSe1969 <mse1969@posteo.de>
* Merge pull request #31937 from nextcloud/Valdnet-patch-1Pytal2022-04-121-1/+1
|\
| * l10n: Remove commaValdnet2022-04-121-1/+1
| | | | | | Signed-off-by: Valdnet <47037905+Valdnet@users.noreply.github.com>
* | Merge pull request #31929 from nextcloud/enh/noid/zip-expose-statCôme Chilliet2022-04-123-0/+1512
|\ \ | | | | | | Expose ZIP stat information
| * | Fix ZipArchive::addEmptyDir stubCôme Chilliet2022-04-121-2/+2
| | | | | | | | | | | | Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
| * | Add stubs for ZipArchiveCôme Chilliet2022-04-122-0/+1483
| | | | | | | | | | | | Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
| * | Expose ZIP stat informationVincent Petry2022-04-111-0/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | Add getStat to OC\Archive\Zip Required to be able to read the mtime and other metadata. To give direct access to mtime Signed-off-by: Vincent Petry <vincent@nextcloud.com> Co-authored-by: Côme Chilliet <come.chilliet@nextcloud.com>
* | | Merge pull request #31907 from nextcloud/enh/noid/tag-remote-as-globalscaleMaxence Lange2022-04-122-0/+13
|\ \ \ | | | | | | | | confirm user is internal to globalscale
| * | | confirm user is internal to globalscaleMaxence Lange2022-04-122-0/+13
| | | | | | | | | | | | Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
* | | | Merge pull request #31934 from nextcloud/getbyid-setup-fallbackJulius Härtl2022-04-121-0/+6
|\ \ \ \ | |_|_|/ |/| | | perform a setup if we can't find any mounts containing a file
| * | | perform a setup if we can't find any mounts containing a fileRobin Appelman2022-04-111-0/+6
| | |/ | |/| | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | Merge pull request #31220 from nextcloud/enhancement/31005/temporary-passwordsVincent Petry2022-04-1223-87/+446
|\ \ \ | | | | | | | | Temporary passwords for public non-anonymous protected shares (ie: files shared with an email recipient).
| * | | Adds a "Request password" button to the public share authentication page for ↵Cyrille Bollu2022-04-1123-87/+446
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | shares of type TYPE_EMAIL, when the "video verification" checkbox isn't checked. Users accessing non-anonymous public shares (TYPE_EMAIL shares) can now request a temporary password themselves. - Creates a migration step for the files_sharing app to add the 'password_expiration_time' attribute to the oc_shares table. - Makes share temporary passwords' expiration time configurable via a system value. - Adds a system config value to allow permanent share passwords -Fixes a typo in a comment in apps/files_sharing/src/components/SharingEntryLink.vue See https://github.com/nextcloud/server/issues/31005 Signed-off-by: Cyrille Bollu <cyrpub@bollu.be>
* | | | Merge pull request #31927 from nextcloud/feat/dont_match_userid_testsVincent Petry2022-04-121-0/+4
|\ \ \ \ | | | | | | | | | | Tweak tests to include shareapi_restrict_user_enumeration_full_match_userid
| * | | | Tweak tests to include shareapi_restrict_user_enumeration_full_match_useridLouis Chemineau2022-04-111-0/+4
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Louis Chemineau <louis@chmn.me>
* | | | | [tx-robot] updated from transifexNextcloud bot2022-04-1254-66/+102
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Nextcloud bot <bot@nextcloud.com>
* | | | | Merge pull request #31916 from nextcloud/enh/noid/template-picker-sizeSimon L2022-04-113-5/+4
|\ \ \ \ \ | | | | | | | | | | | | fix size of template picker
| * | | | | fix size of template pickerszaimen2022-04-093-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: szaimen <szaimen@e.mail.de> Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
* | | | | | Merge pull request #31866 from nextcloud/test-avatar-migrationPytal2022-04-113-9/+55
|\ \ \ \ \ \
| * | | | | | Add comment explaining avatar basenameChristopher Ng2022-04-081-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Christopher Ng <chrng8@gmail.com>
| * | | | | | Remove unnecessary array_diffChristopher Ng2022-04-081-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Christopher Ng <chrng8@gmail.com>
| * | | | | | Test avatar migrationChristopher Ng2022-04-073-9/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Christopher Ng <chrng8@gmail.com>
| * | | | | | Improve strictness of account file regexChristopher Ng2022-04-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Christopher Ng <chrng8@gmail.com>
* | | | | | | Merge pull request #31931 from nextcloud/contact-popover-hyperlink-issue-2Pytal2022-04-115-11/+15
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Wrap contact search result in a linkGnana Sekar2022-04-115-11/+15
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Gnana Sekar <developersekar1992@gmail.com> Signed-off-by: Louis Chemineau <louis@chmn.me>
* | | | | | Merge pull request #31925 from nextcloud/fix/user_migration-use-id-for-migratorsCôme Chilliet2022-04-118-8/+8
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Use Migrators id instead of class names
| * | | | | Adapt AccountMigratorTest to id changeCôme Chilliet2022-04-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
| * | | | | Use Migrators id instead of class namesCôme Chilliet2022-04-117-7/+7
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will help with UI and means migrators can move in namespaces without changing export format. Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
* | | | | Merge pull request #31848 from ↵Carl Schwan2022-04-116-3/+46
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/performance/trottling-capability-frontent Don't inject Bruteforce capability info in the webui
| * | | | | Don't inject Bruteforce capability info in the webuiCarl Schwan2022-04-076-3/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This capability do DB access and as far I know is not used by the webui. This remove one DB query for each page load. Signed-off-by: Carl Schwan <carl@carlschwan.eu>
* | | | | | Merge pull request #31610 from nextcloud/shares-in-folder-mountsVincent Petry2022-04-111-1/+14
|\ \ \ \ \ \ | | | | | | | | | | | | | | fix shared mount roots not being returned from `getSharesInFolder`
| * | | | | | fix shared mount roots not being returned from `getSharesInFolder`Robin Appelman2022-03-311-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | | | Merge pull request #31857 from nextcloud/feat/dont_match_useridVincent Petry2022-04-117-5/+23
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Add settings to not match userID during full match
| * | | | | | | Add settings to not match userID during full matchLouis Chemineau2022-04-067-5/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Louis Chemineau <louis@chmn.me>
* | | | | | | | Merge pull request #31911 from nextcloud/enh/extend-migratorsVincent Petry2022-04-115-2/+117
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Extend migrators needed for implementation of the API
| * | | | | | | | Extend calendar migratorChristopher Ng2022-04-081-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Christopher Ng <chrng8@gmail.com>
| * | | | | | | | Extend contacts migratorChristopher Ng2022-04-081-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Christopher Ng <chrng8@gmail.com>
| * | | | | | | | Extend trashbin migratorChristopher Ng2022-04-081-1/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Christopher Ng <chrng8@gmail.com>
| * | | | | | | | Extend account migratorChristopher Ng2022-04-081-1/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Christopher Ng <chrng8@gmail.com>
| * | | | | | | | Extend migrator interfaceChristopher Ng2022-04-081-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Christopher Ng <chrng8@gmail.com>
* | | | | | | | | Merge pull request #31884 from ↵Côme Chilliet2022-04-110-0/+0
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/automated/noid/psalm-baseline-update-1649391092 [Automated] Update psalm-baseline.xml
| * | | | | | | | | Update psalm baselinenextcloud-command2022-04-081-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: GitHub <noreply@github.com>
* | | | | | | | | | Merge pull request #31903 from nextcloud/bugfix/noid/fix-missing-elseJoas Schilling2022-04-111-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Fix case also when the table existed already
| * | | | | | | | | | Fix case also when the table existed alreadyJoas Schilling2022-04-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | | | | | | [tx-robot] updated from transifexNextcloud bot2022-04-1114-46/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nextcloud bot <bot@nextcloud.com>
* | | | | | | | | | | Merge pull request #31899 from nextcloud/dependabot/npm_and_yarn/marked-4.0.13Carl Schwan2022-04-104-11/+11
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Bump marked from 4.0.12 to 4.0.13
| * | | | | | | | | | | Bump marked from 4.0.12 to 4.0.13dependabot[bot]2022-04-104-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [marked](https://github.com/markedjs/marked) from 4.0.12 to 4.0.13. - [Release notes](https://github.com/markedjs/marked/releases) - [Changelog](https://github.com/markedjs/marked/blob/master/.releaserc.json) - [Commits](https://github.com/markedjs/marked/compare/v4.0.12...v4.0.13) --- updated-dependencies: - dependency-name: marked dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
* | | | | | | | | | | | [tx-robot] updated from transifexNextcloud bot2022-04-108-0/+14
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nextcloud bot <bot@nextcloud.com>
* | | | | | | | | | | Merge pull request #31897 from nextcloud/dependabot/npm_and_yarn/moment-2.29.2dependabot[bot]2022-04-0920-35/+48
|\ \ \ \ \ \ \ \ \ \ \