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
41e91765ca
Add capybara-screenshot gem for integration tests debugging
2017-05-03 11:25:37 +01: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
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
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
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
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
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
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
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
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
Rob Harrington
439d122e93
Merge branch 'master' into customers
...
Conflicts:
app/assets/javascripts/admin/bulk_order_management.js.coffee
app/assets/javascripts/admin/bulk_product_update.js.coffee
app/assets/javascripts/admin/directives/line_item_upd_attr.js.coffee
app/views/spree/admin/orders/bulk_management.html.haml
db/schema.rb
spec/javascripts/unit/bulk_order_management_spec.js.coffee
2015-06-03 15:19:40 +08:00
Rohan Mitchell
db47c01784
Initial config for parallel spec running
2015-06-03 14:29:38 +10:00
Rob Harrington
4c5e75c3f9
Adding acts-as-taggable-on gem
2015-05-13 12:44:36 +10:00
Rohan Mitchell
f024f62970
Content-manage footer fields
2015-05-06 16:36:10 +10:00
Rohan Mitchell
6b1c125b03
Merge branch 'producer-emails' of https://github.com/folklabs/openfoodnetwork into folklabs-producer-emails
...
Conflicts:
Gemfile.lock
app/controllers/admin/order_cycles_controller.rb
app/views/admin/order_cycles/edit.html.haml
app/views/admin/order_cycles/show.rep
db/schema.rb
spec/controllers/admin/order_cycles_controller_spec.rb
2015-04-29 14:42:17 +10:00
Rob Harrington
f13b52411d
Merge branch master into properties
2015-04-17 13:23:33 +10:00
Rohan Mitchell
d1ab2d9dac
Add daemons gem for Delayed::Job
2015-04-16 16:54:43 +10:00
Rohan Mitchell
61cb2514cd
Add Delayed::Job
2015-04-16 16:54:43 +10:00
Rob Harrington
4c4490a9b7
Upgrading foundation-rails and sass
2015-03-06 19:01:39 +11:00
