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

600 Commits

Author SHA1 Message Date
Julius 9502ca28dd Merge latest changes in master 2013-06-17 15:47:08 +02:00
Julius a9938df443 Clean up sort functionality; Remove title attributes due to hard I18n 2013-06-17 15:43:42 +02:00
Benjamin Meichsner eee5d4a896 Fixed indentation bug in sync template. 2013-06-16 15:10:50 +02:00
Benjamin Meichsner 8c4da55561 Merge branch 'show-percent-sign' of git://github.com/foodcoop-rostock/foodsoft into foodcoop-rostock-show-percent-sign 2013-06-16 14:55:48 +02:00
wvengen 713c030213 i18n and translate missing entry 2013-06-15 18:43:42 +02:00
Julius b5acd9b116 Merge master branch of base 2013-06-14 18:59:17 +02:00
wvengen ac62dcce9d make touch device events work on buttons (closes foodcoop-rostock/foodsoft#34, closes foodcoops/foodsoft#104) 2013-06-14 01:42:47 +02:00
wvengen 8141ad0233 remove duplicate code 2013-06-14 01:39:30 +02:00
wvengen 13f2c128c6 do not use string values for integers (closes foodcoops/foodsoft#128) 2013-06-14 01:36:41 +02:00
Julius 3a48d1576f Remove broken sort-by-price; comment redundancy of stock_change template 2013-06-13 23:51:37 +02:00
Julius 65f61e09d5 Improve delivery workflow; introduce sortable tables; use js.erb for deliveries 2013-06-13 23:36:22 +02:00
wvengen 3d1847fabb small i18n and translation updates 2013-06-12 22:44:51 +02:00
Julius 49cfa9aded Cleanup StockArticle creation during delivery 2013-06-11 15:05:19 +02:00
Julius e28f3eda65 Fix StockArticle creation during delivery; small cleanups 2013-06-11 13:10:18 +02:00
wvengen b7f71f5859 fix reset password breakage by avoiding encoding ampersand in url (closes #123) 2013-06-11 00:01:57 +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
Manuel Wiedenmann 7a63394dac Merge remote-tracking branch 'origin/rails3' 
Conflicts:
	Gemfile
	Gemfile.lock
 2013-06-10 01:53:31 +02:00
Benjamin Meichsner 241c5666ec Merge pull request #119 from balkansalat/rails3-improve-checkall-performance 
Improve performance of *check-all* checkbox
 2013-06-09 09:19:19 -07:00
Benjamin Meichsner fd091d9b89 Merge pull request #118 from balkansalat/rails3-order-delivery-articles 
Order articles for delivery selection by name only
 2013-06-09 09:15:20 -07:00
Benjamin Meichsner 7c4ee01ff2 Define autofill attributes when creating new supplier from shared_supplier. 2013-06-09 18:02:47 +02:00
Benjamin Meichsner 60afa85ece Merge pull request #116 from balkansalat/rails3-balancing-delete-article 
Update ordergroup prices in OrderArticles via Order.
 2013-06-09 08:26:38 -07:00
Julius 0ebe38b7a9 Merge branch 'rails3' of http://github.com/balkansalat/foodsoft into rails3-improve-checkall-performance 2013-06-07 09:52:56 +02:00
Julius 966902ff55 Merge branch 'rails3' of http://github.com/balkansalat/foodsoft into rails3-order-delivery-articles 2013-06-07 09:51:50 +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 0058e826b2 Reorder delivery articles 2013-06-07 09:35:22 +02:00
Julius 0f4614eb31 Add percent sign for tax in forms 2013-06-06 17:58:02 +02:00
Julius b8a23a396c Remove test variable 2013-06-06 17:09:22 +02:00
Julius 0d3c23f814 Improve performance of data-check-all 2013-06-06 17:06:05 +02:00
wvengen 8929f69dc4 add missing i18n text 2013-06-06 02:42:38 +02:00
wvengen c38ce28347 fix i18n bug 2013-06-06 02:13:40 +02:00
Robert Waltemath 82fb6d1dbe Update ordergroup prices in OrderArticles via Order. Should fix bennibu#112. 2013-06-06 00:37:50 +02:00
wvengen 043fc6391c show header on fax PDF (closes bennibu#109) 2013-06-04 13:08:50 +02:00
Robert Waltemath 2a1176c31a Update ordergroup prices in OrderArticles via Order. Should fix bennibu#112. 2013-05-30 10:54:22 +02:00
wvengen 3b7cbf71e0 fix i18n typos 2013-05-16 00:05:47 +02:00
wvengen 0c94ef5912 also translate mail subjects 2013-05-07 13:28:14 +02:00
wvengen 8b559269c9 add deliveries, pages, tasks translation in English 2013-05-06 12:43:57 +02:00
wvengen 53d5eabf79 fix login i18n 2013-04-26 21:35:23 +02:00
wvengen 5e2a3fb3f0 fix articles controller i18n 
Conflicts:

	app/controllers/articles_controller.rb
 2013-04-12 16:17:12 +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 70542c1ad7 update en translation 2013-04-12 01:30:02 +02:00
wvengen 368d44e26b fix tasks error reference 2013-04-12 01:08:35 +02:00
wvengen 692c70d324 finish pages i18n 2013-04-12 00:59:45 +02:00
wvengen 1a8c8537a4 finish tasks i18n 2013-04-12 00:00:02 +02:00
wvengen 6c65799025 use more beautiful close mark 2013-04-10 17:34:24 +02:00
wvengen a501fac76f helpers i18n 2013-04-10 17:29:06 +02:00
wvengen 3f82138d84 finish deliveries i18n 2013-04-10 17:02:16 +02:00
wvengen ee5f7ff1b8 small i18n/translation fixes 2013-04-10 14:07:59 +02:00
Benjamin Meichsner 3e9ca336a8 Fixed loosing assignments when updating a task. 2013-04-10 10:55:43 +02:00
Benjamin Meichsner 93f4239db6 Fixed wrong articles total in group_order#show. 
Conflicts:

	app/views/group_orders/show.html.haml
 2013-04-10 10:54:56 +02:00