raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-01 21:47:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
7,711 Commits 18 Branches 452 Tags
052d6c6b0239bca5f4ae05ad4fd2c7b5b53b6f97
Commit Graph

242 Commits

Author SHA1 Message Date
Matt-Yorkley
2ad433590d Add roo gem 2017-03-17 16:11:52 +11:00
Rob Harrington
8e2a111a0b Changing ofn-qz to openfoodfoundation fork 2017-03-15 15:06:28 +11:00
Pierre de Lacroix
70707969f3 Add Qz integration 2017-03-15 15:06:28 +11:00
Matt-Yorkley
0a67876815 Update angular-file-uploader-rails to v1.1.6 2016-12-09 18:47:16 +00:00
Rohan Mitchell
6795237a2d Put timecop into safe mode and fix leaky Timecop.freeze 2016-11-25 14:14:42 +11:00
Rohan Mitchell
0e01350107 Use jquery-migrate instead of downgrading jQuery to access $.browser 2016-11-04 09:39:17 +11:00
Rohan Mitchell
d3a3b2da9a Pin jquery-rails to 2.1.4 (older version) to prevent missing $.browser errors 2016-11-04 09:39:17 +11:00
Rohan Mitchell
ab707cf312 Bundle incremental Spree upgrade 2016-11-04 09:39:17 +11:00
Maikel Linke
d40733d447 Add redirects to global site for /connect, /learn 2016-08-07 10:24:07 +10:00
Rohan Mitchell
4db29ce322 Update css_splitter, fixes problem with keyframes spanning limit 
https://github.com/zweilove/css_splitter/issues/53
 2016-07-29 11:53:46 +10:00
Rohan Mitchell
d3ad823d97 Remove CMS configuration, gem. Fix permalink check dependent on CMS glob path. 2016-07-29 09:18:30 +10:00
Rob Harrington
0586a71071 Bumping Poltergeist and Capybara versions 2016-05-25 08:10:20 +10:00
Rob Harrington
1b0897d53a Bump to AngularJS to 1.5.5 2016-05-25 08:10:20 +10:00
Rob Harrington
668bffcd84 Bumping AngularJS to 1.4.8 2016-05-25 08:10:20 +10:00
Rob Harrington
02be661163 Bumping angularjs version to 1.3.15 2016-05-25 08:10:20 +10:00
Maikel Linke
d12c486dd2 Use new spree_paypal_express branch to hide password 2016-04-01 15:48:21 +11:00
Maikel
ca0c677d46 Auto-merged master into uk/account-balances on deployment. 2016-03-19 07:16:41 +11:00
Maikel
f2c8ea9722 Auto-merged master into uk/account-balances on deployment. 2016-03-09 14:43:05 +11:00
Maikel Linke
9ce5c45799 Update gem nokogiri to 1.6.7.2 
Previous versions had security vulnerabilities. See:
http://rubysec.com/advisories/CVE-2015-5312/
 2016-03-09 14:34:25 +11:00
Rohan Mitchell
422061f137 Merge branch 'master' into products-caching 
Conflicts:
	app/controllers/shop_controller.rb
	app/models/enterprise_fee.rb
	app/models/order_cycle.rb
	app/models/variant_override.rb
	db/schema.rb
	lib/open_food_network/products_renderer.rb
	spec/lib/open_food_network/products_renderer_spec.rb
 2016-03-03 09:42:52 +11:00
Rob Harrington
f280b96215 Hiding a variant from inventory prevents it being available on the shopfront 
User preferences around inventory-only product selection immediately affect the shopfront
 2016-03-02 12:10:22 +11:00
