Skip to content

Commit

Permalink
Merge branch 0.4.9 (#21)
Browse files Browse the repository at this point in the history
* Fix installation error

* Update Semantic UI to 2.2.13

* Update CKEditor to 4.7.3
  • Loading branch information
junepaik committed Oct 2, 2017
1 parent 39e9593 commit b4c49fe
Show file tree
Hide file tree
Showing 31 changed files with 1,229 additions and 1,017 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,5 @@

/composer.lock
/composer.phar
/package-lock.json
/semantic.json
4 changes: 2 additions & 2 deletions www/engine/System/Classes/Frames/Section.php
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ abstract class Section extends Main {

private function loadPhrases() {

$languages = [Extend\Languages::getPrimary('path'), Extend\Languages::get('path')];
$languages = [Extend\Languages::getPrimary('path'), Extend\Languages::get('path')]; $phrases = static::PHRASES;

$phrases = array_merge(static::PHRASES, array_keys(Extend\Addons::getItems() ?? []));
if (Extend\Addons::isInited()) $phrases = array_merge($phrases, array_keys(Extend\Addons::getItems()));

foreach (array_unique($languages) as $path) foreach ($phrases as $name) {

Expand Down
9 changes: 9 additions & 0 deletions www/engine/System/Classes/Modules/Extend/Utils/Extension.php
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,15 @@ public static function validate(string $name) {
return (preg_match(static::$regex_name, $name) ? $name : false);
}

/**
* Check if the extension is inited
*/

public static function isInited() {

return (null !== static::$loader);
}

/**
* Static overloader
*/
Expand Down
6 changes: 3 additions & 3 deletions www/engine/System/Includes/Constants.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@
define('CADMIUM_NAME', 'Cadmium CMS');
define('CADMIUM_HOME', 'http://cadmium-cms.com');

define('CADMIUM_VERSION', '0.4.8');
define('CADMIUM_VERSION', '0.4.9');
define('CADMIUM_COPY', '2017');

# Third-party

define('JQUERY_VERSION', '3.2.1');
define('SEMANTIC_UI_VERSION', '2.2.10');
define('CKEDITOR_VERSION', '4.6.2');
define('SEMANTIC_UI_VERSION', '2.2.13');
define('CKEDITOR_VERSION', '4.7.3');
define('ACE_VERSION', '1.2.6');

# Sections
Expand Down
141 changes: 140 additions & 1 deletion www/include/admin/ckeditor/CHANGES.md

Large diffs are not rendered by default.

6 changes: 4 additions & 2 deletions www/include/admin/ckeditor/build-config.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@
* (1) http://ckeditor.com/builder
* Visit online builder to build CKEditor from scratch.
*
* (2) http://ckeditor.com/builder/d0a1a055cc0805cfb61f4b2856c3eda2
* (2) http://ckeditor.com/builder/3a052910e298eb414c7024536364de53
* Visit online builder to build CKEditor, starting with the same setup as before.
*
* (3) http://ckeditor.com/builder/download/d0a1a055cc0805cfb61f4b2856c3eda2
* (3) http://ckeditor.com/builder/download/3a052910e298eb414c7024536364de53
* Straight download link to the latest version of CKEditor (Optimized) with the same setup as before.
*
* NOTE:
Expand All @@ -38,9 +38,11 @@ var CKBUILDER_CONFIG = {
'.jshintignore',
'.jshintrc',
'.mailmap',
'.travis.yml',
'README.md',
'bender-err.log',
'bender-out.log',
'bender.ci.js',
'bender.js',
'dev',
'gruntfile.js',
Expand Down
1,515 changes: 768 additions & 747 deletions www/include/admin/ckeditor/ckeditor.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion www/include/admin/ckeditor/lang/en.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion www/include/admin/ckeditor/lang/ru.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion www/include/admin/ckeditor/lang/uk.js

Large diffs are not rendered by default.

12 changes: 0 additions & 12 deletions www/include/admin/ckeditor/plugins/clipboard/dialogs/paste.js

This file was deleted.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file modified www/include/admin/ckeditor/plugins/icons.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified www/include/admin/ckeditor/plugins/icons_hidpi.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 4 additions & 3 deletions www/include/admin/ckeditor/plugins/link/dialogs/anchor.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit b4c49fe

Please sign in to comment.