16408 Commits

Author SHA1 Message Date
Moriz Wahl
6703e4a311 add RemoveUserFromGroup mutation 2023-03-03 16:41:59 +01:00
Markus
ee6f72c09a Fix gap above news feed by adding a multi column space element 2023-03-02 11:56:16 +01:00
Hannes Heine
a3cb9b7212
Merge branch 'master' into 6013-change-benutzer-to-nutzer 2023-03-02 11:16:22 +01:00
Hannes Heine
610c60ff6e
Merge pull request #6023 from Ocelot-Social-Community/fix-readme-nvm-usage
docs(webapp): change the used nvm version
b2.4.0-310
2023-03-02 11:15:19 +01:00
elweyn
b5738b8d2e Merge branch '5152-remove-helper-jest-gql-function' of https://github.com/Ocelot-Social-Community/Ocelot-Social into 5152-remove-helper-jest-gql-function 2023-03-02 10:57:28 +01:00
elweyn
e0064e7cf0 Update browserlist. 2023-03-02 10:57:18 +01:00
Hannes Heine
59525ae373
Merge branch 'master' into 6013-change-benutzer-to-nutzer 2023-03-02 10:54:37 +01:00
Hannes Heine
424e3c07d0
Merge branch 'master' into fix-readme-nvm-usage 2023-03-01 16:57:59 +01:00
Wolfgang Huß
0ec67e0e91 Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 6062-adjust-and-create-branding-possibilities 2023-03-01 13:21:39 +01:00
Wolfgang Huß
a1fa905f40 Revert "Set Yunite rebranding"
This reverts commit 2635907ac71320b64a33121c412267662d5e9eb9.

# Conflicts:
#	webapp/assets/styles/imports/_branding.scss
2023-03-01 12:47:47 +01:00
Hannes Heine
66d203bfa4
Merge branch 'master' into 5152-remove-helper-jest-gql-function 2023-03-01 10:45:22 +01:00
elweyn
d76e7e485e Add some graphql and graphql-tag libraries. 2023-03-01 10:42:55 +01:00
elweyn
738d69d3e7 Add graphql-tag to package. 2023-03-01 09:07:44 +01:00
Wolfgang Huß
df49af74a3 Adjust devision space size on footer 2023-03-01 08:01:33 +01:00
Wolfgang Huß
a4a25eb5cf Replace explicit color #6e8b87 in branding by $color-primary 2023-03-01 07:57:07 +01:00
Wolfgang Huß
e719ae23c9 Adjust ds-chips background color on group teaser and group profile 2023-03-01 07:55:50 +01:00
Wolfgang Huß
ecff8476cf Replace devision line by pure space 2023-03-01 07:39:03 +01:00
e58c9839da
Merge pull request #6051 from Ocelot-Social-Community/backup-script
feat(other): backup script
2023-02-28 21:12:41 +01:00
Wolfgang Huß
7278adb09d Set primary and secondary color correctly for Yunite incl. donation bar and toast 2023-02-28 20:51:21 +01:00
Wolfgang Huß
58fd233e70 Make branding color setting possible or better for donation bar and toaster 2023-02-28 20:49:50 +01:00
Wolfgang Huß
1e742dd42c Fix linting 2023-02-28 20:48:23 +01:00
Wolfgang Huß
2635907ac7 Set Yunite rebranding 2023-02-28 19:42:12 +01:00
elweyn
71820a94f5 Change gql tag in cypress. 2023-02-28 13:14:18 +01:00
elweyn
e93832ab98 Merge branch 'master' into 5152-remove-helper-jest-gql-function 2023-02-28 13:07:33 +01:00
Hannes Heine
6be8c8eeb5
Merge branch 'master' into add-db-migrate-up-command-to-docu 2023-02-28 13:06:48 +01:00
elweyn
fb353b8a68 Change README.md 2023-02-28 13:05:13 +01:00
cabcc42d92
Merge branch 'master' into backup-script 2023-02-28 13:04:34 +01:00
elweyn
a3ac360889 docs(other): change contraint* to constraint*, correct indexes to indices, add yarn run db:migrations up to the readmes. 2023-02-28 13:02:29 +01:00
Hannes Heine
f2f9162229
Merge branch 'master' into fix-readme-nvm-usage 2023-02-28 12:56:38 +01:00
Hannes Heine
e6a11fc816
Merge pull request #5996 from Ocelot-Social-Community/fix-description-not-show-null
fix(backend): user or group has null as description
b2.4.0-308
2023-02-28 12:54:35 +01:00
elweyn
b45e4b5990 Refactor create user with defined about 2023-02-28 09:55:34 +01:00
elweyn
fb879f96b6 Merge branch 'master' into fix-description-not-show-null 2023-02-28 08:10:09 +01:00
187b661a70
Merge branch 'master' into backup-script 2023-02-27 22:50:03 +01:00
Wolfgang Huß
a3670f6275 Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 6030-remove-docker-compose-file-for-apple-m1 2023-02-27 16:50:54 +01:00
Wolfgang Huß
58f1aee660 Remove Apple M1 Docker overrides and reduce information about its usage in the readmes 2023-02-27 16:45:06 +01:00
1e0978620d
Merge pull request #6042 from Ocelot-Social-Community/maintenance-mode-script
feat(other): script to set a cluster in maintenance mode
b2.4.0-307
2023-02-27 15:38:54 +01:00
Hannes Heine
b269a490d6
Merge branch 'master' into 6013-change-benutzer-to-nutzer 2023-02-27 14:29:31 +01:00
7f97e7e1ca
Merge branch 'master' into maintenance-mode-script 2023-02-27 13:25:37 +01:00
c1b0367946
Merge pull request #6035 from Ocelot-Social-Community/fix-dependabot
feat(other): fix dependabot
b2.4.0-306
2023-02-27 13:24:08 +01:00
046449cf93
Merge pull request #6032 from Ocelot-Social-Community/maintenance
fix(other): fix maintenance page & maintenance build
b2.4.0-305
2023-02-27 13:23:51 +01:00
799ea1fbe6
finish backup script 2023-02-27 13:01:27 +01:00
51f6469119
backup script working - initial commit 2023-02-27 12:49:52 +01:00
Moriz Wahl
5f70189a2b
Merge pull request #5968 from Ocelot-Social-Community/webapp-upgrade-jest
refactor(webapp): upgrade jest and vue test util
b2.4.0-304
2023-02-27 11:08:36 +01:00
b5bbf5164d
script to set a cluster in maintenance mode 2023-02-27 10:52:34 +01:00
Markus
cecd506581 removed gap above news feed in desktop view 2023-02-27 10:45:46 +01:00
Markus
42a370ffc8 set showDonations flag to false as default to avoid blinking 2023-02-27 10:42:20 +01:00
6016a8b85a
remove comments, checks permissions are working 2023-02-24 13:45:43 +01:00
2b30527ef0
try checks permission 2023-02-24 13:23:04 +01:00
f3a95120bb
try limit permissions to statusses 2023-02-24 13:01:49 +01:00
Moriz Wahl
f95d6d63f9 remove unused package, ignore dist for unit tests 2023-02-24 12:45:47 +01:00