Cillian O'Ruanaidh a9664e103d Merge latest :master into :drop-blockenspiel branch and resolve conflicts related to Rubocop fixes.

2020-06-29 18:11:08 +01:00

..

adjustments

created partial for order page title to resolve French translation of new order

2020-06-05 11:27:51 +10:00

countries

Fix minor detail in states and countries views

2019-09-20 14:57:48 +01:00

general_settings

Remove config and sections related to google analytics in the cookies banner and cookies page

2020-04-27 18:40:00 +01:00

image_settings

Move image_format deface to image settings view

2019-07-16 14:44:38 +01:00

images

Remove views code that tests for the existence of product variants

2020-06-01 14:09:14 +01:00

mail_methods

Change mail method config route

2020-05-29 21:51:57 -03:00

orders

Use #image_path helper correctly

2020-06-16 18:25:13 +02:00

overview

Merge pull request #3659 from mkllnk/missing-translation

2019-04-10 22:05:19 +01:00

payment_methods

Merge pull request #5538 from jeduardo824/bug/4592-payment-methods-table-in-dashboard

2020-06-25 20:32:04 +01:00

payments

created partial for order page title to resolve French translation of new order

2020-06-05 11:27:51 +10:00

product_properties

Add missing translation keys to product properties list

2019-11-01 10:39:09 +11:00

products

Use #image_path helper correctly

2020-06-16 18:25:13 +02:00

properties

Fix broken new property button in properties page

2020-03-24 21:50:49 +00:00

reports

Merge branch 'master' into drop-blockenspiel

2020-06-19 12:12:10 +02:00

return_authorizations

created partial for order page title to resolve French translation of new order

2020-06-05 11:27:51 +10:00

shared

Merge pull request #5482 from rmklaus12/5094-new-order-translation

2020-06-11 13:23:28 +02:00

shipping_categories

Move temp_controller_list deface to shipping_categories index view

2019-07-16 20:16:23 +01:00

shipping_methods

Make display on attribute available for managers to change, not just super admins

2020-05-25 11:21:53 +01:00

states

Fix a problem in states/new template where erb instead of haml was referenced

2019-12-15 21:42:52 +00:00

tax_categories

Fix feature specs added from spree_backend in the configuration area

2019-09-20 15:43:55 +01:00

tax_rates

Convert spree/admin/tax_rates from erb to haml

2019-09-20 15:36:58 +01:00

tax_settings

Reorganising busines model config settings, moving account invoice tax rate in busines model config settings

2015-12-16 19:18:57 +11:00

taxonomies

Make taxonomies edit page use api route instead of spree_api route that is now gone.

2019-10-28 16:01:23 +00:00

taxons

Remove taxons/search action and respective rabl view

2020-03-17 15:51:26 +00:00

users

Merge pull request #4057 from luisramos0/remove_spree_api_2

2019-11-06 13:23:32 +00:00

variants

Use #image_path helper correctly

2020-06-16 18:25:13 +02:00

zones

Convert spree/admin/zones from erb to haml

2019-09-20 15:01:06 +01:00