From 35e9404e8ca0d499b583f113570af06f5a62d591 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Tue, 22 Dec 2020 16:14:05 +0100 Subject: [PATCH 01/12] Correct docker-compose.yml --- docker-compose.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index ddcfd78cd..9b00e3cf4 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -57,7 +57,8 @@ services: environment: - NEO4J_AUTH=none - NEO4J_dbms_security_procedures_unrestricted=algo.*,apoc.* - - NEO4J_ACCEPT_LICENSE_AGREEMENT=yes + # decomment following line for Neo4j Enterprice version instead of Community version + # - NEO4J_ACCEPT_LICENSE_AGREEMENT=yes ports: - 7687:7687 - 7474:7474 From 7c2c8d33685b715c9c198f3f9f4d12d870f3e2fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Tue, 22 Dec 2020 16:15:11 +0100 Subject: [PATCH 02/12] Implement new ocelot.social logos --- webapp/components/Logo/Logo.vue | 4 +- webapp/static/img/custom/Logo-Horizontal.svg | 80 +++++++++++---- webapp/static/img/custom/welcome.svg | 100 ++++++++++++++----- 3 files changed, 137 insertions(+), 47 deletions(-) diff --git a/webapp/components/Logo/Logo.vue b/webapp/components/Logo/Logo.vue index b5a2e38a5..8baa39232 100644 --- a/webapp/components/Logo/Logo.vue +++ b/webapp/components/Logo/Logo.vue @@ -37,7 +37,7 @@ export default { } - diff --git a/webapp/static/img/custom/Logo-Horizontal.svg b/webapp/static/img/custom/Logo-Horizontal.svg index 6a86cfaff..da853dc9c 100644 --- a/webapp/static/img/custom/Logo-Horizontal.svg +++ b/webapp/static/img/custom/Logo-Horizontal.svg @@ -1,8 +1,8 @@ - - - + + + @@ -12,25 +12,69 @@ - + - + - + - - o - c - elo - t - . - s - o - c - i - a - l + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/webapp/static/img/custom/welcome.svg b/webapp/static/img/custom/welcome.svg index 279c519d0..db4c42687 100644 --- a/webapp/static/img/custom/welcome.svg +++ b/webapp/static/img/custom/welcome.svg @@ -1,36 +1,82 @@ - - - - - - - - - - - + + + + + + - + - + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + - - o - c - elo - t - . - s - o - c - i - a - l + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 5705ebac36491b743f1ffb3c3853181c60c8df13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Wed, 23 Dec 2020 08:53:59 +0100 Subject: [PATCH 03/12] Better white logo - Put the white watermark in the background. --- webapp/static/img/custom/Logo-Horizontal.svg | 34 ++++++++++---------- webapp/static/img/custom/welcome.svg | 34 ++++++++++---------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/webapp/static/img/custom/Logo-Horizontal.svg b/webapp/static/img/custom/Logo-Horizontal.svg index da853dc9c..d821c8329 100644 --- a/webapp/static/img/custom/Logo-Horizontal.svg +++ b/webapp/static/img/custom/Logo-Horizontal.svg @@ -1,6 +1,23 @@ + + + + + + + + + + + + + + + + + @@ -60,21 +77,4 @@ - - - - - - - - - - - - - - - - - diff --git a/webapp/static/img/custom/welcome.svg b/webapp/static/img/custom/welcome.svg index db4c42687..e93e04dae 100644 --- a/webapp/static/img/custom/welcome.svg +++ b/webapp/static/img/custom/welcome.svg @@ -1,6 +1,23 @@ + + + + + + + + + + + + + + + + + @@ -62,21 +79,4 @@ - - - - - - - - - - - - - - - - - From b778d3eda5ca3329d98fdc255685c7423f21ef84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Tue, 5 Jan 2021 16:42:21 +0100 Subject: [PATCH 04/12] Change some logos to ocelot.social white branded --- webapp/components/LoginForm/LoginForm.vue | 4 +- webapp/pages/password-reset.vue | 2 +- webapp/static/favicon.ico | Bin 15086 -> 5558 bytes webapp/static/icon.png | Bin 9085 -> 21631 bytes webapp/static/img/custom/logout.svg | 442 ++++---------------- webapp/static/img/custom/password-reset.svg | 83 +++- 6 files changed, 167 insertions(+), 364 deletions(-) diff --git a/webapp/components/LoginForm/LoginForm.vue b/webapp/components/LoginForm/LoginForm.vue index 28998d3fc..5dc571f28 100644 --- a/webapp/components/LoginForm/LoginForm.vue +++ b/webapp/components/LoginForm/LoginForm.vue @@ -6,9 +6,9 @@ Welcome - +

{{ $t('login.login') }}

diff --git a/webapp/pages/password-reset.vue b/webapp/pages/password-reset.vue index f320bd376..21ffdf0fb 100644 --- a/webapp/pages/password-reset.vue +++ b/webapp/pages/password-reset.vue @@ -2,7 +2,7 @@