Updated version numbers to 2.2.0-beta2.
Merge branch '2.2/develop' of git://github.com/pyrocms/pyrocms into release/2.2.0-beta2
Merge branch '2.2/develop' of git://github.com/pyrocms/pyrocms into release/2.2.0-beta2
Merge branch '2.2/develop' of git://github.com/pyrocms/pyrocms into release/2.2.0-beta2
Merge branch '2.2/develop' of git://github.com/pyrocms/pyrocms into release/2.2.0-beta2
Merge branch 'release/2.2.0-beta2' into 2.2/develop
'Only variables should be passed by reference'
Translated a string
Merge pull request #2354 from okhayat/2.2/develop

Translated a string
Fixing full page displaying in modal for Add Child.

Fixes #2350.
Image Uploading Scrolling

fixes #2252
close #2252

Signed-off-by: Joshua Pekera <joshuapekera@me.com>
Navigation Delete Warning

fixed issue where delete button did not display tooltip warning
fixes #2345
close #2345

Signed-off-by: Joshua Pekera <joshuapekera@me.com>
Update system/cms/modules/pages/language/dutch/page_types_lang.php

Some language-strings translated to Dutch.
Fixing issue with keywords in pages:children.

Keywords were just the keyword hash. Now you can properly cycle through meta_keywords like this:

{{ meta_keywords }}
{{ keyword }}
{{ /meta_keywords }}

Also added:

- The ability to restrict returned pages by page type.
- A full 'url' variable in the loop, just because it's nice to have.
Fixing issue with not being able to access custom fields in pages:children.

Now the plugin checks to see what page types/streams are needed and grabs just the entries needed. It only does it if it finds {{ custom_fields }} in the content of the tag.

Since the children of a page can have several different page types (and several different streams), this seems like the most economical way to do things. Each new page type you have requires a query.

You can also check the page type with the {{ page_type_slug }} and {{ page_type_title }} variables.
Merge pull request #2360 from pvdl/patch-3

Update system/cms/modules/pages/language/dutch/page_types_lang.php
Merge pull request #2343 from mikezilla/2.2/develop

'Only variables should be passed by reference'
Fixed issue #2269: Search count and results not matching.
Merge branch '2.2/develop' of git://github.com/pyrocms/pyrocms into 2.2/develop
french translations for system files