236 Commits

Author SHA1 Message Date
Wolfgang Huß
1aa9a46747 Change networkname to wir.social 2021-12-06 14:22:48 +01: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ß
6439e6df08
Merge pull request #40 from Ocelot-Social-Community/39-on-backups-rollbacks--release-v1.0.7-171
docs: 🍰 Add Docs For Backups, Rollbacks, And Release v1.0.7-171
2021-12-02 17:28:11 +01:00
Wolfgang Huß
b792a18fb1 Add docs for backups and release v1.0.7-171 2021-12-02 17:23:05 +01:00
Wolfgang Huß
9d48daf74d
Merge pull request #37 from Ocelot-Social-Community/release-v1.0.6-170
chore: 🍰 Realease v1.0.6-170
2021-11-30 12:01:42 +01:00
Wolfgang Huß
7699485261 Realease v1.0.6-170 2021-11-30 11:59:19 +01:00
Wolfgang Huß
6229a85f12
Merge pull request #36 from Ocelot-Social-Community/35-refactor-faq-link-to-use-internal-page
chore: 🍰 Refactor FAQ Link To Use Internal Page Which Was Implemented Before
2021-11-30 11:16:48 +01:00
Wolfgang Huß
b494dc1456 Refactor to use internal FAQ page 2021-11-30 11:09:42 +01:00
Wolfgang Huß
9764e76fab
Merge pull request #32 from Ocelot-Social-Community/31-add-branding-templates-for-terms-and-conditions-etc
chore: 🍰 Add Branding Templates For Terms And Conditions Etc.
2021-10-20 10:52:45 +02:00
Wolfgang Huß
34e148b923 Refactor CSS for internal pages 2021-10-20 10:35:04 +02:00
Wolfgang Huß
e8eaef50e5 Change note in FAQ templates 2021-10-20 10:33:54 +02:00
Wolfgang Huß
a35a729bfb Fix badges in README.md
- Fix license.
2021-10-20 09:19:28 +02:00
Wolfgang Huß
9959585a5f Refactor CSS on internal pages to replace linebreak 2021-10-20 09:04:22 +02:00
Wolfgang Huß
0163703f46 Add badges to README.md 2021-10-20 08:49:56 +02:00
Wolfgang Huß
3d058251d7 Fix imprint link 2021-10-18 16:44:37 +02:00
Wolfgang Huß
ff24b34df5 Refactor CSS on internal pages after Davids suggestions 2021-10-18 07:59:22 +02:00
sushidave
e6f648cc01
Simplify CSS data-privacy.html 2021-10-15 13:46:40 +02:00
Wolfgang Huß
550f197626 Refactor CSS on internal pages 2021-10-14 13:23:55 +02:00
Wolfgang Huß
dea9806176 Delete comments in data-privacy.html 2021-10-14 11:05:11 +02:00
Wolfgang Huß
f28119a536 Finish data-privacy.html 2021-10-13 16:25:36 +02:00
Wolfgang Huß
9bb3ff8b1a Restructure template folders 2021-10-13 16:24:50 +02:00
Wolfgang Huß
81ac662b33 Refine info pages 2021-10-12 12:26:15 +02:00
Wolfgang Huß
4b892ff43f Overtake some corrections 2021-10-12 12:26:00 +02:00
Wolfgang Huß
973e6a0249 Refine info pages 2021-10-12 08:47:36 +02:00
Wolfgang Huß
3ad58ab989 Refine template for terms-and-….html 2021-10-11 17:45:54 +02:00
Wolfgang Huß
51900faced Refine template for data-privacy.html 2021-10-11 14:07:49 +02:00
Wolfgang Huß
83cdc611f3 Add template for data-privacy.html 2021-10-11 13:43:02 +02:00
Wolfgang Huß
62c436b3dc Add templates for faq.htm 2021-10-07 16:14:49 +02:00
Wolfgang Huß
4e28bfcc31 Refine templates for code-of-conduct.html and terms-and-conditions.htm 2021-10-07 16:14:18 +02:00
Wolfgang Huß
cd68541f36 Add templates for code-of-conduct.html and terms-and-conditions.htm 2021-10-07 15:56:00 +02:00
Wolfgang Huß
f3ba3e7214
Merge pull request #29 from Ocelot-Social-Community/24-add-rebranded-emails-for-sending-notifications
feat: 🍰 Add Rebranded E-Mails For Sending Notifications
2021-10-05 12:03:04 +02:00
Wolfgang Huß
07d1bb65b8 Implement backend email templates 2021-09-29 11:32:08 +02:00
Wolfgang Huß
c8a6f05eda Set version 1.0.6 and new image tag 1.0.6-160 2021-09-29 11:15:22 +02:00
Wolfgang Huß
8cac274082
Merge pull request #28 from Ocelot-Social-Community/Tirokk-minor-fixes
bug: 🍰 Fix Minor Errors And Clarify Docs
2021-09-29 09:21:15 +02:00
Wolfgang Huß
ed76d712dd
Change caution to attention 2021-09-28 09:59:19 +02:00
Wolfgang Huß
0dc321cf70
Add the need of a Docker organisation 2021-09-28 09:57:20 +02:00
Wolfgang Huß
e7af6f5fea
Fix dummy IP and last README.md link 2021-09-28 09:02:35 +02:00
Wolfgang Huß
e0674666a9
Merge pull request #8 from wir-social/7-use-new-internal-pages
feat: 🍰 Use New Internal Pages
2021-08-16 15:46:31 +02:00
Wolfgang Huß
31c817128e Correct and fix links 2021-08-16 15:33:52 +02:00
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