Merge pull request #53 from abdulrauf/master

bug fix for multisite
Better name

Signed-off-by: Yuri Tománek <yuri@tomanek.com.au>
Merge branch 'master' of github.com:Gluttonberg/core
Merge pull request #54 from abdulrauf/master

rescue image processing
Fixing issues with the asset pipeline

Signed-off-by: Yuri Tománek <yuri@tomanek.com.au>
Merge branch 'master' of github.com:Gluttonberg/core
Asset pipeline fixes

Signed-off-by: Yuri Tománek <yuri@tomanek.com.au>
This is causing lots of issues

Signed-off-by: Yuri Tománek <yuri@tomanek.com.au>
Fix

Signed-off-by: Yuri Tománek <yuri@tomanek.com.au>
Merge pull request #55 from abdulrauf/master

Page slug fix, parent page user friendly dropdown
Merge pull request #56 from abdulrauf/master

show_in_asset_picker new image config
Better language

Signed-off-by: Yuri Tománek <yuri@tomanek.com.au>
Merge branch 'master' of github.com:Gluttonberg/core
updated sidekiq
Only fetch articles if blogging is enabled

PagesController#pages_list_for_tinymce was attempting to fetch articles
regardless of whether or not the blogging module is present.  This broke
the 'Insert internal link' functionality in the wysiwyg editor.
Merge pull request #58 from jbarona/master

Only fetch articles if blogging is enabled
Merge pull request #59 from abdulrauf/master

bug fixes
navigation_tree

If pages object passed to navigation_tree is nil look for a home page.
If home page exists find all children and use children for pages object.
If no home page look for all pages where parent_id is nil.

Signed-off-by: Yuri Tománek <yuri@tomanek.com.au>
navigation_tree max_depth

Added in the concept of depth to the navigation_tree.

Signed-off-by: Yuri Tománek <yuri@tomanek.com.au>
Small tweaks to the navigation_tree based on feedback

Signed-off-by: Yuri Tománek <yuri@tomanek.com.au>