Foodsoft/foodsoft
1
1
Fork 0
Code Issues 36 Pull requests 5 Projects 1 Releases Wiki Activity

Merge remote-tracking branch 'upstream/rails3' into twitter-bootstrap

Browse source 
Conflicts:
	Gemfile
This commit is contained in:
Robert Waltemath 2012-11-15 09:53:36 +01:00
commit 1822b330d1
5 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -10,3 +10,4 @@ public/**/*_cached.*
.idea .idea
.get-dump.yml .get-dump.yml
.sass-cache/ .sass-cache/
doc/app/

1
Gemfile
View file

@ -18,6 +18,7 @@ end
gem 'jquery-rails' gem 'jquery-rails'
gem 'mysql2' gem 'mysql2'
gem 'sqlite3', :group => :development
gem 'prawn' gem 'prawn'
gem 'haml-rails' gem 'haml-rails'
gem 'kaminari' gem 'kaminari'

2
Gemfile.lock
View file

@ -153,6 +153,7 @@ GEM
hike (~> 1.2) hike (~> 1.2)
rack (~> 1.0) rack (~> 1.0)
tilt (~> 1.1, != 1.3.0) tilt (~> 1.1, != 1.3.0)
sqlite3 (1.3.6)
therubyracer (0.10.2) therubyracer (0.10.2)
libv8 (~> 3.3.10) libv8 (~> 3.3.10)
thor (0.16.0) thor (0.16.0)
@ -197,6 +198,7 @@ DEPENDENCIES
simple-navigation simple-navigation
simple-navigation-bootstrap simple-navigation-bootstrap
simple_form simple_form
sqlite3
therubyracer therubyracer
twitter-bootstrap-rails twitter-bootstrap-rails
uglifier (>= 1.0.3) uglifier (>= 1.0.3)

2
app/views/messages/new.haml
View file

@ -37,7 +37,7 @@
#recipients #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 :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 :private
= f.input :subject, input_html: {class: 'input-xxlarge'} = f.input :subject, input_html: {class: 'input-xxlarge'}
= f.input :body, input_html: {class: 'input-xxlarge'} = f.input :body, input_html: {class: 'input-xxlarge'}

2
doc/README_FOR_APP
View file

@ -1,5 +1,5 @@
Use this README file to introduce your application and point to useful places in the API for learning more. 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 = The Foodsoft