From 60a218c4ad256889fe2d2248aaa88bbf014b979c Mon Sep 17 00:00:00 2001 From: JoseluCross Date: Thu, 11 Oct 2018 19:45:53 +0200 Subject: [PATCH] Repair loadOriginalAuthor() and migrate JKA Network name to Code Solutions Project --- .env | 3 --- .env.dist | 3 --- .vs/slnx.sqlite | Bin 0 -> 77824 bytes .vs/slnx.sqlite-journal | Bin 0 -> 8720 bytes LICENSE | 2 +- README.md | 2 +- Source/assets/html/TOS.twig | 12 ++++++------ Source/assets/html/about.twig | 2 +- Source/assets/html/code.twig | 4 +++- Source/assets/html/doc.twig | 2 +- Source/assets/html/footer.twig | 4 ++-- Source/composer.lock | 2 +- Source/data/project.json.example | 2 +- Source/src/Config.php | 2 +- Source/src/DB.php | 2 +- Source/src/app.php | 2 +- Source/symfony.lock | 3 --- lab.yml | 2 +- 18 files changed, 21 insertions(+), 28 deletions(-) delete mode 100644 .env delete mode 100644 .env.dist create mode 100644 .vs/slnx.sqlite create mode 100644 .vs/slnx.sqlite-journal diff --git a/.env b/.env deleted file mode 100644 index 2148dfc..0000000 --- a/.env +++ /dev/null @@ -1,3 +0,0 @@ -# This file is a "template" of which env vars need to be defined for your application -# Copy this file to .env file for development, create environment variables when deploying to production -# https://symfony.com/doc/current/best_practices/configuration.html#infrastructure-related-configuration diff --git a/.env.dist b/.env.dist deleted file mode 100644 index 2148dfc..0000000 --- a/.env.dist +++ /dev/null @@ -1,3 +0,0 @@ -# This file is a "template" of which env vars need to be defined for your application -# Copy this file to .env file for development, create environment variables when deploying to production -# https://symfony.com/doc/current/best_practices/configuration.html#infrastructure-related-configuration diff --git a/.vs/slnx.sqlite b/.vs/slnx.sqlite new file mode 100644 index 0000000000000000000000000000000000000000..f70484f8346b76623961aa6cb7bf7cf62e0452b5 GIT binary patch literal 77824 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 UAOHd&00JNY0w4ea?~%ZN0T-YZ9RL6T literal 0 HcmV?d00001 diff --git a/.vs/slnx.sqlite-journal b/.vs/slnx.sqlite-journal new file mode 100644 index 0000000000000000000000000000000000000000..1e4639405d20ced9415ce83856781be49d34be20 GIT binary patch literal 8720 zcmeHLTWjM+6t;4)5<8C54M7ii=%la^k%V>|77C@ydSzu-T}O6gJG&tWqu7%~#g-FG zPS=l4x-Hwk(5L>5z8CV;w^B-9`Y%dZ3Z0QOx{RgVO45auL0Fn|=FFKh-?`22zfS%Q zer*1hN~Olm7e4^{&%9Z*w7oW^M|j~6 zT&-$_Cna%YnOtTWD*$MM)KbwtYT{E-0To5sEGRqRxwr!g^;%hyk;qL^t^v7>o_eXY z3Pyx@DtlrGGf>10Q4wW9tOi$gCa96y=3V(%QDm!nrHJh;6skg@C^}2Kq@q|7ebTC{ zR;AZH(Oa+=+*PDHgwa!m44|3(6&A8j2gut6MR-&*9k z3UUhEhdpRC11R){@^RqvI1v6v5$I7zQFIM32F~tc5E90lo_Y};L8GM^7WTYLG3L9c zw;nx&(e@u9@0oB!Cya-?cfpW870o&f05}Gow}@xreU879K!-yaLi+Hd9Lv2}V}_e{ zDyR-Rd);;s?(2qb>0P7Yyc!3NWg8OC7c|psI2X|5NEu!#pt*4}2rsJg!}%GO6OfWZ zw30ZkM5~s&L^Xfrg$g-=D;(7L^MywOO7Ki|tE5{H?00(|%>wJ_28dx&j{!imJbKW* zkoUvi6W$k^8+ea<&8OD>Ii5sRCjS=m+{?e6Im!N+y`Nc{HrXH2e@(Q;e;Mb;m*NB@ zv+8hlhAGVJH{vuj2zc(o!;Ex1q@ax1mYbber35Aw%8UyWT;16)9=3 zNsFg8>2(Of|Z z-bvC-xVea`bn-$zbH*gq`=*r8#+pw zX_fa(*gJtJhx^gPjWD1nZWQXJ8ff-=HtZ}CYFyzPWkr;p%JwZF@_rke5q1gOlHJ`U z19GPBILkd)WQHF)?J%?~-8cx~u

Solution: Any code snippet and its enclosed information

Privacy

-

All personal data bring to JKA Network in registration form are save under the General Data Protection Regulation (GDPR) (EU) 2016/679. - You can claim your right through JKA Network email contacto@jkanetwork.com. - If you use CodeShare you authorized JKA Network to save and use your Email and Nickname to manage login and upload code snippets. +

All personal data bring to Code Solutions Project in registration form are save under the General Data Protection Regulation (GDPR) (EU) 2016/679. + You can claim your right through Code Solutions Project email contacto@jkanetwork.com. + If you use CodeShare you authorized Code Solutions Project to save and use your Email and Nickname to manage login and upload code snippets.

About content upload to CodeShare

All content which the user upload to CodeShare except his email, password or comments are ceded with their - all rights to JKA Network and immediately JKA Network will prescind from with their rights on these putting + all rights to Code Solutions Project and immediately Code Solutions Project will prescind from with their rights on these putting them under the public domain
- Only JKA Network can remove comment or solutions hosted in CodeShare

+ Only Code Solutions Project can remove comment or solutions hosted in CodeShare

About user's account

The registered user in all moment can close their account but all data hosted in CodeShare will remain hosted. -
JKA Network is reserved the right to ban the access to account of any user who engage Code Solutions Project is reserved the right to ban the access to account of any user who engage vandalism

Cookie policiy

In CodeShare are used two differents cookies, one for session system and other for cookies' consent. You can diff --git a/Source/assets/html/about.twig b/Source/assets/html/about.twig index 616849d..0123e91 100644 --- a/Source/assets/html/about.twig +++ b/Source/assets/html/about.twig @@ -7,7 +7,7 @@

Source

CodeShare is an open source platform licensed under Apache 2.0. All code are hosted in GitLab

Developers
-

Developed by Code Solutions Project, JKA Network's Group <contacto@jkanetwork.com>

+

Developed by Code Solutions Project <contacto@jkanetwork.com>

Maintenance by Jose Luis Garrido Labrador <joselucross@jkanetwork.com>

Open source licenses

Bootstrap 3 by Twitter - Licensed under MIT

diff --git a/Source/assets/html/code.twig b/Source/assets/html/code.twig index 7f4b275..7aa0589 100644 --- a/Source/assets/html/code.twig +++ b/Source/assets/html/code.twig @@ -28,8 +28,10 @@ {% endif %} {#
Se necesita tener JavaScript habilitado para poder ver los comentarios de la web.
#} + {% if page.otherI or user.nick is defined %}

Other implementations

+ {% endif %} {% if page.otherI %} {% for i in otherImplementation %}
@@ -108,7 +110,7 @@
{% endif %} - {% if user.nick is defined and user.IDU == code.idu%} + {% if user.nick is defined and user.IDU == code.idu %}