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
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
Flavio Copes
a1a75954ae
💫 Drop useless hash fallback, as we always have a system.security.default_hash set
2016-01-24 21:15:07 +01:00
Flavio Copes
c8a5e846c1
Fix permissions when the user has no access level set at all
2016-01-24 20:50:47 +01:00
Matias Griese
e3e47717c6
Blueprint refactor: Composer update
2016-01-22 21:44:23 +02:00
Flavio Copes
515f257ee3
Update jQuery to 2.2.0
2016-01-22 18:25:24 +01:00
Flavio Copes
71795fd775
Add tests/_support/_generated/* and tests/cache/* to .gitignore
2016-01-22 18:10:06 +01:00
Matias Griese
a69116738f
Blueprint refactor: Fix Blueprint validation
2016-01-22 14:47:05 +02:00
Matias Griese
f87887920a
Blueprint refactor: Fix Blueprint::checkRequired()
2016-01-22 14:39:32 +02:00
Flavio Copes
8cda9a08da
Improve Assets class code style
2016-01-22 13:10:33 +01:00
Flavio Copes
684503245c
Call addCss & addJs instead of add(), as otherwise it will lose group and loading information
2016-01-22 12:59:22 +01:00
Matias Griese
7760f541fb
Blueprint refactor: Fix page blueprints
2016-01-22 13:04:32 +02:00
Matias Griese
4f73fd62c9
Blueprint refactor: Fix missing dynamic properties
2016-01-22 12:49:19 +02:00
Flavio Copes
77c8458fbf
🐛 Fix addJs and addCSS problem
...
Changes supported by tests in
https://github.com/getgrav/grav/commit/27af9432e0fa9a7abb2b6a2e3f3a6f6d1
55a37e9
2016-01-22 10:43:41 +01:00
Flavio Copes
7f7ba5306d
Add test info to readme
2016-01-22 10:39:36 +01:00
Flavio Copes
612e2126ee
🚨 Initialize assets in tests
2016-01-22 10:39:24 +01:00
Flavio Copes
dd43b3b7da
🚨 Remove acceptance test example
2016-01-22 10:39:15 +01:00
Flavio Copes
27af9432e0
🚨 Added a bunch of tests to make sure Assets addJs and addCSS works as expected
2016-01-22 10:38:56 +01:00
Matias Griese
80d0c2a405
Blueprint refactor: fix theme thumbnails
2016-01-22 10:07:40 +02:00
Flavio Copes
774cf2d6d0
Recreated an issue in calling with an array of values {% do assets.addJs('jquery', {'loading':'async'}) %} introduced in d5bd99b363
2016-01-22 00:09:14 +01:00
Flavio Copes
8270edbc78
Fix loading js and css from collections
...
Calling add() lose information on
- CSS: $group
- JS: $loading, $group
2016-01-21 21:24:26 +01:00
Matias Griese
b791e8efda
Blueprint refactor: fix site blueprint
2016-01-21 15:38:12 +02:00
Matias Griese
130d039101
Merge branch 'feature/plugin-early' of https://github.com/getgrav/grav into feature/blueprints-update
2016-01-21 14:11:09 +02:00
Matias Griese
ebee88dd39
Update blueprints object version
2016-01-21 14:00:54 +02:00
Matias Griese
ad25462bd5
Merge branches 'develop' and 'feature/plugin-early' of https://github.com/getgrav/grav into feature/plugin-early
...
# Conflicts:
# composer.lock
2016-01-21 13:58:48 +02:00
