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

541 Commits

Author SHA1 Message Date
wvengen ef0888f38d add view for all transactions + csv 2014-06-23 17:51:17 +02:00
wvengen a7ebf78fd4 hide insignificant zeroes for percentage 2014-05-17 14:20:48 +02:00
wvengen cf0558b1ff localeapp roundtrip 2014-05-13 17:01:27 +02:00
wvengen 9821f111c2 add missing locale 2014-05-13 17:01:26 +02:00
wvengen 64bb8e043d enable/disable plugins by config option 2014-05-13 17:01:26 +02:00
wvengen 852f3484ad make settle directly less dangerous 
(closes foodcoops#275)
 2014-05-13 17:01:26 +02:00
wvengen ea8e4ee560 add pdf configuration options 2014-05-13 17:01:26 +02:00
wvengen d7938b752c fix simple_navigation ids 2014-05-13 17:01:26 +02:00
wvengen 9743a9f112 localeapp roundtrip 2014-05-13 17:01:25 +02:00
Robert Waltemath 7556c753d0 Extract message system to plugin. 2014-05-13 17:01:25 +02:00
wvengen fe0b17cdb0 cleanup email footer 2014-05-13 17:01:25 +02:00
wvengen c25d4d3f4f use ruby-units for unit parsing (closes foodcoops/foodsoft#200) 
Conflicts:
	Gemfile
	Gemfile.lock
 2014-05-13 17:01:25 +02:00
wvengen 48e9a3e4f5 add fax csv 2014-05-13 17:01:25 +02:00
wvengen 03585e272f add configuration for default language 2014-05-13 17:01:25 +02:00
wvengen 3f032e5dd9 make apple points optional 
a next step would be to move this to a plugin
 2014-05-13 17:01:25 +02:00
wvengen 0fa9bebac9 show supplier user-interface update 2014-05-13 17:01:24 +02:00
wvengen 0014435663 improved shared database import ui 2014-05-13 17:01:24 +02:00
wvengen 9214fff5a1 localeapp roundtrip (mostly formatting changes) 2014-03-15 17:17:25 +01:00
wvengen bb9269f755 avoid word-wrap when showing currency 2014-03-15 16:40:53 +01:00
wvengen ab514d7eb6 use encrypted cookies on new installations 2014-02-24 12:46:28 +01:00
wvengen 7841245795 migrate to Rails 4.0 (closes foodcoops#214) 
Conflicts:
	Gemfile.lock
 2014-02-24 12:46:28 +01:00
wvengen 346bf00b67 localeapp roundtrip (includes updated German translation) 2014-02-19 11:42:25 +01:00
wvengen e61b3dc248 update Dutch translation 2014-02-15 12:38:05 +01:00
wvengen 286c96196c localeapp roundtrip 2014-02-15 12:37:01 +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 f9d2c20aaa cleanup articles sorted in groups 2014-02-10 15:58:58 +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 d92f3f2298 deploy: persist changes to session_store iniitalizer [ci skip] 2014-02-03 10:53:22 +01:00
wvengen 3f12627aa4 Merge pull request #253 from wvengen/feature-cleaner_order_details 
cleanup show order and add search
 2014-01-29 08:44:31 -08:00
wvengen 381d5de0a3 Merge pull request #250 from wvengen/feature-deploy 
deployment with Capistrano 3 (in progress)
 2014-01-27 03:08:24 -08:00
wvengen d08f120b27 show message when ignoring articles due to missing order number 2014-01-24 22:20:29 +01:00
wvengen 2b0d4b0ad7 fix deploy_to, and use stage 2014-01-21 09:46:18 +01:00
wvengen 8db516c5f0 Merge branch 'master' into feature-cleaner_order_details 
Conflicts:
	app/assets/stylesheets/bootstrap_and_overrides.css.less
 2014-01-20 13:36:46 +01:00
wvengen c5cc714f9b add Dutch translation texts 2014-01-20 13:30:14 +01:00
wvengen 3b2d4dfd08 localeapp roundtrip 2014-01-20 12:59:57 +01:00
wvengen 9308096e96 Merge pull request #252 from wvengen/feature-fix_redirect_with_suburi 
fix root redirect when using suburi
 2014-01-20 03:13:25 -08:00
wvengen 6c0de3dc74 Merge remote-tracking branch 'foodcoop-rostock/fix-order-article-update' 
Conflicts:
	config/locales/de.yml
	config/locales/en.yml
 2014-01-20 12:12:00 +01:00
wvengen 8b4c292ea0 Merge pull request #222 from wvengen/feature-receive 
New receive screen
 2014-01-20 03:02:27 -08: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 d496c452e6 allow to enable/disable plugins in deploy 2014-01-15 21:41:54 +01:00
wvengen 46b36c42bd simplify initial database setup deployment rules 2014-01-15 21:40:51 +01:00
wvengen 151f851799 do not require authentication for root redirect 2014-01-15 16:33:13 +01:00
wvengen 4e68d3b7f5 remove dysfunctional deployment hook 2014-01-15 15:50:36 +01:00
wvengen ecb2f2a015 fix root redirect when using suburi 2014-01-15 15:43:29 +01:00
wvengen ca234f0b70 deployment with Capistrano 3 (affects foodcoops#148) 2014-01-15 13:58:24 +01:00
wvengen bab28d2770 i18n update 2014-01-13 23:23:37 +01:00
wvengen 8f0e3af2ba Merge pull request #221 from wvengen/feature-fix_float_display 
Fix float display
 2014-01-13 03:21:17 -08:00
wvengen 45e529b008 revert i18n attributes pluralisation 
until plataformatec/simple_form#974 has a solution
(reverts parts of ce17bf33e0 and 9db8cb72df)
 2014-01-11 16:30:17 +01:00
wvengen cb3e2f7ca0 Merge branch 'master' into feature-receive 
Conflicts:
	config/locales/de.yml
 2014-01-11 15:56:33 +01:00