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

Feature/matrix invites #488

Merged
merged 19 commits into from
Feb 1, 2025
Merged

Feature/matrix invites #488

merged 19 commits into from
Feb 1, 2025

Conversation

vranki
Copy link
Member

@vranki vranki commented May 19, 2024

  • Added configuration values for Matrix integration
  • Added button to invite user to organization's Matrix room/space in user settings
  • New accepted members with Matrix ID are invited to organization's Matrix room/space

@vranki vranki requested review from tswfi and olmari May 19, 2024 13:51
drjaska
drjaska requested changes Feb 1, 2025
View reviewed changes
Copy link
Collaborator

@drjaska drjaska left a comment

Choose a reason for hiding this comment

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

Please undo the Python 3.11 -> 3.12 partial upgrade, 3.12 is neither the latest nor a common stable version but an awkward middle-ground. I don't see a reason to use that version in production.

Pipfile Outdated Show resolved Hide resolved
README.md Outdated Show resolved Hide resolved
README.md Show resolved Hide resolved
README.md Outdated Show resolved Hide resolved
www/views.py Outdated Show resolved Hide resolved
www/views.py Show resolved Hide resolved
tswfi
tswfi reviewed Feb 1, 2025
View reviewed changes
drfx/settings.py Outdated Show resolved Hide resolved
tswfi
tswfi reviewed Feb 1, 2025
View reviewed changes
www/views.py Outdated Show resolved Hide resolved
@vranki vranki requested review from tswfi and drjaska February 1, 2025 15:04
@tswfi
Copy link
Member

tswfi commented Feb 1, 2025

please also rebase now that ci works again to get all the tests ran. see #533

@vranki vranki merged commit 593ba8e into master Feb 1, 2025
1 check passed
@vranki vranki deleted the feature/matrix-invites branch February 1, 2025 16:43
braaar added a commit to HacklabJKL/mulysa that referenced this pull request Feb 1, 2025
@braaar
Merge branch 'main' into generic-welcome-email
38176d1 
* main:
  fix: allow user in bank transaction to be blank in forms (TampereHacklab#539)
  Korjattu assertti
  Feature/matrix invites (TampereHacklab#488)
  fix ci (TampereHacklab#533)
  Update account_deactivated_and_marked_for_deletion.txt (TampereHacklab#500)
  Bump Python version to 3.11 used in Debian 12 (TampereHacklab#523)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@olmari olmari Awaiting requested review from olmari

@tswfi tswfi Awaiting requested review from tswfi

@drjaska drjaska Awaiting requested review from drjaska

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@vranki @tswfi @drjaska