[DRE-commits] [ruby-rails-admin] 01/03: Merge tag 'upstream/0.6.7_dfsg'

Praveen Arimbrathodiyil praveen at moszumanska.debian.org
Tue Mar 31 10:21:09 UTC 2015


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 a20638ed401cd2a2d8cb9cc2f1486f35d457875c
Merge: 1feee75 1187ec7
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Tue Mar 31 15:35:14 2015 +0530

    Merge tag 'upstream/0.6.7_dfsg'
    
    Upstream version 0.6.7~dfsg
    
    # gpg: Signature made Tuesday 31 March 2015 03:35:06 PM 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>"

 Gemfile                                            |   18 +-
 README.md                                          |    3 +-
 .../rails_admin/aristo/images/icon_sprite.png      |  Bin 2682 -> 2660 bytes
 .../rails_admin/bootstrap/glyphicons-halflings.png |  Bin 12799 -> 12764 bytes
 .../rails_admin/colorpicker/colorpicker_rgb_r.png  |  Bin 763 -> 761 bytes
 .../rails_admin/colorpicker/custom_rgb_b.png       |  Bin 723 -> 722 bytes
 app/assets/images/rails_admin/logo.png             |  Bin 955 -> 942 bytes
 .../images/rails_admin/multiselect/icon_sprite.png |  Bin 2682 -> 2660 bytes
 .../rails_admin/bootstrap/bootstrap-affix.js       |  173 +-
 .../rails_admin/bootstrap/bootstrap-alert.js       |  103 +-
 .../rails_admin/bootstrap/bootstrap-button.js      |  135 +-
 .../rails_admin/bootstrap/bootstrap-carousel.js    |  310 +--
 .../rails_admin/bootstrap/bootstrap-collapse.js    |  231 +--
 .../rails_admin/bootstrap/bootstrap-dropdown.js    |  196 +-
 .../rails_admin/bootstrap/bootstrap-modal.js       |  383 ++--
 .../rails_admin/bootstrap/bootstrap-popover.js     |  155 +-
 .../rails_admin/bootstrap/bootstrap-scrollspy.js   |  266 +--
 .../rails_admin/bootstrap/bootstrap-tab.js         |  186 +-
 .../rails_admin/bootstrap/bootstrap-tooltip.js     |  632 +++---
 .../rails_admin/bootstrap/bootstrap-transition.js  |  103 +-
 .../rails_admin/bootstrap/bootstrap-typeahead.js   | 2117 ++++++++++++++++----
 .../javascripts/rails_admin/ra.filter-box.js       |    2 +-
 .../rails_admin/ra.filtering-multiselect.js        |    6 +-
 .../javascripts/rails_admin/ra.filtering-select.js |    2 +-
 .../javascripts/rails_admin/ra.remote-form.js      |    8 +-
 app/assets/javascripts/rails_admin/rails_admin.js  |    8 +-
 .../rails_admin/aristo/images/icon_sprite.png      |  Bin 2682 -> 2660 bytes
 .../base/font-awesome-4-compability.scss           |  284 +--
 .../stylesheets/rails_admin/base/theming.scss      |   57 +-
 .../rails_admin/bootstrap/_accordion.scss          |   34 -
 .../stylesheets/rails_admin/bootstrap/_alerts.scss |  105 +-
 .../stylesheets/rails_admin/bootstrap/_badges.scss |   57 +
 .../rails_admin/bootstrap/_breadcrumbs.scss        |   22 +-
 .../rails_admin/bootstrap/_button-groups.scss      |  315 +--
 .../rails_admin/bootstrap/_buttons.scss            |  267 +--
 .../rails_admin/bootstrap/_carousel.scss           |  217 +-
 .../stylesheets/rails_admin/bootstrap/_close.scss  |   19 +-
 .../stylesheets/rails_admin/bootstrap/_code.scss   |   65 +-
 .../bootstrap/_component-animations.scss           |   19 +-
 .../rails_admin/bootstrap/_dropdowns.scss          |  263 ++-
 .../stylesheets/rails_admin/bootstrap/_forms.scss  |  943 ++++-----
 .../rails_admin/bootstrap/_glyphicons.scss         |  237 +++
 .../stylesheets/rails_admin/bootstrap/_grid.scss   |   85 +-
 .../rails_admin/bootstrap/_hero-unit.scss          |   25 -
 .../rails_admin/bootstrap/_input-groups.scss       |  166 ++
 .../rails_admin/bootstrap/_jumbotron.scss          |   48 +
 .../rails_admin/bootstrap/_labels-badges.scss      |   83 -
 .../stylesheets/rails_admin/bootstrap/_labels.scss |   66 +
 .../rails_admin/bootstrap/_layouts.scss            |   16 -
 .../rails_admin/bootstrap/_list-group.scss         |  131 ++
 .../stylesheets/rails_admin/bootstrap/_media.scss  |   15 +-
 .../stylesheets/rails_admin/bootstrap/_mixins.scss |  729 +------
 .../stylesheets/rails_admin/bootstrap/_modals.scss |  161 +-
 .../stylesheets/rails_admin/bootstrap/_navbar.scss |  928 +++++----
 .../stylesheets/rails_admin/bootstrap/_navs.scss   |  549 ++---
 .../rails_admin/bootstrap/_normalize.scss          |  425 ++++
 .../stylesheets/rails_admin/bootstrap/_pager.scss  |   78 +-
 .../rails_admin/bootstrap/_pagination.scss         |  175 +-
 .../stylesheets/rails_admin/bootstrap/_panels.scss |  243 +++
 .../rails_admin/bootstrap/_popovers.scss           |  122 +-
 .../stylesheets/rails_admin/bootstrap/_print.scss  |  101 +
 .../rails_admin/bootstrap/_progress-bars.scss      |  129 +-
 .../stylesheets/rails_admin/bootstrap/_reset.scss  |  216 --
 .../bootstrap/_responsive-1200px-min.scss          |   28 -
 .../bootstrap/_responsive-767px-max.scss           |  193 --
 .../bootstrap/_responsive-768px-979px.scss         |   19 -
 .../rails_admin/bootstrap/_responsive-embed.scss   |   34 +
 .../rails_admin/bootstrap/_responsive-navbar.scss  |  189 --
 .../bootstrap/_responsive-utilities.scss           |  200 +-
 .../rails_admin/bootstrap/_scaffolding.scss        |  143 +-
 .../rails_admin/bootstrap/_sprites.scss            |  197 --
 .../stylesheets/rails_admin/bootstrap/_tables.scss |  338 ++--
 .../stylesheets/rails_admin/bootstrap/_theme.scss  |  258 +++
 .../rails_admin/bootstrap/_thumbnails.scss         |   69 +-
 .../rails_admin/bootstrap/_tooltip.scss            |   73 +-
 .../stylesheets/rails_admin/bootstrap/_type.scss   |  343 ++--
 .../rails_admin/bootstrap/_utilities.scss          |   54 +-
 .../rails_admin/bootstrap/_variables.scss          |  979 +++++++--
 .../stylesheets/rails_admin/bootstrap/_wells.scss  |   14 +-
 .../rails_admin/bootstrap/bootstrap.scss           |  107 +-
 .../rails_admin/bootstrap/mixins/_alerts.scss      |   14 +
 .../bootstrap/mixins/_background-variant.scss      |   11 +
 .../bootstrap/mixins/_border-radius.scss           |   18 +
 .../rails_admin/bootstrap/mixins/_buttons.scss     |   50 +
 .../bootstrap/mixins/_center-block.scss            |    7 +
 .../rails_admin/bootstrap/mixins/_clearfix.scss    |   22 +
 .../rails_admin/bootstrap/mixins/_forms.scss       |   84 +
 .../rails_admin/bootstrap/mixins/_gradients.scss   |   58 +
 .../bootstrap/mixins/_grid-framework.scss          |   81 +
 .../rails_admin/bootstrap/mixins/_grid.scss        |  122 ++
 .../rails_admin/bootstrap/mixins/_hide-text.scss   |   21 +
 .../rails_admin/bootstrap/mixins/_image.scss       |   34 +
 .../rails_admin/bootstrap/mixins/_labels.scss      |   12 +
 .../rails_admin/bootstrap/mixins/_list-group.scss  |   31 +
 .../rails_admin/bootstrap/mixins/_nav-divider.scss |   10 +
 .../bootstrap/mixins/_nav-vertical-align.scss      |    9 +
 .../rails_admin/bootstrap/mixins/_opacity.scss     |    8 +
 .../rails_admin/bootstrap/mixins/_pagination.scss  |   23 +
 .../rails_admin/bootstrap/mixins/_panels.scss      |   24 +
 .../bootstrap/mixins/_progress-bar.scss            |   10 +
 .../bootstrap/mixins/_reset-filter.scss            |    8 +
 .../rails_admin/bootstrap/mixins/_resize.scss      |    6 +
 .../bootstrap/mixins/_responsive-visibility.scss   |   21 +
 .../rails_admin/bootstrap/mixins/_size.scss        |   10 +
 .../rails_admin/bootstrap/mixins/_tab-focus.scss   |    9 +
 .../rails_admin/bootstrap/mixins/_table-row.scss   |   28 +
 .../bootstrap/mixins/_text-emphasis.scss           |   11 +
 .../bootstrap/mixins/_text-overflow.scss           |    8 +
 .../bootstrap/mixins/_vendor-prefixes.scss         |  219 ++
 .../rails_admin/bootstrap/responsive.scss          |   48 -
 .../rails_admin/ra.calendar-additions.scss         |   19 +
 .../stylesheets/rails_admin/rails_admin.scss.erb   |   14 +-
 .../rails_admin/application_controller.rb          |   13 +-
 app/controllers/rails_admin/main_controller.rb     |   13 +-
 app/helpers/rails_admin/application_helper.rb      |   78 +-
 app/helpers/rails_admin/form_builder.rb            |   27 +-
 .../twitter-bootstrap/_paginator.html.haml         |   17 +-
 .../layouts/rails_admin/_navigation.html.haml      |    7 +
 .../rails_admin/_secondary_navigation.html.haml    |    6 +-
 .../layouts/rails_admin/application.html.haml      |   25 +-
 app/views/layouts/rails_admin/pjax.html.haml       |    7 +-
 .../rails_admin/main/_delete_notice.html.haml      |    2 +-
 .../rails_admin/main/_form_datetime.html.haml      |    3 +-
 app/views/rails_admin/main/_form_field.html.haml   |    2 +-
 .../rails_admin/main/_form_nested_many.html.haml   |    2 +-
 app/views/rails_admin/main/_form_text.html.haml    |    2 +-
 .../rails_admin/main/_submit_buttons.html.haml     |   31 +-
 app/views/rails_admin/main/dashboard.html.haml     |    8 +-
 app/views/rails_admin/main/export.html.haml        |   51 +-
 app/views/rails_admin/main/history.html.haml       |   10 +-
 app/views/rails_admin/main/index.html.haml         |   27 +-
 app/views/rails_admin/main/show.html.haml          |    2 +-
 config/routes.rb                                   |    8 +-
 lib/rails_admin.rb                                 |    1 +
 lib/rails_admin/abstract_model.rb                  |    2 +-
 lib/rails_admin/adapters/active_record.rb          |    4 +-
 lib/rails_admin/adapters/active_record/property.rb |   14 +-
 lib/rails_admin/adapters/mongoid/property.rb       |    2 +-
 lib/rails_admin/config.rb                          |    2 +-
 lib/rails_admin/config/actions/base.rb             |   19 +-
 lib/rails_admin/config/actions/bulk_delete.rb      |    1 -
 lib/rails_admin/config/actions/edit.rb             |    2 -
 lib/rails_admin/config/actions/export.rb           |    2 -
 lib/rails_admin/config/actions/index.rb            |    3 -
 lib/rails_admin/config/actions/new.rb              |    2 -
 lib/rails_admin/config/configurable.rb             |    2 +-
 lib/rails_admin/config/fields/base.rb              |   13 +-
 lib/rails_admin/config/fields/factories/enum.rb    |    5 +-
 lib/rails_admin/config/fields/group.rb             |    2 +-
 lib/rails_admin/config/fields/types/all.rb         |    1 +
 .../config/fields/types/belongs_to_association.rb  |    4 +-
 lib/rails_admin/config/fields/types/boolean.rb     |    6 +-
 lib/rails_admin/config/fields/types/enum.rb        |    2 +-
 lib/rails_admin/config/fields/types/file_upload.rb |    4 +-
 lib/rails_admin/config/fields/types/inet.rb        |   13 +
 lib/rails_admin/config/fields/types/json.rb        |    1 +
 .../config/fields/types/polymorphic_association.rb |    4 +
 lib/rails_admin/config/has_fields.rb               |    2 +-
 lib/rails_admin/config/model.rb                    |    3 +-
 lib/rails_admin/config/sections/base.rb            |    1 +
 lib/rails_admin/engine.rb                          |    3 +
 lib/rails_admin/extensions/cancancan.rb            |    5 +
 .../extensions/cancancan/authorization_adapter.rb  |   55 +
 lib/rails_admin/extensions/history/history.rb      |   10 +-
 .../extensions/paper_trail/auditing_adapter.rb     |   15 +-
 lib/rails_admin/support/csv_converter.rb           |   64 +-
 lib/rails_admin/version.rb                         |    2 +-
 lib/rails_admin/version.rbc                        |  582 ------
 metadata.yml                                       | 1063 +---------
 169 files changed, 10502 insertions(+), 8475 deletions(-)

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



More information about the Pkg-ruby-extras-commits mailing list