Permalink
Browse files

Merge branch '2.0-development' into feindura2.0

  • Loading branch information...
2 parents e57230c + 8ef86e9 commit 444ac98f2164aa21a3f5570b37ad0b89d0a12161 @frozeman committed Aug 28, 2012
Showing 788 changed files with 19,500 additions and 10,082 deletions.
View
@@ -1,7 +1,7 @@
feindura - Flat File Content Management System
Version
-2.0
-Build 957
+2.0 beta
+Build 976
==================================================
Copyright (C) Fabian Vogelsteller [frozeman.de]
published under the GNU General Public License version 3
@@ -22,8 +22,27 @@ if not, see <http://www.gnu.org/licenses>.
ChangeLog:
----------
-2.0
-
+2.0 beta
+
+ build 976: make user list clickable for admins
+ build 975: beautified, varnames are now also used for the speaking url page/category names
+ build 974: changed the order of parameters in listPagesByDate() and createMenu().. methods
+ build 973: finally fixed that strange websiteLanguage bug, where it was saving the wrong language in the backend, because it get it from the frontend...
+ build 972: add en-US as language, working on the datepicker
+ build 971: moved the upload folder to its new location inside the feindura folder
+ build 970: add restore last version feature
+ build 969: made more use of the pagesMetaData array, should boost the perfomance, still issues with the previous state button
+ build 968: changed versin name to beta, moved userlist to the header sidebar
+ build 967: small header fixes
+ build 966: pimped user interface ready..
+ build 965: pimped the user interface! still work to do..
+ build 964: add edit plugin button to the plugin dialog, also fixed ckeditor
+ build 963: add jsMultipleSelect to the multiLanguageWebsite Settings! :)
+ build 962: add new CKEditor 3.6.4 and grabbar to the listpages
+ build 961: add drag n drop for plugins
+ build 960: add new CKEditor bootstrap skin
+ build 959: plugins are now multiple and editable, but not integrated into the website... and user permissions are missing
+ build 958: moved statistics to the timeline
build 957: implemented user permissions (hopefully complete :\)
build 956: changed login page to pure css
build 955: add messagePopUp to display status messages
@@ -715,10 +734,10 @@ ChangeLog:
build 337: fixes in layout pictures
build 336: savePageStats(): prevent save searchwords to be counted miltuple times
build 335: fixes in content.js with anchor scroll; add thumbnailToolTip style to editFiles -> create new file
- build 334: changes in sidebartasklog layout
+ build 334: changes in sideBarActivityLog layout
build 333: fixes with stylefilepath, when including an url
build 332: fixes in file manager & add new CKEditor build 5813
- build 331: changed .innerBlockListPages layout
+ build 331: changed .insetBlockListPages layout
build 330: add separate delete of length-of-stay statistics
build 329: small change on slide in arrows
build 328: add arrow over category pages menu in the left sidebar
View
@@ -1,3 +1,20 @@
+### ADDITIONAL ICONS LICENCES ###
+
+--------------------------------------------------------------------------------------------------
+Pretty office icon set part
+--------------------------------------------------------------------------------------------------
+
+All the icons contained in this archive free for non-commercial use.
+If you like them just visit the website "http://www.customicondesign.com"
+They can be given out provided that they are neither altered
+Not separated from this "Read me" file and from a reference
+to the site: http://www.customicondesign.com
+
+Artwork by http://www.customicondesign.com
+
+
+
+### GPL ###
--------------------------------------------------------------------------------------------------
ENGLISH
--------------------------------------------------------------------------------------------------
@@ -532,7 +549,7 @@ die begründbar durch den physikalischen Vorgang der Übertragung des Quelltexte
c) Sie übertragen Kopien des Objekt-Codes gemeinsam mit einer Kopie des schriftlichen Angebots, den korrespondierenden Quelltext
zur Verfügung zu stellen. Diese Alternative ist nur für gelegentliche, nicht-kommerzielle Übertragung zulässig und nur,
wenn Sie den Objekt-Code als mit einem entsprechenden Angebot gemäß Absatz 6b erhalten haben.
-d)
+d)
Sie übertragen den Objekt-Code dadurch, daß Sie Zugriff auf eine dafür vorgesehene Stelle gewähren,
und bieten gleichwertigen Zugriff auf den korrespondierenden Quelltext auf gleichem Weg auf dieselbe Stelle und ohne zusätzliche Kosten.
View
@@ -51,15 +51,15 @@ It's basic requirements is a web server with PHP running, however for using the
#### FUTURE FEATURES
* modul system (like search)
* addon system, build your own application running in the feindura-CMS backend
-
+
### REQUIREMENTS
* PHP >= 5.1 (PHP as FastCGI)
* apache with mod_rewrite modul if you want to have speaking URLs like: "domain.com/pages/welcome.html"
-### APPROPRIATE USES
+### APPROPRIATE USES
It's not tested yet, but it should work well on websites with up to 100 vistiors per Minute.
The feinduraPages::$storedPages array can have up to 30 000 Pages if the php memory limit is 16MB (means you website can have up to 30 000 pages)
-
+
### INSTALLATION
Just copy the feindura folder on your webserver in a folder, like e.g. "/cms/".
Iimplement the feindura class in your websites index.php and use the feindura class methods to get your websites content from feindura.
@@ -72,11 +72,11 @@ before the header is sent, which means before any HTML tag:
<?php
include('cms/feindura.include.php');
-
+
$myCms = new Feindura();
-
+
?>
-
+
After this you can refer to the feindura class an it's methods through the $mycms->... instance.
Read first: <http://feindura.org/?site=gettingstarted>.
@@ -100,6 +100,6 @@ If you want to use the MooTools framework in your website and you have activated
you should include the script at the end of your page (before the closing </body> tag) as follow.
<script>!window.MooTools && document.write(unescape('%3Cscript src="your/path/mootools-core-1.4.5.js"%3E%3C/script%3E'))</script>
-
+
Otherwise you will have problems with the frontend editing.
If don't care about that, you can deactivate the frontendediting mode inside the admin setup > user permissions.
View
@@ -1,3 +1,3 @@
-This file is necessary for the next feindura update. Do not delete it!
-2.0
-957
+feindura - Flat File CMS (Version,Build)
+2.0 beta
+976
@@ -15,7 +15,11 @@
'title' => 'Example Page 1',
'href' => '?page=5&category=1',
'pageDate' => '2000-12-31',
- 'pageDateTimestamp' => 1325393999,
+ 'pageDateTimestamp' => array(
+ 'date' => 1325393999, // 'date' and 'start' is the same
+ 'start' => 1325393999,
+ 'end' => 1325303455 // will be 0 when its not a date range
+ ),
'pageId' or 'id' => 5,
'categoryId' => 1
),
@@ -29,7 +33,11 @@
'title' => 'Example Page 2',
'href' => '?page=8&category=1',
'pageDate' => '2000-10-10',
- 'pageDateTimestamp' => 13253034552,
+ 'pageDateTimestamp' => array(
+ 'date' => 1325393465, // 'date' and 'start' is the same
+ 'start' => 1325393465,
+ 'end' => 0
+ ),
'pageId' or 'id' => 8,
'categoryId' => 1
),
@@ -43,7 +51,11 @@
'title' => 'Example Page 3',
'href' => '?page=9&category=1',
'pageDate' => '2000-10-15',
- 'pageDateTimestamp' => 13253034222,
+ 'pageDateTimestamp' => array(
+ 'date' => 1325393322, // 'date' and 'start' is the same
+ 'start' => 1325393322,
+ 'end' => 0
+ ),
'pageId' or 'id' => 9,
'categoryId' => 1
),
@@ -6,8 +6,12 @@
'categoryId' => 3,
'subCategory' => 'Another Category',
'subCategoryId' => 4,
- 'pageDate' => '2000-12-31', // depending on the date format settings from the backend
- 'pageDateTimestamp' => 1325393999,
+ 'pageDate' => '2000-12-31 - 2010-01-15', // depending on the date format settings in the backend
+ 'pageDateTimestamp' => array(
+ 'date' => 1325393999, // 'date' and 'start' is the same
+ 'start' => 1325393999,
+ 'end' => 1325303455 // will be 0 when its not a date range
+ ),
'title' => 'Title Example',
'thumbnail' => '<img src="/path/thumb_page1.png" class="feinduraThumbnail" alt="Thumbnail" title="Title Example">',
'thumbnailPath' => '/path/thumb_page1.png',
@@ -10,7 +10,11 @@
'subCategory' => 'Another Category',
'subCategoryId' => 2,
'pageDate' => '2010-12-31', // format depending on the administrator-settings
- 'pageDateTimestamp' => 1325393999,
+ 'pageDateTimestamp' => array(
+ 'date' => 1325393999, // 'date' and 'start' is the same
+ 'start' => 1325393999,
+ 'end' => 0
+ ),
'title' => 'Title Example 1',
'thumbnail' => false, // page has no thumbnail
'thumbnailPath' => false,
@@ -38,8 +42,12 @@
'categoryId' => 1,
'subCategory' => false,
'subCategoryId' => false,
- 'pageDate' => '2009-12-31',
- 'pageDateTimestamp' => 1325393999,
+ 'pageDate' => '2009-12-31 - 2010-01-15',
+ 'pageDateTimestamp' => array(
+ 'date' => 1325393999, // 'date' and 'start' is the same
+ 'start' => 1325393999,
+ 'end' => 1325303455 // will be 0 when its not a date range
+ ),
'title' => 'Title Example 2',
'thumbnail' => false,
'thumbnailPath' => false,
Oops, something went wrong.

0 comments on commit 444ac98

Please sign in to comment.