forked from michielbdejong/server
-
Notifications
You must be signed in to change notification settings - Fork 1
Mrv/rebase old branch #292
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
Merged
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Joas Schilling <[email protected]>
Signed-off-by: Joas Schilling <[email protected]>
Signed-off-by: Julius Härtl <[email protected]>
Signed-off-by: Julius Härtl <[email protected]>
Signed-off-by: Robin Appelman <[email protected]>
Signed-off-by: Julius Härtl <[email protected]>
Signed-off-by: Josh Richards <[email protected]>
…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 <[email protected]>
Signed-off-by: GitHub <[email protected]>
* 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 <[email protected]>
* Use dedicated DevContainer user to run Apache (ensure file permissions) * Install NVM for node Signed-off-by: GitHub <[email protected]>
Signed-off-by: GitHub <[email protected]>
Signed-off-by: GitHub <[email protected]>
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] <[email protected]>
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] <[email protected]>
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 <[email protected]>
Signed-off-by: Robin Appelman <[email protected]>
Signed-off-by: Christoph Wurst <[email protected]>
…ection Signed-off-by: Thomas Citharel <[email protected]>
Signed-off-by: Josh Richards <[email protected]>
Signed-off-by: Robin Appelman <[email protected]>
…ered Signed-off-by: Robin Appelman <[email protected]>
Signed-off-by: jld3103 <[email protected]>
Signed-off-by: julia.kirschenheuter <[email protected]>
Signed-off-by: julia.kirschenheuter <[email protected]>
…t-username Trim the user/email provided for password resets
Signed-off-by: Julius Härtl <[email protected]>
Signed-off-by: John Molakvoæ <[email protected]>
…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 <[email protected]>
…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/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] <[email protected]>
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] <[email protected]>
Signed-off-by: Nextcloud bot <[email protected]>
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] <[email protected]>
--- updated-dependencies: - dependency-name: "@typescript-eslint/eslint-plugin" dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]>
Signed-off-by: GitHub <[email protected]>
…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] <[email protected]> Signed-off-by: nextcloud-command <[email protected]>
…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] <[email protected]>
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] <[email protected]>
…yarn/webpack-5.79.0
…er-update-psalm-baseline [master] Update psalm-baseline.xml
Signed-off-by: Nextcloud bot <[email protected]>
Signed-off-by: Nextcloud bot <[email protected]>
…ignore-excluded-dirs-on-image-optimization chore(assets): Ignore git-ignored directories on image optimization
Signed-off-by: MohammadReza vahedi <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
TODO
Checklist