Nemcio/Grav
1
0
Fork 0
mirror of https://github.com/getgrav/grav.git synced 2026-03-10 06:31:00 +01:00
Code Issues Packages Projects Releases Activity
7,920 Commits 9 Branches 318 Tags
348fa04c478cdc920342afab83ba30914bbf0bab
Commit Graph

7920 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Flavio Copes
1494247c85 ✅ Tests code cleanup 2016-01-29 18:32:52 +01:00
Andy Miller
d6b8ae6297 Merge branch 'develop' into feature/page_level_ssl 
# Conflicts:
#	system/src/Grav/Common/Markdown/ParsedownGravTrait.php
#	system/src/Grav/Common/Uri.php
 2016-01-29 10:30:47 -07:00
Matias Griese
233af34bdc Add missing parameter after merge 2016-01-29 14:24:48 +02:00
Matias Griese
b3a8a66c0e Merge branches 'develop' and 'feature/blueprints-update' of https://github.com/getgrav/grav into feature/blueprints-update 
# Conflicts:
#	system/src/Grav/Common/Plugins.php
#	system/src/Grav/Common/Themes.php
 2016-01-29 13:43:37 +02:00
Andy Miller
d3202b3210 Merge branch 'feature/proxy_support' into develop 2016-01-28 10:37:06 -07:00
Andy Miller
a08b5a1863 Added proxy_url to config blueprints 2016-01-28 10:34:50 -07:00
Andy Miller
1f75e014d3 added example 2016-01-28 10:30:24 -07:00
Flavio Copes
19891408db 🎨 Code cleanup and PHPDoc 2016-01-28 17:33:23 +01:00
Flavio Copes
57c4f13e53 🎨 PHPDoc 2016-01-28 17:13:19 +01:00
Flavio Copes
4854c72cbb 🐛 Fix typo 2016-01-28 13:51:07 +01:00
Flavio Copes
d440739b8b 🎨 Adjust spacing and PHPDoc 2016-01-28 13:32:18 +01:00
Flavio Copes
2d49054a95 🎨 Fix spacing and code formatting 2016-01-28 11:34:33 +01:00
Flavio Copes
2fb22d813f 🎨 Fix spacing and code formatting 2016-01-28 11:21:17 +01:00
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