IT4Change/Ocelot-Social
3
0
Fork 0
mirror of https://github.com/IT4Change/Ocelot-Social.git synced 2025-12-13 07:45:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
325 Commits 5 Branches 2 Tags
Commit Graph

325 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ogerly
7578e03c6d change hasttag search test color to #17b53f 2022-10-28 11:34:34 +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
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
Wolfgang Huß
0cf00fdc07 Fix copy error by adding two empty JSON files to the locales 2022-10-13 15:13:34 +02:00
Wolfgang Huß
be603a5af2 Set this branch as publishing branch for testing purposes – revert later 2022-10-13 15:11:42 +02:00
Moriz Wahl
179907046f
Merge pull request #77 from Ocelot-Social-Community/merge-locales 
feat: 🍰 Merge Locales
 2022-10-12 18:10:48 +02:00
Moriz Wahl
a1ce804995 clean up 2022-10-12 16:29:20 +02:00
Moriz Wahl
ebf8894ca2 remove tmp folder, test for override of existing locales 2022-10-12 15:58:28 +02:00
Moriz Wahl
9045ac3199 add script to merge variables 2022-10-12 15:33:07 +02:00
Moriz Wahl
111b1da00d test jq to merge locale files 2022-10-11 18:59:52 +02:00
Wolfgang Huß
3ca0970ba3
Merge pull request #14 from Yunite-Net/13-groups-release-v1.1.1-231 
chore: 🍰 Groups Release v1.1.1-231 - Show New Features
 2022-09-30 10:18:01 +02:00
Wolfgang Huß
2bfde2afc1 Merge branch '5059-epic-groups' of github.com:Yunite-Net/Yunite-Net-Ocelot-Social-Deploy-Rebranding into 13-groups-release-v1.1.1-231 
# Conflicts:
#	package.json
 2022-09-30 09:57:21 +02:00
Wolfgang Huß
4f5ff1ff36 Release v1.1.1-231 show new group features 2022-09-30 09:52:09 +02:00
Wolfgang Huß
ccd039ec61 Add 'stage.yunite.me' to the live demo list 2022-09-26 21:02:11 +02:00
Wolfgang Huß
0a33fc05b1 Fix 'neo4j-community' name to 'neo4j-community-branded' 2022-09-26 20:26:41 +02:00
Wolfgang Huß
ca20e11b91 Fix publishing of groups branch, again, again 2022-09-26 20:07:25 +02:00
Wolfgang Huß
49d89bff9b Fix publishing of groups branch, again 2022-09-26 19:35:47 +02:00
Wolfgang Huß
c800930ee1 Fix publishing of groups branch 2022-09-26 17:17:03 +02:00
Wolfgang Huß
3b034679bc Add groups header menu 2022-09-26 17:16:38 +02:00
Wolfgang Huß
34c5096755 Change build number 2022-09-26 16:52:43 +02:00
Wolfgang Huß
bb2b4df276 Implement automatic deployment for groups branch 5059-epic-groups for Yunite branding 2022-09-26 16:48:59 +02:00
Wolfgang Huß
7e05f2e82a Implement automatic deployment for groups branch 5059-epic-groups for Yunite branding 2022-09-26 14:52:22 +02:00
Wolfgang Huß
48860b7c70 Add '/dns.values*-ME.yaml' to .gitignore 2022-09-23 12:39:00 +02:00
Wolfgang Huß
e757e3422e
Merge pull request #10 from Yunite-Net/release-v1.1.1 
chore: 🍰 Release v1.1.1 – First Design Rebranding
 2022-09-23 09:22:38 +02:00
Alexander Friedland
a9b1ab8e2c
Update branding/constants/links.js 
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
 2022-09-23 09:10:31 +02:00
Alexander Friedland
b44ab6ff93
Update branding/constants/links.js 
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
 2022-09-23 09:10:26 +02:00