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
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
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
Flavio Copes
b848f98481
🆙 Update Twig to 1.24. Up composer.lock
2016-01-26 13:06:28 +01:00
Djamil Legato
a69e7ee7cf
🔙 Restored jQuery 2.1.4 for Backward Compatibility
2016-01-25 10:52:32 -08:00
Flavio Copes
e5493573d5
🐛 Also accept a single group as a string instead of requiring an array
...
In addition to
```yaml
groups:
- a-group
```
also accept
```yaml
groups: a-group
```
syntax.
2016-01-25 17:11:09 +01:00
Flavio Copes
bdbc14b9c1
🐛 If a user belongs to more than one group, if one group gives us a permission we end the loop and take that permission for granted
2016-01-25 16:40:05 +01:00
Flavio Copes
f82b40ef49
Merge branch 'develop' into feature/fix-loading-js-and-css-from-collections
2016-01-25 09:34:01 +01:00
Flavio Copes
7958db6a17
Merge branch 'develop' into feature/introduce-testing
2016-01-25 09:07:00 +01:00
Andy Miller
ed8cd7f30e
Merge pull request #632 from robwent/develop
...
fix for #631
2016-01-24 20:41:16 -07:00
Robert Went
43f11f5d49
Removing bat's for pull
2016-01-25 02:36:45 +00:00
Robert Went
5a1fa1025d
fixes #631
2016-01-25 02:26:24 +00:00
Robert Went
879f0815cb
Merge branch 'develop' of https://github.com/robwent/grav into develop
2016-01-25 02:24:52 +00:00
Robert Went
bff84ae8d5
makes cli commands available on windows machines from site root
2016-01-25 02:24:24 +00:00
Andy Miller
4e0db8e540
Merge pull request #622 from getgrav/feature/fix-Append-URL-extension-home-link
...
Remove any URL extension for the home link
2016-01-24 18:36:03 -07:00
Andy Miller
85ff412768
Merge pull request #624 from getgrav/feature/update-jquery
...
Update jQuery to 2.2.0
2016-01-24 18:35:37 -07:00
Andy Miller
2b695a985d
Merge pull request #630 from getgrav/feature/drop-useless-default-hash-fallback
...
💫 Drop useless hash fallback, as we always have a system.security.default_hash set
2016-01-24 18:29:59 -07:00
