325 Commits

Author SHA1 Message Date
Robert Schäfer
f604c1a1f5 update to latest ocelot-staging version 2024-12-02 14:24:13 +01:00
a7176d1e62
new secrets 7-ocelot.social2.5.1-master b7-ocelot.social2.5.1-master 2023-04-20 13:35:49 +02:00
1d41deefe0
properly set constants 2023-04-20 13:34:54 +02:00
2f03303773
delete deployment folder 2023-04-20 13:34:42 +02:00
246c5dc201
properly define external links 6-ocelot.social2.5.1-master b6-ocelot.social2.5.1-master 2023-04-20 11:46:51 +02:00
b4832b0d0f
new secrets 5-ocelot.social2.5.1-master b5-ocelot.social2.5.1-master 2023-04-20 11:06:48 +02:00
622e1dd34d
new secrets 4-ocelot.social2.5.1-master b4-ocelot.social2.5.1-master 2023-04-20 10:36:26 +02:00
020cd79110
new secrets 3-ocelot.social2.5.1-master b3-ocelot.social2.5.1-master 2023-04-20 09:58:16 +02:00
df8cff9fa6
new secrets 2-ocelot.social2.5.1-master 1-ocelot.social2.5.1-master b1-ocelot.social2.5.1-master b2-ocelot.social2.5.1-master 2023-04-20 09:30:00 +02:00
e9563da358
cleanup 2023-04-20 09:29:48 +02:00
3f69d72b73
gitkeep fonts in assets 2023-04-20 09:28:33 +02:00
5c7108e5e0
removed tools 2023-04-20 09:28:23 +02:00
29d73c4bc1
removed docker 2023-04-20 09:28:12 +02:00
ebbc27bcba
github 2023-04-20 09:27:58 +02:00
Wolfgang Huß
989c2b036b
Merge pull request #12 from wir-social/11-release-v1.0.8-fix-cookies-and-password-reset-etc
chore: 🍰 Release v1.1.1-228 – Fix Cookies And Password Reset Etc.
2022-10-15 11:44:17 +02:00
6aacbbf235
corrected badges 2022-10-15 11:08:12 +02:00
52c90af25b
Merge branch 'master-ocelot' into 11-release-v1.0.8-fix-cookies-and-password-reset-etc
# Conflicts:
#	.github/workflows/publish.yml
#	README.md
#	docker-compose.wirsocial.yml
#	package.json
2022-10-15 10:59:51 +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ß
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
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ß
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ß
7afb2d688e
Update issue templates 2022-07-25 18:07:53 +02:00
Wolfgang Huß
43171e0679
Merge pull request #59 from Ocelot-Social-Community/58-release-v1.0.9-199
chore: 🍰 Release v1.0.9-199
2022-07-20 16:39:49 +02:00
Wolfgang Huß
eb8d3903a2 Release v1.0.9-199 2022-07-20 16:17:24 +02:00
Wolfgang Huß
368a926e4f
Merge pull request #56 from Ocelot-Social-Community/55-implement-PRODUCTION_DB_CLEAN_ALLOW-for-staging-production-evironments
chore: 🍰 Implement `PRODUCTION_DB_CLEAN_ALLOW` for Staging Production Environments
2022-07-20 14:57:33 +02:00
Wolfgang Huß
92007dfb74 Change document by accumulate Neo4j db 'clean.js' and 'seed.js' and make the node calls await with flag '--experimental-repl-await' in 'publish.yml' 2022-07-20 14:53:10 +02:00
Wolfgang Huß
0adbe7696b Change back to only publish on master branch push 2022-07-20 14:50:07 +02:00
Wolfgang Huß
c041d29878
Merge pull request #57 from Ocelot-Social-Community/54-add-docker-compose-override-for-apple-m1-and-docu
chore: 🍰 Add Docker Compose Override For Apple M1 And Docu
2022-07-20 10:49:31 +02:00
Wolfgang Huß
b36eb508a6 Document Docker Compose override for Apple M1 2022-07-20 10:45:38 +02:00