Rohan Mitchell
1b62dd06b8 Add products cache integrity checker 2016-02-24 15:05:03 +11:00
Rohan Mitchell
9747b0cf96 Upgrade select2-rails 2016-02-24 11:26:37 +11:00
Steve Pettitt
0f4479aceb Back to original (current master) Rspec version 2016-01-15 09:07:50 +11:00
Rob Harrington
14c8683535 Updating active_model_serializers 2016-01-15 09:07:47 +11:00
Maikel Linke
749061d60a knapsack report generation 2016-01-13 15:05:48 +11:00
Maikel Linke
efa7c215e2 Removing usage of SimpleCov 2015-12-04 14:51:44 +11:00
Rob Harrington
6c254c534f Upgrade fog to resolve 'Digest::Digest is deprecated; use Digest' warning 2015-11-25 15:13:25 +11:00
Rob Harrington
76414dedff Bumping coffee-script version 2015-11-16 10:27:32 +11:00
Rob Harrington
a96cdd5ee7 Merge branch 'master' into line_item_naming 
Conflicts:
	app/views/admin/order_cycles/edit.html.haml
 2015-11-13 09:54:26 +11:00
Rob Harrington
2310bc95bc Committing changes to version used to bundle Gemfile.lock 2015-11-12 17:34:22 +11:00
Rob Harrington
be8038e9d0 Merge branch 'master' into line_item_naming 
Conflicts:
	lib/open_food_network/order_cycle_management_report.rb
	lib/open_food_network/packing_report.rb
 2015-11-12 14:40:11 +11:00
Rob Harrington
93caa4a11d Bumping poltergeist version to 1.7.0 2015-11-12 09:45:14 +11:00
Rohan Mitchell
e20d8d3e95 Merge branch 'master' into folklabs-producer-emails 2015-11-11 14:20:25 +11:00
Rob Harrington
b7d92786d0 Bumping ruby version to 2.1.5 2015-11-05 11:09:22 +11:00
Rob Harrington
aef8b9648e Initial upgrade of Gemfile 2015-11-05 11:09:21 +11:00
Rohan Mitchell
f63a80300b Merge branch 'master' into folklabs-producer-emails 2015-10-29 11:49:24 +11:00
Rob Harrington
3a505abfc7 Adding WickedPDF for generation of order invoices 2015-10-16 17:25:39 +11:00
Rohan Mitchell
ecc3bad8c8 Merge branch 'master' into folklabs-producer-emails 2015-10-16 12:38:54 +11:00
Rob Harrington
6489848eff Adding paper_trail gem 2015-09-17 22:37:33 +10:00
Maikel Linke
2488411b94 JS feature specs completing before cleaning db 
Some specs ran into a deadlock when the Database::Cleaner tried to do
its job while AJAX requests were still triggering other actions.
 2015-09-16 15:38:09 +10:00
Rohan Mitchell
af04c61528 Add rspec-retry for intermittently failing spec 2015-08-05 13:35:53 +10:00
Rohan Mitchell
a90666467a Add helper support to Reports DSL 2015-07-23 11:45:19 +10:00
Continuous Integration
c76021462c Auto-merge from CI [skip ci] 2015-06-16 14:12:16 +10:00
Rohan Mitchell
b540f645c3 Split CSS to overcome IE9's 4096 rule limit 2015-06-16 11:57:50 +10:00
Rohan Mitchell
4f311543ae Merge branch 'master' into enterprise-index-revamp 2015-06-12 10:26:11 +10:00
Rob Harrington
ff3d9e27ec Upgrade angular-rails-templates 2015-06-12 01:49:35 +08:00
Rohan Mitchell
d908701b59 Merge branch 'master' into folklabs-producer-emails 
Conflicts:
	Gemfile
 2015-06-11 17:02:34 +10:00
Rohan Mitchell
6dea3fa19d Merge branch 'fix-duplicate-fees' into combined/ginerr_bugfixes_fix-duplicate-fees 2015-06-11 12:56:32 +10:00
Rohan Mitchell
610a4c03fe Merge branch 'master' into redesign 
Conflicts:
	app/controllers/home_controller.rb
	app/views/producers/index.html.haml
	app/views/shared/menu/_mobile_menu.html.haml
	app/views/shop/products/_form.html.haml
	config/routes.rb
	spec/controllers/shops_controller_spec.rb
 2015-06-10 18:27:50 +10:00