Commit Graph

1624 Commits

Author SHA1 Message Date
wvengen b080fb5fda bundle update 2014-12-15 21:15:47 +01:00
wvengen 0aa098e75b localeapp roundtrip 2014-12-15 21:11:41 +01:00
wvengen 8e4f3a4caf Increase account_balance precision (closes foodcoops/foodsoft#322) 2014-12-11 22:12:19 +01:00
wvengen 12bf2198e5 fix simple_form deprecations 2014-12-10 22:04:32 +01:00
wvengen 7ac3f54709 bundle update 2014-12-10 20:07:26 +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 a278004c11 Merge pull request #330 from foodcoops/feature/plugin-move
Move plugins to separate directory.
2014-12-02 23:37:22 +01:00
wvengen e63a34edd3 Merge pull request #329 from foodcoops/feature/order-schedule
Allow to specify an order schedule for new orders.
2014-12-02 23:37:02 +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 6aa8ee7968 Move plugins to separate directory. 2014-11-22 00:43:24 +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 d83ce60516 Merge pull request #323 from wvengen/feature/sudo
sudo functionality
2014-11-17 16:46:55 +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 fe38e168bd bundle update 2014-10-16 20:57:44 +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 51830f6ca4 continue development after release 2014-10-14 18:42:19 +02:00
wvengen 071dd326fc Bumped new version: 4.2.0 2014-10-14 18:41:04 +02:00
wvengen e9dcaadb06 localeapp roundtrip 2014-10-14 18:39:05 +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 575928d8a3 fix use_messages heading in config screen (closes foodcoops#319) 2014-10-07 01:07:11 +02:00
Benjamin Meichsner b961037fff Fixed broken login#update_password route. 2014-10-05 20:35:28 +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 8e04074cd3 Fixed I18n.locale bu in wiki page. 2014-09-23 19:04:23 +02:00
Benjamin Meichsner cc4e925c1a Fixed ensure_open_order filter on missing id params. 2014-09-23 10:39:10 +02:00
Benjamin Meichsner d9e8f29d44 Fixed number_to_currency bug in financial transaction csv export. 2014-09-22 17:37:51 +02:00
wvengen 93ece7fb05 Merge pull request #312 from aboutsource/fix_out_of_range_amount_input
Avoid out of range error when using big numbers in financial transactions
2014-09-22 14:30:38 +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
Benjamin Meichsner 9b03ac9a7c Do not fail over missing user, when building rss feed. 2014-09-22 11:02:45 +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
wvengen 459b2826d3 Merge pull request #310 from aboutsource/fix_deleting_memberships_on_workgroup_destroy
Fix deleting memberships on workgroup destroy
2014-09-22 09:06:25 +02:00
wvengen de3a755f3a Merge pull request #308 from aboutsource/fix_rspec_type_deprecation_warning
Fixed rspec deprecation warning concerning spec type.
2014-09-22 08:53:34 +02:00
wvengen e816d78770 Merge pull request #309 from aboutsource/update_selenium_webdriver
Updated selenium-webdriver to 2.43.0.
2014-09-22 08:48:57 +02:00
Benjamin Meichsner c750416b9e Remove all memberships where belonging group was deleted. 2014-09-21 12:54:01 +02:00
Benjamin Meichsner 0231df9d5b Delete memberships when deleting associated groups. 2014-09-21 12:47:58 +02:00
Benjamin Meichsner 4718255015 Updated selecium-webdriver to 2.43.0.
Works now with recent firefox/ubuntu.
2014-09-21 12:37:47 +02:00
Benjamin Meichsner d2a218c9fa Fixed rspec deprecation warning concerning spec type. 2014-09-21 12:28:00 +02:00
wvengen 418a8b5806 fix i18n issues + localeapp roundtrip
thanks, i18n-tasks!
2014-09-15 13:52:35 +02:00
wvengen 8b83787252 simplify config loading 2014-09-11 16:40:21 +02:00
wvengen 92b6e6e28e fix encoding issue (for Ruby 1.9) 2014-09-11 14:46:50 +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