Changeset [f6ea3794285a892adfbdb3a54472fad09567264b] by Bryan Larsen
July 11th, 2012 @ 03:37 PM
Merge remote-tracking branch 'origin/master' into rails-3.2
Conflicts:
hobo_support/lib/hobo_support/common_tasks.rb
https://github.com/tablatom/hobo/commit/f6ea3794285a892adfbdb3a5447...
Committed by Bryan Larsen
- A hobo_jquery/vendor/assets/javascripts/jquery.getPath.js
- A hobo_rapid/lib/hobo_rapid/previous_uri_filter.rb
- A hobo_rapid/taglibs/plus/search_filter.dryml
- M dryml/VERSION
- M hobo/CHANGES-1.3.txt
- M hobo/CHANGES-1.4.txt
- M hobo/TODO-1.4.txt
- M hobo/VERSION
- M hobo/app/helpers/hobo_permissions_helper.rb
- M hobo/lib/generators/hobo/front_controller/front_controller_generator.rb
- M hobo/lib/hobo/controller/model.rb
- M hobo/lib/hobo/model.rb
- M hobo_clean/VERSION
- M hobo_clean/vendor/assets/stylesheets/clean.css.erb
- M hobo_clean_admin/VERSION
- M hobo_fields/VERSION
- M hobo_jquery/VERSION
- M hobo_jquery/taglibs/hobo_jquery.dryml
- M hobo_jquery/vendor/assets/javascripts/hobo-jquery/hjq-a.js
- M hobo_jquery/vendor/assets/javascripts/hobo-jquery/hjq-form.js
- M hobo_jquery/vendor/assets/javascripts/hobo-jquery/hjq-spinner.js
- M hobo_jquery/vendor/assets/javascripts/hobo-jquery/hjq.js
- M hobo_jquery_ui/VERSION
- M hobo_rapid/VERSION
- M hobo_rapid/lib/hobo_rapid.rb
- M hobo_rapid/taglibs/buttons/delete-button.dryml
- M hobo_rapid/taglibs/cache/swept_cache.dryml
- M hobo_rapid/taglibs/html/a.dryml
- M hobo_rapid/taglibs/html/table.dryml
- M hobo_rapid/taglibs/inputs/after_submit.dryml
- M hobo_rapid/taglibs/inputs/input.dryml
- M hobo_rapid/taglibs/plus/filter_menu.dryml
- M hobo_rapid/taglibs/plus/table_plus.dryml
- M hobo_support/VERSION
Create your profile
Help contribute to this project by taking a few moments to create your personal profile. Create your profile ยป