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

Gamma v2.0 #853

Merged
merged 2,166 commits into from
Nov 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2166 commits
Select commit Hold shift + click to select a range
35eddb5
stuff
Portals Oct 7, 2021
4e0ed64
more of going around fixing the frontend
Portals Oct 7, 2021
579b921
more
Portals Oct 9, 2021
8745835
web client basically done, started working on new oauth2
Portals Oct 11, 2021
c2c5807
spring-authorization-server is being used
Portals Nov 6, 2021
64f145d
more
Portals Nov 17, 2021
69f7369
Got userinfo oidc
Portals Dec 5, 2021
9087358
more
Portals Dec 5, 2021
91e86ce
updates
Portals Dec 17, 2021
21e18d1
Custom consent
Portals Dec 18, 2021
cc3028c
more
Portals Dec 18, 2021
fe1dede
tests and accessmanager
Portals Dec 19, 2021
3a7dc7a
info api settings
Portals Dec 19, 2021
aa50f53
no more email, stuff
Portals Dec 20, 2021
becdb8e
Start of AuthorityLevelFacadeTest
Portals Dec 22, 2021
3c9ccc0
More tests, spring data tests, persistable
Portals Dec 24, 2021
a04fe1e
More tests
Portals Dec 28, 2021
a887a8b
tests
Portals Dec 29, 2021
ad24039
testcontainer, more tests, versions, and stuff
Portals Dec 30, 2021
582f0f7
more tests and responses to tests
Portals Dec 31, 2021
537fd82
more tests
Portals Jan 1, 2022
7a103d9
Rewrite of User domain object. Only signed in and admin can access Us…
Portals Jan 1, 2022
fe224fb
Move language from extended to normal
Portals Jan 1, 2022
5d59b4f
Testing with Gradle?
Portals Jan 1, 2022
7546fe3
Correct folder?
Portals Jan 1, 2022
4c15799
Working directory?
Portals Jan 1, 2022
c44301e
Did it work? I need to test this
Portals Jan 1, 2022
527acc6
stuff
Portals Feb 12, 2022
fdf574c
Delete SingleImmutableEntity
Portals Feb 12, 2022
8ea4a3e
Add UserActivationEntityIntegrationTests
Portals Feb 15, 2022
c2944a1
more tests
Portals Feb 23, 2022
ae4bb1c
Yes
Portals Feb 25, 2022
17d7cc2
UPgrade deps and movement towards new security logic
Portals Mar 17, 2022
aaad276
:brain:
Portals Mar 20, 2022
8929b46
Use User from Spring Security :brain:
Portals Mar 20, 2022
4bb6ce9
Both api tests and integration tests can now live together
Portals Apr 3, 2022
679fb3f
??
Portals Aug 19, 2022
ca64320
Forward again
Portals Aug 19, 2022
7d9bd75
more
Portals Aug 20, 2022
535f51c
More fixes on auth and tests
Portals Aug 20, 2022
38659c1
Minor Update
Portals Jan 31, 2023
893d4f1
Update
Portals Feb 7, 2023
ef75fe6
Update
Portals Feb 10, 2023
b853495
Update
Portals Feb 10, 2023
093e628
Update
Portals Feb 11, 2023
5421d4b
Update
Portals May 21, 2023
d062526
Update
Portals May 22, 2023
7c0893c
Update
Portals Aug 24, 2023
e43abbb
Update
Portals Aug 24, 2023
b7226fa
Update
Portals Dec 4, 2023
baac593
Update
Portals Dec 10, 2023
fcd545e
Update
Portals Dec 10, 2023
b67d1e5
Update
Portals Dec 11, 2023
f7991ed
Update
Portals Dec 11, 2023
7275558
Update
Portals Dec 11, 2023
9d07a37
Update
Portals Dec 12, 2023
7472dff
Update
Portals Dec 12, 2023
e078fb4
Update
Portals Dec 12, 2023
13f26a6
Frontend docker image
Portals Dec 12, 2023
03b95de
Update to latest spring amongst other things
Portals Dec 23, 2023
e19508a
Remove frontend, rename backend to app.
Portals Dec 23, 2023
dd3ceae
Start of htmx rewrite
Portals Dec 23, 2023
3ed7b3a
Show users
Portals Dec 23, 2023
25cb7ae
Update
Portals Dec 26, 2023
b766863
More views, also can set admin
Portals Dec 27, 2023
409879c
can set gdpr trained
Portals Dec 27, 2023
29aad8f
lots of things
Portals Jan 6, 2024
c2e96c9
lots of things
Portals Jan 7, 2024
624427f
lots of things
Portals Jan 10, 2024
a89a44a
Create account
Portals Jan 13, 2024
fc0f425
inline editing posts and other things
Portals Jan 16, 2024
3014e01
create edit delete post
Portals Jan 17, 2024
2f44c97
start using thymeleaf field and errors
Portals Jan 18, 2024
ba9ece9
working example of global error in thymeleaf
Portals Jan 19, 2024
c5e6e40
edit super group
Portals Jan 20, 2024
e9a6d5e
edit group
Portals Jan 20, 2024
f81f47a
update
Portals Jan 21, 2024
6230d6d
remove and add member
Portals Jan 23, 2024
e4f606e
client details
Portals Jan 23, 2024
00b9ed8
reset password
Portals Jan 24, 2024
5159378
create client
Portals Jan 24, 2024
78a0c34
create api key
Portals Jan 24, 2024
5546aad
img
Portals Jan 24, 2024
9916026
add authorities to client
Portals Jan 25, 2024
e6b5dee
partial step forward
Portals Jan 25, 2024
3df7a54
improve consent.html
Portals Jan 25, 2024
729cb97
show user approvals
Portals Jan 25, 2024
eea2e0b
thymeleaf -> web for controllers package
Portals Jan 25, 2024
9788473
be able to upload images for groups
Portals Jan 26, 2024
60fb71d
remove unused html files
Portals Jan 26, 2024
1fe9dbf
Start of normal / admin views
Portals Jan 26, 2024
98fa98e
me view
Portals Jan 26, 2024
be5ec9a
remove the concept of last updated user agreement
Portals Jan 26, 2024
45204ab
be able to update super group types for settings for info api
Portals Jan 26, 2024
5a4fac1
quick fix
Portals Jan 26, 2024
e775375
More updates
Portals Jan 26, 2024
9928dc3
use redis config from application.yml in lettuce factory
Portals Jan 26, 2024
a534063
update docker compose
rosengrenen Jan 26, 2024
c4f7fc7
Update ENV variables
Portals Jan 26, 2024
26a071e
portals smh
rosengrenen Jan 26, 2024
c05263e
Add LICENSE
Portals Jan 26, 2024
acc04de
Update workflow
Portals Jan 26, 2024
eb05956
Add distribution to workflow
Portals Jan 26, 2024
9122d0f
To lowercase
Portals Jan 26, 2024
ef71a15
Test
Portals Jan 26, 2024
eb39148
Add permissions
Portals Jan 26, 2024
5d7d8c6
.
Portals Jan 26, 2024
2ce49d1
..
Portals Jan 26, 2024
e7986d5
..
Portals Jan 26, 2024
950f53d
.
Portals Jan 26, 2024
7468470
.
Portals Jan 26, 2024
e48b6dc
Updates
Portals Feb 19, 2024
fd7aab7
Remove unused imports
Portals Feb 19, 2024
05bb240
Use spotless to format java, yml and sql files
Portals Feb 20, 2024
69d1aad
Fix and client authorities through client api
Portals Feb 24, 2024
94c201a
Update
Portals Mar 1, 2024
9062ece
fixes
Portals Mar 1, 2024
89bc2e4
Merge branch 'main' into dev
Portals Mar 1, 2024
4874237
fixes
Portals Mar 1, 2024
3e88c37
Update
Portals Mar 1, 2024
ef91f14
Empty
Portals Mar 1, 2024
6a2a4ec
fixes
Portals Mar 1, 2024
92308eb
fixes
Portals Mar 1, 2024
a134e07
fixes
Portals Mar 4, 2024
2d912ad
Add new endpoint for info api /blob.
Portals Mar 5, 2024
443afcb
Remove global settings, and add api type specific settings to info an…
Portals Mar 23, 2024
c3ae1af
Add ENV variable for upload folder
Portals Mar 23, 2024
95b0a5d
Bump github actions
Portals Mar 23, 2024
18d5287
Fix button type in activate cid
Portals Mar 26, 2024
088be8e
Flip bad if statement
Portals Mar 26, 2024
4d9940a
Fix typo in activation codes page
Portals Mar 26, 2024
743861a
Allow account scaffold to access extended users
Portals Mar 26, 2024
e3573ae
Move userinfo endpoint to /oauth/userinfo
Portals Mar 26, 2024
3ffa4b8
Various fixes
Portals Apr 2, 2024
21d576f
Update
Portals May 20, 2024
97c0348
Update
Portals May 20, 2024
8e834e8
Update
Portals May 20, 2024
ad2385c
Update
Portals May 20, 2024
2d03e99
Update
Portals May 20, 2024
86cbcb8
Update
Portals May 20, 2024
1a2b631
Update
Portals May 20, 2024
0043e54
Update
Portals May 20, 2024
6e91703
Update
Portals May 20, 2024
bae1766
Update UserAccessGuard
Portals May 20, 2024
24f697e
Update
Portals May 26, 2024
7fc7af4
Update
Portals May 26, 2024
500ce7b
Update
Portals May 26, 2024
f5847ee
Various fixes
Portals Jun 6, 2024
eb55d2c
Update
Portals Jun 8, 2024
3ede1d1
Be able to delete your own account
Portals Jun 8, 2024
e8f2c81
Various fixes
Portals Jun 8, 2024
9b49343
More migration
Portals Jun 8, 2024
a547c17
Add created_at and updated_at, remove formatting of sql.
Portals Jun 8, 2024
079aa2a
Update
Portals Jun 8, 2024
f7c5612
Update
Portals Jun 8, 2024
dceb0cf
Delete demo project
Portals Jun 8, 2024
7e23745
Update
Portals Jun 8, 2024
52e3463
Update
Portals Jun 8, 2024
cbbf966
Fix
Portals Jun 8, 2024
dbd8073
Update
Portals Jun 8, 2024
fc5a6b5
Upgrade deps, fix formatting
Portals Jun 8, 2024
87b7682
Update
Portals Jun 8, 2024
b370192
base url
Portals Jun 8, 2024
1ba03b1
Improve client and api key views
Portals Jun 9, 2024
2ebc365
Fix api key details
Portals Jun 9, 2024
d692d71
Fix owned clients details
Portals Jun 9, 2024
5ff2b66
Use localhost instead
Portals Jun 10, 2024
b848f6f
Be able to update unofficial post name yourself (not requiring admin)
Portals Jun 10, 2024
1cfac51
Randomize super group banner and avatar images
Portals Jun 10, 2024
23071d4
Introduce hasBanner and hasAvatar
Portals Jun 10, 2024
f20fc73
Fix bug
Portals Jun 12, 2024
f144a9a
Many improvements
Portals Jun 14, 2024
34cd1eb
Whoops forgot new files
Portals Jun 14, 2024
d3064e9
From partial and pages to users and user-details
Portals Jun 14, 2024
066e670
Improvements to groups, and avatar and banner uploading
Portals Jun 14, 2024
dd71d12
Sort all the things!
Portals Jun 14, 2024
f626a36
Sort user approvals for client
Portals Jun 14, 2024
9447dd8
Create user validation, other things
Portals Jun 14, 2024
7bd8c86
More refactoring
Portals Jun 14, 2024
8dc8580
More refactoring
Portals Jun 14, 2024
4afef43
Update
Portals Jun 14, 2024
1364c9d
Update
Portals Jun 14, 2024
f58c507
Update
Portals Jun 15, 2024
b6f89de
Update
Portals Jun 15, 2024
16c97f8
Reset password and create account through email and token query param…
Portals Jun 15, 2024
c1c151a
check if valid token first
Portals Jun 15, 2024
55b4fd6
token max valid for 15 minutes
Portals Jun 15, 2024
6b6b3b4
Revert exception handling code...
Portals Jun 16, 2024
cc27193
htmx strikes again
Portals Jun 16, 2024
888f5fd
Increase max ram
Portals Jun 16, 2024
47704e0
Show error if token has expired when resetting password.
Portals Jun 16, 2024
b32f656
Make reset and creation links into an actual anchor tag.
Portals Jun 16, 2024
ee3dd87
Formatting
Portals Jun 17, 2024
3984694
Add GET for retrieving a users groups
Portals Jun 17, 2024
dd3bcfd
Update
Portals Jun 18, 2024
7125eaa
Show error page when runtime exception happens
Portals Jun 18, 2024
14b9801
Remove anchor links from mails
Portals Jun 20, 2024
48101c7
Add GET /clients/v1/users/{id} and fix GET /clients/v1/superGroups
Portals Jun 20, 2024
44f900d
Update
Portals Jun 22, 2024
7c4ac4c
Update
Portals Jun 22, 2024
5a60676
Update
Portals Jun 22, 2024
f42cdb8
Update
Portals Jun 22, 2024
31fe633
Update
Portals Jun 23, 2024
5844196
More space when adding member
Portals Jun 25, 2024
d2a00bc
Update
Portals Jun 25, 2024
b9ee17e
Update
Portals Jun 25, 2024
fa4aebd
Update
Portals Jun 25, 2024
2610aad
Update
Portals Jun 25, 2024
d4056b4
Update
Portals Jun 25, 2024
7534182
Update
Portals Jun 27, 2024
feb1ffb
Update application.yml
Portals Jul 11, 2024
eaca2ef
Fix client restrictions
Portals Jul 30, 2024
3794075
Fix null pointer exception when displaying error
Portals Jul 30, 2024
bbef21f
Update
Portals Jul 30, 2024
d36cc42
Update
Portals Jul 30, 2024
694ddb8
Update
Portals Jul 30, 2024
500d9a8
Update
Portals Aug 18, 2024
5f57683
Update application.yml
Portals Aug 18, 2024
ddf5ef5
Update CookieConfig.java
Portals Aug 18, 2024
0431ea2
Update UserResetPasswordFacade.java
Portals Aug 18, 2024
b513bb5
Update
Portals Aug 18, 2024
eff86aa
Update
Portals Aug 20, 2024
49a7b47
Update
Portals Aug 20, 2024
147e50a
Update
Portals Aug 20, 2024
4f21d45
Update
Portals Aug 20, 2024
7e86594
Update
Portals Aug 20, 2024
9f9b0d2
Update
Portals Aug 20, 2024
54a29ce
Update
Portals Aug 20, 2024
c830bbb
Update
Portals Aug 20, 2024
a34bd99
Devcontainer
Portals Aug 26, 2024
a602a25
Update devcontainer
Portals Aug 26, 2024
edf3700
Update devcontainer
Portals Aug 26, 2024
10049f5
Update
Portals Aug 26, 2024
8695501
Update
Portals Aug 28, 2024
1b796a2
Update devcontainer.json
Portals Aug 28, 2024
1768e52
Fix missing super group deletion
Portals Aug 31, 2024
e82e999
Update
Portals Sep 2, 2024
ed7bffa
Update
Portals Sep 4, 2024
c1afbd5
Update
Portals Sep 4, 2024
3123030
Allow list and Activation code updates
Portals Sep 5, 2024
580cb97
Post ordering
Portals Sep 5, 2024
c7e31bf
Reset api key token
Portals Sep 6, 2024
3f8c313
Reset client secret
Portals Sep 6, 2024
682f48b
Update
Portals Sep 6, 2024
8725b05
Update
Portals Sep 7, 2024
d5fcd7a
Added smurf
Portals Sep 7, 2024
462a9e2
Update
Portals Sep 7, 2024
3e7acb2
Update
Portals Sep 7, 2024
9f4855a
Whoops
Portals Sep 17, 2024
f303272
Fix admins view
Portals Sep 17, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
25 changes: 25 additions & 0 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{
"name": "Gamma Devcontainer",
"dockerComposeFile": "docker-compose.yml",
"service": "app",
"workspaceFolder": "/workspaces/${localWorkspaceFolderBasename}",
"remoteUser": "root",

"features": {
"ghcr.io/devcontainers/features/java:1": {
"version": "21",
"jdkDistro": "open"
},
"ghcr.io/devcontainers/features/node:1": {
"version": "20"
}
},

"forwardPorts": [8081],

"customizations" : {
"jetbrains" : {
"backend" : "IntelliJ"
}
}
}
31 changes: 31 additions & 0 deletions .devcontainer/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
volumes:
postgres-data:

