Foodsoft
/
foodsoft
1
1
Fork 0
Code Issues 36 Pull Requests 5 Projects 1 Releases Wiki Activity
foodsoft/app/controllers
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
..
admin Fixed admin, orders, wiki views. Converted all erb to haml. 2012-10-15 21:19:17 +02:00
finance Merge branch 'master' into master-rails3-merging 2012-12-11 10:32:59 +01:00
foodcoop Fixed foodcoop/ordergroups and workgroups views. 2012-10-08 16:20:24 +02:00
application_controller.rb Fixed multi coop routing and changed config accessors. 2012-08-24 19:52:38 +02:00
article_categories_controller.rb Avoid deleting categories which still have articles. 2012-12-11 10:53:01 +01:00
articles_controller.rb Fixed finance module to work with bootstrap design. 2012-11-10 16:44:05 +01:00
deliveries_controller.rb Fixed encoding issues with ruby > 1.9.2.. 2012-04-16 08:49:54 +02:00
feedback_controller.rb Fixed feedback. 2012-11-10 17:05:43 +01:00
group_orders_controller.rb Fixed admin, orders, wiki views. Converted all erb to haml. 2012-10-15 21:19:17 +02:00
home_controller.rb Removed fancybox. Fixed profile, my ordergroup and tasks. 2012-11-12 09:18:44 +01:00
invites_controller.rb Fixed admin, orders, wiki views. Converted all erb to haml. 2012-10-15 21:19:17 +02:00
login_controller.rb Fixed login, new_password and invitation views. 2012-10-08 11:51:56 +02:00
memberships_controller.rb Bugfixing in memberships-filter. 2009-02-02 17:28:59 +01:00
messages_controller.rb Fixed messages. New styling for token input plugin. 2012-10-08 18:19:15 +02:00
order_comments_controller.rb Refactoring of order comments. 2011-06-19 20:47:27 +02:00
orders_controller.rb Save and display creator of Order 2012-11-12 14:24:49 +01:00
pages_controller.rb Fixed wiki pages. 2012-10-09 02:31:10 +02:00
sessions_controller.rb Fixed multi coop routing and changed config accessors. 2012-08-24 19:52:38 +02:00
stock_takings_controller.rb Fixed stockit. 2012-10-29 18:28:17 +01:00
stockit_controller.rb Upgraded to rails 3.1.8. Fixed various bugs in wiki. 2012-09-30 21:15:55 +02:00
suppliers_controller.rb Fixed encoding issues with ruby > 1.9.2.. 2012-04-16 08:49:54 +02:00
tasks_controller.rb Merge branch 'master' into master-to-rails3 2012-12-14 18:10:46 +01:00
users_controller.rb Some fixes for task module. 2011-05-15 22:06:54 +02:00