Wolfgang Huß
|
9ded9105a3
|
Left over of merge conflict
|
2023-03-16 16:09:18 +01:00 |
|
Wolfgang Huß
|
9dbb8cae41
|
Merge branch '6068-on-create-edit-group-page-have-additional-hint' of github.com:Ocelot-Social-Community/Ocelot-Social into 6068-on-create-edit-group-page-have-additional-hint
# Conflicts:
# webapp/components/ContributionForm/ContributionForm.vue
|
2023-03-16 16:06:35 +01:00 |
|
Wolfgang Huß
|
84e483a450
|
Fix variable name
|
2023-03-16 16:03:51 +01:00 |
|
Wolfgang Huß
|
04b6dc4407
|
Merge branch '6068-on-create-edit-group-page-have-additional-hint' of github.com:Ocelot-Social-Community/Ocelot-Social into 6068-on-create-edit-group-page-have-additional-hint
# Conflicts:
# webapp/components/ContributionForm/ContributionForm.vue
|
2023-03-16 15:56:40 +01:00 |
|
Wolfgang Huß
|
4f6c9319fb
|
Update webapp/components/ContributionForm/ContributionForm.vue
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
|
2023-03-16 15:52:31 +01:00 |
|
Wolfgang Huß
|
5c634ca688
|
Update webapp/components/ContributionForm/ContributionForm.vue
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
|
2023-03-16 15:51:16 +01:00 |
|
Wolfgang Huß
|
424f5c4172
|
Refine style of contribution (post) form hint text for group post
|
2023-03-16 15:49:13 +01:00 |
|
Wolfgang Huß
|
8d98d07d22
|
Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 6068-on-create-edit-group-page-have-additional-hint
|
2023-03-16 13:06:04 +01:00 |
|
|
|
46d1c84077
|
Merge pull request #6145 from Ocelot-Social-Community/deployment-upgrade-to-specific-version
fix(other): use access token to trigger build on external repo
b2.4.0-355
|
2023-03-16 12:19:20 +01:00 |
|
elweyn
|
c15a6d1fbe
|
Merge branch '6068-on-create-edit-group-page-have-additional-hint' of https://github.com/Ocelot-Social-Community/Ocelot-Social into 6068-on-create-edit-group-page-have-additional-hint
|
2023-03-16 12:09:05 +01:00 |
|
elweyn
|
9259615a34
|
Style changes for the action buttons
|
2023-03-16 12:08:56 +01:00 |
|
|
|
357a657f91
|
Merge branch 'master' into deployment-upgrade-to-specific-version
|
2023-03-16 11:47:33 +01:00 |
|
mahula
|
0f4174885c
|
Merge pull request #6124 from Ocelot-Social-Community/6014-feature-webapp-join-leave-button-on-group-page-is-misleading
feat(webapp): set different icon and text on join leave button, when member is pending
b2.4.0-354
|
2023-03-16 09:55:30 +01:00 |
|
mahula
|
c5d3b8830b
|
Merge branch 'master' into 6014-feature-webapp-join-leave-button-on-group-page-is-misleading
|
2023-03-16 08:42:20 +01:00 |
|
mahula
|
945f076d6d
|
linting
|
2023-03-16 08:39:35 +01:00 |
|
|
|
7ab2c24f7a
|
Merge branch 'master' into deployment-upgrade-to-specific-version
|
2023-03-15 20:24:55 +01:00 |
|
|
|
ed76f69a8c
|
use access token to trigger build on external repo
|
2023-03-15 20:25:06 +01:00 |
|
|
|
4dfeeddd7c
|
Merge pull request #6143 from Ocelot-Social-Community/deployment-upgrade-to-specific-version
refactor(other): deployment upgrade to specific version, trigger build on stage
b2.4.0-353
|
2023-03-15 19:32:56 +01:00 |
|
|
|
f50862db7d
|
Merge branch 'master' into deployment-upgrade-to-specific-version
|
2023-03-15 13:54:20 +01:00 |
|
|
|
6896536a3b
|
trigger build success on stage repo
|
2023-03-15 13:43:34 +01:00 |
|
Hannes Heine
|
bc38436b3b
|
Merge pull request #6135 from Ocelot-Social-Community/6009-grouplist-add-second-column
feat(webapp): show 2 GroupItem per row in GroupList
b2.4.0-352
|
2023-03-15 13:35:01 +01:00 |
|
Wolfgang Huß
|
3a2e18d794
|
Merge branch 'master' into 6014-feature-webapp-join-leave-button-on-group-page-is-misleading
|
2023-03-15 12:48:17 +01:00 |
|
Hannes Heine
|
e84e56e947
|
Merge branch 'master' into 6009-grouplist-add-second-column
|
2023-03-15 12:47:03 +01:00 |
|
|
|
f3bf64ea4f
|
Merge pull request #6136 from Ocelot-Social-Community/deployment-fix-dbreset
fix(backend): do not delete migrations on db reset
b2.4.0-351
|
2023-03-15 12:46:23 +01:00 |
|
mahula
|
6a66c99a7d
|
update webapp/locales/en.json
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
|
2023-03-15 12:46:10 +01:00 |
|
mahula
|
40a80fa93a
|
update webapp/locales/de.json
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
|
2023-03-15 12:45:54 +01:00 |
|
|
|
67d15db533
|
cluster upgrade to specific version
|
2023-03-15 12:25:41 +01:00 |
|
elweyn
|
19b81a85b1
|
Change padding-bottom from 5px to 20px
|
2023-03-15 12:17:10 +01:00 |
|
elweyn
|
6223edcb20
|
Change style ds-flex-item to class name group-item
|
2023-03-15 12:02:19 +01:00 |
|
|
|
a67e3452da
|
do not delete migrations
|
2023-03-15 11:57:28 +01:00 |
|
elweyn
|
176050082b
|
Add scoped to style
|
2023-03-15 11:55:18 +01:00 |
|
elweyn
|
be130f849a
|
Fix linting.
|
2023-03-15 11:44:13 +01:00 |
|
mahula
|
5d5100f08c
|
change join leave button behavior for pending user
|
2023-03-15 11:43:14 +01:00 |
|
mahula
|
fe422f5c77
|
add leave and tooltip key tolocales
|
2023-03-15 11:39:03 +01:00 |
|
elweyn
|
19ac18af2a
|
Base is now width 98% after md we switch to 48%
|
2023-03-15 11:08:47 +01:00 |
|
elweyn
|
2eed0986a5
|
Change ds-container to ds-space to remove padding
|
2023-03-15 10:44:15 +01:00 |
|
elweyn
|
e2c82116ae
|
feat(webapp): GroupList shows 2 GroupItem per row
|
2023-03-15 10:43:35 +01:00 |
|
|
|
9b759ec1d2
|
Merge pull request #6129 from Ocelot-Social-Community/deployment-reseed
feat(other): deployment reseed
b2.4.0-350
|
2023-03-14 23:42:40 +01:00 |
|
|
|
ee8d9233a9
|
Merge branch 'master' into deployment-reseed
|
2023-03-14 21:22:46 +01:00 |
|
|
|
9ec46db2ec
|
Merge pull request #6120 from Ocelot-Social-Community/deployment-secrets
feat(other): deployment secrets
b2.4.0-349
|
2023-03-14 21:22:33 +01:00 |
|
|
|
895ba16ab1
|
Merge branch 'master' into deployment-secrets
|
2023-03-14 20:24:54 +01:00 |
|
Wolfgang Huß
|
e36af318ec
|
Merge pull request #6116 from Ocelot-Social-Community/6016-feature-refactor-notification-page
feat(webapp): refactor notification page
b2.4.0-348
|
2023-03-14 20:21:03 +01:00 |
|
Wolfgang Huß
|
701d1d1dcf
|
Merge branch 'master' into 6016-feature-refactor-notification-page
|
2023-03-14 19:49:33 +01:00 |
|
Wolfgang Huß
|
c4601964df
|
Merge pull request #6130 from Ocelot-Social-Community/3157-fix-post-ribbons-position
fix(webapp): fix ribbons position
b2.4.0-347
|
2023-03-14 19:49:11 +01:00 |
|
Wolfgang Huß
|
fdb451c87a
|
Merge branch 'master' into 3157-fix-post-ribbons-position
|
2023-03-14 19:15:51 +01:00 |
|
Wolfgang Huß
|
5e56b8ba37
|
Merge branch 'master' into 6016-feature-refactor-notification-page
|
2023-03-14 15:25:46 +01:00 |
|
Wolfgang Huß
|
387d70a907
|
Merge pull request #6107 from Ocelot-Social-Community/5982-fix-donation-bar-blink
fix(webapp): fix donation bar blink
b2.4.0-346
|
2023-03-14 15:25:32 +01:00 |
|
Wolfgang Huß
|
3d795558d7
|
Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 6016-feature-refactor-notification-page
|
2023-03-14 14:25:23 +01:00 |
|
Wolfgang Huß
|
3f4f65121a
|
Fix linting
|
2023-03-14 14:25:15 +01:00 |
|
Wolfgang Huß
|
b1be6321e0
|
Merge branch 'master' into 5982-fix-donation-bar-blink
|
2023-03-14 14:23:54 +01:00 |
|
