348 Commits

Author SHA1 Message Date
47fbabf1b4
Merge pull request #95 from Ocelot-Social-Community/revert-94-v2.3.0
Revert "V2.3.0"
2022-12-07 00:16:15 +01:00
32871a8f83
Revert "V2.3.0" 2022-12-07 00:16:00 +01:00
18b2d0fca0
Merge pull request #94 from Yunite-Net/v2.3.0
V2.3.0
2022-12-07 00:14:52 +01:00
97911f809a
Merge branch 'master-ocelot'
# Conflicts:
#	package.json
2022-12-07 00:13:57 +01:00
bbd53b539c
Merge pull request #93 from Ocelot-Social-Community/v2.3.0-281
v2.3.0-281
2022-12-07 00:10:10 +01:00
6e85677b48
adjusted ocelotDockerVersionTag 2022-12-06 10:18:33 +01:00
Alexander Friedland
307e42ad6b
Merge pull request #26 from Yunite-Net/hamonize-to-yunite
rebranding for yunite
2022-12-01 13:00:58 +01:00
ogerly
fd10880214 resolve conflicts 2022-12-01 12:59:24 +01:00
ogerly
507f42a55a rebranding for yunite 2022-12-01 12:54:30 +01:00
Moriz Wahl
f98045143d
Merge pull request #25 from Yunite-Net/copy-fonts-from-assets
feat(webapp): copy fonts from assets
2022-12-01 12:35:24 +01:00
Moriz Wahl
34b22936f3
Update webapp.Dockerfile 2022-12-01 12:34:00 +01:00
Moriz Wahl
b7f7f7818f
Merge pull request #92 from Ocelot-Social-Community/copy-fonts-from-assets
feat(webapp): copy fonts from assets
2022-12-01 12:32:12 +01:00
Moriz Wahl
fb6d0ace31 feat(webapp): copy fonts from assets 2022-12-01 12:29:30 +01:00
Wolfgang Huß
f8adbe9f6f
Merge pull request #19 from Yunite-Net/18-release-v2.1.X-XXX-fixes-groups-page
chore: 🍰 Release v2.2.0-267 – Fixes And Groups Page Etc.
2022-10-28 21:30:37 +02:00
Wolfgang Huß
9389c3463f Adjust groups header menu 2022-10-28 21:26:04 +02:00
Wolfgang Huß
21fcc094a6 Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding into 18-release-v2.1.X-XXX-fixes-groups-page
# Conflicts:
#	branding/constants/headerMenu.js
#	branding/constants/links.js
#	branding/constants/logos.js
#	package.json
2022-10-28 20:00:15 +02:00
Alexander Friedland
a1b2accc36
Merge pull request #21 from Yunite-Net/20-Color-of-Hastags-in-Search-Results
fix: 🍰 Change Hasttag Menu Search Color To `#17b53f`
2022-10-28 19:31:12 +02:00
Wolfgang Huß
daeef5f689
Merge pull request #90 from Ocelot-Social-Community/84-release-v2.2.0-267
chore: 🍰 Release v2.2.0-267
2022-10-28 17:32:01 +02:00
Wolfgang Huß
9790e15166 Release v2.2.0-267 2022-10-28 17:26:17 +02:00
Wolfgang Huß
de797e94f1 Add all new configuration files and properties 2022-10-28 17:25:11 +02:00
Wolfgang Huß
a357ae0738
Merge pull request #86 from Ocelot-Social-Community/docu_updates
Docu Updates
2022-10-28 14:20:53 +02:00
ogerly
7578e03c6d change hasttag search test color to #17b53f 2022-10-28 11:34:34 +02:00
Wolfgang Huß
75b447493f Change owner data etc. 2022-10-26 13:48:03 +02:00
Wolfgang Huß
1d3d6ee29b
Merge pull request #12 from Yunite-Net/5059-epic-groups
chore: 🍰 Release v2.1.0-253 – Merge Groups Into master – Epic Groups
2022-10-25 20:08:49 +02:00
Wolfgang Huß
0d1eac9928 Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding into 5059-epic-groups
# Conflicts:
#	package.json
2022-10-25 18:21:09 +02:00
Wolfgang Huß
22aa91f296
Merge pull request #87 from Ocelot-Social-Community/85-release-v2.1.0-253
chore: 🍰 Release v2.1.0-253
2022-10-25 18:12:54 +02:00
Wolfgang Huß
82103939a2 Release v2.1.0-253 2022-10-25 18:06:52 +02:00
96489e8218
- fixed spelling errors
- detailed upgrade guide for the certmanager
2022-10-24 22:27:39 +02:00
Wolfgang Huß
8ec8125991 Remove 'groups' from 'publish.yml' 2022-10-23 19:10:23 +02:00
Wolfgang Huß
6e419acb46 Remove auto-deploy by push on '5059-epic-groups' 2022-10-23 18:58:53 +02:00
Wolfgang Huß
bab4ca2ad8 Merge branch '5059-epic-groups' of github.com:Yunite-Net/Yunite-Net-Ocelot-Social-Deploy-Rebranding into 5059-epic-groups 2022-10-23 18:56:47 +02:00
Wolfgang Huß
c94e0dec3d Add database migration to auto-deployment on publish 2022-10-23 18:55:40 +02:00
Wolfgang Huß
71a0a18b3c
Merge pull request #16 from Yunite-Net/15-release-v1.1.2-XXX-configurable-header-menu-is-translatable
chore: [WIP] 🍰 Release v2.0.0-250 – Groups – Configurable Header Menu Is Translatable Etc.
2022-10-23 15:31:31 +02:00
Wolfgang Huß
e80908c00a Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding into 15-release-v1.1.2-XXX-configurable-header-menu-is-translatable
# Conflicts:
#	package.json
2022-10-23 15:30:38 +02:00
Wolfgang Huß
c246ecaa41
Merge pull request #83 from Ocelot-Social-Community/76-release-v2.0.0-groups-extend-rebranding-and-deployment
chore: 🍰 Release v2.0.0 – Groups Etc. – Extend Rebranding And Deployment
2022-10-23 15:28:18 +02:00
Wolfgang Huß
2b87fb2df5 Release v2.0.0-250 2022-10-23 15:16:25 +02:00
Wolfgang Huß
05e4984df6 Merge branch '76-release-v2.0.0-groups-extend-rebranding-and-deployment' of github.com:Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding into 15-release-v1.1.2-XXX-configurable-header-menu-is-translatable
# Conflicts:
#	README.md
#	TODO-next-update.md
#	branding/constants/groups.js
#	branding/constants/headerMenu.js
#	branding/constants/logos.js
2022-10-22 21:06:45 +02:00
Wolfgang Huß
ea51f73b64 Adjust the footer 2022-10-22 20:46:38 +02:00
Wolfgang Huß
c13b285992 Add header menu item 'Topic' 2022-10-22 20:31:32 +02:00
Wolfgang Huß
7ec3ee09df Adjust merge of groups branch by fixing header menu lacales idents 2022-10-22 20:26:31 +02:00
Wolfgang Huß
c2c66786a7 Merge branch '5059-epic-groups' of github.com:Yunite-Net/Yunite-Net-Ocelot-Social-Deploy-Rebranding into 15-release-v1.1.2-XXX-configurable-header-menu-is-translatable
# Conflicts:
#	.github/workflows/publish.yml
#	branding/constants/headerMenu.js
2022-10-22 20:21:25 +02:00
Wolfgang Huß
9492162712 Set footer 2022-10-22 20:14:51 +02:00
Wolfgang Huß
b0ff413d83 Adjust and add constants files 2022-10-22 20:05:29 +02:00
Wolfgang Huß
4dca4269cb Change and correct readme's 2022-10-22 20:04:52 +02:00
Wolfgang Huß
5bd5f99d24 Merge branch '7-refine-rebanding-deployment--#2' of github.com:Yunite-Net/Yunite-Net-Ocelot-Social-Deploy-Rebranding into 15-release-v1.1.2-XXX-configurable-header-menu-is-translatable 2022-10-17 10:56:42 +02:00
Wolfgang Huß
0794115b3f Release v1.1.2-XXX - configurable header menu is translatable 2022-10-15 15:57:36 +02:00
Wolfgang Huß
323826ca20 Add '/dns.values*-ME.yaml' to .gitignore 2022-10-15 15:05:08 +02:00
Wolfgang Huß
f4d440b86c Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding 2022-10-15 15:03:12 +02:00
Wolfgang Huß
a95e891e28
Merge pull request #80 from Ocelot-Social-Community/79-fix-implementation-of-overwriting-locales
fix: 🍰 Fix Implementation Of Overwriting Locales
2022-10-13 16:58:20 +02:00
Wolfgang Huß
4479fb4cbc Revert the publish branch 2022-10-13 16:55:39 +02:00