From 9bf001dac83031e85c8bd137b56b5933ac1e0520 Mon Sep 17 00:00:00 2001 From: Mzhelskiy Maxim Date: Wed, 19 Apr 2017 14:59:49 +0700 Subject: [PATCH 1/8] fix install --- application/install/data/sql/patch_2.0.0_to_2.0.1.sql | 1 - framework | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/application/install/data/sql/patch_2.0.0_to_2.0.1.sql b/application/install/data/sql/patch_2.0.0_to_2.0.1.sql index 9b72478c..a2f50a2a 100644 --- a/application/install/data/sql/patch_2.0.0_to_2.0.1.sql +++ b/application/install/data/sql/patch_2.0.0_to_2.0.1.sql @@ -6,7 +6,6 @@ ALTER TABLE `prefix_topic_content` CHANGE `topic_text_source` `topic_text_source ALTER TABLE `prefix_topic_content` CHANGE `topic_text` `topic_text` LONGTEXT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL; ALTER TABLE `prefix_topic_content` CHANGE `topic_text_short` `topic_text_short` TEXT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL; ALTER TABLE `prefix_topic_content` CHANGE `topic_extra` `topic_extra` TEXT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL; -ALTER TABLE `prefix_topic_photo` CHANGE `description` `description` TEXT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL; ALTER TABLE `prefix_talk` CHANGE `talk_text` `talk_text` TEXT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL; ALTER TABLE `prefix_property_value` CHANGE `value_text` `value_text` TEXT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL; ALTER TABLE `prefix_blog` CHANGE `blog_description` `blog_description` TEXT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL; diff --git a/framework b/framework index d8082f10..fe79575f 160000 --- a/framework +++ b/framework @@ -1 +1 @@ -Subproject commit d8082f10ab01ba1fd9d30316378a392a1dc9dd55 +Subproject commit fe79575fa28c116d7392c8028df0c1404f2b246d From 43aa3ee037aa53ecea6940d3ca8482bd31686899 Mon Sep 17 00:00:00 2001 From: Mzhelskiy Maxim Date: Mon, 24 Apr 2017 19:37:03 +0700 Subject: [PATCH 2/8] update framework --- framework | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framework b/framework index fe79575f..480e1643 160000 --- a/framework +++ b/framework @@ -1 +1 @@ -Subproject commit fe79575fa28c116d7392c8028df0c1404f2b246d +Subproject commit 480e1643ef686657616bb92792656c9e34d51c48 From 211a1e2d45fcce73f29624bf439314a257de8913 Mon Sep 17 00:00:00 2001 From: Mzhelskiy Maxim Date: Mon, 1 May 2017 14:11:30 +0700 Subject: [PATCH 3/8] fix comment vote --- .../frontend/skin/synio/components/vote/vote.tpl | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/application/frontend/skin/synio/components/vote/vote.tpl b/application/frontend/skin/synio/components/vote/vote.tpl index f18e2819..909b9cf0 100644 --- a/application/frontend/skin/synio/components/vote/vote.tpl +++ b/application/frontend/skin/synio/components/vote/vote.tpl @@ -12,16 +12,17 @@ {component_define_params params=[ 'showRating', 'target', 'isLocked', 'useAbstain', 'mods', 'classes', 'attributes' ]} {* Параметры для тестирования *} -{component_define_params params=[ 'isVoted', 'targetId', 'rating', 'direction' ]} +{component_define_params params=[ 'targetId', 'rating']} {* Установка дефолтных значений *} {$showRating = $showRating|default:true} {* Рейтинг *} {$rating = $rating|default:$target->getRating()} -{$_direction = $direction|default:$target->getDirection()} {$_id = $targetId|default:$target->getId()} -{$_isVoted = $isVoted|default:$target->getVote()} +{$_vote = $target->getVote()} +{$_direction = ($_vote) ? $_vote->getDirection() : 0} + {* Получаем модификаторы *} {if $showRating} @@ -34,7 +35,7 @@ {/if} {/if} -{if $_isVoted} +{if $_vote} {$mods = "$mods voted"} {if $_direction > 0} @@ -76,15 +77,15 @@ {* Нравится *} -
+
{* Воздержаться *} {if $useAbstain} -
+
{/if} {* Не нравится *} -
+
{/block} \ No newline at end of file From 6969e17f6d82587aaf56ddfa11a443b3a415c60f Mon Sep 17 00:00:00 2001 From: Mzhelskiy Maxim Date: Mon, 1 May 2017 14:59:48 +0700 Subject: [PATCH 4/8] fix synio comments --- .../frontend/skin/synio/components/comment/css/comment.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/application/frontend/skin/synio/components/comment/css/comment.css b/application/frontend/skin/synio/components/comment/css/comment.css index e85f59bd..b9a0992b 100644 --- a/application/frontend/skin/synio/components/comment/css/comment.css +++ b/application/frontend/skin/synio/components/comment/css/comment.css @@ -42,7 +42,8 @@ filter: alpha(opacity=100); } -.ls-comment.ls-comment--deleted { background: #efd5d5; } +.ls-comment--deleted .ls-comment-content { background: #efd5d5; } +.ls-comment--deleted .ls-comment-content:after { border-top-color: #efd5d5; } .ls-user-role-not-admin .ls-comment.ls-comment--deleted { padding: 10px 15px; min-height: 0; From af8f6b50d050ddb27832f6bd3935c7531407ce8a Mon Sep 17 00:00:00 2001 From: Mzhelskiy Maxim Date: Mon, 1 May 2017 15:05:56 +0700 Subject: [PATCH 5/8] add target _blank for links --- application/config/jevix.php | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/application/config/jevix.php b/application/config/jevix.php index 90e1ee4b..c35945c0 100644 --- a/application/config/jevix.php +++ b/application/config/jevix.php @@ -30,6 +30,15 @@ return array( array('data-rel' => '#text', 'class' => array('js-lbx')) ), ), + // Теги с обязательными параметрами + 'cfgSetTagParamDefault' => array( + array( + 'a', + 'target', + '_blank', + true + ), + ), 'cfgSetTagCallbackFull' => array( array( 'ls', From 7174d93558ad4893f4b35777a9749f36342eed37 Mon Sep 17 00:00:00 2001 From: Mzhelskiy Maxim Date: Mon, 1 May 2017 15:17:27 +0700 Subject: [PATCH 6/8] fix jevix config --- application/config/jevix.php | 6 ++++++ framework | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/application/config/jevix.php b/application/config/jevix.php index c35945c0..5f8c3e9a 100644 --- a/application/config/jevix.php +++ b/application/config/jevix.php @@ -38,6 +38,12 @@ return array( '_blank', true ), + array( + 'a', + 'rel', + 'noreferrer noopener', + true + ), ), 'cfgSetTagCallbackFull' => array( array( diff --git a/framework b/framework index 480e1643..39e193e9 160000 --- a/framework +++ b/framework @@ -1 +1 @@ -Subproject commit 480e1643ef686657616bb92792656c9e34d51c48 +Subproject commit 39e193e9f13114525403ab1f59741853d3e0f743 From 0f666fae6689bfc53cd5f222685f75f1588939a4 Mon Sep 17 00:00:00 2001 From: Mzhelskiy Maxim Date: Mon, 1 May 2017 15:24:22 +0700 Subject: [PATCH 7/8] update version and framework --- README.md | 2 +- Readme.EN.txt | 2 +- Readme.RU.txt | 2 +- application/config/config.php | 2 +- framework | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index c9998a9f..8d2ca79e 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ [LiveStreet CMS](http://livestreetcms.ru) - бесплатный блого-социальный движок. Позволяет удобно и быстро создать сообщество с коллективными блогами. ### Текущая версия -На данный момент релизная версия LS 2.0.0 +На данный момент релизная версия LS 2.0.1 Каталог плагинов доступен на официальном сайте - [catalog.livestreetcms.com](https://catalog.livestreetcms.com). diff --git a/Readme.EN.txt b/Readme.EN.txt index 65e36753..fd63b423 100644 --- a/Readme.EN.txt +++ b/Readme.EN.txt @@ -1,4 +1,4 @@ -LiveStreet 2.0.0 +LiveStreet 2.0.1 Free social engine. diff --git a/Readme.RU.txt b/Readme.RU.txt index 63f7ebed..246a9621 100644 --- a/Readme.RU.txt +++ b/Readme.RU.txt @@ -1,4 +1,4 @@ -LiveStreet 2.0.0 +LiveStreet 2.0.1 Бесплатный движок блого-социальной сети. diff --git a/application/config/config.php b/application/config/config.php index e44ddbf2..d56d384f 100644 --- a/application/config/config.php +++ b/application/config/config.php @@ -21,7 +21,7 @@ * Ничего не изменяйте в этом файле! * Все изменения нужно вносить в файл config/config.local.php */ -define('LS_VERSION', '2.0.0'); +define('LS_VERSION', '2.0.1'); /** * Основные настройки путей diff --git a/framework b/framework index 39e193e9..6ee95bbb 160000 --- a/framework +++ b/framework @@ -1 +1 @@ -Subproject commit 39e193e9f13114525403ab1f59741853d3e0f743 +Subproject commit 6ee95bbb0c11b50271755a460592a80c3dd88680 From 4d0d7740659694778b4cfdda8509c04cf6a699f9 Mon Sep 17 00:00:00 2001 From: Mzhelskiy Maxim Date: Mon, 1 May 2017 15:56:06 +0700 Subject: [PATCH 8/8] fix sql dump --- application/install/data/sql/dump.sql | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/application/install/data/sql/dump.sql b/application/install/data/sql/dump.sql index 4064e7ee..80d5b247 100644 --- a/application/install/data/sql/dump.sql +++ b/application/install/data/sql/dump.sql @@ -1814,4 +1814,17 @@ ALTER TABLE `prefix_user_note` -- AUTO_INCREMENT для таблицы `prefix_wall` -- ALTER TABLE `prefix_wall` - MODIFY `id` int(11) unsigned NOT NULL AUTO_INCREMENT; \ No newline at end of file + MODIFY `id` int(11) unsigned NOT NULL AUTO_INCREMENT; + + +-- patch from 2.0.1 +ALTER TABLE `prefix_topic_content` CHANGE `topic_text_source` `topic_text_source` LONGTEXT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL; +ALTER TABLE `prefix_topic_content` CHANGE `topic_text` `topic_text` LONGTEXT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL; +ALTER TABLE `prefix_topic_content` CHANGE `topic_text_short` `topic_text_short` TEXT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL; +ALTER TABLE `prefix_topic_content` CHANGE `topic_extra` `topic_extra` TEXT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL; +ALTER TABLE `prefix_talk` CHANGE `talk_text` `talk_text` TEXT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL; +ALTER TABLE `prefix_property_value` CHANGE `value_text` `value_text` TEXT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL; +ALTER TABLE `prefix_blog` CHANGE `blog_description` `blog_description` TEXT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL; +ALTER TABLE `prefix_comment` CHANGE `comment_text` `comment_text` TEXT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL; +ALTER TABLE `prefix_comment` CHANGE `comment_text_source` `comment_text_source` TEXT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL; +ALTER TABLE `prefix_wall` CHANGE `text` `text` TEXT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL; \ No newline at end of file