Skip to content

Commit 3d71fb4

Browse files
author
Leonix
committed
Webasyst Framework v.2.3.2
* Fixed bug in the tags-adding field used in various apps.
1 parent 4015115 commit 3d71fb4

File tree

9 files changed

+24
-15
lines changed

9 files changed

+24
-15
lines changed

wa-apps/installer/lib/config/app.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
'description' => 'Install new apps from the Webasyst Store',
55
'icon' => 'img/installer.svg',
66
'mobile' => false,
7-
'version' => '2.3.1',
8-
'critical' => '2.3.1',
7+
'version' => '2.3.2',
8+
'critical' => '2.3.2',
99
'system' => true,
1010
'vendor' => 'webasyst',
1111
'csrf' => true,

wa-content/js/jquery-plugins/jquery-tagsinput/jquery.tagsinput.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

wa-content/js/jquery-wa/wa.js

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3712,6 +3712,18 @@
37123712

37133713
if (callback) { callback(timezone); }
37143714
}
3715+
},
3716+
3717+
util: {
3718+
formatFileSize: function(bytes) {
3719+
var i = -1;
3720+
do {
3721+
bytes = bytes / 1024;
3722+
i++;
3723+
} while (bytes > 99);
3724+
3725+
return Math.max(bytes, 0.01).toFixed(2) + ((i >=0)? (' ' + $_(['kB', 'MB', 'GB', 'TB', 'PB', 'EB'][i])):'');
3726+
}
37153727
}
37163728
});
37173729

wa-system/waid/waWebasystIDAuthAdapter.class.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ protected function processAuthResponse()
164164
{
165165
// check state first
166166
if (!$this->verifyState()) {
167-
throw new waWebasystIDAuthException(_ws('Invalid or expired state'));
167+
throw new waWebasystIDAuthException(_ws('The time for authorization has expired. Please go back using the button below and try again.'));
168168
}
169169

170170
// check error from server
@@ -287,7 +287,7 @@ public function getAccessToken($code, array $params = [])
287287
$credentials = $this->getCredentials();
288288

289289
$redirect_uri = $this->getCallbackUrl(true);
290-
290+
291291
$params = array_merge($params, [
292292
'code' => $code,
293293
'grant_type' => 'authorization_code',

wa-system/webasyst/lib/config/app.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
return array(
44
'name' => 'Webasyst',
55
'prefix' => 'webasyst',
6-
'version' => '2.3.1',
7-
'critical' => '2.3.1',
6+
'version' => '2.3.2',
7+
'critical' => '2.3.2',
88
'vendor' => 'webasyst',
99
'csrf' => true,
1010
'header_items' => array(
2 Bytes
Binary file not shown.

wa-system/webasyst/locale/en_US/LC_MESSAGES/webasyst.po

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ msgid ""
22
msgstr ""
33
"Project-Id-Version: WebAsyst\n"
44
"POT-Creation-Date: \n"
5-
"PO-Revision-Date: 2021-07-21 12:51+0300\n"
5+
"PO-Revision-Date: 2021-09-22 09:47+0300\n"
66
"Last-Translator: \n"
77
"Language-Team: \n"
88
"MIME-Version: 1.0\n"
@@ -12,7 +12,7 @@ msgstr ""
1212
"X-Poedit-SourceCharset: utf-8\n"
1313
"X-Poedit-Basepath: .\n"
1414
"Language: en\n"
15-
"X-Generator: Poedit 3.0\n"
15+
"X-Generator: Poedit 2.0.6\n"
1616
"X-Poedit-SearchPath-0: .\n"
1717
"X-Poedit-SearchPath-1: .\n"
1818

@@ -3611,9 +3611,6 @@ msgstr ""
36113611
msgid "Unknown authorization error. Sign in with a login and a password."
36123612
msgstr ""
36133613

3614-
msgid "Invalid or expired state"
3615-
msgstr ""
3616-
36173614
msgid "Webasyst ID account <i class=\"icon16 userpic20\" style=\"background-image: url(%s);\"></i> <strong>%s</strong> is already connected to user <i class=\"icon16 userpic20\" style=\"background-image: url(%s);\"></i> <strong>%s</strong>"
36183615
msgstr ""
36193616

173 Bytes
Binary file not shown.

wa-system/webasyst/locale/ru_RU/LC_MESSAGES/webasyst.po

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ msgid ""
22
msgstr ""
33
"Project-Id-Version: WebAsyst\n"
44
"POT-Creation-Date: \n"
5-
"PO-Revision-Date: 2021-09-17 18:46+0300\n"
5+
"PO-Revision-Date: 2021-09-22 09:47+0300\n"
66
"Last-Translator: Webasyst\n"
77
"Language-Team: \n"
88
"MIME-Version: 1.0\n"
@@ -5848,8 +5848,8 @@ msgstr "Изменить подключение на нового пользов
58485848
msgid "If you need to change the connection of your Webasyst ID account to user <strong>%s</strong>, press “Confirm”."
58495849
msgstr "Если вам необходимо изменить подключение вашего аккаунта Webasyst ID на пользователя <strong>%s</strong>, нажмите «Подтвердить»."
58505850

5851-
msgid "Invalid or expired state"
5852-
msgstr "Недействительное или просроченное состояние"
5851+
msgid "The time for authorization has expired. Please go back using the button below and try again."
5852+
msgstr "Истекло время, необходимое для авторизации. Вернитесь назад с помощью кнопки ниже и повторите попытку."
58535853

58545854
msgid "Sorry, the login has failed."
58555855
msgstr "Извините, авторизация не удалась."

0 commit comments

Comments
 (0)