13308 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Ulf Gebhardt	6aaa51e388	use sh instead of bash	2023-06-02 12:32:20 +02:00
Ulf Gebhardt	987e204ff9	remove all script functionality	2023-06-02 12:24:18 +02:00
Ulf Gebhardt	f4f016265a	capsulate in /bin/sh	2023-06-02 12:18:08 +02:00
Ulf Gebhardt	0954951e26	removed ./	2023-06-02 12:11:42 +02:00
Ulf Gebhardt	031c9c370b	copy files in external script	2023-06-02 11:08:08 +02:00
Ulf Gebhardt	1b92bb60b3	Merge pull request #6321 from Ocelot-Social-Community/typescript ... feat(backend): typescript	2023-06-02 10:52:10 +02:00
Ulf Gebhardt	d2a44c8753	Merge branch 'master' into typescript	2023-06-02 10:16:01 +02:00
entermex	a4f84b0a4c	Merge pull request #6319 from Ocelot-Social-Community/6307-group-list-number-to-six ... fix(webapp): fix group list number to six	2023-06-01 23:29:06 +02:00
entermex	9176cbfe80	Merge branch 'master' into 6307-group-list-number-to-six	2023-06-01 22:50:46 +02:00
entermex	691226e3f3	Merge pull request #6335 from Ocelot-Social-Community/6290-fix-notification-menu-comment-hash ... fix(webapp): fix notification menu comment hash	2023-06-01 22:50:13 +02:00
entermex	e11b4eb28e	Merge branch 'master' into 6290-fix-notification-menu-comment-hash	2023-06-01 22:19:44 +02:00
Ulf Gebhardt	3bcd518bd4	reverted removal of data:null	2023-05-31 10:32:40 +02:00
Ulf Gebhardt	a21df08551	revered removal of data: null	2023-05-31 10:28:28 +02:00
Ulf Gebhardt	a50e3f2f14	Merge branch 'master' into typescript	2023-05-31 10:21:04 +02:00
Ulf Gebhardt	3790f3d010	Merge pull request #6199 from Ocelot-Social-Community/event-master ... feat(other): 🍰 epic events – master	2023-05-30 16:28:29 +02:00
Hannes Heine	9a9f5eaf45	Merge branch 'master' into event-master	2023-05-30 15:26:22 +02:00
Ulf Gebhardt	a72ce57d12	Merge pull request #6260 from Ocelot-Social-Community/fix-avatar-seeding ... fix(other): fix avatar seeding	2023-05-30 14:05:50 +02:00
Wolfgang Huß	e090611efa	Merge branch 'event-master' of github.com:Ocelot-Social-Community/Ocelot-Social into event-master	2023-05-30 10:53:53 +02:00
Wolfgang Huß	54c7f9e38d	Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into event-master	2023-05-30 10:53:20 +02:00
mahula	7b0322434a	Merge branch 'master' into fix-avatar-seeding	2023-05-30 10:11:29 +02:00
Wolfgang Huß	eac46dd6c8	Merge pull request #6333 from Ocelot-Social-Community/6332-enable-gql-playground-set-DEBUG=true-in-backend-env ... chore(other): set 'DEBUG=true' in backend '.env.template' to use GraphQL Playground	2023-05-25 14:41:14 +02:00
Wolfgang Huß	baf860c5c9	Merge branch 'master' into 6332-enable-gql-playground-set-DEBUG=true-in-backend-env	2023-05-25 14:14:50 +02:00
Ulf Gebhardt	9667641e42	Merge branch 'master' into fix-avatar-seeding	2023-05-25 13:47:32 +02:00
Ulf Gebhardt	6c6e308cc7	Merge pull request #6326 from Ocelot-Social-Community/unused-packages-ocelot ... refactor(other): unused packages ocelot	2023-05-25 13:47:11 +02:00
entermex	6807b6f543	Fix notification menu comment hash	2023-05-25 13:10:32 +02:00
Ulf Gebhardt	86d64ce25e	Merge branch 'master' into fix-avatar-seeding	2023-05-25 12:51:14 +02:00
Ulf Gebhardt	deeccecd19	Merge branch 'master' into unused-packages-ocelot	2023-05-25 12:49:35 +02:00
Ulf Gebhardt	69275096a6	Merge pull request #6325 from Ocelot-Social-Community/unused-packages-backend ... refactor(backend): unused packages backend	2023-05-25 12:49:19 +02:00
Ulf Gebhardt	04ab8148f9	lint fixes	2023-05-25 12:41:04 +02:00
Ulf Gebhardt	73417079ed	fix eslint ignore	2023-05-25 12:40:32 +02:00
Ulf Gebhardt	3f1e42e6fd	externalize styles	2023-05-25 12:15:03 +02:00
Ulf Gebhardt	2bd8a7ef04	make time selection to be always valid	2023-05-25 11:56:10 +02:00
Ulf Gebhardt	572272b581	typo	2023-05-25 11:26:31 +02:00
entermex	bb3047a21a	Merge branch 'master' into 6307-group-list-number-to-six	2023-05-25 11:23:53 +02:00
Ulf Gebhardt	e6e972e50e	removed compiled css files	2023-05-25 11:22:56 +02:00
Ulf Gebhardt	13c7f080f0	removed compiled css files	2023-05-25 11:19:08 +02:00
Ulf Gebhardt	ec2fa8878b	Merge branch 'master' into fix-avatar-seeding	2023-05-25 10:45:30 +02:00
Wolfgang Huß	2ba2da75a3	Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into event-master	2023-05-25 09:39:03 +02:00
Wolfgang Huß	cb1473b748	Set 'DEBUG=true' in backend '.env.template' to use GraphQL Playground ... - Mention in docs as well.	2023-05-24 18:01:17 +02:00
Ulf Gebhardt	948ec7dfcf	Merge branch 'master' into unused-packages-backend	2023-05-24 16:55:15 +02:00
Wolfgang Huß	e9073b04e4	Merge pull request #6329 from Ocelot-Social-Community/6328-add-description-for-script-usage ... docs(other): add description for script usage in deployment readme	2023-05-24 15:42:20 +02:00
Ulf Gebhardt	3e41b699d5	potentially fix problem with fullstack tests and faker/image seeding	2023-05-24 15:23:27 +02:00
Ulf Gebhardt	49223e07d2	Merge branch 'master' into unused-packages-ocelot	2023-05-24 14:56:48 +02:00
Ulf Gebhardt	58928d4b56	Merge branch 'master' into unused-packages-backend	2023-05-24 14:56:21 +02:00
Wolfgang Huß	b4d8affec0	Add description for script usage in deployment readme	2023-05-24 11:50:42 +02:00
Markus	e0183a949f	Merge pull request #6154 from Ocelot-Social-Community/newsfeed-layout-fixes ... fix(webapp): fix newsfeed layout	2023-05-24 10:46:03 +02:00
Markus	87b41769f1	Merge branch 'master' into newsfeed-layout-fixes	2023-05-24 10:17:00 +02:00
Markus	e54629554b	Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social	2023-05-24 10:16:44 +02:00
Markus	12a4ab6b83	merged master and resolved conflict in webapp/pages/index.vue	2023-05-24 10:16:07 +02:00
Markus	7b6fed6d64	Merge pull request #6308 from Ocelot-Social-Community/6142-comment-mention-missing-white-space ... fix(webapp): adds white space after user handle in comment editor	2023-05-24 09:57:48 +02:00