Commit Graph

1612 Commits

Author SHA1 Message Date
wvengen f09ef892dc add foodsoft_config protection whitelisting 2014-09-02 15:02:25 +02:00
wvengen 3fee071a10 specify timezone in configuration (closes foodcoops#282) 2014-09-02 14:21:33 +02:00
wvengen daae87f6d5 fix deprecation warning 2014-09-02 14:21:32 +02:00
wvengen 6115979bae allow protected keys to be set/unset + config_db tests 2014-09-02 14:21:32 +02:00
wvengen 9beaac2627 allow to specify (un)checked values for config boolean
Conflicts:
	app/helpers/admin/configs_helper.rb
2014-09-02 14:21:32 +02:00
wvengen 34e8901d04 let plugins define their own foodcoop-config defaults 2014-09-02 14:21:32 +02:00
wvengen 429e111db4 hide protected keys from config 2014-09-02 14:21:32 +02:00
wvengen 90f60595e6 don't fail in foodsoft_config without database,
and use proper config defaults so that configuration editing has
sensible default values
2014-09-02 14:21:32 +02:00
wvengen 7b000c39eb add foodcoop configuration screen 2014-09-02 14:21:32 +02:00
wvengen dd3ac0971c allow to put foodcoop config in database 2014-09-02 14:21:32 +02:00
wvengen a39c56fdf1 update strings from localeapp 2014-09-02 14:21:15 +02:00
wvengen b5ddbcae21 make custom css more robust 2014-09-02 14:15:59 +02:00
wvengen 97dc090e4d Merge pull request #306 from wvengen/feature-styling
allow foodcoops to add custom css
2014-09-02 13:59:18 +02:00
wvengen 19630e8607 allow foodcoops to add custom css 2014-09-02 13:35:45 +02:00
wvengen 9343b965a0 Merge pull request #287 from wvengen/feature-sync_all
Allow to synchronise all articles + category matching
2014-09-02 13:11:08 +02:00
wvengen 8473f16091 query performance improvements 2014-09-02 12:58:32 +02:00
wvengen 647b7f0430 allow to synchronize all articles of a shared supplier 2014-09-02 12:58:31 +02:00
wvengen 3918e22214 synchronize price on two decimal places only 2014-09-02 12:58:31 +02:00
wvengen d9c61b2db3 allow to match category names on import/sync 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 d906a7342f workaround receive error with many articles 2014-09-02 12:35:57 +02:00
wvengen 63d52db91b more sensible mailer option defaults
Conflicts:
	app/mailers/base_mailer.rb
	config/app_config.yml.SAMPLE
	spec/app_config.yml
2014-09-02 12:35:57 +02:00
wvengen ecf5601023 make missing_units get correct details for closed orders 2014-09-01 12:25:42 +02:00
wvengen 0b08d461fa remove html escaping from all text mails 2014-09-01 11:08:32 +02:00
wvengen 8913ad615c show articles ordered by members but not by foodcoop dimmed in receive 2014-08-29 12:23:23 +02:00
wvengen 790a6b1972 allow to set page break options for each document 2014-08-29 12:01:21 +02:00
wvengen 72709be60a try workaround for failing test
(closes foodcoops#303)
2014-08-25 18:29:59 +02:00
wvengen 21838e9c84 prepare for RSpec 3.0 2014-08-19 11:53:01 +02:00
wvengen 61a1efdfcf bundle update 2014-08-19 10:50:10 +02:00
wvengen e61c3c9267 order articles by number then name in fax+receive
This makes it easier to enter the receive screen from an order pdf print
with received amounts.

Conflicts:
	app/documents/order_fax.rb
2014-08-19 09:19:01 +02:00
wvengen fd8b9ac19d expand gitignore [ci skip] 2014-07-09 14:26:49 +02:00
wvengen 94639b2817 Merge pull request #302 from orangeman/patch-1
typo
2014-07-09 10:31:40 +02:00
flo detig c8f699535b typo 2014-07-08 21:32:52 +02:00
wvengen d8f4ac47dd handle ajax errors (closes foodcoops#300) 2014-07-02 13:55:05 +02:00
wvengen fa725dbf38 fix csv download also when searching 2014-07-02 09:37:03 +02:00
wvengen c80a9cd68b fix csv download (closes foodcoop-adam#129) 2014-07-01 11:14:35 +02:00
wvengen 5349add890 fix fax txt table 2014-07-01 10:12:59 +02:00
wvengen d375572358 continue development after release 2014-06-24 09:13:50 +02:00
wvengen 88252e034f Bumped new version: 4.1.0 2014-06-24 09:13:50 +02:00
wvengen 133b832d78 fix database migrations 2014-06-24 09:13:35 +02:00
wvengen 94e100b78b localeapp roundtrip 2014-06-23 17:51:20 +02:00
wvengen fcd2cd8713 update documentation generation 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 59ab628e2f fix layout bug 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 86c972a201 fix document indentation 2014-06-23 17:51:20 +02:00
wvengen 6466ea9653 revamp footer 2014-06-23 17:51:20 +02:00
wvengen 81c18097a5 update doc [ci skip] 2014-06-23 17:51:20 +02:00
wvengen d0790609f6 Add Inch CI (documentation status) badge 2014-06-23 17:51:20 +02:00