[DRE-commits] [ruby-rails-admin] 02/05: Merge tag 'upstream/0.6.8_dfsg'

[Praveen Arimbrathodiyil]

This is an automated email from the git hooks/post-receive script.

praveen pushed a commit to branch master
in repository ruby-rails-admin.

commit b668eca147ed625469835be655c4de1963bc422a
Merge: 670d9ab a9374bf
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Sat Aug 29 09:19:41 2015 +0530

    Merge tag 'upstream/0.6.8_dfsg'
    
    Upstream version 0.6.8~dfsg
    
    # gpg: Signature made Saturday 29 August 2015 09:19:36 AM IST using RSA key ID 4512C22A
    # gpg: Good signature from "Praveen Arimbrathodiyil (piratepin) <praveen at debian.org>"
    # gpg:                 aka "Pirate Praveen (pirates.org.in) <praveen at onenetbeyond.org>"
    # gpg:                 aka "Pirate Praveen (piratesin) <me at j4v4m4n.in>"
    # gpg:                 aka "Pirate Praveen (PP) <praveen at privacyrequired.com>"
    # gpg:                 aka "Praveen Arimbrathodiyil (j4v4m4n) <pravi.a at gmail.com>"

 Gemfile                                            |   2 +-
 .../javascripts/rails_admin/ra.datetimepicker.js   |  24 ++-
 .../javascripts/rails_admin/ra.filter-box.js       |  28 ++--
 .../javascripts/rails_admin/ra.widgets.coffee      |  74 ++++++++++
 app/assets/javascripts/rails_admin/ui.coffee       |   5 +
 .../rails_admin/aristo/jquery-ui-1.8.7.custom.scss |   2 +-
 .../stylesheets/rails_admin/base/theming.scss      | 164 ++++++++++++---------
 .../rails_admin/ra.calendar-additions.scss         |  17 ++-
 .../stylesheets/rails_admin/rails_admin.scss.erb   |   1 +
 .../rails_admin/application_controller.rb          |   6 +-
 app/controllers/rails_admin/main_controller.rb     |   2 +-
 app/helpers/rails_admin/application_helper.rb      |  14 +-
 app/helpers/rails_admin/form_builder.rb            |   6 +-
 .../rails_admin/_sidebar_navigation.html.haml      |   2 +
 .../layouts/rails_admin/application.html.haml      |   9 +-
 app/views/layouts/rails_admin/pjax.html.haml       |   3 +-
 app/views/rails_admin/main/_form_boolean.html.haml |   3 +
 .../rails_admin/main/_form_datetime.html.haml      |   4 +-
 app/views/rails_admin/main/_form_field.html.haml   |   2 +-
 app/views/rails_admin/main/_form_froala.html.haml  |   8 +
 .../rails_admin/main/_form_nested_many.html.haml   |   5 +-
 .../rails_admin/main/_form_nested_one.html.haml    |   2 +-
 .../main/_form_polymorphic_association.html.haml   |   5 +-
 .../rails_admin/main/_submit_buttons.html.haml     |   6 +-
 app/views/rails_admin/main/dashboard.html.haml     |   6 +-
 app/views/rails_admin/main/export.html.haml        |  28 ++--
 lib/rails_admin/config.rb                          |   8 +-
 lib/rails_admin/config/actions/base.rb             |   2 +-
 lib/rails_admin/config/actions/bulk_delete.rb      |  39 +++--
 lib/rails_admin/config/actions/dashboard.rb        |   4 +-
 lib/rails_admin/config/fields.rb                   |   2 +-
 lib/rails_admin/config/fields/base.rb              |   3 +-
 lib/rails_admin/config/fields/types/all.rb         |   2 +
 lib/rails_admin/config/fields/types/boolean.rb     |   4 +
 lib/rails_admin/config/fields/types/froala.rb      |  37 +++++
 .../config/fields/types/has_one_association.rb     |   2 +-
 lib/rails_admin/config/fields/types/uuid.rb        |  13 ++
 lib/rails_admin/config/has_fields.rb               |  10 +-
 lib/rails_admin/extensions/cancan.rb               |   4 +-
 lib/rails_admin/extensions/cancancan.rb            |   4 +-
 lib/rails_admin/extensions/history.rb              |   4 +-
 lib/rails_admin/extensions/paper_trail.rb          |   4 +-
 lib/rails_admin/support/csv_converter.rb           |   2 +-
 lib/rails_admin/version.rb                         |   2 +-
 metadata.yml                                       |  11 +-
 45 files changed, 395 insertions(+), 190 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-rails-admin.git