Permalink
Browse files

Merge branch 'hotfix/0.3.8'

  • Loading branch information...
2 parents 716a072 + 9a2b521 commit d25e38bae5433d93b0d64f5a525a7cbba8be0bad @noctivityinc committed May 25, 2010
View
2 Gemfile
@@ -5,7 +5,7 @@ source :gemcutter
gem 'bundler', :require => nil
gem 'rubygems-update', :require => nil
-gem 'rails', '2.3.7', :require => nil
+gem 'rails', '2.3.8', :require => nil
gem 'pg', '0.8.0'
View
5 RELEASE_NOTES.textile
@@ -1,5 +1,10 @@
h1. Todopia Release Notes
+h3. 0.3.8 (hotfix)
+* upgraded to 2.3.8 (ugh)
+* fixed bug which sends empty daily todos (sorry)
+* fixed spinner from sometimes showing
+
h3. 0.3.4 (hotfix)
* Fixed bug with inviting new users on todo creation
* upgraded to 2.3.6
View
2 config/environment.rb
@@ -1,7 +1,7 @@
# Be sure to restart your server when you modify this file
# Specifies gem version of Rails to use when vendor/rails is not present
-RAILS_GEM_VERSION = '2.3.7' unless defined? RAILS_GEM_VERSION
+RAILS_GEM_VERSION = '2.3.8' unless defined? RAILS_GEM_VERSION
# Bootstrap the Rails environment, frameworks, and default configuration
require File.join(File.dirname(__FILE__), 'boot')
View
29 default.gems
@@ -1,35 +1,29 @@
# default.gems generated gem export file. Note that any env variable settings will be missing. Append these after using a ';' field separator
+abstract -v1.0.0
+actionmailer -v2.3.8
actionmailer -v2.3.7
-actionmailer -v2.3.6
-actionmailer -v2.3.5
+actionpack -v2.3.8
actionpack -v2.3.7
-actionpack -v2.3.6
-actionpack -v2.3.5
+activerecord -v2.3.8
activerecord -v2.3.7
-activerecord -v2.3.6
-activerecord -v2.3.5
+activeresource -v2.3.8
activeresource -v2.3.7
-activeresource -v2.3.6
-activeresource -v2.3.5
+activesupport -v2.3.8
activesupport -v2.3.7
-activesupport -v2.3.6
-activesupport -v2.3.5
acts-as-taggable-on -v2.0.6
-acts-as-taggable-on -v2.0.5
annotate-models -v1.0.4
archive-tar-minitar -v0.5.2
authlogic -v2.1.4
-authlogic -v2.1.3
bundler -v0.9.25
-bundler -v0.9.24
chronic -v0.2.3
columnize -v0.3.1
compass -v0.10.1
+erubis -v2.6.5
formtastic -v0.9.8
friendly_id -v3.0.4
friendly_id -v2.3.4
+haml -v3.0.6
haml -v3.0.5
-haml -v3.0.4
hirb -v0.3.2
hoe -v2.6.0
hoptoad_notifier -v2.2.2
@@ -39,21 +33,20 @@ linecache19 -v0.5.11
newgem -v1.5.3
nifty-generators -v0.4.0
nokogiri -v1.4.2
-nokogiri -v1.4.1
pg -v0.9.0
pg -v0.8.0
rack -v1.1.0
-rack -v1.0.1
+rails -v2.3.8
rails -v2.3.7
-rails -v2.3.6
-rails -v2.3.5
RedCloth -v4.2.3
rubigen -v1.5.4
ruby-debug-base19 -v0.11.23
ruby-debug19 -v0.11.6
ruby_core_source -v0.1.4
+ruby_parser -v2.0.4
rubyforge -v2.0.4
rubygems-update -v1.3.7
+sexp_processor -v3.0.4
syntax -v1.0.0
unicorn -v0.99.0
whenever -v0.4.2
View
2 git-flow-version
@@ -1 +1 @@
-GITFLOW_VERSION=0.3.7
+GITFLOW_VERSION=0.3.8
View
4 lib/jobs/send_daily_emails.rb
@@ -1,7 +1,9 @@
class SendDailyEmails
def process
User.wanting_daily_emails.each do |user|
- user.update_attribute(:daily_summary_sent_at, Time.now) if Postoffice.deliver_email_todos(user)
+ unless (user.todos.not_complete + user.shared_todos.not_complete).empty?
+ user.update_attribute(:daily_summary_sent_at, Time.now) if Postoffice.deliver_email_todos(user)
+ end
end
end
end
View
9 public/javascripts/application.js
@@ -8,7 +8,6 @@ $(function(){
$("#bottom_panel").slideBox({width: "100%", height: 100, position: "bottom"});
$(document).bind('reveal.facebox', function() {
- $('.spinner').hide();
setup_ajax();
$('#note_body').focus();
@@ -59,7 +58,10 @@ function setup_ajax(){
xhr.setRequestHeader("Accept", "text/javascript")
$('.spinner').fadeIn(200);
},
- dataType: 'html'
+ dataType: 'html',
+ complete: function(){
+ $('.spinner').hide();
+ }
})
$('body').ajaxSend(function(event, request, settings) {
@@ -96,7 +98,6 @@ function reload_checklist(responseText) {
bind_tag_group();
bind_checklist_keyboard();
$('a[rel*=facebox]').facebox()
- $('.spinner').hide();
$(document).trigger('checklist.reloaded')
});
}
@@ -180,7 +181,6 @@ function checklist_sortable() {
$(document).unbind('checklist.reloaded')
})
reload_checklist(todoResponse);
- $('.spinner').hide();
}) }
} else {
reorder_url = $('#urls').attr('url:reorder_todos')
@@ -189,7 +189,6 @@ function checklist_sortable() {
$(document).unbind('checklist.reloaded')
})
reload_checklist(todoResponse);
- $('.spinner').hide();
})
}
}
View
1 public/javascripts/controllers/public/todos.js
@@ -217,7 +217,6 @@ function setup_autocomplete() {
}});
$('#todo_submit').show();
- $('.spinner').hide();
$(":text").labelify({ labelledClass: "labelHighlight" });
$(".textboxlist-bit-editable-input").labelify({ labelledClass: "labelHighlight", text: function(input) { return "+ tag"; } });

0 comments on commit d25e38b

Please sign in to comment.