diff --git a/branding/constants/links.js b/branding/constants/links.js index 6b945a5e0..b111726f3 100644 --- a/branding/constants/links.js +++ b/branding/constants/links.js @@ -1,9 +1,13 @@ -// this file is duplicated in `backend/src/config/links.js` and `webapp/constants/links.js` and replaced on rebranding +// this file is duplicated in `backend/src/config/links.js` and `webapp/constants/links.js` and replaced on rebranding by https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/constants/ export default { - ORGANIZATION: 'https://ocelot.social', - SUPPORT: 'https://ocelot.social', + LANDING_PAGE: '/login', // examples: '/login', '/registration', '/organization', or external 'https://ocelot.social' - // on null or empty strings internal imprint is used, see 'webapp/locales/html/' + // you can find and store templates at https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/templates/ + + SUPPORT: 'https://ocelot.social', // example for internal support page: 'https://staging.ocelot.social/support'. set a full URL please, because it is used in e-mails as well! + + // on null or empty strings internal pages are used, see 'webapp/locales/html/' + ORGANIZATION: 'https://ocelot.social', DONATE: 'https://ocelot-social.herokuapp.com/donations', // we use 'ocelot-social.herokuapp.com' at the moment, because redirections of 'ocelot.social' subpages are not working correctly IMPRINT: 'https://ocelot-social.herokuapp.com/imprint', // we use 'ocelot-social.herokuapp.com' at the moment, because redirections of 'ocelot.social' subpages are not working correctly TERMS_AND_CONDITIONS: null, diff --git a/branding/locales/html/de/code-of-conduct.html b/branding/locales/html/de/code-of-conduct.html index 5e096fe1e..e890fcc01 100644 --- a/branding/locales/html/de/code-of-conduct.html +++ b/branding/locales/html/de/code-of-conduct.html @@ -1,6 +1,7 @@ - - + + -

Ich bin der Inhalt vom Verhaltenskodex

+
+

Ich bin der Inhalt vom Verhaltenskodex.


Neu gebrandet …

diff --git a/branding/locales/html/de/data-privacy.html b/branding/locales/html/de/data-privacy.html index 0472a6877..094f1e7c0 100644 --- a/branding/locales/html/de/data-privacy.html +++ b/branding/locales/html/de/data-privacy.html @@ -1,6 +1,7 @@ - - + + -

Das hier wäre der Inhalt der Datenschutzbestimmungen

+
+

Das hier wäre der Inhalt der Datenschutzbestimmungen.


Neu gebrandet …

diff --git a/branding/locales/html/de/faq.html b/branding/locales/html/de/faq.html index e2f6fcbbd..7a0f5a1a2 100644 --- a/branding/locales/html/de/faq.html +++ b/branding/locales/html/de/faq.html @@ -1,6 +1,7 @@ - - + + -

Hier stehen die FAQs

+
+

Hier stehen die FAQs.


Neu gebrandet …

diff --git a/branding/locales/html/de/imprint.html b/branding/locales/html/de/imprint.html index 4c64c8c6a..8a902f6fd 100644 --- a/branding/locales/html/de/imprint.html +++ b/branding/locales/html/de/imprint.html @@ -1,6 +1,7 @@ - - + + -

Ich bin das Impressum

+
+

Ich bin das Impressum.


Neu gebrandet …

diff --git a/branding/locales/html/de/organization.html b/branding/locales/html/de/organization.html new file mode 100644 index 000000000..7ecd4395e --- /dev/null +++ b/branding/locales/html/de/organization.html @@ -0,0 +1,7 @@ + + + +
+

Hier wird das Netzwerk beschrieben.

+
+

Neu gebrandet …

diff --git a/branding/locales/html/de/support.html b/branding/locales/html/de/support.html new file mode 100644 index 000000000..6dab2b250 --- /dev/null +++ b/branding/locales/html/de/support.html @@ -0,0 +1,7 @@ + + + +
+

Ich bin der Inhalt vom Support.

