12876 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Ulf Gebhardt	49ed4437f4	make configuration a mandatory variable	2023-03-20 11:01:53 +01:00
Ulf Gebhardt	36f4e89b80	updated stage.ocelot.social submodule reference	2023-03-20 11:01:13 +01:00
Ulf Gebhardt	61b5112b8b	moved example into stage.ocelot.social	2023-03-20 10:59:49 +01:00
Ulf Gebhardt	1b41d3bb7c	stage.ocelot.social as submodule	2023-03-20 10:53:00 +01:00
Ulf Gebhardt	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
Ulf Gebhardt	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
Ulf Gebhardt	7ab2c24f7a	Merge branch 'master' into deployment-upgrade-to-specific-version	2023-03-15 20:24:55 +01:00
Ulf Gebhardt	ed76f69a8c	use access token to trigger build on external repo	2023-03-15 20:25:06 +01:00
Ulf Gebhardt	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
Ulf Gebhardt	f50862db7d	Merge branch 'master' into deployment-upgrade-to-specific-version	2023-03-15 13:54:20 +01:00
Ulf Gebhardt	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
Ulf Gebhardt	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
Ulf Gebhardt	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
Ulf Gebhardt	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
Ulf Gebhardt	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
Ulf Gebhardt	ee8d9233a9	Merge branch 'master' into deployment-reseed	2023-03-14 21:22:46 +01:00
Ulf Gebhardt	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
Ulf Gebhardt	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
Wolfgang Huß	678fc2e7d3	Merge pull request #6122 from Ocelot-Social-Community/6066-group-query-sort-by-createdAt ... feat(webapp): change order of groups to new first b2.4.0-345	2023-03-14 14:17:58 +01:00
Ulf Gebhardt	14b79c9aaa	Merge branch 'master' into deployment-secrets	2023-03-14 13:05:38 +01:00
Hannes Heine	017140c672	Merge branch 'master' into 6066-group-query-sort-by-createdAt	2023-03-14 13:01:54 +01:00
Hannes Heine	dad1764a62	Merge pull request #6093 from Ocelot-Social-Community/5967-user-profil-show-more-following-user ... fix(webapp): error in user profil on the 'show x more' button b2.4.0-344	2023-03-14 13:01:24 +01:00
Hannes Heine	3864c8a8d6	Merge branch 'master' into 5967-user-profil-show-more-following-user	2023-03-14 12:05:29 +01:00
Ulf Gebhardt	a8cc17db44	Merge branch 'master' into deployment-secrets	2023-03-14 12:04:58 +01:00