Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Mrv/rebase old branch #292

Merged
merged 189 commits into from
Apr 17, 2023
Merged

Mrv/rebase old branch #292

merged 189 commits into from
Apr 17, 2023

Conversation

mrvahedi68
Copy link

Summary

TODO

  • ...

Checklist

nickvergessen and others added 30 commits March 8, 2023 12:15
Signed-off-by: Joas Schilling <coding@schilljs.com>
Signed-off-by: Joas Schilling <coding@schilljs.com>
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: Robin Appelman <robin@icewind.nl>
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: Josh Richards <josh.t.richards@gmail.com>
…rrent implementation uses php 7.4, which is no longer compatible with the required PHP version of the server. I upped this to PHP 8.1

List of changes:
- Upped PHP Version to 8.1
- Added Apache Webserver so the Container works "out of the box" after docker-compose up -d
- Mounting whole project as volume to /var/www/html in docker-compose.yml (and set WORKDIR to /var/www/html)

Tested in a Docker for Windows environment.
* Autostart apache2
* Apply occ installation on start
* Autostart Xdebug on request
* Add DevContainer Xdebug profile

Signed-off-by: GitHub <noreply@github.com>
Signed-off-by: GitHub <noreply@github.com>
* Add gnupg2 to be able to sign commits
* Make sure /var/www/html always belongs to www-data
* Add Git-History plugin
* Introduce dedicated entrypoint script
* Store Postgres database data in volume to be persistent
* Cleaner check if NC is already installed in setup.sh
* Add composer to DevContainer

Signed-off-by: GitHub <noreply@github.com>
* Use dedicated DevContainer user to run Apache (ensure file permissions)
* Install NVM for node

