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

Commit

Permalink
Merge pull request #1402 from evolution-cms/master
Browse files Browse the repository at this point in the history
1.4.0
  • Loading branch information
Dmi3yy committed Jan 25, 2018
2 parents 1d215c3 + eb5ae03 commit b6ed91e
Show file tree
Hide file tree
Showing 2,122 changed files with 34,792 additions and 93,979 deletions.
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# Evolution CMS

![PHP version](https://img.shields.io/badge/PHP->=v5.4-green.svg?php=5.4) [![GitHub release](https://img.shields.io/github/release/evolution-cms/evolution.svg)](https://github.com/evolution-cms/evolution/)
![PHP version](https://img.shields.io/badge/PHP->=v5.6-green.svg?php=5.6) [![GitHub release](https://img.shields.io/github/release/evolution-cms/evolution.svg)](https://github.com/evolution-cms/evolution/)

Evolution CMS requires **PHP >= 5.4**, but snippet FormLister need **PHP >=5.6**
Evolution CMS requires **PHP >= 5.6**


## What is EVO
Expand Down Expand Up @@ -34,11 +34,11 @@ Just use [Evo Installer](https://github.com/evolution-cms/installer)

### Screenshots

![screenshot_1](https://cloud.githubusercontent.com/assets/523389/20504423/97db8bf8-b047-11e6-9eef-550c1c7d34f2.jpg)
![screenshot_1](https://user-images.githubusercontent.com/7342798/30167975-5ec146c0-93e8-11e7-8cf8-b324c2b09477.jpg)

![screenshot_2](https://cloud.githubusercontent.com/assets/523389/20504414/926ceec8-b047-11e6-8760-3d11d6610977.jpg)
![screenshot_2](https://user-images.githubusercontent.com/7342798/30128635-b34fa2a4-9343-11e7-9d87-13d0e17fb69e.jpg)

![screenshot_3](https://cloud.githubusercontent.com/assets/523389/20504420/956ef5d0-b047-11e6-9460-7c7a471bada6.jpg)
![screenshot_3](https://user-images.githubusercontent.com/7342798/30128638-b5b2cdc8-9343-11e7-8c75-0864d00fe28a.jpg)

### References

Expand Down
Empty file modified assets/.thumbs/index.html
100644 → 100755
Empty file.
Empty file modified assets/backup/index.html
100644 → 100755
Empty file.
Empty file modified assets/cache/images/.htaccess
100644 → 100755
Empty file.
Empty file modified assets/cache/images/ht.access
100644 → 100755
Empty file.
Empty file modified assets/cache/images/index.html
100644 → 100755
Empty file.
Empty file modified assets/cache/siteManager.php
100644 → 100755
Empty file.
Empty file modified assets/cache/sitePublishing.idx.php
100644 → 100755
Empty file.
Empty file modified assets/cache/updater/.htaccess
100644 → 100755
Empty file.
Empty file modified assets/cache/updater/ht.access
100644 → 100755
Empty file.
Empty file modified assets/cache/updater/index.html
100644 → 100755
Empty file.
Empty file modified assets/docs/.htaccess
100644 → 100755
Empty file.
468 changes: 468 additions & 0 deletions assets/docs/changelog.txt
100644 → 100755

Large diffs are not rendered by default.

Empty file modified assets/export/index.html
100644 → 100755
Empty file.
Empty file modified assets/files/index.html
100644 → 100755
Empty file.
2 changes: 0 additions & 2 deletions assets/flash/index.html

This file was deleted.

File renamed without changes
Empty file modified assets/images/index.html
100644 → 100755
Empty file.
Empty file modified assets/import/index.html
100644 → 100755
Empty file.
Empty file modified assets/js/.htaccess
100644 → 100755
Empty file.
Empty file modified assets/js/easy-ui/easyloader.js
100644 → 100755
Empty file.
Empty file modified assets/js/easy-ui/editors/fileBrowser.js
100644 → 100755
Empty file.
Empty file modified assets/js/easy-ui/jquery.easyui.min.js
100644 → 100755
Empty file.
Empty file modified assets/js/easy-ui/jquery.easyui.mobile.js
100644 → 100755
Empty file.
Empty file modified assets/js/easy-ui/plugins/datagrid-bufferview.js
100644 → 100755
Empty file.
Empty file modified assets/js/easy-ui/plugins/datagrid-detailview.js
100644 → 100755
Empty file.
Empty file modified assets/js/easy-ui/plugins/datagrid-groupview.js
100644 → 100755
Empty file.
Empty file modified assets/js/easy-ui/plugins/datagrid-scrollview.js
100644 → 100755
Empty file.
Empty file modified assets/js/easy-ui/plugins/jquery.accordion.js
100644 → 100755
Empty file.
Empty file modified assets/js/easy-ui/plugins/jquery.calendar.js
100644 → 100755
Empty file.
Empty file modified assets/js/easy-ui/plugins/jquery.combo.js
100644 → 100755
Empty file.
Empty file modified assets/js/easy-ui/plugins/jquery.combobox.js
100644 → 100755
Empty file.
Empty file modified assets/js/easy-ui/plugins/jquery.combogrid.js
100644 → 100755
Empty file.
Empty file modified assets/js/easy-ui/plugins/jquery.combotree.js
100644 → 100755
Empty file.
Empty file modified assets/js/easy-ui/plugins/jquery.combotreegrid.js
100644 → 100755
Empty file.
Empty file modified assets/js/easy-ui/plugins/jquery.datagrid.js
100644 → 100755
Empty file.
Empty file modified assets/js/easy-ui/plugins/jquery.datalist.js
100644 → 100755
Empty file.
Empty file modified assets/js/easy-ui/plugins/jquery.datebox.js
100644 → 100755
Empty file.
Empty file modified assets/js/easy-ui/plugins/jquery.datetimebox.js
100644 → 100755
Empty file.
Empty file modified assets/js/easy-ui/plugins/jquery.datetimespinner.js
100644 → 100755
Empty file.
Empty file modified assets/js/easy-ui/plugins/jquery.dialog.js
100644 → 100755
Empty file.
Empty file modified assets/js/easy-ui/plugins/jquery.draggable.js
100644 → 100755
Empty file.
Empty file modified assets/js/easy-ui/plugins/jquery.droppable.js
100644 → 100755
Empty file.
Empty file modified assets/js/easy-ui/plugins/jquery.filebox.js
100644 → 100755
Empty file.
Empty file modified assets/js/easy-ui/plugins/jquery.form.js
100644 → 100755
Empty file.
Empty file modified assets/js/easy-ui/plugins/jquery.layout.js
100644 → 100755
Empty file.
Empty file modified assets/js/easy-ui/plugins/jquery.linkbutton.js
100644 → 100755
Empty file.
Empty file modified assets/js/easy-ui/plugins/jquery.menu.js
100644 → 100755
Empty file.
Empty file modified assets/js/easy-ui/plugins/jquery.menubutton.js
100644 → 100755
Empty file.
Empty file modified assets/js/easy-ui/plugins/jquery.messager.js
100644 → 100755
Empty file.
Empty file modified assets/js/easy-ui/plugins/jquery.mobile.js
100644 → 100755
Empty file.
Empty file modified assets/js/easy-ui/plugins/jquery.numberbox.js
100644 → 100755
Empty file.
Empty file modified assets/js/easy-ui/plugins/jquery.numberspinner.js
100644 → 100755
Empty file.
Empty file modified assets/js/easy-ui/plugins/jquery.pagination.js
100644 → 100755
Empty file.
Empty file modified assets/js/easy-ui/plugins/jquery.panel.js
100644 → 100755
Empty file.
Empty file modified assets/js/easy-ui/plugins/jquery.parser.js
100644 → 100755
Empty file.
Empty file modified assets/js/easy-ui/plugins/jquery.passwordbox.js
100644 → 100755
Empty file.
Empty file modified assets/js/easy-ui/plugins/jquery.progressbar.js
100644 → 100755
Empty file.
Empty file modified assets/js/easy-ui/plugins/jquery.propertygrid.js
100644 → 100755
Empty file.
Empty file modified assets/js/easy-ui/plugins/jquery.resizable.js
100644 → 100755
Empty file.
Empty file modified assets/js/easy-ui/plugins/jquery.searchbox.js
100644 → 100755
Empty file.
Empty file modified assets/js/easy-ui/plugins/jquery.slider.js
100644 → 100755
Empty file.
Empty file modified assets/js/easy-ui/plugins/jquery.spinner.js
100644 → 100755
Empty file.
Empty file modified assets/js/easy-ui/plugins/jquery.splitbutton.js
100644 → 100755
Empty file.
Empty file modified assets/js/easy-ui/plugins/jquery.switchbutton.js
100644 → 100755
Empty file.
Empty file modified assets/js/easy-ui/plugins/jquery.tabs.js
100644 → 100755
Empty file.
Empty file modified assets/js/easy-ui/plugins/jquery.tagbox.js
100644 → 100755
Empty file.
Empty file modified assets/js/easy-ui/plugins/jquery.textbox.js
100644 → 100755
Empty file.
Empty file modified assets/js/easy-ui/plugins/jquery.timespinner.js
100644 → 100755
Empty file.
Empty file modified assets/js/easy-ui/plugins/jquery.tooltip.js
100644 → 100755
Empty file.
Empty file modified assets/js/easy-ui/plugins/jquery.tree.js
100644 → 100755
Empty file.
Empty file modified assets/js/easy-ui/plugins/jquery.treegrid.js
100644 → 100755
Empty file.
Empty file modified assets/js/easy-ui/plugins/jquery.validatebox.js
100644 → 100755
Empty file.
Empty file modified assets/js/easy-ui/plugins/jquery.window.js
100644 → 100755
Empty file.
89 changes: 0 additions & 89 deletions assets/js/easy-ui/themes/black/accordion.css

This file was deleted.

202 changes: 0 additions & 202 deletions assets/js/easy-ui/themes/black/calendar.css

This file was deleted.

35 changes: 0 additions & 35 deletions assets/js/easy-ui/themes/black/combo.css

This file was deleted.

39 changes: 0 additions & 39 deletions assets/js/easy-ui/themes/black/combobox.css

This file was deleted.

Loading

0 comments on commit b6ed91e

Please sign in to comment.