Commit Graph

3707 Commits

Author SHA1 Message Date
Flavio Copes
6c02bf0c70 🎨 Fix spacing and code formatting 2016-01-28 11:20:26 +01:00
Flavio Copes
172600415d 🎨 Fix spacing and code formatting 2016-01-28 11:18:17 +01:00
Flavio Copes
c55b032928 🎨 Fix spacing and code formatting 2016-01-28 11:11:54 +01:00
Flavio Copes
1d79ef60c3 🎨 PHPDoc and type hints, code style 2016-01-28 10:59:49 +01:00
Flavio Copes
e279817839 🐛 Lookup the correct property for the home route 2016-01-28 10:59:22 +01:00
Flavio Copes
c8983bf7db 🎨 PHPDoc 2016-01-28 10:35:34 +01:00
Flavio Copes
ab5233032d 🎨 Correct inflector method call 2016-01-28 10:31:14 +01:00
Flavio Copes
535e3c982d 🎨 PHPDoc and coding style 2016-01-28 10:29:56 +01:00
Flavio Copes
2d5f721301 🎨 Improve type hints and coding style 2016-01-28 09:52:30 +01:00
Andy Miller
5c746f869a fix for curl 2016-01-27 17:45:58 -07:00
Andy Miller
4485aa3109 remove tests folder when running 'clean' command 2016-01-27 17:17:29 -07:00
Andy Miller
b8437fbd01 Added support for proxy_url to enable GPM behind proxy servers #639 2016-01-27 17:15:39 -07:00
Andy Miller
7e20ef5dd6 Added start of Markdown tests 2016-01-27 15:49:52 -07:00
Andy Miller
04116b3a37 don't process links on special protocols 2016-01-27 14:00:45 -07:00
Andy Miller
086f791c9f removed block shortcode handler, moved to shortcode-core plugin 2016-01-27 14:00:17 -07:00
Andy Miller
86c22c2e29 Merge branch 'develop' of https://github.com/getgrav/grav into develop 2016-01-27 11:45:46 -07:00
Andy Miller
95241da47c don't iterate over empty redirects/routes 2016-01-27 11:45:41 -07:00
Andy Miller
683b8a2848 if an empty string is passed to array, return null 2016-01-27 11:45:18 -07:00
Andy Miller
8dbe06941c comment out default routes/aliases from system/config/site.yaml 2016-01-27 11:44:46 -07:00
Tyler Cosgrove
af2e416ea1 Fix for #612 2016-01-27 13:25:42 -05:00
Flavio Copes
e576b05078 🎨 Add use statements. Add docblocks. Improve code readability and type hints 2016-01-27 15:57:39 +01:00
Flavio Copes
78c6d60655 🎨 Fix the return type for better type hinting 2016-01-27 15:49:14 +01:00
Flavio Copes
cbb1cc2b85 Test using Streams in Assets::addDir() 2016-01-27 12:09:04 +01:00
Flavio Copes
8a3636d10f 🐛 Fix Assets::addDir() (add addCssDir/addJsDir) to work as expected
Was looking up assets in the /assets folder, which is reserved for
Grav-compiled assets.

Now
- Looks up paths from the Grav ROOT_DIR or from a stream location
- Internally uses Assets::addJs() and Assets::addJs() instead of
directly accessing the assets arrays
- Removed the file extension determination effort already done in
Assets::add(), use Assets::add() instead
2016-01-27 12:08:41 +01:00
Flavio Copes
2721e681ef Test Assets::addDirCss(), Assets::addDirJs(), Assets::addDir() 2016-01-27 11:46:53 +01:00
Flavio Copes
8a41b2e08d 🎨 Move similar methods near each other. 2016-01-27 11:23:48 +01:00
Flavio Copes
dec78b9cbd Test Assets::resetJs() and Assets::resetCss()
Also fix closing parentheses. Added PHPDoc
2016-01-27 10:51:04 +01:00
Flavio Copes
7ab75811ad 📚 Drop old link in README 2016-01-27 10:27:49 +01:00
Flavio Copes
15043e1a11 🐛 In Assets::reset() also reset the inline CSS and inline JS arrays 2016-01-27 10:27:24 +01:00
Flavio Copes
4ef5236a53 Test Assets::registerCollection() 2016-01-27 10:26:03 +01:00
Flavio Copes
2a06cfc5e2 Test Assets::reset() 2016-01-27 10:25:53 +01:00
Flavio Copes
60876f2f09 Test Assets::exists() 2016-01-27 10:24:57 +01:00
Flavio Copes
74fdca79f0 Test Assets::getCollections() 2016-01-27 10:24:47 +01:00
Flavio Copes
c3c7c78e46 Test Assets::getCss() and Assets::getJs() 2016-01-27 09:25:07 +01:00
Andy Miller
24a5c2c03c Fix for #610 when you have an array of just empty string [''] 2016-01-26 21:34:36 -07:00
Andy Miller
9113c86196 Add other method signature items to internal lookup hash 2016-01-26 17:35:16 -07:00
Andy Miller
06b993181c typo in buildRootPath() after refactor 2016-01-26 17:34:38 -07:00
Andy Miller
a579544130 Missed one error 2016-01-26 15:09:31 -07:00
Andy Miller
a8bfa88cac Fix URITest with static methods 2016-01-26 15:08:52 -07:00
Matias Griese
2742f333aa Merge branches 'develop' and 'feature/blueprints-update' of https://github.com/getgrav/grav into feature/blueprints-update
# Conflicts:
#	composer.lock
2016-01-26 20:39:08 +02:00
Matias Griese
b6329b1964 Blueprint refactor: Code style 2016-01-26 20:38:13 +02:00
Andy Miller
d1b24d0077 Merge branch 'develop' of https://github.com/getgrav/grav into develop 2016-01-26 11:25:14 -07:00
Andy Miller
8d93df1633 updated lock file 2016-01-26 11:24:54 -07:00
Flavio Copes
ef095d4fc0 📚 Drop IRC, add link to gitter 2016-01-26 19:23:58 +01:00
Andy Miller
1df6173041 Merge pull request #588 from getgrav/feature/introduce-testing
Introduce testing
2016-01-26 10:54:15 -07:00
Andy Miller
fb50c4a4f0 Merge pull request #623 from getgrav/feature/fix-loading-js-and-css-from-collections
Fix loading js and css from collections
2016-01-26 10:53:49 -07:00
Flavio Copes
febe3123dd Use new jQuery filename 2016-01-26 18:02:27 +01:00
Flavio Copes
23ad20ed13 Test addAsyncJs addInlineCss, addInlineJs 2016-01-26 18:02:03 +01:00
Flavio Copes
bce084841e Ⓜ️ Merge branch 'develop' into feature/introduce-testing 2016-01-26 17:36:12 +01:00
Flavio Copes
172236e58d 🚧 Rename jquery-2.2.0.min.js to jquery-2.x.min.js
When stored in the user config, configuration for collections might
still reference old shipped releases. We move to jquery-2.x.min.js for
all future 2.x releases, and we'll have a jquery-3.x.min.js when it's
shipped.
2016-01-26 13:24:29 +01:00