Commit graph

375 commits

Author SHA1 Message Date
theshka
2465906151 Add theme_config array to Pico::loadConfig() 2015-11-29 15:29:43 -06:00
theshka
f1048d2366 Add theme_config array to template 2015-11-29 15:21:33 -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
Diogo Oliveira de Melo
70d813eafe change the way to call autoload.php.
- As suggested by @theshka, this code first verify if Pico is being used
as local composer install, then verify if it is being used as a composer
library.
2015-11-27 02:16:06 -02:00
Daniel Rudolf
54305c4d33 phpDocs auto deployment: Remove pull requests support
We can deploy phpDocs in safe environments only, but "safe environment" is equivalent to "pull a local branch", therefore we can simply use that local branch to deploy the phpDocs. There's no need for a explicit pull request support.
2015-11-26 04:06:34 +01:00
Daniel Rudolf
8005efdbbb phpDocs auto deployment: Remove latest commit check for pull requests
See https://developer.github.com/v3/pulls/#get-a-single-pull-request
> Each time the pull request receives new commits, GitHub creates a merge
> commit to *test* whether the pull request can be automatically merged into
> the base branch. (This *test* commit is not added to the base branch or the
> head branch.) The  attribute holds the SHA of the *test*
> merge commit; however, this attribute is deprecated and is scheduled for
> removal in the next version of the API.

 holds the SHA of the  merge commit and not of the
latest commit of the head branch, therefore the comparison fails. We could
theoretically compare it against this attribute, but as of its deprecation,
this is a pretty bad idea. Thus we remove the latest commit check for pull
requests.
2015-11-26 02:38:29 +01:00
Daniel Rudolf
45dcf32fa7 phpDocs auto deployment: Support pull requests in a safe environment 2015-11-26 02:15:34 +01:00
Daniel Rudolf
6e0b2aab34 phpDocs auto deployment: Disable for pull requests with a safe environment
Pull requests with a safe environment are primarly local branches
2015-11-26 01:35:35 +01:00
Daniel Rudolf
5af160c31d phpDocs auto deployment: Use $GITHUB_OAUTH_TOKEN to determine latest commit 2015-11-26 01:13:37 +01:00
Daniel Rudolf
869a697977 Merge branch 'master' into enhancement/build-release
Conflicts:
	.travis.yml
2015-11-26 00:38:30 +01:00
Daniel Rudolf
17dbc4cf18 phpDocs auto deployment: Cleanup 2015-11-26 00:29:14 +01:00
Daniel Rudolf
2306010ba7 phpDocs auto deployment: Fix phpDocs generation
phpDocumentor acts very strange when relative paths are involved...
2015-11-25 23:53:58 +01:00
Daniel Rudolf
3ac53d2b4c phpDocs auto deployment: Improve title of class docs for branches 2015-11-25 23:44:11 +01:00
Daniel Rudolf
38d2dd2e20 Travis: Remove .git dirs from vendor/ dir when deploying
See https://github.com/picocms/Pico/issues/289#issuecomment-159722672 - thanks to @joshas for spotting
2015-11-25 23:38:22 +01:00
Daniel Rudolf
137b2ba3a6 phpDocs auto deployment: Fix deployment of branches with slashes 2015-11-25 23:35:42 +01:00
Daniel Rudolf
236ae43dab phpDocs auto deployment: Fix deployment of branches 2015-11-25 23:09:15 +01:00
Daniel Rudolf
c198333de7 Improve phpDocs auto-generation 2015-11-25 22:55:21 +01:00
Daniel Rudolf
728873c5a4 build/deploy-phpdoc.sh: Fix credentials 2015-11-25 22:26:51 +01:00
Daniel Rudolf
3c68095075 Improve phpDocs auto-generation 2015-11-25 22:04:16 +01:00
Daniel Rudolf
3852585ba0 Improve phpDocs auto-generation 2015-11-25 21:55:28 +01:00
Daniel Rudolf
9a46033141 Improve phpDocs auto-generation 2015-11-25 21:36:56 +01:00