Foodsoft
/
foodsoft
1
1
Fork 0
Code Issues 36 Pull Requests 5 Projects 1 Releases Wiki Activity
1,435 Commits 22 Branches 1 Tag 31 MiB
Commit Graph

107 Commits

Author SHA1 Message Date
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
Benjamin Meichsner 4ea940e4a3 Removed unused acts_as_configurable gem. 2013-09-02 10:03:12 +02:00
wvengen eac8260b38 add i18n tests 2013-07-25 14:46:25 +02:00
wvengen ca50006235 add coverage report, set COVERAGE=1 in env when running specs 2013-07-25 14:00:08 +02:00
wvengen bb20e9abea Merge branch 'master' into tests-rspec 
Conflicts:
	Gemfile
	Gemfile.lock
 2013-07-24 21:25:36 +02:00
wvengen 62682b7e64 make integration test work 2013-07-24 12:37:20 +02:00
wvengen 0d33922ed9 make integration spec work with javascript driver too 2013-07-24 02:58:53 +02:00
wvengen d58ce31b7f add first integration test 2013-07-24 01:05:01 +02:00
wvengen b9599ce455 Merge branch 'master' into updated-gems 
Conflicts:
	Gemfile.lock
 2013-07-18 20:28:56 +02:00
wvengen 74bfc85562 Merge remote-tracking branch 'fsmanuel/master' into master. 
Updated migration date to today.

Conflicts:
	db/schema.rb
 2013-07-18 18:48:49 +02:00
wvengen eef4626107 Merge branch 'master' into updated-gems 
Conflicts:
	Gemfile.lock
	app/views/deliveries/_form.html.haml
 2013-07-17 11:04:28 +02:00
wvengen e5448603a4 update uglifier 2013-07-15 23:45:09 +02:00
wvengen 3c264f6225 add some rspec tests for supplier and article 2013-07-14 02:50:54 +02:00
wvengen fc6fbdaa95 use less-rails, and make exception_notifier work again 2013-07-13 23:06:30 +02:00
wvengen cfae279196 bundle update 2013-07-12 23:35:31 +02:00
wvengen 7fa8193010 start using rspec for tests 2013-07-12 20:06:49 +02:00
wvengen e9e7135639 run bundle update and make it work again 2013-07-08 14:32:24 +02:00
Julius Rapp a5565b436f Resolve merge conflicts 2013-07-07 14:58:57 +02:00
wvengen 8080cd6b7e pass locale to datepicker, use gem for that 2013-07-07 01:47:22 +02:00
Julius 6e6cce1cb7 Add Select2 jQuery plugin 2013-06-17 16:15:19 +02:00
Manuel Wiedenmann 5b7ec86ed6 Merge branch master into i18n 2013-06-14 02:02:57 +02:00
Manuel Wiedenmann 7a63394dac Merge remote-tracking branch 'origin/rails3' 
Conflicts:
	Gemfile
	Gemfile.lock
 2013-06-10 01:53:31 +02:00