From 9ac913fd34dbfaf474bb639365da21912081b29c Mon Sep 17 00:00:00 2001 From: Robert Waltemath Date: Mon, 15 Oct 2012 17:31:12 +0200 Subject: [PATCH 1/6] added Gem 'sqlite3' for quick setup to work --- Gemfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index f245fbd9..a6a1b3bf 100644 --- a/Gemfile +++ b/Gemfile @@ -18,6 +18,7 @@ end gem 'jquery-rails' gem 'mysql2' +gem 'sqlite3' gem "fastercsv" gem 'prawn' gem 'haml-rails' @@ -34,4 +35,4 @@ gem 'delayed_job_active_record' group :production do gem 'exception_notification', :require => 'exception_notifier' -end \ No newline at end of file +end From f0bf196934907e00e06823c4a8cf8c322217d678 Mon Sep 17 00:00:00 2001 From: Robert Waltemath Date: Mon, 15 Oct 2012 17:33:33 +0200 Subject: [PATCH 2/6] order group recepient list ascending --- app/views/messages/new.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/messages/new.haml b/app/views/messages/new.haml index f0a4be8e..9ea1361f 100644 --- a/app/views/messages/new.haml +++ b/app/views/messages/new.haml @@ -36,7 +36,7 @@ #recipients = f.input :recipient_tokens, :input_html => { 'data-pre' => User.find_all_by_id(@message.recipients_ids).map { |u| u.token_attributes }.to_json } - = f.input :group_id, :as => :select, :collection => Group.order('type DESC, name DESC').all.reject { |g| g.memberships.empty? } + = f.input :group_id, :as => :select, :collection => Group.order('type DESC, name ASC').all.reject { |g| g.memberships.empty? } = f.input :private = f.input :subject = f.input :body From 28fda3c61212c7119aa4244637c096c2b79c9a29 Mon Sep 17 00:00:00 2001 From: Robert Waltemath Date: Thu, 18 Oct 2012 09:54:59 +0200 Subject: [PATCH 3/6] Corrected rake command for doc generation. --- doc/README_FOR_APP | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/README_FOR_APP b/doc/README_FOR_APP index a0186c07..79fdd74b 100644 --- a/doc/README_FOR_APP +++ b/doc/README_FOR_APP @@ -1,5 +1,5 @@ Use this README file to introduce your application and point to useful places in the API for learning more. -Run "rake appdoc" to generate API documentation for your models and controllers. +Run "rake doc:app" to generate API documentation for your models and controllers. = The Foodsoft From f6cc41aad98aca6367ebbf83e3455ca2bf20117a Mon Sep 17 00:00:00 2001 From: Robert Waltemath Date: Thu, 18 Oct 2012 09:58:53 +0200 Subject: [PATCH 4/6] Told git to ignore generated doc. --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 31caeb2e..772a90bd 100644 --- a/.gitignore +++ b/.gitignore @@ -9,4 +9,5 @@ capfile public/**/*_cached.* .idea .get-dump.yml -.sass-cache/ \ No newline at end of file +.sass-cache/ +doc/app/ From dd3e5a0e4c7c8e6dc327eab8af7572c872ecf621 Mon Sep 17 00:00:00 2001 From: Robert Waltemath Date: Thu, 18 Oct 2012 10:08:29 +0200 Subject: [PATCH 5/6] Use sqlite database in development env only. --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index a6a1b3bf..c2781c8a 100644 --- a/Gemfile +++ b/Gemfile @@ -18,7 +18,7 @@ end gem 'jquery-rails' gem 'mysql2' -gem 'sqlite3' +gem 'sqlite3', :group => :development gem "fastercsv" gem 'prawn' gem 'haml-rails' From 736ac91aef44163fd586a082d121450941d13c65 Mon Sep 17 00:00:00 2001 From: Robert Waltemath Date: Thu, 18 Oct 2012 10:09:32 +0200 Subject: [PATCH 6/6] Added Gemfile.lock. --- Gemfile.lock | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Gemfile.lock b/Gemfile.lock index a6f5edd6..8b224dc7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -141,6 +141,7 @@ GEM hike (~> 1.2) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) + sqlite3 (1.3.6) therubyracer (0.10.2) libv8 (~> 3.3.10) thor (0.16.0) @@ -179,6 +180,7 @@ DEPENDENCIES rails3_acts_as_paranoid (~> 0.1.4) sass-rails (~> 3.2.3) simple_form + sqlite3 therubyracer uglifier (>= 1.0.3) wikicloth