artfully_ose 1.2.0.pre.18 → 1.2.0.pre.19

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MGNjMDg0YzRmMDRiM2FkYjFhMzU0NzBmY2YyNjA2OTNjMjUzMzAwNw==
+    M2E4OTBlNDU5Zjc0NGJmODQyY2ZmNzQ2ODI1OGEzYjQ2N2Q1ODAyZQ==
   data.tar.gz: !binary |-
-    ODQ0MWUxN2EwYTNhOTRhOTdjNWEwM2I5NDViMTJlMzZjYmJmM2U3NQ==
+    ZGI1ZmRhMjY3MjhlZjc0YjJhYmNhZDQ0Yjc5ZDZhNGE4NGQ3NTlmNQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MmRkN2FhMzU0NmQzYmE5ZDk1OTFjZWZkNjkyMGQ4YjRhYWRlY2IzYWQ3ODdh
-    ZmU1MGNiNmZjOThjMjE5MDRkOGViOTBmMmYzYTUzZjNiYTEwYjNlOTQyYjFk
-    OWE3NDM1M2U0ZDAyNThkOGVjMDI1NGRmMzE2ZjQ0ZjYyODNiNmE=
+    ODhhZDk0ZWFjOWMwNGU2NmQxMGI1NzkzNjI2NGFjZjQ2MDYwYjQzNjE0YWY0
+    MTUxZmFjMzdlMTI1MjA3YzYyZDBmNWRhOTgyYWVjODcyYWFjNThlMzJhYzA0
+    MzJjY2I0MmQ4MmJiNjJmMGMyYWU3YThhZDFjNzc2ZGE5MjgwOWY=
   data.tar.gz: !binary |-
-    ZjJmNGE5YzdlMTdkMDc4ODZlYzQ3MzA3OTc2NjA5OGY5MDdlNjBhNjY3YmVk
-    Y2EyZWQ1MzQ2OWNjZTU5OWRjZWY4NWZiNWY0OTBiZmM3MWE2N2YwY2VhM2Y2
-    YTZjMDA1M2IyYjljNmJlNGUwMjA2NjZlYzk3Y2M5NjU4NTMyMTg=
+    ZjUyNWY5ODY4ZDA3NGY2MjU3YWU3OWM5NmNlYzA4MmM0Mzc3MjM4MGVkN2Jm
+    YjI4NmM2Njk5MzAzMTgzZTEzZWJjOTVmOTk1YzVhYTRhN2Y0MmRjZTZkMjM1
+    ZjI2YmFlZTFmOWRhYjJhYTQwNTAzYzI1MGFjM2UwMDg4MmJlN2Y=

data/app/assets/javascripts/jquery-lib/jquery.mask-money.js

@@ -179,6 +179,7 @@
 						} else if (settings.symbolStay && input.val() == settings.symbol){
 							input.val(setSymbol(getDefaultMask()));
 						}
+            input.change();
 					}
 				}
 

data/app/views/layouts/_flash.html.haml

@@ -1,4 +1,4 @@
-- [:notice, :error, :alert, :info].each do |type|
+- [:notice, :success, :error, :alert, :info].each do |type|
   - if flash[type]
     .flash{ "data-alert" => "alert", :class => [bootstrapped_type(type), type, 'alert'] }
       .close{ "data-dismiss" => "alert"} ×

data/app/views/memberships/index.html.haml

@@ -19,7 +19,7 @@
               %li
                 = link_to "Change Expiration", "#extend", 'data-toggle' => 'modal'
               %li
-                = link_to "Change Membership", "#change", 'ng-controller' => 'ChangeMembershipController', 'ng-click' => 'changeSelected($event)'
+                = link_to "Change Membership Type", "#change", 'ng-controller' => 'ChangeMembershipController', 'ng-click' => 'changeSelected($event)'
               %li
                 = link_to "Cancel Membership", "#cancel", 'data-toggle' => 'modal'
       .span6.right
@@ -43,7 +43,7 @@
               - if membership.expired?
                 %tr{'ng-show' => 'scope.showExpired', 'ng-style' => 'scope.expiredStyle'}
                   %td.grouped-checkbox= check_box_tag "membership_ids[]", membership.id, false, :id => "membership_id_#{membership.id}", 'ng-disabled' => 'true'
-                  %td.item-description=link_to membership.membership_type.name, membership_type_path(membership.membership_type.id)
+                  %td.item-description=membership.membership_type.name
                   %td.starts-at=l membership.starts_at, :format => :slashed_date
                   %td.ends-at=l membership.ends_at, :format => :slashed_date
                   %td.price.right=number_as_cents membership.sold_price
@@ -51,7 +51,7 @@
               - else
                 %tr
                   %td.grouped-checkbox= check_box_tag "membership_ids[]", membership.id, false, :id => "membership_id_#{membership.id}"
-                  %td.item-description=link_to membership.membership_type.name, membership_type_path(membership.membership_type.id)
+                  %td.item-description=membership.membership_type.name
                   %td.starts-at=l membership.starts_at, :format => :slashed_date
                   %td.ends-at=l membership.ends_at, :format => :slashed_date
                   %td.price.right=number_as_cents membership.sold_price

data/lib/artfully_ose/version.rb

@@ -1,3 +1,3 @@
 module ArtfullyOse
-  VERSION = "1.2.0.pre.18"
+  VERSION = "1.2.0.pre.19"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: artfully_ose
 version: !ruby/object:Gem::Version
-  version: 1.2.0.pre.18
+  version: 1.2.0.pre.19
 platform: ruby
 authors:
 - Artful.ly
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-13 00:00:00.000000000 Z
+date: 2014-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails