Commit graph

397 commits

Author SHA1 Message Date
theshka c4f9eb8d4e Merge branch 'master' of https://github.com/picocms/Pico into feature/bootstrap-theme 2015-11-29 20:13:47 -06:00
Daniel Rudolf 9a7e53328d Merge pull request #273 from picocms/feature/PicoTwigExtension
Add map and sort_by Twig filters
2015-11-30 03:11:13 +01:00
theshka 3c10c8ac0b fix typo 2015-11-29 19:59:34 -06:00
theshka 02ac0c276b Merge branch 'feature/PicoTwigExtension' of https://github.com/picocms/Pico into feature/PicoTwigExtension 2015-11-29 19:53:05 -06:00
Daniel Rudolf 3d4c4e1669 Fix _build/generate-phpdoc.sh 2015-11-30 02:02:53 +01:00
Tyler Heshka cf71f36651 Merge pull request #295 from picocms/enhancement/isolate-build
Isolate build-related files from source
2015-11-29 18:56:36 -06:00
Daniel Rudolf d19ab3814c Merge branch 'enhancement/isolate-build' of github.com:picocms/Pico into enhancement/isolate-build
Conflicts:
	.phpdoc.xml
2015-11-30 00:54:21 +01:00
Daniel Rudolf 4be51a7bee Refactor phpDoc generation 2015-11-30 00:52:19 +01:00
theshka 49e5e44b4a update .phpdoc.xml 2015-11-29 16:28:33 -06:00
theshka ff02f34e23 Merge branch 'enhancement/isolate-build' of https://github.com/picocms/Pico into enhancement/isolate-build 2015-11-29 15:57:21 -06:00
theshka 1ea81d4b41 add .phpdoc.xml and move ignore list 2015-11-29 15:55:25 -06:00
Daniel Rudolf 4f90296295 Update .phpcs.xml: Check $PWD by default 2015-11-29 22:55:05 +01:00
Daniel Rudolf 272a13f0f2 Update CONTRIBUTING.md: Use Pico's .phpcs.xml instead of PSR2 standard for PHP_CodeSniffer 2015-11-29 22:54:18 +01:00
theshka 2465906151 Add theme_config array to Pico::loadConfig() 2015-11-29 15:29:43 -06:00
Daniel Rudolf 24b58175a4 Inline docs: Update Blogging section to use "sort_by" filter 2015-11-29 22:28:18 +01:00
theshka f1048d2366 Add theme_config array to template 2015-11-29 15:21:33 -06:00
Daniel Rudolf be46e19677 Merge branch 'master' into feature/PicoTwigExtension
Conflicts:
	CHANGELOG.md
2015-11-29 22:19:57 +01:00
Daniel Rudolf 2ce422d907 PicoTwigExtension: Refactor error handling 2015-11-29 22:18:41 +01:00
Daniel Rudolf 9aaab5de1a Refactor Pico::parseFileMeta() 2015-11-29 21:58:30 +01:00
theshka 1dc410425f Isolate build-related files from source
* [Changed] rename `phpcs.xml` -> `.phpcs.xml`
* [Changed] rename `build/` dir -> `_build/`
* [Changed] update paths in `.gitignore`
* [Changed] update paths in `.travis.yml`
* [Changed] update paths in `.sh` scripts
2015-11-29 14:55:55 -06:00
theshka e50cc1404b delete style.css 2015-11-29 14:00:48 -06:00
theshka 782139cf08 Merge remote-tracking branch 'upstream/master' into feature/bootstrap-theme
Conflicts:
	themes/default/style.css
