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
293 Commits 5 Branches 2 Tags
Commit Graph

293 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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ß
ccd039ec61 Add 'stage.yunite.me' to the live demo list 2022-09-26 21:02:11 +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
Alexander Friedland
f764a5e840
Update branding/constants/links.js 
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
 2022-09-23 09:10:21 +02:00
Alexander Friedland
5c134140f7
Update branding/constants/links.js 
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
 2022-09-23 09:10:15 +02:00
Alexander Friedland
af6a7ee063
Update branding/constants/links.js 
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
 2022-09-23 09:10:10 +02:00
Alexander Friedland
3ea522ff2a
Update branding/constants/links.js 
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
 2022-09-23 09:10:03 +02:00
Alexander Friedland
d14fd3f47a
Update branding/constants/links.js 
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
 2022-09-23 09:09:56 +02:00
Wolfgang Huß
7edc3c8af8
Merge pull request #8 from Yunite-Net/7-refine-rebanding-deployment 
chore: [WIP] 🍰 Refine Rebanding And Deployment
 2022-09-23 08:56:48 +02:00
ogerly
3f59926a75 change neo4j image path docker-compose.yml 2022-09-23 08:53:20 +02:00
ogerly
58079c5b8e merge ocelot master resolve conflicts 2022-09-23 08:50:00 +02:00
ogerly
0f27858284 resolve conflicts 2022-09-23 08:45:41 +02:00
Wolfgang Huß
07cd6ab7e8
Merge pull request #71 from Ocelot-Social-Community/70-release-v1.1.1-228-58-fix-folder-name 
chore: 🍰 Fix Folder Name From `branding/assets/styles/import` To `branding/assets/styles/imports`
 2022-09-23 07:41:15 +02:00
Wolfgang Huß
e0b2b098cf Fix folder name from branding/assets/styles/import to branding/assets/styles/imports 2022-09-23 07:20:14 +02:00
ogerly
8779bdc00e resolve conflict 2022-09-22 21:23:30 +02:00
Alexander Friedland
94f5081c22
Merge pull request #68 from Ocelot-Social-Community/release-v1.1.1 
chore: 🍰 Release v1.1.1-228 – Refactor Rebranding
 2022-09-22 21:17:34 +02:00
ogerly
5f967f563a update package.json to v1.1.1 -228 2022-09-22 20:48:40 +02:00
ogerly
870fe89a80 refactor rebranding 2022-09-22 19:49:24 +02:00
Wolfgang Huß
5d5ac673fd Ignore value.yaml files of the different deploys 2022-09-20 08:41:25 +02:00
Wolfgang Huß
626ff6fe57
Merge pull request #6 from Yunite-Net/5-release-v1.1.0-205 
chore: 🍰 Release v1.1.0-205
 2022-09-13 17:59:11 +02:00
Wolfgang Huß
d5c1952734 Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding into 5-release-v1.1.0-205 
# Conflicts:
#	.github/ISSUE_TEMPLATE/---epic.md
#	.github/ISSUE_TEMPLATE/---question.md
#	package.json
 2022-09-13 16:57:06 +02:00
Wolfgang Huß
239faa1acf Refine installation partly before pull main deploy repo 2022-09-13 16:53:41 +02:00
Wolfgang Huß
13545545fe
Merge pull request #66 from Ocelot-Social-Community/64-release-v1.1.0-225-configure-categories-etc 
chore: 🍰 Release v1.1.0-225
 2022-09-13 16:51:56 +02:00
Wolfgang Huß
8d6a80cc3a Release v1.1.0-225 2022-09-13 16:48:59 +02:00
Wolfgang Huß
36c7ad5a1e
Merge pull request #46 from Ocelot-Social-Community/45-refine-documentation 
chore: [WIP] 🍰 Refine Deployment Setup And Documentation
 2022-09-13 16:31:44 +02:00
Wolfgang Huß
ba4ad75508 Refine main readme for cert-manager and kubectl version 2022-09-13 16:25:31 +02:00
Wolfgang Huß
c68499c2a8 Remove live networks 2022-09-13 15:39:44 +02:00
Wolfgang Huß
37e1e68b9b Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding into 45-refine-documentation 
# Conflicts:
#	TODO-next-update.md
#	docker/DOCKER_MORE_CLOSELY.md
 2022-09-13 15:24:06 +02:00
Wolfgang Huß
0285c4c622 Add documentation for PRODUCTION_DB_CLEAN_ALLOW 2022-09-13 15:01:51 +02:00
Wolfgang Huß
a41efec078
Merge pull request #63 from Ocelot-Social-Community/5144-release-v1.1.0--implement-categories-again 
chore: [WIP] 🍰 Release v1.1.0 - Implement Categories Again
 2022-08-04 06:24:45 +02:00
Wolfgang Huß
bfa3942238 Release v1.1.0-205 2022-08-04 06:19:03 +02:00
Wolfgang Huß
b094bdb278 Refine 'TODO-next-update.md' 2022-08-04 06:18:18 +02:00
Wolfgang Huß
323b73680a Add 'CATEGORIES_ACTIVE' config 2022-08-03 15:50:21 +02:00
Wolfgang Huß
fd2388826e
Merge pull request #3 from Yunite-Net/Tirokk-update-issue-templates 
Update issue templates
 2022-07-27 10:15:11 +02:00
Wolfgang Huß
1d7f3988cb
Update issue templates 2022-07-25 18:08:13 +02:00