Skip to content
This repository was archived by the owner on Mar 8, 2021. It is now read-only.

Commit fa17b05

Browse files
Dmi3yyDmi3yy
authored
Merge pull request #1393 from evolution-cms/master
Evolution CMS 1.3.0
2 parents 14d2a8f + 724de67 commit fa17b05

File tree

605 files changed

+8477
-21543
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

605 files changed

+8477
-21543
lines changed

‎README.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
# MODX Evolution
1+
# Evolution CMS
22

3-
**What is MODX**
3+
**What is EVO**
44

5-
MODX is an open source Content Management System and Application Framework. Initially inspired by Etomite 0.6, MODX is an ongoing project written by Raymond Irving and a core team of contributors at the MODX Project. MODX is distributed under the GPL license and is now run by a professional team of developers from all over the world. Visit the Forums for more information.
5+
EVO is an open source Content Management System and Application Framework. Initially inspired by Etomite 0.6, then it been MODX Evolution 0.7 - 1.0.8 is an ongoing project written by Raymond Irving and a core team of contributors MODX, and now its Evolution CMS maintained by Dmytro Lukianenko and a core team of contributors at the EVO Project. EVO is distributed under the GPL license and is now run by a professional team of developers from all over the world. Visit the Forums for more information.
66

7-
MODX provides a fast, lightweight and powerful framework on which to deploy and secure your website and web applications. For example, it gives you a true system for registered web users and groups that is separate from administration users. You can grant some web users access to one page and others access to another page. For content management, you can easily duplicate documents, folders (and all their children!), chunks and snippets. Most significant, though, is MODX's ability to empower you to quickly and easily create and maintain a rich and dynamic website like never before.
7+
EVO provides a fast, lightweight and powerful framework on which to deploy and secure your website and web applications. For example, it gives you a true system for registered web users and groups that is separate from administration users. You can grant some web users access to one page and others access to another page. For content management, you can easily duplicate documents, folders (and all their children!), chunks and snippets. Most significant, though, is EVO's ability to empower you to quickly and easily create and maintain a rich and dynamic website like never before.
88

9-
MODX Evolution requires **PHP version 5.3 and higher**.
9+
Evolution CMS requires **PHP version 5.4 and higher**.
1010

1111
### Screenshots
1212

@@ -19,16 +19,16 @@ MODX Evolution requires **PHP version 5.3 and higher**.
1919
### References
2020

2121
Official Website:
22-
https://modx.com/community/modx-evolution
22+
https://evo.im/
2323

2424
Download:
25-
https://modx.com/download/evolution/
25+
https://github.com/evolution-cms/evolution/releases
2626

2727
Previous Releases:
2828
https://modx.com/download/evolution/previous-releases.html
2929

3030
Extras:
31-
https://modx.com/extras/?product=evolution
31+
https://extras.evolution-cms.com
3232

3333
Documentation:
34-
https://docs.modx.com/evolution/1.0
34+
https://evolution-docs.com

‎assets/cache/updater/.htaccess

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
order deny,allow
2+
allow from all

‎assets/cache/updater/ht.access

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
order deny,allow
2+
allow from all

‎manager/media/style/MODxRE2_DropdownMenu/frames/index.html renamed to ‎assets/cache/updater/index.html

File renamed without changes.

‎assets/docs/changelog.txt

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,44 @@
11
This file shows the changes in recent releases of MODX. The most current release is usually the
22
development release, and is only shown to give an idea of what's currently in the pipeline.
33