2015-11-29 13:53:33 -06:00
theshka c6b86381f0 * [New] add blog example to default theme
* [New] blog, sidebar post, and full-width post layouts
* [New] blog/ directory in content-sample with 2 posts demo'ing layout
2015-11-29 13:40:53 -06:00
theshka a484681e38 * [New] added font-awesome stylesheet from MaxCDN
* [Changed] demonstrate twig by splitting and including html snippets
* [Changed] moved stylesheet to assets/css/
2015-11-29 13:37:29 -06:00
Daniel Rudolf 6cb378e83f Inline docs: Add link to YAML wikipedia article
Official resources about YAML are ... - impossible to understand for a ordinary user.
2015-11-29 20:26:43 +01:00
theshka 9b31a54adc Merge branch 'enhancement/build-release' 2015-11-29 11:20:54 -06:00
theshka bef150221b CONTRIBUTING.md: Final tocuhes on Build & Release section. 2015-11-29 11:11:26 -06:00
Daniel Rudolf 372979e45b CONTRIBUTING.md: Update build & release process 2015-11-29 17:18:46 +01:00
Daniel Rudolf b18464adba CONTRIBUTING.md: Convert Issues template to continuous text 2015-11-29 17:00:05 +01:00
Daniel Rudolf 2d9b5aa1a2 Fix operators 2015-11-29 16:39:03 +01:00
Daniel Rudolf 698a249d45 Force Pico::$requestUrl to have no leading/trailing slash
Fixes #291
2015-11-27 22:52:45 +01:00
Daniel Rudolf 2eed14103a Add @codingStandardsIgnoreFile to index.php.dist
The comments of the "instance Pico" section violate PSR-2, but we want to keep them anyway
2015-11-27 20:36:40 +01:00
Daniel Rudolf e088f6c6fa Update phpcs.xml 2015-11-27 20:31:17 +01:00
Daniel Rudolf b50023c8ad Merge branch 'enhancement/build-release' of github.com:picocms/Pico into enhancement/build-release 2015-11-27 20:27:26 +01:00
Daniel Rudolf 2535df7cfe Add index.php.dist
See https://github.com/picocms/Pico/issues/285#issuecomment-160130798
2015-11-27 20:24:29 +01:00
Daniel Rudolf 98022a5a8f Update CHANGELOG.md 2015-11-27 20:21:13 +01:00
Daniel Rudolf 2761f8b751 Refactor Pico::isUrlRewritingEnabled() 2015-11-27 20:13:17 +01:00
Daniel Rudolf abce8b84b8 Merge branch 'master' into enhancement/build-release
Conflicts:
	index.php
2015-11-27 19:52:17 +01:00
Daniel Rudolf cb15ea7493 Amend #286 2015-11-27 19:49:53 +01:00
Daniel Rudolf 86d1f713f2 Move PHP version check to index.php 2015-11-27 19:45:21 +01:00
Daniel Rudolf 81138ce06a Merge branch 'master' of github.com:picocms/Pico 2015-11-27 19:43:47 +01:00
Daniel Rudolf f97cd83cc8 Merge pull request #286 from dmelo/composer-compat
change Pico's default `index.php` to be compatible with `composer require picocms/pico`
2015-11-27 19:43:10 +01:00
Daniel Rudolf 31acaffa67 Add PHP_CodeSniffer 2015-11-27 19:40:26 +01:00
Daniel Rudolf e14c007789 Default theme: Replace tabs with 4-space-indentation 2015-11-27 19:32:12 +01:00
Daniel Rudolf 913cf3816f Plugins: Improve onPagesLoaded() code styling 2015-11-27 19:31:22 +01:00
Daniel Rudolf 364b9066d9 PicoDeprecated: Use $GLOBALS superglobal instead of global keyword 2015-11-27 19:30:25 +01:00
Daniel Rudolf 81821e7811 Improve Pico::getBaseUrl() code styling 2015-11-27 19:28:48 +01:00
theshka 1fae7ab3df * [New] added PHP_VERSION check to Pico::run() 2015-11-27 12:27:45 -06:00
theshka 917cd6caf3 Consolidate Issue Template 2015-11-27 10:36:44 -06:00
theshka 0dcb49d8ac Consolidate Build & Release section. 2015-11-27 10:31:17 -06:00