Commit Graph

552 Commits

Author SHA1 Message Date
wvengen d8f4ac47dd handle ajax errors (closes foodcoops#300) 2014-07-02 13:55:05 +02:00
wvengen 94e100b78b localeapp roundtrip 2014-06-23 17:51:20 +02:00
wvengen cdc746b364 update production environment to match 3.3.0 version 2014-06-23 17:51:20 +02:00
wvengen ae392ad861 fix number display 2014-06-23 17:51:20 +02:00
wvengen 873e8d44a2 harmonize foodsoft capitalisation 2014-06-23 17:51:20 +02:00
wvengen 6466ea9653 revamp footer 2014-06-23 17:51:20 +02:00
wvengen a43020463d normalize article and category attributes (closes foodcoops#294) 2014-06-23 17:51:19 +02:00
wvengen e7a476e6b6 remove unused season import fields 2014-06-23 17:51:19 +02:00
wvengen 99301a0576 make Redis a softer dependency
(closes foodcoops#288)
2014-06-23 17:51:18 +02:00
wvengen c54e15dc04 localeapp roundtrip 2014-06-23 17:51:18 +02:00
wvengen 8c0df3b4e8 edit order user-interface update
also closes foodcoops#145
2014-06-23 17:51:18 +02:00
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