5620 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Flavio Copes
515f257ee3 Update jQuery to 2.2.0 2016-01-22 18:25:24 +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