Foodsoft
/
foodsoft
1
1
Fork 0
Code Issues 36 Pull Requests 5 Projects 1 Releases Wiki Activity
foodsoft/app/models
History
benni 0edd29dfd4 Merge branch 'master' into master-to-rails3 
Conflicts:
	Gemfile
	README_DEVEL
	app/controllers/articles_controller.rb
	app/controllers/orders_controller.rb
	app/controllers/tasks_controller.rb
	app/models/task.rb
	app/views/articles/_import_search_results.haml
	app/views/articles/index.haml
	app/views/messages/new.haml
	app/views/ordering/_order_head.haml
	app/views/ordering/my_order_result.haml
	app/views/orders/show.haml
	app/views/stockit/new.html.haml
	db/schema.rb
 		2012-12-14 18:10:46 +01:00
..
article.rb Fixed articles module. 2012-10-28 18:03:50 +01:00
article_category.rb Avoid deleting categories which still have articles. 2012-12-11 10:53:01 +01:00
article_price.rb Added validation for article_price. Avoid unit_quantity of 0. 2012-12-11 10:59:50 +01:00
assignment.rb Removed annoate and hirb Gemfiles. 2012-07-27 18:07:42 +02:00
delivery.rb Removed annoate and hirb Gemfiles. 2012-07-27 18:07:42 +02:00
financial_transaction.rb Removed annoate and hirb Gemfiles. 2012-07-27 18:07:42 +02:00
group.rb Removed annoate and hirb Gemfiles. 2012-07-27 18:07:42 +02:00
group_order.rb Upgraded to rails 3.1.8. Fixed various bugs in wiki. 2012-09-30 21:15:55 +02:00
group_order_article.rb Fixed finance module to work with bootstrap design. 2012-11-10 16:44:05 +01:00
group_order_article_quantity.rb Removed annoate and hirb Gemfiles. 2012-07-27 18:07:42 +02:00
invite.rb Fixed login, new_password and invitation views. 2012-10-08 11:51:56 +02:00
invoice.rb Removed annoate and hirb Gemfiles. 2012-07-27 18:07:42 +02:00
membership.rb Removed annoate and hirb Gemfiles. 2012-07-27 18:07:42 +02:00
message.rb Moved message delivering into background process. 2012-08-24 14:33:45 +02:00
order.rb Merge branch 'master' into master-to-rails3 2012-12-14 18:10:46 +01:00
order_article.rb Merge branch 'master' into master-rails3-merging 2012-12-11 10:32:59 +01:00
order_comment.rb Removed annoate and hirb Gemfiles. 2012-07-27 18:07:42 +02:00
ordergroup.rb Introduced actionbar. Some fixes for balancing page. 2012-11-12 13:13:01 +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 Performance improvement for stockit view. 2012-07-31 17:37:32 +02:00
stock_change.rb Fixed deliveries. 2012-10-17 20:45:52 +02:00
stock_taking.rb Removed annoate and hirb Gemfiles. 2012-07-27 18:07:42 +02:00
supplier.rb Fixed deliveries. 2012-10-17 20:45:52 +02:00
task.rb Merge branch 'master' into master-to-rails3 2012-12-14 18:10:46 +01:00
user.rb Merge branch 'master' into master-to-rails3 2012-12-14 18:10:46 +01:00
user_notifier.rb Moved notification about negative account balance to background. 2012-08-24 15:04:54 +02:00
workgroup.rb Big feactoring and bug fixing, Mailer, Tasks, GroupOrders 2012-08-24 11:11:40 +02:00