+
+

Neu gebrandet …

diff --git a/branding/locales/html/de/terms-and-conditions.html b/branding/locales/html/de/terms-and-conditions.html index 75892442a..38cc15a96 100644 --- a/branding/locales/html/de/terms-and-conditions.html +++ b/branding/locales/html/de/terms-and-conditions.html @@ -1,6 +1,7 @@ - - + + -

Ich bin der Inhalt der Seite "Nutzungsbedingungen"

+
+

Ich bin der Inhalt der Seite "Nutzungsbedingungen".


Neu gebrandet …

diff --git a/branding/locales/html/en/code-of-conduct.html b/branding/locales/html/en/code-of-conduct.html index 7a93d97b9..fe10442a6 100644 --- a/branding/locales/html/en/code-of-conduct.html +++ b/branding/locales/html/en/code-of-conduct.html @@ -1,6 +1,7 @@ - - + + -

I am the content of the code of conduct

+
+

I am the content of the code of conduct.


Rebranded …

diff --git a/branding/locales/html/en/data-privacy.html b/branding/locales/html/en/data-privacy.html index ccbd2c3f1..981c7467e 100644 --- a/branding/locales/html/en/data-privacy.html +++ b/branding/locales/html/en/data-privacy.html @@ -1,6 +1,7 @@ - - + + -

This would be our data privacy section

+
+

This would be our data privacy section.


Rebranded …

diff --git a/branding/locales/html/en/faq.html b/branding/locales/html/en/faq.html index ada798d3e..33d6d27ac 100644 --- a/branding/locales/html/en/faq.html +++ b/branding/locales/html/en/faq.html @@ -1,6 +1,7 @@ - - + + -

Here are the FAQs

+
+

Here are the FAQs.


Rebranded …

diff --git a/branding/locales/html/en/imprint.html b/branding/locales/html/en/imprint.html index 3e021cbad..5f42e2efd 100644 --- a/branding/locales/html/en/imprint.html +++ b/branding/locales/html/en/imprint.html @@ -1,6 +1,7 @@ - - + + -

I am the imprint

+
+

I am the imprint.


Rebranded …

diff --git a/branding/locales/html/en/organization.html b/branding/locales/html/en/organization.html new file mode 100644 index 000000000..7c972d2bf --- /dev/null +++ b/branding/locales/html/en/organization.html @@ -0,0 +1,7 @@ + + + +
+

Here the network is described.

+
+

Rebranded …

diff --git a/branding/locales/html/en/support.html b/branding/locales/html/en/support.html new file mode 100644 index 000000000..b54197d8a --- /dev/null +++ b/branding/locales/html/en/support.html @@ -0,0 +1,7 @@ + + + +
+

I am the content of the support.

+
+

Rebranded …

diff --git a/branding/locales/html/en/terms-and-conditions.html b/branding/locales/html/en/terms-and-conditions.html index 1da118d36..030a96c07 100644 --- a/branding/locales/html/en/terms-and-conditions.html +++ b/branding/locales/html/en/terms-and-conditions.html @@ -1,6 +1,7 @@ - - + + -

I am the content of the page "terms and conditions"

+
+

I am the content of the page "Terms And Conditions".


Rebranded …

diff --git a/branding/templates/locales/html/de/code-of-conduct.html b/branding/templates/locales/html/de/code-of-conduct.html index 65af881fc..0934ad276 100644 --- a/branding/templates/locales/html/de/code-of-conduct.html +++ b/branding/templates/locales/html/de/code-of-conduct.html @@ -1,5 +1,5 @@ - + diff --git a/package.json b/package.json index 8519b2f1a..cb57d4923 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "ocelot-social-branded", "version": "1.0.4", - "ocelotDockerVersionTag": "1.0.4-100", + "ocelotDockerVersionTag": "1.0.4-135", "dockerOrganisation": "ocelotsocialnetwork", "description": "ocelot.social Branded", "author": "ocelot.social Community",