21 Commits

Author SHA1 Message Date
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ß
c68499c2a8 Remove live networks 2022-09-13 15:39:44 +02:00
Wolfgang Huß
45913de805 Refine docs, first step 2022-07-08 11:14:18 +02:00
Wolfgang Huß
d24ef63576 Merge branch 'master' of https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding
# Conflicts:
#	README.md
#	branding/constants/links.js
#	package.json
2021-12-06 14:22:25 +01:00
Wolfgang Huß
a35a729bfb Fix badges in README.md
- Fix license.
2021-10-20 09:19:28 +02:00
Wolfgang Huß
0163703f46 Add badges to README.md 2021-10-20 08:49:56 +02:00
Wolfgang Huß
c675b6fa22 Add original repos absolute link to Readme.md 2021-07-13 15:36:19 +02:00
Wolfgang Huß
288ddd66b2 Merge branch 'master' of https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding
# Conflicts:
#	README.md
#	package.json
2021-07-13 15:32:49 +02:00
Wolfgang Huß
0fdd997113 Add text to indicate optional steps 2021-06-17 13:24:19 +02:00
Wolfgang Huß
dd719ea71b Refine Doc for proofing DockerHub images 2021-06-17 13:21:30 +02:00
Wolfgang Huß
84e6467392 Refine README and add browser addresses 2021-06-17 13:10:37 +02:00
Wolfgang Huß
5bd1208103 Add docs for DockerHub 2021-06-17 13:02:29 +02:00
Wolfgang Huß
511095451a Add configure and rebranding Readme.md
- Refine general Readme.md.
2021-06-16 09:09:46 +02:00
Wolfgang Huß
20c70757be Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding into 14-new-deployment-with-base-and-code
# Conflicts:
#	branding/constants/links.js
#	branding/locales/html/de/code-of-conduct.html
#	branding/locales/html/de/data-privacy.html
#	branding/locales/html/de/faq.html
#	branding/locales/html/de/imprint.html
#	branding/locales/html/de/terms-and-conditions.html
#	branding/locales/html/en/code-of-conduct.html
#	branding/locales/html/en/data-privacy.html
#	branding/locales/html/en/faq.html
#	branding/locales/html/en/imprint.html
#	branding/locales/html/en/terms-and-conditions.html
#	docker/maintenance.Dockerfile
#	docker/webapp.Dockerfile
2021-06-07 20:46:37 +02:00
Wolfgang Huß
f542673944 Correct Discord link 2021-05-31 15:59:18 +02:00
Wolfgang Huß
a03830d5c6 Correct Discord link 2021-05-31 15:57:50 +02:00
Wolfgang Huß
153aeeca12
Add Readme.md 2021-05-25 17:13:20 +02:00
Wolfgang Huß
7fea34a71e
Change link for contribution 2021-05-25 17:07:46 +02:00
Wolfgang Huß
06fafb8cee
Change logo file name in main Readme.md 2021-05-25 16:59:27 +02:00
Wolfgang Huß
6cc5f1dff6 Add README and LICENSE 2021-05-17 09:26:09 +02:00