Foodsoft/foodsoft
1
1
Fork 0
Code Issues 36 Pull requests 5 Projects 1 Releases Wiki Activity
1648 commits 22 branches 1 tag 31 MiB
Commit graph

65 commits

Author SHA1 Message Date
wvengen
647b7f0430 allow to synchronize all articles of a shared supplier 2014-09-02 12:58:31 +02:00
wvengen
16b78ba2a0 fix shared import paging without query 2014-09-02 12:58:31 +02:00
wvengen
e7a476e6b6 remove unused season import fields 2014-06-23 17:51:19 +02:00
wvengen
0014435663 improved shared database import ui 2014-05-13 17:01:24 +02:00
wvengen
7841245795 migrate to Rails 4.0 (closes foodcoops#214) 
Conflicts:
	Gemfile.lock
 2014-02-24 12:46:28 +01:00
wvengen
2de4a2a3a0 Merge pull request #256 from wvengen/feature-partial_shared_sync 
Small change to allow non-shared articles with shared suppliers
 2014-02-07 11:24:33 +01:00
wvengen
c322545f85 fix i18n buglet 2014-02-06 10:15:20 +01:00
wvengen
d08f120b27 show message when ignoring articles due to missing order number 2014-01-24 22:20:29 +01:00
wvengen
699be6a6d9 introduce new layout in balancing article screen as well 2013-12-23 16:11:14 +01:00
wvengen
3f497e9274 allow more than two columns in horizontal form 2013-12-10 23:41:45 +01:00
wvengen
85b6ff908b make new article dialog more responsive 2013-12-10 16:41:26 +01:00
wvengen
58de1a231b update price during editing as well 2013-12-10 13:30:15 +01:00
wvengen
62ca3cb634 small layout cleanup [ci skip] 2013-12-06 14:49:13 +01:00
wvengen
2f10210c76 remove unimplemented unit_divide box 2013-12-06 14:38:28 +01:00
wvengen
c99aa7aab6 add availability to article edit dialog 2013-12-06 14:33:51 +01:00
wvengen
923b579bd1 Merge branch 'master' into article-dialog 
Conflicts:
	app/assets/stylesheets/bootstrap_and_overrides.css.less
 2013-12-06 14:26:50 +01:00
wvengen
1c4b9591a2 fix edit article dialog title 2013-12-06 12:34:14 +01:00
wvengen
05b934e79f update fc price dynamically in article edit form 2013-12-06 12:19:13 +01:00
wvengen
84191ddcd0 first shot on improving edit article form 
(see also foodcoops#209)
 2013-11-20 23:46:11 +01:00
wvengen
de948d7692 fix and cleanup routing (closes foodcoops#190) 2013-10-30 02:27:04 +01:00
wvengen
23b38b5a46 fix category heading 2013-10-10 19:22:43 +02:00
wvengen
a9dff7f1df add missing i18n 2013-10-04 10:25:53 +02:00
wvengen
bbcad49831 start moving from simple_form i18n to activerecord 2013-10-03 16:03:13 +02:00
wvengen
1674dcf851 fix i18n of article sync 2013-10-03 14:36:53 +02:00
wvengen
a6688b3b43 import manufacturer and origin too (closes #140) 2013-07-06 17:48:40 +02:00
Benjamin Meichsner
eee5d4a896 Fixed indentation bug in sync template. 2013-06-16 15:10:50 +02:00
Julius
9753e6db00 Resolve merge conflicts with i18n 2013-06-10 20:05:47 +02:00
Robert Waltemath
b7416b2210 Fixed percent sign in sync-view. 2013-06-10 11:01:31 +02:00
Julius
ff343933dd Merge branch 'rails3' of http://github.com/balkansalat/foodsoft into rails3-show-percent-sign-in-views 2013-06-07 09:49:32 +02:00
Julius
0f4614eb31 Add percent sign for tax in forms 2013-06-06 17:58:02 +02:00
wvengen
f6ba21832d Merge remote-tracking branch 'bennibu/rails3' into rails3 
Conflicts:
	app/controllers/articles_controller.rb
	app/views/articles/_form.html.haml
	app/views/articles/sync.html.haml
	app/views/finance/balancing/_edit_note.html.haml
	app/views/finance/group_order_articles/_form.html.haml
	app/views/finance/order_articles/_edit.html.haml
	app/views/finance/order_articles/_new.html.haml
	app/views/group_orders/show.html.haml
	app/views/invites/_modal_form.html.haml
 2013-04-12 15:45:24 +02:00
wvengen
6c65799025 use more beautiful close mark 2013-04-10 17:34:24 +02:00
Benjamin Meichsner
4966aae0ad Fixed modal forms. Submit form when hitting enter. 2013-04-08 14:27:23 +02:00
Benjamin Meichsner
13e921a632 Fixed some errors in articles#sync. Show better error messages. 2013-04-08 01:00:49 +02:00
wvengen
f1d6df9ecc move commonly used verbs to common i18n identifier 2013-04-04 02:49:52 +02:00
wvengen
e1f5969719 use short form plus title for unit quantity 2013-04-04 00:24:14 +02:00
wvengen
aabeb1a332 finish articles i18n 2013-03-22 00:20:37 +01:00
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
Benjamin Meichsner
6745b79bb9 Allow importing articles again, when article was deleted before. 2013-03-17 20:02:14 +01:00
Benjamin Meichsner
329c451774 Fixed articles sync view. 2013-03-17 17:47:37 +01:00
Benjamin Meichsner
07581b7ecf Removed acts_as_paranoid. Implemented own version. 2013-03-16 17:57:38 +01:00
Benjamin Meichsner
50873addf8 Fixed deleting of articles. Added missing id. 2013-03-09 16:46:33 +01:00
wvengen
cb537bc11c start articles i18n 2013-03-09 00:40:07 +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
1d9815731c Removed fancybox. Fixed profile, my ordergroup and tasks. 2012-11-12 09:18:44 +01:00
benni
0236fb5a60 Fixed finance module to work with bootstrap design. 2012-11-10 16:44:05 +01:00
benni
fc1c173718 Fixed articles module. 2012-10-28 18:03:50 +01:00
benni
f30e57dd49 Fixed articles views. 2012-10-19 01:12:47 +02:00
benni
552c553b77 Fixed admin, orders, wiki views. Converted all erb to haml. 2012-10-15 21:19:17 +02:00
benni
e9383e0d17 Remove searching shared articles by list. 
This is necessary to go with newest fixes in sharedlists app.
 2012-10-13 22:19:01 +02:00