Signed-off-by: GitHub <noreply@github.com>
Signed-off-by: GitHub <noreply@github.com>
Signed-off-by: GitHub <noreply@github.com>
Bumps [phpunit/phpunit](https://github.com/sebastianbergmann/phpunit) from 9.6.4 to 9.6.6.
- [Release notes](https://github.com/sebastianbergmann/phpunit/releases)
- [Changelog](https://github.com/sebastianbergmann/phpunit/blob/main/ChangeLog-9.6.md)
- [Commits](sebastianbergmann/phpunit@9.6.4...9.6.6)

---
updated-dependencies:
- dependency-name: phpunit/phpunit
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [symfony/event-dispatcher](https://github.com/symfony/event-dispatcher) from 5.4.19 to 5.4.22.
- [Release notes](https://github.com/symfony/event-dispatcher/releases)
- [Changelog](https://github.com/symfony/event-dispatcher/blob/6.2/CHANGELOG.md)
- [Commits](symfony/event-dispatcher@v5.4.19...v5.4.22)

---
updated-dependencies:
- dependency-name: symfony/event-dispatcher
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
remove folder entries as they are cleared instead of in one go afterwards

otherwise they stick around if some of the child entries can't be removed

Signed-off-by: Robin Appelman <robin@icewind.nl>
Signed-off-by: Robin Appelman <robin@icewind.nl>
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
…ection

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
Signed-off-by: Josh Richards <josh.t.richards@gmail.com>
Signed-off-by: Robin Appelman <robin@icewind.nl>
…ered

Signed-off-by: Robin Appelman <robin@icewind.nl>
Signed-off-by: jld3103 <jld3103yt@gmail.com>
Signed-off-by: julia.kirschenheuter <julia.kirschenheuter@nextcloud.com>
Signed-off-by: julia.kirschenheuter <julia.kirschenheuter@nextcloud.com>
…t-username

Trim the user/email provided for password resets
Signed-off-by: Julius Härtl <jus@bitgrid.net>
skjnldsv and others added 29 commits April 14, 2023 09:26
Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>
…oloader-generation-extraneous-apps

ci(checkers): Fix autoloader (re)generation for extraneous apps
fix(files): standardize `files:node:event` event syntax
Signed-off-by: Joas Schilling <coding@schilljs.com>
…cryption-password-email-to-template

Move encrypt-all password email to EmailTemplate
…est-msg

More honest reset password request response
Unquote S3 ETag stored in oc_filecache
Bumps [sass-loader](https://github.com/webpack-contrib/sass-loader) from 13.2.0 to 13.2.2.
- [Release notes](https://github.com/webpack-contrib/sass-loader/releases)
- [Changelog](https://github.com/webpack-contrib/sass-loader/blob/master/CHANGELOG.md)
- [Commits](webpack-contrib/sass-loader@v13.2.0...v13.2.2)

---
updated-dependencies:
- dependency-name: sass-loader
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [@vue/vue2-jest](https://github.com/vuejs/vue-jest) from 29.1.1 to 29.2.3.
- [Release notes](https://github.com/vuejs/vue-jest/releases)
- [Commits](vuejs/vue-jest@v29.1.1...v29.2.3)

---
updated-dependencies:
- dependency-name: "@vue/vue2-jest"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
Bumps [phpunit/phpunit](https://github.com/sebastianbergmann/phpunit) from 9.6.6 to 9.6.7.
- [Release notes](https://github.com/sebastianbergmann/phpunit/releases)
- [Changelog](https://github.com/sebastianbergmann/phpunit/blob/9.6.7/ChangeLog-9.6.md)
- [Commits](sebastianbergmann/phpunit@9.6.6...9.6.7)

---
updated-dependencies:
- dependency-name: phpunit/phpunit
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
updated-dependencies:
- dependency-name: "@typescript-eslint/eslint-plugin"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: GitHub <noreply@github.com>
…yarn/sass-loader-13.2.2

chore(deps-dev): Bump sass-loader from 13.2.0 to 13.2.2
…yarn/vue/vue2-jest-29.2.3

chore(deps-dev): Bump @vue/vue2-jest from 29.1.1 to 29.2.3
…/build/integration/phpunit/phpunit-9.6.7

chore(deps-dev): Bump phpunit/phpunit from 9.6.6 to 9.6.7 in /build/integration
…yarn/typescript-eslint/eslint-plugin-5.58.0

bump @typescript-eslint/eslint-plugin from 5.45.0 to 5.58.0
Bumps [@nextcloud/calendar-availability-vue](https://github.com/nextcloud/calendar-availability-vue) from 0.5.0-rc2 to 0.6.0-alpha1.
- [Release notes](https://github.com/nextcloud/calendar-availability-vue/releases)
- [Changelog](https://github.com/nextcloud/calendar-availability-vue/blob/main/CHANGELOG.md)
- [Commits](nextcloud/calendar-availability-vue@v0.5.0-rc2...v0.6.0-alpha1)

---
updated-dependencies:
- dependency-name: "@nextcloud/calendar-availability-vue"
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
…yarn/nextcloud/calendar-availability-vue-0.6.0-alpha1
---
updated-dependencies:
- dependency-name: webpack
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [@nextcloud/browser-storage](https://github.com/nextcloud/nextcloud-browser-storage) from 0.1.1 to 0.2.0.
- [Release notes](https://github.com/nextcloud/nextcloud-browser-storage/releases)
- [Changelog](https://github.com/nextcloud/nextcloud-browser-storage/blob/master/CHANGELOG.md)
- [Commits](nextcloud-libraries/nextcloud-browser-storage@v0.1.1...v0.2.0)

---
updated-dependencies:
- dependency-name: "@nextcloud/browser-storage"
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
…er-update-psalm-baseline

[master] Update psalm-baseline.xml
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
…ignore-excluded-dirs-on-image-optimization

chore(assets): Ignore git-ignored directories on image optimization
Signed-off-by: MohammadReza vahedi <34796044+mrvahedi68@users.noreply.github.com>
@mrvahedi68 mrvahedi68 merged commit 7941a69 into mfa-check-rebased Apr 17, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.