Commit graph

1090 commits

Author SHA1 Message Date
wvengen
d1ece157c6 Get rid of last empty page in PDFs 2015-01-03 00:24:33 +01:00
wvengen
1b9b81fa75 Make sync work when unit has no name
(closes foodcoops#337)

Conflicts:
	app/models/article.rb
2015-01-02 23:20:36 +01:00
wvengen
f340b127dc Fix fast test failing 2015-01-02 18:08:38 +01:00
wvengen
1c0db4374f Merge pull request #332 from foodcoops/feature/edit-address
Allow to edit address from user profile
2014-12-23 21:00:20 +01:00
wvengen
bf6a31a032 Cleanup groups view on profile page 2014-12-16 21:14:20 +01:00
wvengen
86eee94249 Add hint for ordergroup address in user form 2014-12-16 20:53:38 +01:00
wvengen
12bf2198e5 fix simple_form deprecations 2014-12-10 22:04:32 +01:00
wvengen
56f6efa590 Allow to edit address from user profile 2014-12-10 21:27:53 +01:00
wvengen
cee2ac8f9f Merge pull request #331 from foodcoops/feature/configure-upfront-tasks
Configure upfront tasks
2014-12-06 14:35:22 +01:00
wvengen
5c78bdde7e Cleanup old task-related i18n 2014-11-23 01:42:15 +01:00
wvengen
f6c008c79c Allow configuration of task periods 2014-11-23 01:34:51 +01:00
wvengen
219eb71bc9 Allow to specify an order schedule for new orders. 2014-11-23 00:38:13 +01:00
wvengen
6e990fed4c Upgrade to rails 4.1 2014-11-21 14:37:56 +01:00
wvengen
6188567931 hide message preferences when messages are disabled 2014-11-20 23:11:04 +01:00
wvengen
68d54e7e25 add sudo functionality 2014-10-18 17:58:31 +02:00
wvengen
7826d2f674 move login and logout to separate methods
Conflicts:
	app/controllers/sessions_controller.rb

Conflicts:
	app/controllers/application_controller.rb
	app/controllers/sessions_controller.rb
2014-10-18 17:57:07 +02:00
wvengen
c585f53f54 Merge pull request #315 from wvengen/feature/db_seeds
more extensive database seeds (in two languages)
2014-10-16 20:43:11 +02:00
wvengen
9e7b2321cd Merge pull request #316 from wvengen/feature/disable_config_validation
disable config validation (closes foodcoops#313)
2014-10-09 09:45:53 +02:00
wvengen
9a7b3378c3 Make invalid login message depend on use_nick (closes foodcoops#321) 2014-10-09 09:42:13 +02:00
wvengen
a594dffed2 disable config validation (closes foodcoops#313) 2014-09-30 15:09:47 +02:00
wvengen
0e1cde9e2b more extensive database seeds (in two languages) (closes foodcoops#277) 2014-09-29 17:26:27 +02:00
Benjamin Meichsner
cc4e925c1a Fixed ensure_open_order filter on missing id params. 2014-09-23 10:39:10 +02:00
Benjamin Meichsner
91bcf0c580 Avoid out of range error when using big numbers in financial transactions.
The database schema allows numbers up (+/-) 999_999.99. But as we are also adding the amount to the Ordergroup#account_balance, we use lower barriers to avoid running in errors when updating the account balance.

So, technically the user has to make 10 times the maximum input to raise an account balance error. This should be sufficient, I hope.
2014-09-22 11:36:10 +02:00
wvengen
71324ce5db be more robust showing config list 2014-09-22 09:38:23 +02:00
wvengen
668ba1e5d6 add webstats_tracking_code to configuration screen (closes foodcoops#311) 2014-09-22 09:36:36 +02:00
Benjamin Meichsner
81d22e6077 Allow adding tracking code for webstatistics service. E.g. piwik. 2014-09-22 09:15:47 +02:00
Benjamin Meichsner
0231df9d5b Delete memberships when deleting associated groups. 2014-09-21 12:47:58 +02:00
wvengen
418a8b5806 fix i18n issues + localeapp roundtrip
thanks, i18n-tasks!
2014-09-15 13:52:35 +02:00
wvengen
cf360335ee fix articles with zero quantity showing
complements 8913ad615c
2014-09-11 13:47:03 +02:00
wvengen
ee1874a15f fix upload error 2014-09-10 14:42:44 +02:00
wvengen
f18cc367ae workaround for CVE-2014-4920 2014-09-10 13:27:45 +02:00
wvengen
a699f95903 fix fax documents for stock orders (closes foodcoops#79) 2014-09-02 15:47:01 +02:00
wvengen
1a3b690757 add custom css to config screen 2014-09-02 15:02:26 +02:00
wvengen
cf680d3410 add page break to config screen 2014-09-02 15:02:26 +02:00
wvengen
0f7dc37015 fix config value override
Conflicts:
	app/helpers/admin/configs_helper.rb
2014-09-02 15:02:25 +02:00
wvengen
68ccc19c70 allow to configure currency (closes foodcoops#258) 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
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
429e111db4 hide protected keys from config 2014-09-02 14:21:32 +02:00
wvengen
7b000c39eb add foodcoop configuration screen 2014-09-02 14:21:32 +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
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