Permalink
Browse files

Merge branch 'develop' into aleksandr

  • Loading branch information...
2 parents 0ceae52 + 19b39b2 commit 6aba295a61ece20e7f379a9d0200458e0ca76f81 @MonsWriter MonsWriter committed Mar 30, 2012
View
@@ -55,6 +55,10 @@ gem 'capistrano'
# To use debugger
# gem 'ruby-debug19', :require => 'ruby-debug'
+# for backup
+gem 'backup'
+gem 'dropbox-sdk', '~> 1.1.0'
+
group :test, :development do
gem "awesome_print", "~> 1.0.2"
gem 'spork', '0.9.0.rc9'
View
@@ -1,6 +1,10 @@
GEM
remote: http://rubygems.org/
specs:
+ POpen4 (0.1.4)
+ Platform (>= 0.4.0)
+ open4
+ Platform (0.4.0)
actionmailer (3.2.1)
actionpack (= 3.2.1)
mail (~> 2.4.0)
@@ -32,6 +36,9 @@ GEM
ansi (1.4.2)
arel (3.0.0)
awesome_print (1.0.2)
+ backup (3.0.23)
+ POpen4 (~> 0.1.4)
+ thor (~> 0.14.6)
bcrypt-ruby (3.0.1)
builder (3.0.0)
cancan (1.6.7)
@@ -61,6 +68,8 @@ GEM
coffee-script-source (1.2.0)
database_cleaner (0.7.1)
diff-lcs (1.1.3)
+ dropbox-sdk (1.1)
+ json
erubis (2.7.0)
execjs (1.3.0)
multi_json (~> 1.0)
@@ -110,6 +119,7 @@ GEM
net-ssh-gateway (1.1.0)
net-ssh (>= 1.99.1)
nokogiri (1.5.0)
+ open4 (1.3.0)
polyamorous (0.5.0)
activerecord (~> 3.0)
polyglot (0.3.3)
@@ -212,13 +222,15 @@ PLATFORMS
DEPENDENCIES
annotate (~> 2.4.1.beta)
awesome_print (~> 1.0.2)
+ backup
bcrypt-ruby
cancan (~> 1.6.7)
capistrano
capybara (~> 1.1.2)
carrierwave (~> 0.5.8)
coffee-rails (~> 3.2.2)
database_cleaner (~> 0.7.1)
+ dropbox-sdk (~> 1.1.0)
factory_girl_rails
flash_cookie_session
jquery-rails
@@ -463,7 +463,7 @@ $(document).ready(function() {
required: true
},
"subject[area]" : {
- digits: true
+ number: true
},
"subject[floor]" : {
required: true,
@@ -489,7 +489,7 @@ $(document).ready(function() {
required: "Введите цену "
},
"subject[area]" : {
- digits: "Только цифры"
+ number: "Только числа"
},
"subject[floor]" : {
required: "Введите этаж",
@@ -759,8 +759,8 @@ $(document).ready(function() {
$("#search_room_lte").autotab_filter('numeric');
$("#search_price_gte").autotab_filter('numeric');
$("#search_price_lte").autotab_filter('numeric');
- $("#search_area_gte").autotab_filter('numeric');
- $("#search_area_lte").autotab_filter('numeric');
+ // $("#search_area_gte").autotab_filter('numeric');
+ // $("#search_area_lte").autotab_filter('numeric');
});
// search
Oops, something went wrong. Retry.

0 comments on commit 6aba295

Please sign in to comment.