197 Commits

Author SHA1 Message Date
Wolfgang Huß
8efa08eccd Change organization and support link in backend for now 2021-08-16 15:30:07 +02:00
Wolfgang Huß
a55fa21cdd Merge branch 'master' of https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding
# Conflicts:
#	branding/constants/emails.js
#	branding/constants/links.js
#	package.json
2021-08-16 15:29:25 +02:00
Wolfgang Huß
ef650d1fb6
Merge pull request #25 from Ocelot-Social-Community/23-add-new-internal-pages-v1.0.5
chore: 🍰 Implement New Internal Pages – Main Release v1.0.5
2021-08-12 13:36:34 +02:00
Wolfgang Huß
89ef3aad2d Fix warning in docker-compose
- Fixes 'WARNING: The WEBSOCKETS_URI variable is not set. Defaulting to a blank string.'
2021-08-12 13:34:31 +02:00
Wolfgang Huß
2ddf817372 Fix image upload problem by adding volumes to Docker YAML files 2021-08-12 13:24:09 +02:00
Wolfgang Huß
59a98eccbb Set 'ocelotDockerVersionTag' to '1.0.5-153' 2021-08-12 12:11:53 +02:00
Wolfgang Huß
a57f6cb9c9 Implement new internal pages
- Add internal donation page.
- Replace `links.js`.
- Remove copying of `links.js` to backend.
- Add copying of `emails.js` to backend and set new values.
- Remove leading `<br>` on each internal page default.
2021-08-12 11:53:42 +02:00
Wolfgang Huß
19838a0d80
Merge pull request #22 from Ocelot-Social-Community/21-add-landing-page-etc
feat: [WIP] 🍰 Add Landing Page Etc.
2021-07-27 11:59:29 +02:00
Wolfgang Huß
895150f997 Change DockerHub build number to compatible one 2021-07-27 11:54:03 +02:00
Wolfgang Huß
551dd5eec7 Change comments 2021-07-20 17:33:37 +02:00
Wolfgang Huß
bfecd09fcd Refine comments 2021-07-20 11:49:59 +02:00
Wolfgang Huß
2f045553d4 Implement HTML internal support and organization pages 2021-07-20 11:34:30 +02:00
Wolfgang Huß
74852aa2d1 Add dot at line end of HTML internal pages 2021-07-20 10:43:49 +02:00
Wolfgang Huß
e9638147d1 Add comment to 'links.js' 2021-07-19 15:31:32 +02:00
Wolfgang Huß
5ce8b9e237 Refine HTML of internal pages and their templates 2021-07-19 15:23:20 +02:00
Wolfgang Huß
2f6ea34c1d Merge branch 'master' of https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding 2021-07-13 15:39:27 +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ß
aaa10921b4
Merge pull request #20 from H-E-L-F-A/ocelot-parent-refactor
docs: 🍰 [WIP] Add Configure And Rebranding Readme.md
2021-07-13 14:00:14 +02:00
Wolfgang Huß
1f6a0874c9 Fulfill Ulf's suggestions and minor design fixes 2021-07-13 13:54:18 +02:00
Wolfgang Huß
d8c879b373 Add template folder and file 'branding/templates/locales/html/de/code-of-conduct.html' 2021-06-21 13:23:41 +02:00
Wolfgang Huß
8d6bd92c1b Describe DNS setup 2021-06-21 12:59:14 +02:00
Wolfgang Huß
a00288e56d Document getting cluster ID 2021-06-18 12:38:32 +02:00
Wolfgang Huß
7c21306d17 Refine mail dummy in value.template.yaml 2021-06-17 18:24:35 +02:00
Wolfgang Huß
b4adb248fa Add DigitalOcean.md 2021-06-17 17:40:00 +02:00
Wolfgang Huß
d0cd87cee3 Add Kubernetes to Kubernetes README.md 2021-06-17 17:39:43 +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ß
c3482c6b58
Merge pull request #6 from wir-social/new-favicon-without-white-background
chore: 🍰 Renew Favicon Without White Background
2021-06-16 12:11:56 +02:00
Wolfgang Huß
3ac1b57803 Renew favicon without white background 2021-06-16 12:08:09 +02:00
Wolfgang Huß
03bc560443 Fix line ending 2021-06-16 09:36:46 +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ß
200695a9c2
Merge pull request #3 from wir-social/wir-social
chore: [WIP] 🍰 Wir.Social First Logo Branding And 'base‘, 'code‘ Deployment
2021-06-09 21:56:19 +02:00
Wolfgang Huß
56be601da1 Set pushing on master branch only 2021-06-09 21:35:27 +02:00
Wolfgang Huß
c721b57764 Implement the wir.social logo for the 'icon.png' and 'favicon.ico' 2021-06-09 21:32:45 +02:00
Wolfgang Huß
eeaac9a52e Release v1.0.4 with ocelotDockerVersionTag v1.0.4-100 2021-06-08 15:30:58 +02:00
Wolfgang Huß
aa305df9f3 Rename to 'docker-compose.wirsocial.yml' 2021-06-08 14:46:30 +02:00
Wolfgang Huß
1d38049592 Adjust 'docker-compose.wirsocial-branded.yml' to wir.social 2021-06-07 21:27:27 +02:00
Wolfgang Huß
862218a2dc Correct 'metadata.js' 2021-06-07 21:26:50 +02:00
Wolfgang Huß
fe0cdecffc Merge branch 'master' of https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding into wir-social
# Conflicts:
#	.github/workflows/publish.yml
#	branding/constants/links.js
#	branding/constants/metadata.js
#	package.json
2021-06-07 21:22:52 +02:00
Wolfgang Huß
0babdfe8ec
Merge pull request #15 from Ocelot-Social-Community/14-new-deployment-with-base-and-code
chore: [WIP] 🍰 New Deployment With 'base' And 'code' Docker Images
2021-06-07 21:07:00 +02:00
Wolfgang Huß
92664ee0df Set publish again on master push only 2021-06-07 21:04:54 +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ß
9aa3e51a8f
Merge pull request #4 from wir-social/1-flexible-footer-links
feat: [WIP] 🍰 Flexible Footer Links
2021-06-07 20:31:42 +02:00
Wolfgang Huß
bab552ae86 Overtake the tested changes from sender.fm 2021-06-07 20:17:13 +02:00
Wolfgang Huß
f0a01fa42a Add comment and lineend 2021-06-07 18:07:09 +02:00
Wolfgang Huß
c3212eaca1 Implement 'docker-compose.ocelotsocial-branded.yml' 2021-06-03 19:20:54 +02:00
Wolfgang Huß
16ef30041a
Merge pull request #17 from Ocelot-Social-Community/16-flexibe-footer-links
feat: [WIP] 🍰 Flexible Footer Links
2021-06-03 19:05:45 +02:00