Em-AK
a70cdaadb6
Start spree upgrade step 5
2017-09-08 23:55:49 +10:00
Em-AK
8a42b606eb
Start spree upgrade step 4
2017-09-08 23:55:49 +10:00
Em-AK
31f2551116
Update the JS unit spec to the new endpoint
2017-09-08 23:55:49 +10:00
Em-AK
1136cb40a9
Revert to OFN spree fork
...
This reverts commit 92f50d96803f9d0f302be51aad085c9a68ec4c32.
And bundle update to the last commit of openfoodfoundation/spree, branch: spree-upgrade-step-3
2017-09-08 23:55:49 +10:00
Em-AK
f22a12d657
Revert later: depend on our spree fork
2017-09-08 23:55:49 +10:00
Em-AK
d68104cecb
Update a dependency to run the specs
2017-09-08 23:55:49 +10:00
Rohan Mitchell
73abb93737
Update Spree: Bring forward simplified version of Spree.t for spree_auth_devise
2017-09-08 23:55:48 +10:00
Rohan Mitchell
2a44b190fe
Use spree_paypal_express 2-0-stable pretending to be 1.3
2017-09-08 23:55:48 +10:00
Rohan Mitchell
3605b610fe
Use spree_auth_devise 2-0-stable pretending to be 1.3
2017-09-08 23:55:48 +10:00
Rohan Mitchell
48e50540db
Start Spree upgrade step 3
2017-09-08 23:55:48 +10:00
Rohan Mitchell
8eca260297
Update Spree: Prevent duplicate copies of images appearing
2017-09-08 23:55:48 +10:00
Rohan Mitchell
017b63fa71
Update Spree: Fix further admin authorization errors
2017-09-08 23:55:48 +10:00
Rohan Mitchell
efe0d3ab22
Update spree, upgrading jquery-rails to provide jquery 1.9. Fixes ng-tags-input.
2017-09-08 23:55:48 +10:00
Rohan Mitchell
bfd54ef621
Update Spree: Fix admin authorization errors
2017-09-08 23:55:48 +10:00
Rohan Mitchell
f5c4537afa
Start Spree upgrade step 2
2017-09-08 23:55:48 +10:00
Julius Pabrinkis
3adb13e62c
Add i18n-js gem
2017-08-02 09:57:32 +10:00
Rob Harrington
327753b7ca
Remove zeus and guard-zeus from the bundle
...
Having guard-zeus specified as a dependency is problematic because
it also pulls in the zeus gem as a dependency. This makes it impo-
ssible to update or switch zeus versions locally without affecting
other developers.
The maintainers of zeus say that it is designed to be installed and
run outside of the bundle: https://github.com/burke/zeus
2017-07-26 13:36:58 +10:00
Rob Harrington
9d7f63db42
Bump eventmachine version to resolve openssl issue on macOS
2017-07-12 11:42:15 +10:00
Rob Harrington
94b6a61665
Bump rubocop to latest version (0.49.1)
2017-06-29 10:47:56 +10:00
Rob Harrington
7079952f6b
Add rubocop to development group in gemfile
2017-06-23 16:49:08 +10:00
Julius Pabrinkis
e63f1c2991
Refactor time and currency symbol getters
2017-05-03 12:59:16 +01:00
Julius Pabrinkis
1e6f4aa73d
Restore bundler version
2017-05-03 11:25:37 +01:00
Julius Pabrinkis
41e91765ca
Add capybara-screenshot gem for integration tests debugging
2017-05-03 11:25:37 +01:00
Pierre de Lacroix
49c19a1d6a
update wkhtmltopdf-binary and wicked_pdf
2017-04-27 18:38:47 +10:00
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
