Foodsoft
/
foodsoft
1
1
Fork 0
Code Issues 36 Pull Requests 5 Projects 1 Releases Wiki Activity
1,478 Commits 22 Branches 1 Tag 31 MiB
Commit Graph

25 Commits

Author SHA1 Message Date
wvengen 48e9a3e4f5 add fax csv 2014-05-13 17:01:25 +02:00
wvengen 7841245795 migrate to Rails 4.0 (closes foodcoops#214) 
Conflicts:
	Gemfile.lock
 2014-02-24 12:46:28 +01:00
wvengen 60826ceedc allow to edit GroupOrderArticle result from orders screen 
Conflicts:
	app/assets/javascripts/application.js
 2014-02-10 16:03:08 +01:00
wvengen 65041c78c5 allow to preselect order view 2014-01-17 15:04:03 +01:00
wvengen 1129cf4094 include comments link 2014-01-17 14:32:12 +01:00
wvengen 5b6d1a66a6 complete show order i18n 
Conflicts:
	app/helpers/orders_helper.rb
 2014-01-17 14:25:57 +01:00
wvengen 42d622d1b2 cleanup orders and add search 
Conflicts:
	app/assets/stylesheets/bootstrap_and_overrides.css.less
	app/views/orders/_articles.html.haml
	app/views/orders/show.html.haml
 2014-01-17 13:41:38 +01:00
wvengen 41ea9ed66e hide receive screen for stock orders 2013-12-21 17:36:25 +01:00
wvengen 84fe791078 update balancing screen 2013-12-18 22:10:38 +01:00
wvengen d299fa4870 move receive screen to orders 2013-12-18 21:08:58 +01:00
wvengen a0c6cf8afe fix warning without text 2013-12-18 16:04:30 +01:00
wvengen 135e938d3d i18n cleanups (affects #137) 2013-11-23 12:05:29 +01:00
wvengen 66ac3be81f Merge branch 'master' into allow-no-nickname 
Conflicts:
	app/views/home/ordergroup.html.haml
	app/views/login/new_password.html.haml
	app/views/shared/_auto_complete_users.rhtml
	app/views/shared/memberships/_current_members.rhtml
	app/views/shared/memberships/_non_members.rhtml
 2013-11-18 11:42:49 +01:00
wvengen de948d7692 fix and cleanup routing (closes foodcoops#190) 2013-10-30 02:27:04 +01:00
wvengen e4f0a1e3ed start of making nickname optional 2013-09-20 22:40:13 +02:00
wvengen 20533a5163 fix orders i18n 2013-02-11 15:34:31 +01:00
Manuel Wiedenmann 2d58054d1c added order for interpolation 2013-02-10 15:05:31 +07:00
wvengen e06524ca37 finish ordergroups and orders i18n + controller 2013-02-08 01:52:20 +01:00
benni 0dff5ea784 Fixed some bugs in tasks, apple feature: 
* Update ordergroup stats when task is destroyed.
* Removed assigned caching attribute in task object.
* A lot of eager loading for tasks controller.
 2012-12-16 19:07:45 +01:00
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
benni 552c553b77 Fixed admin, orders, wiki views. Converted all erb to haml. 2012-10-15 21:19:17 +02:00
benni 92649d3053 Removed acts_as_ordered. Fixed bug in group_orders archive. 2012-10-03 20:08:54 +02:00
benni eb532babd6 Refactored pdf generation with newest prawn. 2012-10-02 02:50:48 +02:00
benni ad508b207b Updated to rails 3.0.12. remove old gettext code. 2012-04-15 19:59:39 +02:00
benni b3c64ecb85 Fixed order views. 2011-06-20 00:26:17 +02:00
Renamed from app/views/orders/show.haml (Browse further)