4+
Evolution CMS 1.3.0(Jul 10, 2017)
5+
* [GitHub:#3dda520a] - [R] update sortables list delete mootools sortables (64j)
6+
* [GitHub:#9cafe6db] - [F] fix toggle menu (64j)
7+
* [GitHub:#6c316c18] - [I] Update DocLister add DLmenu (dmi3yy)
8+
* [GitHub:#fd23c498] - [I] Update FormLister to 1.7.3 (dmi3yy)
9+
* [GitHub:#30a552fd] - [F] fix autoloader paths (Pathologic)
10+
* [GitHub:#21ec58cf] - [F] fix show icon dragndrop (Serg)
11+
* [GitHub:#56f57ec1] - [F] fix for OnManagerNodePrerender (dmi3yy)
12+
* [GitHub:#aa04955b] - [F] fix issues #60 (Serg)
13+
* [GitHub:#14503447] - [F] fix issues #62 (Serg)
14+
* [GitHub:#c316e0d7] - [F] update tv rank (64j)
15+
* [GitHub:#534deada] - [F] fix width logo in IE (64j)
16+
* [GitHub:#0c3f8780] - [R] update plugins priority (64j)
17+
* [GitHub:#aee4c3ed] - [R] format code style logs (64j)
18+
* [GitHub:#8777bbf3] - [F] fix file managment (64j)
19+
* [GitHub:#eaaaf777] - [R] upd actions buttons managment files (64j)
20+
* [GitHub:#16cbb4f1] - [F] fix showChildren in tree (64j)
21+
* [GitHub:#9258c4be] - [R] update actionbuttons (64j)
22+
* [GitHub:#92f954fa] - [F] fixed issues #15 (64j)
23+
* [GitHub:#328ad309] - [F] fix #12 (dmi3yy)
24+
* [GitHub:#2bcc9874] - [F] change home ico from modx to home ) (dmi3yy)
25+
* [GitHub:#626b416f] - [F] fix bkmanager header error (dmi3yy)
26+
* [GitHub:#c43f140e] - [F] fix #9 (dmi3yy)
27+
* [GitHub:#9da575f7] - [F] add favicon (64j)
28+
* [GitHub:#2ff3f724] - [R] update loader (64j)
29+
* [GitHub:#8df7c747] - [F] for update from older version (from security-fix) (dmi3yy)
30+
* [GitHub:#f17a35ab] - [R] ajaxSearch 1.11.0 no use index-ajax.php for ajax (dmi3yy)
31+
* [GitHub:#78e656e6] - [I] add updater plugin in core (dmi3yy)
32+
* [GitHub:#8bbe38ae] - [F] Error : Undefined property (Serg)
33+
* [GitHub:#ca775306] - [R] min php version set to 5.4 (dmi3yy)
34+
* [GitHub:#95ea0349] - [F] update lang (dmi3yy)
35+
* [GitHub:#e6224f43] - [С] rename modx to EVO (dmi3yy)
36+
* [GitHub:#9e319a67] - [F] fix file path (dmi3yy)
37+
* [GitHub:#524052e3] - [С] move new file from theme to core (dmi3yy)
38+
* [GitHub:#1af46a1c] - [С] change logos, delete old theme, rename new theme to default (dmi3yy)
39+
* [GitHub:#14d2a8f2] - [F] fix mysql_info (dmi3yy)
40+
41+
442
MODX Evolution 1.2.2(Jul 10, 2017)
543
* [GitHub:#99d1b62cd] - [F] fix properties for instal snippet,modules,plugins (dmi3yy)
644
* [GitHub:#e18d5d373] - [F] mm multiplefields for php 7 (dmi3yy)

‎assets/images/modx-logo.png

20.4 KB
Loading

‎assets/modules/docmanager/templates/main.tpl

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
<head>
44
<title>[+lang.DM_module_title+]</title>
55
<link rel="stylesheet" type="text/css" href="media/style[+theme+]/style.css" />
6-
<link rel="stylesheet" href="media/style/common/font-awesome/css/font-awesome.min.css" />
76
<script type="text/javascript" src="media/script/tabpane.js"></script>
87
<script type="text/javascript" src="[(mgr_jquery_path)]"></script>
98
<script type="text/javascript" src="media/script/mootools/mootools.js"></script>
@@ -60,9 +59,11 @@
6059
</h1>
6160

6261
<div id="actions">
63-
<ul class="actionButtons">
64-
<li id="Button1"><a href="javascript:;" onclick="window.location.href='index.php?a=106';"><i class="fa fa-times-circle"></i> [+lang.DM_close+]</a></li>
65-
</ul>
62+
<div class="btn-group">
63+
<a id="Button1" class="btn btn-success" href="javascript:;" onclick="window.location.href='index.php?a=106';">
64+
<i class="fa fa-times-circle"></i><span>[+lang.DM_close+]</span>
65+
</a>
66+
</div>
6667
</div>
6768

6869
<div class="sectionBody">
@@ -90,7 +91,7 @@
9091
</div>
9192

9293
<div class="tab-page" id="tabOther">
93-
<h2 class="tab"><i class="fa fa-tasks"></i>[+lang.DM_other+]</h2>
94+
<h2 class="tab"><i class="fa fa-tasks"></i> [+lang.DM_other+]</h2>
9495
<script type="text/javascript">tpResources.addTabPage(document.getElementById("tabOther"));</script>
9596
[+view.misc+]
9697
[+view.changeauthors+]

‎assets/modules/evogallery/js/uploadify/uploadify.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
<?php
2+
die();
3+
?>

‎assets/plugins/updater/lang/english.php

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
<?php
2+
// ---------------------------------------------------------------
3+
// :: Updater
4+
// ----------------------------------------------------------------
5+
//
6+
//
7+
//
8+
// ----------------------------------------------------------------
9+
// :: Copyright & Licencing
10+
// ----------------------------------------------------------------
11+
//
12+
// GNU General Public License (GPL - http://www.gnu.org/copyleft/gpl.html)
13+
//
14+
15+
$_lang['pluginname'] = 'Updater';
16+
$_lang['system_update'] = 'System Update';
17+
$_lang["cms_outdated_msg"] = 'Content management system is outdated. To update contact the site developers. Current version';
18+
$_lang['bkp_before_msg'] = 'We strongly recommend making a backup before upgrading the system, the update is performed at your own risk !!';
19+
$_lang['updateButton_txt'] = 'Update to version';
20+
//Error Messages
21+
$_lang['error_curl'] = 'You need to enable CURL function in PHP';
22+
$_lang['error_zip'] = 'It is necessary to enable the ZIP in PHP';
23+
$_lang['error_openssl'] = 'You need to enable OpenSSL function in PHP';
24+
$_lang['error_overwrite'] = 'EVO files are not available for overwriting';
25+

‎assets/plugins/updater/lang/italian.php

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
<?php
2+
// ---------------------------------------------------------------
3+
// :: Updater
4+
// ----------------------------------------------------------------
5+
//
6+
//
7+
//
8+
// ----------------------------------------------------------------
9+
// :: Copyright & Licencing
10+
// ----------------------------------------------------------------
11+
//
12+
// GNU General Public License (GPL - http://www.gnu.org/copyleft/gpl.html)
13+
//
14+
15+
$_lang['pluginname'] = 'Updater';
16+
$_lang['system_update'] = 'Aggiornamento di Sistema';
17+
$_lang["cms_outdated_msg"] = 'Il Sistema di gestione dei contenuti è obsoleto. Per aggiornare contattare gli sviluppatori del sito. Versione attuale';
18+
$_lang['bkp_before_msg'] = 'Si consiglia vivamente di fare un backup prima di aggiornare il sistema, l\'aggiornamento viene eseguito a proprio rischio !!';
19+
$_lang['updateButton_txt'] = 'Aggiorna alla versione';
20+
//Error Messages
21+
$_lang['error_curl'] = 'È necessario abilitare la funzione CURL in PHP';
22+
$_lang['error_zip'] = 'È necessario abilitare la funzione ZIP in PHP';
23+
$_lang['error_openssl'] = 'È necessario abilitare la funzione OpenSSL in PHP';
24+
$_lang['error_overwrite'] = 'I file di EVO non sono disponibili per la sovrascrittura';
25+

0 commit comments

Comments
 (0)