Andy Miller
0ddfd4c546
value is getting overridden so not needed here
2016-01-31 19:05:15 -07:00
Andy Miller
5abb4060f3
moved grav-based base_uri values into Uri->init()
2016-01-31 19:04:58 -07:00
Andy Miller
a1dca420e4
More progress with tests using page references.
2016-01-29 17:32:44 -07:00
Andy Miller
7a1e10ee13
Merge branch 'develop' into feature/page_level_ssl
2016-01-29 14:33:39 -07:00
Andy Miller
99c16d5514
fixes for merge
2016-01-29 14:31:57 -07:00
Djamil Legato
ae3ca8aa2d
😱 Fixed missing variable
2016-01-29 10:26:27 -08:00
Djamil Legato
0bce4a95b7
Refractored Metadata generator. [BC included]
...
Metadata are now only flat array. To use social metas, such as open graph, specify the key property with the separator in it (ie, 'og:title'). Grav will automatically treat it as social media and render with both `property` and `name`.
Any other meta will be regularly treated as `name` (ie, 'title' or 'description')
2016-01-29 10:13:14 -08:00
Flavio Copes
60ab5cefd0
🚧 Reset instances, children and routes properties in Pages::init() prior to calling buildPages()
...
Useful when calling Pages::init() multiple times, or the properties are
never reset and the subsequent buildPages() calls fail
2016-01-29 18:32:52 +01:00
Flavio Copes
793f14c3e0
📚 PHPDoc
2016-01-29 18:32:52 +01:00
Flavio Copes
bb1e49dd8e
✨ Return $this in Page constructor and Page::init() to allow method chaining
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
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
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
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
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
8a41b2e08d
🎨 Move similar methods near each other.
2016-01-27 11:23:48 +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
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
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
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
