foodsoft/app/models
benni 182742fbec Merge branch 'master' into rails3
Conflicts:
	.gitignore
	app/models/task.rb
	app/models/workgroup.rb
	app/views/shared/_group_form.html.haml
	config/locales/de.yml
	db/schema.rb
2012-06-26 11:51:56 +02:00
..
article.rb Fixed encoding issues with ruby > 1.9.2.. 2012-04-16 08:49:54 +02:00
article_category.rb Refactored article_categories. 2011-05-18 16:10:30 +02:00
article_price.rb New annotation, because of db switch to mysql. 2011-05-07 21:55:24 +02:00
assignment.rb New annotation, because of db switch to mysql. 2011-05-07 21:55:24 +02:00
delivery.rb Updated router. Temporarly replaced routing filter with rails internal. 2011-05-11 12:27:58 +02:00
financial_transaction.rb Refactored finance/ordergroups|transactions module. 2011-06-09 21:35:05 +02:00
group.rb Admin namespace beendet. 2011-06-10 13:22:15 +02:00
group_order.rb Refactored ordering part two. Integrated stock order. 2011-06-19 19:56:04 +02:00
group_order_article.rb Ordering refactored: Made everything RESTful. 2011-06-19 15:30:33 +02:00
group_order_article_quantity.rb New annotation, because of db switch to mysql. 2011-05-07 21:55:24 +02:00
invite.rb New validate_on/before syntax. 2011-05-11 11:17:02 +02:00
invoice.rb Updated finance/invoices 2012-04-20 18:33:47 +02:00
membership.rb Added meta where and jquery observe field. Fixed members view. 2011-05-15 23:43:23 +02:00
message.rb Refactored messages modul, but refactoring is still neccessary. 2011-05-18 14:47:17 +02:00
order.rb Fixed encoding issues with ruby > 1.9.2.. 2012-04-16 08:49:54 +02:00
order_article.rb Simplify balancing view. Part 1 of ... 2012-06-21 17:19:00 +02:00
order_comment.rb Refactoring of order comments. 2011-06-19 20:47:27 +02:00
ordergroup.rb Merge branch 'master' into rails3 2012-06-26 11:51:56 +02:00
page.rb Updated router. Temporarly replaced routing filter with rails internal. 2011-05-11 12:27:58 +02:00
shared_article.rb Refactored shared article import. Added meta search gem. 2011-05-19 22:22:05 +02:00
shared_supplier.rb Added duration to tasks. Annotated all models. 2011-05-07 20:50:39 +02:00
stock_article.rb Fixed encoding issues with ruby > 1.9.2.. 2012-04-16 08:49:54 +02:00
stock_change.rb New annotation, because of db switch to mysql. 2011-05-07 21:55:24 +02:00
stock_taking.rb New annotation, because of db switch to mysql. 2011-05-07 21:55:24 +02:00
supplier.rb Added client side validations. Fixed shared sync. 2011-05-19 22:35:13 +02:00
task.rb Added new autocomplete for task assignments. 2011-05-14 19:41:46 +02:00
user.rb Updated to rails 3.0.12. remove old gettext code. 2012-04-15 19:59:39 +02:00
workgroup.rb Merge branch 'master' into rails3 2012-06-26 11:51:56 +02:00