Skip to content

Commit

Permalink
Merge branch 'release/0.9.0'
Browse files Browse the repository at this point in the history
Conflicts:
	extensions/system/src/System/Controller/SystemController.php
  • Loading branch information
saschadube committed Sep 10, 2015
2 parents a417844 + 4365ceb commit a49aa22
Show file tree
Hide file tree
Showing 1,583 changed files with 64,950 additions and 229,370 deletions.
3 changes: 3 additions & 0 deletions .bowerrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"directory": "app/assets"
}
2 changes: 1 addition & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ root = true
[*]
end_of_line = LF

[{*.php, *.js, *.less, *.css, *.json, *.razr}]
[{*.php, *.less, *.css, *.js, *.json}]
indent_style = space
indent_size = 4
1 change: 1 addition & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
app/modules/profiler/assets/vendor/**/*
28 changes: 28 additions & 0 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{
"env": {
"browser": true
},
"globals": {
"_": true,
"Vue": true,
"jQuery": true,
"UIkit": true
},
"rules": {
"quotes": [2, "single", "avoid-escape"],
"eqeqeq": [2, "smart"],
"guard-for-in": 2,
"no-mixed-spaces-and-tabs": 2,
"no-trailing-spaces": 2,
"no-undef": 2,
"no-unused-vars": [2, {"vars": "local", "args": "none"}],
"strict": 0,
"new-cap": 0,
"camelcase": 0,
"no-underscore-dangle": 0,
"no-new": 0,
"no-alert": 0,
"no-use-before-define": 0,
"consistent-return": 0
}
}
26 changes: 13 additions & 13 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
/extensions/*
!/extensions/blog
!/extensions/hello
!/extensions/installer
!/extensions/page
!/extensions/system
/themes/*
!/themes/alpha
/vendor/*
!/vendor/assets
**/languages/**/*.json
**/app/bundle/**/*.js
/app/vendor/*
/app/assets/*
!/app/assets/codemirror
!/app/assets/marked
!/app/assets/vue-intl
!/app/assets/vue-validator
/app/installer/assets/css/*
/app/system/modules/theme/css/*
/packages/*
/config.php
/composer.phar
/composer.lock
/pagekit*.zip
/.idea
/pagekit.db
node_modules
.DS_Store
*.mo
.idea
10 changes: 7 additions & 3 deletions .htaccess
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Restricted access to files
<FilesMatch "\.(cache|db|log|po|pot|sql|razr)$">
<FilesMatch "((\.(lock|cache|db))|installed.json)$">
Order allow,deny
</FilesMatch>

Expand All @@ -16,12 +16,16 @@ Options -Indexes

RewriteCond %{REQUEST_FILENAME} !-f
RewriteCond %{REQUEST_FILENAME} !-d
RewriteRule .* pagekit.php [L]
RewriteRule .* index.php [L]

<IfModule mod_env.c>
SetEnv HTTP_MOD_REWRITE On
</IfModule>

<IfModule mod_headers.c>
RequestHeader set MOD_REWRITE "On"
</IfModule>

</IfModule>

# Redirect admin URL, if rewrite is not enabled
Expand All @@ -42,4 +46,4 @@ Options -Indexes
AddEncoding gzip svgz
</IfModule>

</IfModule>
</IfModule>
24 changes: 24 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
language: php

sudo: false

php:
- 5.4
- 5.5
- 5.6
- 7.0
- hhvm

before_install:
- composer self-update

install:
- composer install --prefer-source

script:
- php app/vendor/bin/phpunit

matrix:
allow_failures:
- php: 7.0
fast_finish: true
16 changes: 2 additions & 14 deletions .tx/config
Original file line number Diff line number Diff line change
Expand Up @@ -7,21 +7,9 @@ source_file = extensions/blog/languages/messages.pot
source_lang = en
type = PO

[pagekit-cms.installer]
file_filter = extensions/installer/languages/<lang>/messages.po
source_file = extensions/installer/languages/messages.pot
source_lang = en
type = PO

[pagekit-cms.page]
file_filter = extensions/page/languages/<lang>/messages.po
source_file = extensions/page/languages/messages.pot
source_lang = en
type = PO

[pagekit-cms.system]
file_filter = extensions/system/languages/<lang>/messages.po
source_file = extensions/system/languages/messages.pot
file_filter = app/system/languages/<lang>/messages.po
source_file = app/system/languages/messages.pot
source_lang = en
type = PO

8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# Changelog

### 0.9.0 (September 10, 2015)

- Refactored codebase
- Added site tree
- Added new default theme
- Added data-reactive components with Vue.js
- Added package management using Composer

### 0.8.8 (November 17, 2014)

- Added pagination in Blog extension
Expand Down
69 changes: 52 additions & 17 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,47 +1,78 @@
# Pagekit

[![Build Status](https://travis-ci.org/pagekit/pagekit.svg?branch=develop)](https://travis-ci.org/pagekit/pagekit)
[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/pagekit/pagekit)

Pagekit is a modular and lightweight CMS built with Symfony components.

* [Homepage](http://pagekit.com) - Learn more about Pagekit
* [@pagekit](https://twitter.com/pagekit) - Get the latest buzz on Twitter
* [Google+ Community](https://plus.google.com/communities/104125443335488004107) - Share news and latest work

Join our developer chat. We are online every work day between 8:00 and 18:00 UTC

[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/pagekit/pagekit)
* [Gitter Chat](https://gitter.im/pagekit/pagekit) - Join the developer chat on Gitter

## Getting started

Download the [latest release](http://www.pagekit.com) and extract the archive, then copy the extracted folder to your webserver.
Create a database for Pagekit.
Download the [latest release](http://www.pagekit.com) and extract the archive, then copy the extracted folder to your webserver. Create a database for Pagekit.
Run the Pagekit installation by accessing the URL where you uploaded the Pagekit files in a browser.

## Developers
*Fresh packages coming soon.*

## Install Pagekit from Source

First of all, install [Composer](https://getcomposer.org/doc/00-intro.md#installation-nix).
Make sure you have the following tools installed: [Composer](https://getcomposer.org/doc/00-intro.md#installation-nix), [npm](https://www.npmjs.com/), [Bower](http://bower.io/), [Webpack](http://webpack.github.io/), [Gulp](http://gulpjs.com/).

Clone the repository.

If you haven't done so already, clone the Pagekit git repo.
```
git clone git://github.com/pagekit/pagekit.git
git clone --branch develop git://github.com/pagekit/pagekit.git
```

To install the dependencies of the project, navigate to the cloned directory and run the composer `install` command
Navigate to the cloned directory and install PHP dependencies.

```
composer install
#or if you don't have composer installed globally:
php path/to/composer.phar install
```

To update Pagekit, you need to pull the Pagekit git repo and run the composer `update` command
Install build tool dependencies.

```
npm install
```

Install asset dependencies (CSS & JS).

```
bower install
```

Compile LESS assets (run `gulp watch` to watch for local file changes).

```
gulp
```

Bundle JS modules (run `webpack --watch` to watch for local file changes)

```
webpack
```

When these commands have finished, point your browser to the Pagekit URL on your web server and follow the installer.

## Stay up to date

If you've set up Pagekit from source, run these commands to get new commits and to rebuild everything you need.

```
git pull
composer update
npm install
bower update
gulp
webpack
```

You may also clear the `app/cache` folder.

### CLI
## CLI

Pagekit offers a set of commands to run usual tasks on the command line. You can see the available commands with
```
Expand All @@ -62,3 +93,7 @@ Pagekit is maintained by using the [Semantic Versioning Specification (SemVer)](
## Copyright and License

Copyright [YOOtheme](http://www.yootheme.com) GmbH under the [MIT license](LICENSE.md).

## Credits

[Half Dome Photo](http://www.youseethenew.com/landscape-outdoors/) by Brendan Lynch / [CC BY](http://creativecommons.org/licenses/by-nd/4.0/)
55 changes: 0 additions & 55 deletions app/app.php

This file was deleted.

Loading

0 comments on commit a49aa22

Please sign in to comment.