services:
app:
image: mcr.microsoft.com/devcontainers/base:ubuntu-22.04
volumes:
- ../..:/workspaces:cached
command: sleep infinity

db:
container_name: db
image: postgres:16
restart: unless-stopped
environment:
POSTGRES_PASSWORD: "postgres"
volumes:
- postgres-data:/var/lib/postgresql/data

redis:
container_name: redis
image: redis:5.0
restart: always

gotify:
container_name: gotify
image: cthit/gotify:latest
environment:
GOTIFY_PRE-SHARED-KEY: "123abc"
GOTIFY_MOCK-MODE: "true"
GOTIFY_DEBUG-MODE: "true"
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Original file line number Diff line number Diff line change
@@ -1 +1 @@
* @portals @gurr1
* @portals
47 changes: 47 additions & 0 deletions .github/workflows/gradle.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
name: Build Docker Image
on:
push:
branches: [dev]

jobs:
build:
runs-on: ubuntu-latest
permissions:
packages: write
steps:
- uses: actions/checkout@v4

- name: Set up JDK 21
uses: actions/setup-java@v4
with:
java-version: "21"
distribution: "adopt"

- name: Validate Gradle wrapper
uses: gradle/wrapper-validation-action@e6e38bacfdf1a337459f332974bb2327a31aaf4b

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3

- name: Login to GitHub Container Registry
if: ${{ github.ref == 'refs/heads/dev' }}
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Docker Build-Tag-Push my-app
run: |
./gradlew bootBuildImage
docker tag gamma:2.0.0-SNAPSHOT ghcr.io/cthit/gamma:latest
docker push ghcr.io/cthit/gamma:latest
working-directory: ./app

- name: Cleanup Gradle Cache

# Remove some files from the Gradle cache, so they aren't cached by GitHub Actions.
# Restoring these files from a GitHub Actions cache might cause problems for future builds.
run: |
rm -f ~/.gradle/caches/modules-2/modules-2.lock
rm -f ~/.gradle/caches/modules-2/gc.properties
5 changes: 3 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
yarn-error.log
frontend/node_modules/
.idea/*
.DS_Store
uploads/
.run
1 change: 0 additions & 1 deletion .mailmap

This file was deleted.

22 changes: 0 additions & 22 deletions .travis.yml

This file was deleted.

Loading
Loading