Foodsoft/foodsoft
1
1
Fork 0
Code Issues 36 Pull requests 5 Projects 1 Releases Wiki Activity
foodsoft/app/models
History
wvengen 7af796c09c Merge remote-tracking branch 'bennibu/rails3' into rails3 
Conflicts:
	app/controllers/admin/ordergroups_controller.rb
	app/controllers/finance/balancing_controller.rb
	app/controllers/suppliers_controller.rb
	app/views/articles/_article.html.haml
	app/views/finance/balancing/_summary.haml
	app/views/finance/balancing/new.html.haml
	app/views/group_orders/_form.html.haml
	app/views/home/_apple_bar.html.haml
	app/views/suppliers/index.haml
2013-03-21 22:08:09 +01:00
..
article.rb Merge pull request #99 from balkansalat/rails3-fix-stock-ordering-2 2013-03-17 11:50:56 -07:00
article_category.rb Allow deleting of category, when there are only deleted articles left. 2013-03-17 20:13:11 +01:00
article_price.rb Removed acts_as_paranoid. Implemented own version. 2013-03-16 17:57:38 +01:00
assignment.rb Fixed some bugs in tasks, apple feature: 2012-12-16 19:07:45 +01:00
delivery.rb Removed acts_as_paranoid. Implemented own version. 2013-03-16 17:57:38 +01:00
financial_transaction.rb Removed acts_as_paranoid. Implemented own version. 2013-03-16 17:57:38 +01:00
group.rb Removed acts_as_paranoid. Implemented own version. 2013-03-16 17:57:38 +01:00
group_order.rb Removed acts_as_paranoid. Implemented own version. 2013-03-16 17:57:38 +01:00
group_order_article.rb Fixed missing group_order_article in group_order show. 2012-12-16 16:50:09 +01:00
group_order_article_quantity.rb Removed annoate and hirb Gemfiles. 2012-07-27 18:07:42 +02:00
invite.rb localize invite model 2013-02-27 11:59:03 +01:00
invoice.rb Removed acts_as_paranoid. Implemented own version. 2013-03-16 17:57:38 +01:00
membership.rb Removed annoate and hirb Gemfiles. 2012-07-27 18:07:42 +02:00
message.rb finish messages i18n + controller + model 2013-02-09 10:18:52 +01:00
order.rb Merge pull request #99 from balkansalat/rails3-fix-stock-ordering-2 2013-03-17 11:50:56 -07:00
order_article.rb Fixed updating order article in stockit balancing. 2013-03-17 18:33:04 +01:00
order_comment.rb Removed annoate and hirb Gemfiles. 2012-07-27 18:07:42 +02:00
ordergroup.rb Merge remote-tracking branch 'bennibu/rails3' into rails3 2013-03-21 22:08:09 +01:00
page.rb Moved acts_as_configurable to gemfile. 2012-11-24 16:49:19 +01:00
shared_article.rb Fixed articles views. 2012-10-19 01:12:47 +02:00
shared_supplier.rb Merge branch 'master' into master-to-rails3 2012-12-14 18:10:46 +01:00
stock_article.rb Merge remote-tracking branch 'bennibu/rails3' into rails3 2013-03-21 22:08:09 +01:00
stock_change.rb Removed acts_as_paranoid. Implemented own version. 2013-03-16 17:57:38 +01:00
stock_taking.rb Removed annoate and hirb Gemfiles. 2012-07-27 18:07:42 +02:00
supplier.rb Removed acts_as_paranoid. Implemented own version. 2013-03-16 17:57:38 +01:00
task.rb Fixed some bugs in tasks, apple feature: 2012-12-16 19:07:45 +01:00
user.rb Merge branch 'master' into master-to-rails3 2012-12-14 18:10:46 +01:00
workgroup.rb Fixed bad syntax (from already dropped meta_where gem). 2013-02-25 10:51:01 +01:00