New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Pico 1.0 #252
Merged
Merged
Pico 1.0 #252
Changes from 18 commits
Commits
Show all changes
120 commits
Select commit
Hold shift + click to select a range
adc3562
Remove index.html
PhrozenByte c496297
Class files should exactly match the class name
PhrozenByte 284e0ce
Move constants to global.php
PhrozenByte 92c307d
Pico 1.0
PhrozenByte cd14582
Remove pull request message
PhrozenByte 43a7540
Add IPicoPlugin
PhrozenByte 07ae267
Add AbstractPicoPlugin
PhrozenByte b347790
Replace Pico_Plugin with DummyPlugin
PhrozenByte fd1b94e
Update composer.json
PhrozenByte 70316ec
Add PicoDeprecated, PicoParsePagesContent, PicoExcerpt
PhrozenByte 144939b
Update config.php.template
PhrozenByte 39e1d78
Update sample content
PhrozenByte 5438fdb
Rename index.html of default theme to index.twig; Update template
PhrozenByte c44afd3
Update .htaccess
PhrozenByte df10d60
Fixing paths in global.php
PhrozenByte 5eed6d0
Add missing update of index.twig
PhrozenByte 5338223
Workaround for webservers omitting QUERY_STRING
PhrozenByte a83b01e
Access plugins by class name, not file name
PhrozenByte 71e7da2
Various fixes
PhrozenByte 5731ede
Allow omitting config/config.php; Fix write context on return value
PhrozenByte 4821454
Declare in config/config.php.template to prevent a E_NOTICE
PhrozenByte 70f187f
Rename IPicoPlugin to PicoPluginInterface
PhrozenByte f76a0b7
Use v0.7 releases of erusev/parsedown-extra
PhrozenByte 5533b07
Re-add lost PicoPluginInterface
PhrozenByte a7fd853
Add striptags filter to description meta header
PhrozenByte a5755b0
Fix deprecated get_page_data and get_pages events
PhrozenByte 13a50c7
Don't change $pageData['id'], add ~dup1 to the array key only
PhrozenByte 8d88863
Fix whitespace
PhrozenByte 5e77d86
Remove twig cache dir
PhrozenByte fc7632b
Overhaul init of Pico
PhrozenByte cdef7a6
Explicitly treat relative paths to be relative to Picos root dir
PhrozenByte 95db5ba
Drop inaccessible pages
PhrozenByte 45815e2
Don't read file contents of inaccessible pages
PhrozenByte fd64e4f
Add a exception to alpha sorting: List index files first
PhrozenByte 012dffa
Fix #257
PhrozenByte fbb744d
Deny access to config, content, content-sample, lib and vendor dirs
PhrozenByte 241a529
Update inline code comments
PhrozenByte 9be23de
Require PHP >= 5.3.6 until erusev/parsedown-extra#75 is solved
PhrozenByte 00f76d1
Update README.md
PhrozenByte 7698f18
Merge branch 'master' into pico1.0
PhrozenByte fa024ce
Fix README.md formatting
PhrozenByte ab89945
Improve README.md formatting; Run PHP web server on localhost only
PhrozenByte 3a4721a
SCANDIR_SORT_* constants are available since PHP 5.4
PhrozenByte 3f7b099
Declare undefined $plugins variable
PhrozenByte 77f9390
Support per-directory 404.md files
PhrozenByte 9aa62b4
Improve method docs of Pico::load404Content()
PhrozenByte ef1a9e0
Improve README.md
PhrozenByte 2e15e11
Define deprecated constants before evaluating the config.php in Picos…
PhrozenByte 006afa5
Update changelog.txt
PhrozenByte 27d6946
Fix code formatting
PhrozenByte 79e2dac
Fix method docs typo
PhrozenByte 4f1e866
Cast AbstractPicoPlugin::$dependsOn to array
PhrozenByte 9d518fd
Move sorting of $pages from Pico::getPages() to Pico::sortPages()
PhrozenByte 46ef631
Support $config['<plugin name>']['enabled'] option
PhrozenByte 1cbf48a
Split PicoDeprecated::onConfigLoaded() into multiple methods
PhrozenByte 7537159
Remove the need to register headers during onMetaHeaders()
PhrozenByte 7aa199d
Update changelog.txt for 7537159
PhrozenByte 1419cf1
Add Pico::setConfig() method
PhrozenByte 04a1c60
Update changelog.txt for 1419cf1
PhrozenByte b09433a
Allow multiple calls to Pico::setConfig()
PhrozenByte 7c5f371
Use PSR-0 autoload
PhrozenByte 40dbd0e
Update Picos inline user docs
PhrozenByte b46ed05
Let users know about Twigs link filter
PhrozenByte 3336fb7
fix spelling
theshka fe83d1f
fix spelling
theshka 01122f2
fix spelling
theshka 8380b54
fix spelling
theshka 132399f
add comments/in-line docs
theshka aec024a
fix spelling
theshka 15515ff
Fix typo/formatting
PhrozenByte 9cdd34e
Change content order, add Customization section
PhrozenByte 4171f9a
Move URL Rewriting to Config section
PhrozenByte 92af554
Improve inline code comments; preparing use of phpDocumentor
PhrozenByte a654b15
phpDocumentor 2.8.5 currently doesn't support the Generic notations
PhrozenByte de6b3a7
Fix Markdown %meta.*% replacement
PhrozenByte 9e2604a
Prevent content_dir breakouts using malicious request URLs
PhrozenByte 647a7b5
Trap empty $requestFileParts
PhrozenByte 3e0161b
Create .travis.yml
dav-m85 d3a1308
Update .travis.yml
PhrozenByte efcbbb8
Update .travis.yml
PhrozenByte a068a1f
Update changelog.txt
PhrozenByte 360e7ab
Update .travis.yml
PhrozenByte 43f9590
Update .travis.yml
PhrozenByte a068850
Update .travis.yml
PhrozenByte 38081b3
Sync docs with website
PhrozenByte 638638f
Add UPGRADE section to docs
PhrozenByte f1fc4c9
Revert commit a068850
PhrozenByte 54ce5b9
Various small improvements
PhrozenByte d29e2c1
Add CONTRIBUTING.md
PhrozenByte 7a69fdf
Update CONTRIBUTING.md
PhrozenByte e6681ea
Improve class docs
PhrozenByte afb55b9
Improve class docs
PhrozenByte 9a70241
Remove `return $config` in `config/config.php`
PhrozenByte 8da62f4
PicoDeprecated: Making $config globally accessible again
PhrozenByte 85d7c51
Update CONTRIBUTING.md
PhrozenByte 2597e0d
Move upgrade instructions from inline docs to README.md in a more gen…
PhrozenByte ebe007b
Guess content directory
PhrozenByte a1331e7
Update inline docs to reflect ebe007b
PhrozenByte 8db3bc5
Update changelog.txt to reflect ebe007b
PhrozenByte 92adb27
Update README.md
PhrozenByte 0e0eb56
Update CONTRIBUTING.md
PhrozenByte 641a5d1
Merge branch 'pico1.0' of github.com:PhrozenByte/Pico into pico1.0
PhrozenByte d65eb55
Update README.md
PhrozenByte 2ab3611
Update content-sample/index.md
PhrozenByte ffc5936
README.md: Add Getting Help section
PhrozenByte 365333c
Update content-sample/index.md
PhrozenByte 48264fc
Move license.txt and changelog.txt
PhrozenByte 8164038
Use Markdown for CHANGELOG.md
PhrozenByte 82e0ca5
Small changes
PhrozenByte 90128f4
Fix possible foreach on null errors
PhrozenByte e3a6116
Sync documentation
PhrozenByte ccac8dd
Force trailing slash of $config['base_url'] and force existance of $c…
PhrozenByte 2a43b21
Enable PicoDeprecated if no plugins are loaded
PhrozenByte af8de56
Fix typos
PhrozenByte 19f708e
Sync documentation
PhrozenByte b5d54d0
Update .travis.yml: Name release archives "pico-release-$TRAVIS_TAG.t…
PhrozenByte cd7cd37
Add content filter to get the parsed contents of a page (lazy loading)
PhrozenByte e3e0300
Fix typo
PhrozenByte 82cbe37
fix typos
theshka cd1dc07
Sync docs
PhrozenByte File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,54 +1,61 @@ | ||
<?php | ||
/** | ||
* Pico Configuration | ||
* Pico configuration | ||
* | ||
* This is the configuration file for Pico. It comes loaded with the | ||
* default values, which can be found in the get_config() method of | ||
* the Pico class (lib/pico.php). | ||
* This is the configuration file for {@link Pico}. It comes loaded with the | ||
* default values, which can be found in {@link Pico::getConfig()} (see | ||
* {@path "lib/Pico.php"}). | ||
* | ||
* @author Gilbert Pellegrom | ||
* @link http://picocms.org | ||
* To override any of the default settings below, copy this file to | ||
* {@path "config/config.php"}, uncomment the line and make and | ||
* save your changes. | ||
* | ||
* @author Gilbert Pellegrom | ||
* @link http://picocms.org | ||
* @license http://opensource.org/licenses/MIT | ||
* @version 0.9 | ||
* | ||
* To override any of the default settings below, copy this file to | ||
* `config.php`, uncomment the line and make and save your changes. | ||
*/ | ||
|
||
/* | ||
* BASIC | ||
*/ | ||
// $config['site_title'] = 'Pico'; // Site title | ||
// $config['base_url'] = ''; // Override base URL (e.g. http://example.com) | ||
// $config['rewrite_url'] = null; // A boolean indicating forced URL rewriting | ||
|
||
/* | ||
* THEME | ||
*/ | ||
// $config['theme'] = 'default'; // Set the theme (defaults to "default") | ||
// $config['twig_config'] = array( // Twig settings | ||
// 'cache' => false, // To enable Twig caching change this to CACHE_DIR | ||
// 'autoescape' => false, // Autoescape Twig vars | ||
// 'debug' => false // Enable Twig debug | ||
// 'cache' => false, // To enable Twig caching change this to CACHE_DIR | ||
// 'autoescape' => false, // Autoescape Twig vars | ||
// 'debug' => false // Enable Twig debug | ||
// ); | ||
|
||
/* | ||
* CONTENT | ||
*/ | ||
// $config['date_format'] = '%D %T'; // Set the PHP date format as described here: http://php.net/manual/en/function.strftime.php | ||
// $config['pages_order_by'] = 'alpha'; // Order pages by "alpha" or "date" | ||
// $config['pages_order'] = 'asc'; // Order pages "asc" or "desc" | ||
// $config['excerpt_length'] = 50; // The pages excerpt length (in words) | ||
// $config['content_dir'] = 'content-sample/'; // Content directory | ||
// $config['date_format'] = '%D %T'; // Set the PHP date format as described here: http://php.net/manual/en/function.strftime.php | ||
// $config['pages_order_by'] = 'alpha'; // Order pages by "alpha" or "date" | ||
// $config['pages_order'] = 'asc'; // Order pages "asc" or "desc" | ||
// $config['content_dir'] = 'content-sample/'; // Content directory | ||
// $config['content_ext'] = '.md'; // File extension of content files to serve | ||
|
||
/* | ||
* TIMEZONE | ||
*/ | ||
// date_default_timezone_set('UTC'); // Timezone may be reqired by your php install | ||
// $config['timezone'] = 'UTC'; // Timezone may be required by your php install | ||
|
||
/* | ||
* PLUGINS | ||
*/ | ||
// $config['DummyPlugin.enabled'] = false; // Force DummyPlugin to be disabled | ||
|
||
/* | ||
* CUSTOM | ||
*/ | ||
// $config['custom_setting'] = 'Hello'; // Can be accessed by {{ config.custom_setting }} in a theme | ||
// $config['custom_setting'] = 'Hello'; // Can be accessed by {{ config.custom_setting }} in a theme | ||
|
||
// Keep this line | ||
// DO NOT REMOVE THIS LINE | ||
return $config; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,9 +1,9 @@ | ||
/* | ||
--- | ||
Title: Error 404 | ||
Robots: noindex,nofollow | ||
*/ | ||
--- | ||
|
||
Error 404 | ||
========= | ||
|
||
Woops. Looks like this page doesn't exist. | ||
Woops. Looks like this page doesn't exist. |
Empty file.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
<?php | ||
define('ROOT_DIR', __DIR__ . '/'); | ||
define('LIB_DIR', ROOT_DIR . 'lib/'); | ||
define('VENDOR_DIR', ROOT_DIR . 'vendor/'); | ||
define('PLUGINS_DIR', ROOT_DIR . 'plugins/'); | ||
define('THEMES_DIR', ROOT_DIR . 'themes/'); | ||
define('CONFIG_DIR', ROOT_DIR . 'config/'); | ||
define('CACHE_DIR', LIB_DIR . 'cache/'); | ||
|
||
require_once(VENDOR_DIR . 'autoload.php'); | ||
|
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Mh why not a stable constraint here ? Gonna break at the next composer update.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@theshka (968dc18), are there any reasons that oppose using e.g.
0.7.*
instead?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@PhrozenByte, @dav-m85 ... No, I think that was just overlooked at some point. I would say to use a stable constraint here instead of the dev branch.