Commit Graph

128 Commits

Author SHA1 Message Date
Benjamin Meichsner 4718255015 Updated selecium-webdriver to 2.43.0.
Works now with recent firefox/ubuntu.
2014-09-21 12:37:47 +02:00
wvengen 7a9dd4edec bundle update 2014-09-02 15:49:50 +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 61a1efdfcf bundle update 2014-08-19 10:50:10 +02:00
wvengen fcd2cd8713 update documentation generation 2014-06-23 17:51:20 +02:00
wvengen b1d085c618 bundle update 2014-06-23 17:51:19 +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 ea2ae21923 bundle update 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 f221af4992 bundle update (rails CVEs) 2014-05-13 17:01:27 +02:00
wvengen 0bbe5ebcee bundle update 2014-05-13 17:01:27 +02:00
wvengen ce0ee6773a bundle update 2014-05-13 17:01:26 +02:00
wvengen a12dbde671 bundle update 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 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 775137f7c0 bundle update
Forcing rails to version 3.2.17 because of CVE-2014-0081
Forcing net-ssh to version 2.7.0 because of https://github.com/net-ssh/net-ssh/issues/148
2014-02-19 16:54:58 +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 abb3770d08 bundle update 2014-01-08 14:39:17 +01:00
Manuel Wiedenmann 0d0ff90a64 adds an RSS feed for pages/all 2014-01-04 20:12:01 +01:00
wvengen b4dfa50409 bundle update 2013-12-18 11:10:00 +01:00
wvengen 147365cba1 update coverage and use coveralls.io 2013-12-16 23:11:39 +01:00
wvengen 2408545496 bundle update (fixes rails vulnerability) 2013-12-04 21:07:50 +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 3b8dfa7173 bundle update 2013-11-18 12:12: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 b314363ce3 bundle update 2013-10-24 10:11:26 +02: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 1afd8b8387 bundle update 2013-10-10 17:47:12 +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
wvengen 75e858db71 bundle update 2013-10-02 22:55:14 +02:00
wvengen 19a61a6c42 update gems 2013-09-18 16:53:49 +02:00
wvengen 0abb63279f Merge branch 'master' into updated-gems
Conflicts:
	Gemfile.lock
2013-09-18 13:00:26 +02:00
wvengen 1cf2145ff6 version update for security (now properly) (see also resque/redis-namespace#64) 2013-09-17 15:02:58 +02:00
wvengen e6320e5b7b add resque version for security 2013-09-17 14:49:19 +02:00
wvengen 707f487128 update spec gems to make tests work again 2013-09-07 01:34:34 +02:00
wvengen 7de57715f2 Merge branch 'master' into tests-rspec
Conflicts:
	Gemfile
2013-09-07 01:11:24 +02:00