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.

Sign up for GitHub

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

Jump to bottom

Merge dev in main #540

Merged
merged 24 commits into from
Oct 30, 2023
Merged

Merge dev in main #540

merged 24 commits into from
Oct 30, 2023

Conversation

TitusKirch
Copy link
Contributor

N/A

dependabot bot and others added 23 commits September 21, 2023 21:10
@dependabot
Bump @formkit/themes from 1.0.0-beta.9-f64c966 to 1.1.0 (#480)
495b23f 
Bumps [@formkit/themes](https://github.com/formkit/formkit/tree/HEAD/packages/themes) from 1.0.0-beta.9-f64c966 to 1.1.0.
- [Release notes](https://github.com/formkit/formkit/releases)
- [Commits](https://github.com/formkit/formkit/commits/1.1.0/packages/themes)

---
updated-dependencies:
- dependency-name: "@formkit/themes"
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump docker/login-action from 2 to 3 (#463)
fa703e2 
Bumps [docker/login-action](https://github.com/docker/login-action) from 2 to 3.
- [Release notes](https://github.com/docker/login-action/releases)
- [Commits](docker/login-action@v2...v3)

---
updated-dependencies:
- dependency-name: docker/login-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump docker/build-push-action from 4 to 5 (#462)
b15c8f4 
Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 4 to 5.
- [Release notes](https://github.com/docker/build-push-action/releases)
- [Commits](docker/build-push-action@v4...v5)

---
updated-dependencies:
- dependency-name: docker/build-push-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump @tailwindcss/typography from 0.5.9 to 0.5.10 (#461)
97088ce 
Bumps [@tailwindcss/typography](https://github.com/tailwindcss/typography) from 0.5.9 to 0.5.10.
- [Release notes](https://github.com/tailwindcss/typography/releases)
- [Changelog](https://github.com/tailwindlabs/tailwindcss-typography/blob/master/CHANGELOG.md)
- [Commits](tailwindlabs/tailwindcss-typography@v0.5.9...v0.5.10)

---
updated-dependencies:
- dependency-name: "@tailwindcss/typography"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@TitusKirch
Revert "Bump docker/login-action from 2 to 3 (#463)" (#482)
36a87a1 
This reverts commit fa703e2.
@dependabot
Bump @formkit/vue from 1.0.0-beta.9-f64c966 to 1.1.0 (#479)
3a02d04 
Bumps [@formkit/vue](https://github.com/formkit/formkit/tree/HEAD/packages/rules) from 1.0.0-beta.9-f64c966 to 1.1.0.
- [Release notes](https://github.com/formkit/formkit/releases)
- [Commits](https://github.com/formkit/formkit/commits/1.1.0/packages/rules)

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

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump @formkit/addons from 1.0.0-beta.9-f64c966 to 1.1.0 (#478)
cf3cb93 
Bumps [@formkit/addons](https://github.com/formkit/formkit/tree/HEAD/packages/addons) from 1.0.0-beta.9-f64c966 to 1.1.0.
- [Release notes](https://github.com/formkit/formkit/releases)
- [Commits](https://github.com/formkit/formkit/commits/1.1.0/packages/addons)

---
updated-dependencies:
- dependency-name: "@formkit/addons"
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@simonostendorf
fix(readme): kubernetes link (#506)
fee962e 
* fix(readme): kubernetes link

* fix(readme): kubernetes link
@simonostendorf
feat(readme): add devcontainer section (#507)
c415383
@simonostendorf
feat(deploy): add aws s3 (#508)
9406f39
@TitusKirch @DontEdit
Titus tasks for gerolstein (#512)
fa63d92 
* Update ddates

* Improve Module seeder logic

* Fix naming

* Add state logic

* Add modules to inertia share

* Linting

* Add random generaot backend

* Generate components

* Sort user by firstname

* Proof of Concept up and download from s3

* Image to s3 nearly done (req to controller not working)

* s3 Image Upload in user register and s3 show image funciton ready for use

* Remove outdated docs

* Add spatie permissions

* Remove dev code

* Migrate to rbac

* Update routes

* Fix drop col

* All comments implemented

* Add super admin role to prevent erros

* Add edit view

* Add link to old register/assigne page

* Add special role

* Add disabled flag

* Fix namings

* Add public api

* Improve user view

* Add missing if

* Add missing dependencies

* Improve S3 Implmentation

* Improvee admin ui

* Fix s3 logic

* Fix S3 logic

* Allow to edit super admins (except roles)

---------

Co-authored-by: DontEdit <vitor.macedo@outlook.de>
Co-authored-by: DontEdit <115659871+DontEdit@users.noreply.github.com>
@simonostendorf
feat(github_actions): add docker e2e test (#513)
6fb0119 
* feat(github_actions): add docker e2e test

* fix(github_actions/docker-e2e): event name typo

* fix(github_actions/docker-e2e): env file creation typo

* fix(docker-compose): adjust db connection typo

* fix(github_actions/docker-e2e): add missing env vars

* feat(github_actions/docker-e2e): change naming

* debug(github_actions/docker-e2e): add debug steps

* debug(github_actions/docker-e2e): remove redis connection
@simonostendorf
update(docker): roadrunner (#519)
a712eaf
@simonostendorf
fix(database/seeders): invalid and missing seeders (#520)
16a3ff1 
* fix(database/seeders): missing students seeder

* fix(database/seeders): bracket inside tutor seeder
@simonostendorf
feat(database/seeders/tutor): switch delimiter and add disabled (#521)
fbcd4b0
@TitusKirch
Fix/darkmode (#533)
64c84d7 
* Fix darkmode

* lint code
@PhilPinsdorf @TitusKirch
Feat/phil frontend (#532)
9e03851 
* Init Commit

* Pair programming
Co-authored-by: PhilPinsdorf

* Added Random Generator Frontend

* Removed Scaleup Animation because it is not used

* Fixed Font

* Fixed AvatarCard

* Fixed Transition Component

* Fixed single-file component element order

* Added Name for Display Route

* Set new Location for AvatarCard

* Fixed isFetchingRandomGenerator

* Fixed Naming

* Fixed Transiotin, Audio and added Riser

---------

Co-authored-by: Titus Kirch <titus.kirch@kirch.dev>
@TitusKirch @PhilPinsdorf
Feat/add score system (#534)
c22520c 
* Init Commit

* Pair programming
Co-authored-by: PhilPinsdorf

* Added Random Generator Frontend

* Removed Scaleup Animation because it is not used

* Fix darkmode

* lint code

* Fixed Font

* Add scoresystem

* Fixed AvatarCard

* Fixed Transition Component

* Fixed single-file component element order

* Added Name for Display Route

* Set new Location for AvatarCard

* Fixed isFetchingRandomGenerator

* Fixed Naming

* Fixed Transiotin, Audio and added Riser

* Adjust display of name

* Regenerate components file

* Lint code and fix typo

---------

Co-authored-by: Phil Pinsdorf <philemon.pinsdorf@live.de>
@TitusKirch
feat/add user delete feature (#536)
2ac9044 
* Add delete feature for super admins

* Fix message

* Add missing redirect back
@TitusKirch
Feat/update authors in readme md #335 (#432)
e727bae 
* Add Martin Philemon Pinsdorf

* Fix typo

* Add Vitor
@PhilPinsdorf
Changed Gif (#537)
8c4fb0d
@TitusKirch
Feat/improve audio (#538)
ccd1a36 
* Lint

* Fade out audio
@TitusKirch
Update event data (#539)
431fd8f 
* Update event data

* Fix wording
@TitusKirch TitusKirch added bug Something isn't working documentation Improvements or additions to documentation enhancement New feature or request dependencies Pull requests that update a dependency file labels Oct 29, 2023
@TitusKirch TitusKirch added this to the Version 2.3.x milestone Oct 29, 2023
@TitusKirch TitusKirch self-assigned this Oct 29, 2023
@TitusKirch TitusKirch marked this pull request as ready for review October 30, 2023 17:17
@TitusKirch
Fix/hotfix 1 (#542)
be804fb 
* Remove >

* Fix naming of file
simonostendorf
simonostendorf approved these changes Oct 30, 2023
View reviewed changes
Copy link
Contributor

@simonostendorf simonostendorf left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Deployment tested, everything successful

@TitusKirch TitusKirch merged commit 5c1e6c4 into main Oct 30, 2023
4 checks passed
TitusKirch added a commit that referenced this pull request Oct 30, 2023
@TitusKirch
Revert "Merge dev in main (#540)"
7ae9343 
This reverts commit 5c1e6c4.
@TitusKirch TitusKirch mentioned this pull request Oct 30, 2023
Merged
TitusKirch added a commit that referenced this pull request Oct 30, 2023
@TitusKirch
Revert "Merge dev in main (#540)" (#543)
ce6df81 
This reverts commit 5c1e6c4.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@simonostendorf simonostendorf simonostendorf approved these changes

@PhilPinsdorf PhilPinsdorf Awaiting requested review from PhilPinsdorf

@tijavo tijavo Awaiting requested review from tijavo

@DontEdit DontEdit Awaiting requested review from DontEdit

Assignees

@TitusKirch TitusKirch

Labels
bug Something isn't working dependencies Pull requests that update a dependency file documentation Improvements or additions to documentation enhancement New feature or request
Projects
None yet
Milestone
Version 2.3.x
Development

Successfully merging this pull request may close these issues.
3 participants
@TitusKirch @simonostendorf @PhilPinsdorf