Commit Graph

132 Commits

Author SHA1 Message Date
wvengen 4a9cf862be Merge pull request #373 from foodcoops/feature/current-orders-plugin
Add current_orders plugin
2015-08-07 19:36:05 +02:00
wvengen dc731ee40d Make current_orders plugin configurable 2015-07-21 00:13:15 +02:00
wvengen 9efa9d5d43 Handle errors using Gaffe 2015-07-21 00:08:17 +02:00
wvengen ae4979a3f0 Lock protected_attributes version to make tests succeed (for now) 2015-07-20 23:55:44 +02:00
wvengen 12dae9cee8 Use inherited_resources rubygem 2015-06-05 14:59:54 +02:00
wvengen f5a7c4c90a Bundle update 2015-05-30 19:12:33 +02:00
wvengen 491ca00949 Update roo 2015-05-30 19:09:58 +02:00
wvengen 7f9c99f849 Use main ice_cube gem now feature is merged 2015-05-30 18:31:49 +02:00
wvengen b3196e0a12 Use tokeninput as dependency 2015-05-08 17:56:08 +02:00
wvengen aa7a2a31ae Bundle update & restructure tests (RSpec 3) 2015-04-25 17:14:37 +02:00
wvengen 07ba6f0535 Import multiple spreadsheet formats. Make upload work like sync. 2015-04-11 02:52:57 +02:00
wvengen 7be903c209 Fix simple-navigation version to be sure 2015-04-11 02:13:28 +02:00
wvengen 987f14c226 Add missing gem (since Rails 4.2 upgrade) 2015-01-16 20:22:32 +01:00
wvengen 68f56a55e5 Merge pull request #333 from foodcoops/feature/plugin-uservoice
Add uservoice plugin
2015-01-02 23:22:12 +01:00
wvengen 7bc9d0ede6 Upgrade to rails 4.2 2015-01-02 17:43:44 +01:00
wvengen f72da3b5c9 Add uservoice plugin 2014-12-16 22:43:46 +01:00
wvengen 7ac3f54709 bundle update 2014-12-10 20:07:26 +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 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 fe38e168bd bundle update 2014-10-16 20:57:44 +02:00
wvengen da2b5b54d0 fix pdf generation after last bundle update (complements 61a1efdfcf) 2014-09-02 15:41:43 +02:00
wvengen 21838e9c84 prepare for RSpec 3.0 2014-08-19 11:53:01 +02:00
wvengen fcd2cd8713 update documentation generation 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 06bed3698f upgrade rails-settings-cached & bundle update 2014-06-23 17:51:19 +02:00
wvengen f2c755d2fb fix Gemfile (rspec would fail) 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 24b0628825 add yard documentation config 2014-06-23 17:51:18 +02:00
wvengen caed27948d add meta_request gem for debugging 2014-05-17 16:01:17 +02:00
wvengen 0bbe5ebcee bundle update 2014-05-13 17:01:27 +02:00
Robert Waltemath 7556c753d0 Extract message system to plugin. 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 7841245795 migrate to Rails 4.0 (closes foodcoops#214)
Conflicts:
	Gemfile.lock
2014-02-24 12:46:28 +01:00
wvengen e88810e4a7 fix "Mysql2::Error: This connection is in use by" in spec for Rails 4
Conflicts:
	Gemfile
	Gemfile.lock
2014-02-10 15:58:52 +01:00
wvengen ca234f0b70 deployment with Capistrano 3 (affects foodcoops#148) 2014-01-15 13:58:24 +01:00
wvengen 64040d6bb9 make some dependencies optional to decrease startup-time 2013-12-17 23:03:48 +01:00
wvengen 147365cba1 update coverage and use coveralls.io 2013-12-16 23:11:39 +01:00
wvengen 8ac7cbf96f retry tests as a workaround for fragile integration tests (closes foodcoops#205) 2013-11-21 00:29:24 +01:00
wvengen fd3aa7ebc9 move dependency to wiki plugin 2013-11-06 13:43:04 +01:00
wvengen 70c12b7c1f move wiki functionality to plugin 2013-10-29 22:42:06 +01:00
wvengen d4dccbc646 add foodsoft_wiki plugin to Gemfile by default 2013-10-29 22:23:17 +01:00
wvengen 7779c15dc9 update testing gems to try fixing occasional integration test error 2013-10-29 21:31:07 +01:00
wvengen 98e7189d31 Merge branch 'master' into i18n
Conflicts:
	app/assets/javascripts/application.js
2013-10-18 12:30:34 +02:00
wvengen 6e5184d796 use rails-i18n translations 2013-10-17 16:43:14 +02:00
wvengen 34a4951e28 Merge branch 'master' into i18n
Conflicts:
	Gemfile
	config/locales/de.yml
	config/locales/en.yml
2013-10-09 23:57:43 +02:00
wvengen bdce1b5872 Merge branch 'master' into updated-gems
Conflicts:
	Gemfile
	Gemfile.lock
2013-10-09 10:37:02 +02:00
Julius 3a948e9b73 Move list.js extensions to plugins 2013-10-04 18:28:45 +02:00
wvengen 64a597c689 use i18n-js 2013-10-04 15:01:10 +02:00