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

chore(deps): update actions/setup-python action to v5 - autoclosed #52

Closed
wants to merge 42 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
a716724
requirements: add extra file for fork specific packages
goapunk Jul 20, 2023
ecd4dbc
* only update fork specific packages
goapunk Jul 20, 2023
df892ac
scripts/deploy.sh: fix project name
goapunk Jul 20, 2023
5bcfa4a
README: fix build status and coverage badge
goapunk Jul 20, 2023
31571e0
ci: fix django and postgresql version
goapunk Jul 24, 2023
d7dd4b3
translations: enable fork locale in settings
goapunk Jul 24, 2023
cb8a822
translations: add fork translations
goapunk Jul 24, 2023
32f638e
changelog: reset changelog
goapunk Jul 28, 2023
3cf504b
apps/dashboard/blueprints: remove un-needed blueprints and fix tests …
philli-m Jul 27, 2023
605b08a
assets/*: update logo, colours and styles to match branding and updat…
philli-m Jul 25, 2023
960c9e7
apps/ai_reports: initial commit for ai reports
hklarner Jul 26, 2023
c8850b2
apps/userdashboard: integrates new filter into user dashboard
hklarner Jul 26, 2023
1a84d77
apps/userdashboard: updates tests
hklarner Aug 8, 2023
1d7800d
chore(deps): update dependency ubuntu to v22
renovate[bot] Aug 10, 2023
d088734
userdashboard/ModerationNotification//AIFeedback: add AI feedback com…
philli-m Jul 31, 2023
bb58388
apps/moderatorfeedback: add ai_report serialiser
m4ra Aug 2, 2023
7d938d5
apps/userdashboard: add ai_report to moderation comment serializer
m4ra Aug 15, 2023
cd5e85e
apps/ai_reports: fix admin comment relation and display
m4ra Aug 16, 2023
3812d74
userdashboard/AiReportExplanation: add switch component to display/hi…
philli-m Aug 2, 2023
1a98c79
userdashboard/ModerationNotification: add labels for ai or user repor…
philli-m Aug 14, 2023
ee6d865
userdashboard: ensure aiexplanation switch always on and replace dumm…
philli-m Aug 16, 2023
568ffcf
userdashboard/UserReport: add slider for user report with dummy data …
philli-m Aug 16, 2023
ac13f87
apps/userdashboard: extends the moderation comment serializer with "u…
hklarner Aug 9, 2023
ddc0a38
fixes typos
hklarner Aug 9, 2023
e2ae058
apps/userdashboard: refactors moderation comment serializer
hklarner Aug 9, 2023
a02ab0c
chore(deps): update actions/checkout action to v4
renovate[bot] Sep 4, 2023
fd9b7c6
apps/userdashboard: fix reported by user label not shown if also
goapunk Sep 5, 2023
723e824
apps/userdashboard: show real user reports in dashboard and update st…
goapunk Sep 5, 2023
a9dcd4f
userdashboard/ModerationNotification: fix if to only show userreports…
philli-m Sep 12, 2023
70759f1
userdashboard/ModerationNotification: update AIReport component to ad…
philli-m Sep 5, 2023
d09755b
assets/scss: use correct color for brand--danger
goapunk Sep 11, 2023
951afda
add changelog
goapunk Sep 7, 2023
5297722
userdashboard/userreport: show actual username of the reportee
goapunk Sep 13, 2023
bb92c83
assets/icons: add required favicon files and appropriate tags in base…
philli-m Oct 12, 2023
d6c0c9e
assets/avatars: replace a+ coloured avatars with defakts ones colors …
philli-m Oct 12, 2023
0cf0a9f
assets/header_lower: add styling for if no org logo partial fixes #38
philli-m Oct 12, 2023
246ae24
assets/*: update rating colours add to variable, change btns in comme…
philli-m Oct 12, 2023
49108df
settings: update languages to en and de only
m4ra Oct 17, 2023
2c57d68
locale-fork: delete languages not being used
m4ra Oct 17, 2023
95786a6
release v2310.1
m4ra Oct 17, 2023
c227b42
assets/images: replace low quality logo files and fix footer to use o…
philli-m Oct 31, 2023
2ff9b43
chore(deps): update actions/setup-python action to v5
renovate[bot] Dec 6, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .github/workflows/django.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ on:

jobs:
build:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
services:
postgres:
image: postgres:12
image: postgres:14
env:
POSTGRES_PASSWORD: postgres
ports:
Expand All @@ -22,11 +22,11 @@ jobs:
--health-timeout 5s
--health-retries 5
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: '3.8'
python-version: '3.10'
- name: Setup Node
uses: actions/setup-node@v3
with:
Expand Down
688 changes: 41 additions & 647 deletions CHANGELOG.md

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

[adhocracy.plus](https://adhocracy.plus/) is a free Open-Source participation platform maintained and primarily developed by Liquid Democracy e.V.. It is based on [adhocracy 4](https://github.com/liqd/adhocracy4) and [Django](https://github.com/django/django).

![Build Status](https://github.com/liqd/adhocracy-plus/actions/workflows/django.yml/badge.svg)
[![Coverage Status](https://coveralls.io/repos/github/liqd/adhocracy-plus/badge.svg?branch=main)](https://coveralls.io/github/liqd/adhocracy-plus?branch=main)
![Build Status](https://github.com/liqd/a4-defakts/actions/workflows/django.yml/badge.svg)
[![Coverage Status](https://coveralls.io/repos/github/liqd/a4-defakts/badge.svg?branch=main)](https://coveralls.io/github/liqd/a4-defakts?branch=main)

## Getting started

Expand Down
Binary file modified adhocracy-plus/assets/images/avatars/avatar-00.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
49 changes: 26 additions & 23 deletions adhocracy-plus/assets/images/avatars/avatar-00.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified adhocracy-plus/assets/images/avatars/avatar-01.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
47 changes: 24 additions & 23 deletions adhocracy-plus/assets/images/avatars/avatar-01.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified adhocracy-plus/assets/images/avatars/avatar-02.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
49 changes: 26 additions & 23 deletions adhocracy-plus/assets/images/avatars/avatar-02.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified adhocracy-plus/assets/images/avatars/avatar-03.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
47 changes: 24 additions & 23 deletions adhocracy-plus/assets/images/avatars/avatar-03.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified adhocracy-plus/assets/images/avatars/avatar-04.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
49 changes: 26 additions & 23 deletions adhocracy-plus/assets/images/avatars/avatar-04.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion adhocracy-plus/assets/images/blueprints/agenda-setting.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion adhocracy-plus/assets/images/blueprints/brainstorming.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion adhocracy-plus/assets/images/blueprints/debate.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading