Skip to content

Commit b046804

Browse files
hiteshaggarwalhiteshaggarwal
authored
Merge pull request #221 from joomdev/dev
Dev
2 parents fa25716 + 5d27cf5 commit b046804

File tree

8 files changed

+30
-29
lines changed

8 files changed

+30
-29
lines changed

‎astroid/astroid-framework/astroid.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<libraryname>astroid</libraryname>
55
<author>JoomDev</author>
66
<creationDate>Oct 2020</creationDate>
7-
<version>2.5.1</version>
7+
<version>2.5.2</version>
88
<url>https://www.astroidframework.com</url>
99
<copyright>Copyright (C) 2020 Joomdev, Inc. All rights reserved.</copyright>
1010
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>

‎astroid/astroid-framework/framework/library/astroid/Helper/Constants.php‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
class Constants
1515
{
16-
public static $astroid_version = '2.5.1';
16+
public static $astroid_version = '2.5.2';
1717
public static $fontawesome_version = '5.14.0';
1818
public static $animatecss_version = '3.7.0';
1919
public static $forum_link = 'https://www.joomdev.com/forum/astroid-framework';
@@ -277,87 +277,87 @@ class Constants
277277
public static $preloadersFont = [
278278
'spinner' => [
279279
'name' => 'fas fa-spinner fa-spin',
280-
'code' => '<div class="icon-center fas fa-spinner fa-spin" style="font-size: 40px; margin: 0 auto;"></div>',
280+
'code' => '<div class="fas fa-spinner fa-spin" style="font-size: 40px; margin: 0 auto;"></div>',
281281
],
282282
'circle-notch' => [
283283
'name' => 'fas fa-circle-notch fa-spin',
284-
'code' => '<div class="icon-center fas fa-circle-notch fa-spin" style="font-size: 40px;margin: 0 auto;"></div>',
284+
'code' => '<div class="fas fa-circle-notch fa-spin" style="font-size: 40px;margin: 0 auto;"></div>',
285285
],
286286
'sync' => [
287287
'name' => 'fas fa-sync fa-spin',
288-
'code' => '<div class="icon-center fas fa-sync fa-spin fa-spin" style="font-size: 40px;margin: 0 auto;"></div>',
288+
'code' => '<div class="fas fa-sync fa-spin fa-spin" style="font-size: 40px;margin: 0 auto;"></div>',
289289
],
290290
'cog' => [
291291
'name' => 'fas fa-cog fa-spin',
292-
'code' => '<div class="icon-center fas fa-cog fa-spin" style="font-size: 40px;margin: 0 auto;"></div>',
292+
'code' => '<div class="fas fa-cog fa-spin" style="font-size: 40px;margin: 0 auto;"></div>',
293293
],
294294
'spinner fa-pulse' => [
295295
'name' => 'fas fa-spinner fa-pulse',
296-
'code' => '<div class="icon-center fas fa-spinner fa-pulse" style="font-size: 40px;margin: 0 auto;"></div>',
296+
'code' => '<div class="fas fa-spinner fa-pulse" style="font-size: 40px;margin: 0 auto;"></div>',
297297
],
298298
'stroopwafel' => [
299299
'name' => 'fas fa-stroopwafel fa-spin',
300-
'code' => '<div class="icon-center fas fa-stroopwafel fa-spin" style="font-size: 40px;margin: 0 auto;"></div>',
300+
'code' => '<div class="fas fa-stroopwafel fa-spin" style="font-size: 40px;margin: 0 auto;"></div>',
301301
],
302302
'sun' => [
303303
'name' => 'fas fa-sun fa-spin',
304-
'code' => '<div class="icon-center fas fa-sun fa-spin" style="font-size: 40px;margin: 0 auto;"></div>'
304+
'code' => '<div class="fas fa-sun fa-spin" style="font-size: 40px;margin: 0 auto;"></div>'
305305
],
306306
'sun-fr' => [
307307
'name' => 'far fa-sun fa-spin',
308-
'code' => '<div class="icon-center far fa-sun fa-spin" style="font-size: 40px;margin: 0 auto;"></div>'
308+
'code' => '<div class="far fa-sun fa-spin" style="font-size: 40px;margin: 0 auto;"></div>'
309309
],
310310
'asterisk' => [
311311
'name' => 'fas fa-asterisk fa-spin',
312-
'code' => '<div class="icon-center fas fa-asterisk fa-spin" style="font-size: 40px;margin: 0 auto;"></div>'
312+
'code' => '<div class="fas fa-asterisk fa-spin" style="font-size: 40px;margin: 0 auto;"></div>'
313313
],
314314
'atom' => [
315315
'name' => 'fas fa-atom fa-spin',
316-
'code' => '<div class="icon-center fas fa-atom fa-spin" style="font-size: 40px;margin: 0 auto;"></div>'
316+
'code' => '<div class="fas fa-atom fa-spin" style="font-size: 40px;margin: 0 auto;"></div>'
317317
],
318318
'certificate' => [
319319
'name' => 'fas fa-certificate fa-spin',
320-
'code' => '<div class="icon-center fas fa-certificate fa-spin" style="font-size: 40px;margin: 0 auto;"></div>'
320+
'code' => '<div class="fas fa-certificate fa-spin" style="font-size: 40px;margin: 0 auto;"></div>'
321321
],
322322
'compact-disc' => [
323323
'name' => 'fas fa-compact-disc fa-spin',
324-
'code' => '<div class="icon-center fas fa-compact-disc fa-spin" style="font-size: 40px;margin: 0 auto;"></div>'
324+
'code' => '<div class="fas fa-compact-disc fa-spin" style="font-size: 40px;margin: 0 auto;"></div>'
325325
],
326326
'compass' => [
327327
'name' => 'fas fa-compass fa-spin',
328-
'code' => '<div class="icon-center fas fa-compact-compass fa-spin" style="font-size: 40px;margin: 0 auto;"></div>'
328+
'code' => '<div class="fas fa-compact-compass fa-spin" style="font-size: 40px;margin: 0 auto;"></div>'
329329
],
330330
'compass' => [
331331
'name' => 'far fa-compass fa-spin',
332-
'code' => '<div class="icon-center far fa-compass fa-spin" style="font-size: 40px;margin: 0 auto;"></div>'
332+
'code' => '<div class="far fa-compass fa-spin" style="font-size: 40px;margin: 0 auto;"></div>'
333333
],
334334
'crosshairs' => [
335335
'name' => 'fas fa-crosshairs fa-spin',
336-
'code' => '<div class="icon-center fas fa-crosshairs fa-spin" style="font-size: 40px;margin: 0 auto;"></div>'
336+
'code' => '<div class="fas fa-crosshairs fa-spin" style="font-size: 40px;margin: 0 auto;"></div>'
337337
],
338338
'dharmachakra' => [
339339
'name' => 'fas fa-dharmachakra fa-spin',
340-
'code' => '<div class="icon-center fas fa-dharmachakra fa-spin" style="font-size: 40px;margin: 0 auto;"></div>'
340+
'code' => '<div class="fas fa-dharmachakra fa-spin" style="font-size: 40px;margin: 0 auto;"></div>'
341341
],
342342
'bahai' => [
343343
'name' => 'fas fa-bahai fa-spin',
344-
'code' => '<div class="icon-center fas fa-bahai fa-spin" style="font-size: 40px;margin: 0 auto;"></div>'
344+
'code' => '<div class="fas fa-bahai fa-spin" style="font-size: 40px;margin: 0 auto;"></div>'
345345
],
346346
'life-ring' => [
347347
'name' => 'fas fa-life-ring fa-spin',
348-
'code' => '<div class="icon-center fas fa-life-ring fa-spin" style="font-size: 40px;margin: 0 auto;"></div>'
348+
'code' => '<div class="fas fa-life-ring fa-spin" style="font-size: 40px;margin: 0 auto;"></div>'
349349
],
350350
'life-ring' => [
351351
'name' => 'fas fa-life-ring fa-spin',
352-
'code' => '<div class="icon-center fas fa-life-ring fa-spin" style="font-size: 40px;margin: 0 auto;"></div>'
352+
'code' => '<div class="fas fa-life-ring fa-spin" style="font-size: 40px;margin: 0 auto;"></div>'
353353
],
354354
'yin-yang' => [
355355
'name' => 'fas fa-yin-yang fa-spin',
356-
'code' => '<div class="icon-center fas fa-yin-yang fa-spin" style="font-size: 40px;margin: 0 auto;"></div>'
356+
'code' => '<div class="fas fa-yin-yang fa-spin" style="font-size: 40px;margin: 0 auto;"></div>'
357357
],
358358
'sync-alt' => [
359359
'name' => 'fas fa-sync-alt fa-spin',
360-
'code' => '<div class="icon-center fas fa-sync-alt fa-spin" style="font-size: 40px;margin: 0 auto;"></div>'
360+
'code' => '<div class="fas fa-sync-alt fa-spin" style="font-size: 40px;margin: 0 auto;"></div>'
361361
],
362362

363363
];

‎astroid/astroid-framework/plugins/astroid/astroid.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ public function onContentPrepareForm($form, $data)
4343

4444
public function onAfterRender()
4545
{
46-
if (Framework::isAdmin()) return;
4746
Framework::getClient()->onAfterRender();
4847
}
4948

‎astroid/astroid-framework/plugins/astroid/astroid.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<name>Astroid Plugin</name>
44
<author>JoomDev</author>
55
<creationDate>Oct 2020</creationDate>
6-
<version>2.5.1</version>
6+
<version>2.5.2</version>
77
<url>https://www.astroidframework.com</url>
88
<copyright>Copyright (C) 2020 Joomdev, Inc. All rights reserved.</copyright>
99
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>

‎astroid/astroid-framework/script.php‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,9 @@ public function postflight($type, $parent)
4545
}
4646
}
4747

48-
Overrides::fix();
48+
if ($type == "update") {
49+
Overrides::fix();
50+
}
4951
}
5052

5153
public function installPlugin($plugin, $plugin_dir)

‎astroid/astroid-template-one/templateDetails.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<authorUrl>https://www.joomdev.com</authorUrl>
88
<copyright>Copyright (C) 2019 Joomdev, Inc. All rights reserved.</copyright>
99
<license>GNU General Public License bn 2 or later; see LICENSE.txt</license>
10-
<version>1.3.1</version>
10+
<version>1.3.2</version>
1111
<description>TPL_ASTROID_XML_DESCRIPTION</description>
1212
<updateservers>
1313
<server type="extension" name="astroid_framework" priority="1">https://cdn.joomdev.com/updates/astroid_template_one.xml</server>

‎astroid/astroid-template-zero/templateDetails.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<authorUrl>https://www.joomdev.com</authorUrl>
88
<copyright>Copyright (C) 2020 Joomdev, Inc. All rights reserved.</copyright>
99
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
10-
<version>2.5.1</version>
10+
<version>2.5.2</version>
1111
<description>TPL_ASTROID_XML_DESCRIPTION</description>
1212
<updateservers>
1313
<server type="extension" name="astroid_framework" priority="1">https://cdn.joomdev.com/updates/astroid_template_zero.xml</server>

‎pkg_astroid.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<packagerurl>https://www.astroidframework.com</packagerurl>
77
<author>JoomDev</author>
88
<creationDate>Oct 2020</creationDate>
9-
<version>2.5.1</version>
9+
<version>2.5.2</version>
1010
<url>https://www.joomdev.com</url>
1111
<copyright>Copyright (C) 2020 Joomdev, Inc. All rights reserved.</copyright>
1212
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>

0 commit comments

Comments
 (0)