luisramos0
|
e26a54d897
|
Fix indentation problem in layouts/admin view
We move most entries inside wrapper as it should be and the last ones "admin_footer_scripts" and Spree.api_key inside the body tag as it should be
|
2019-07-29 13:33:11 +01:00 |
|
luisramos0
|
f2ac354e00
|
Make features/admin/orders_spec test a bit more reliable by expecting element to be there before using it
|
2019-07-18 14:29:38 +01:00 |
|
luisramos0
|
6064f096a7
|
Fix a pre-existing problem in orders_tab by moving the links in to the li elements
|
2019-07-16 20:16:32 +01:00 |
|
luisramos0
|
a62fa755f5
|
Remove page_title_classes as it is breaking the rendering of the classes attribute and it is no longer used
|
2019-07-16 20:16:32 +01:00 |
|
luisramos0
|
fa25991f0f
|
Fix problem in previous de-deface, move sections around in general settings page to keep order. No changes in code, just moving
|
2019-07-16 20:16:32 +01:00 |
|
luisramos0
|
6f2be1dfa6
|
Fix issue in layouts/admin view, make classes compute correctly
|
2019-07-16 20:16:32 +01:00 |
|
luisramos0
|
c81a9fd032
|
Fix error in js tag in head
|
2019-07-16 20:16:32 +01:00 |
|
luisramos0
|
665d0cc86b
|
Fix error related to missing _hamlout method by replacing code with standard haml
|
2019-07-16 20:16:32 +01:00 |
|
luisramos0
|
a34d8a3f20
|
Revert "Move app_wrapper deface to spree/layouts/admin view"
This reverts commit bb18f6ecf3c1d0ecf7c010623215d161a6102f2b.
|
2019-07-16 20:16:32 +01:00 |
|
luisramos0
|
6e35701dd6
|
Remove unused add_enterprise_fees_to_admin_configurations_menu deface, this menu entry is already in the view
|
2019-07-16 20:16:32 +01:00 |
|
luisramos0
|
9991458d2a
|
Remove spree/admin/shared/_order_details defaces, these are only used in admin/order/show which is a view that is not used in ofn anymore, only admin/order/edit is used
|
2019-07-16 20:16:32 +01:00 |
|
luisramos0
|
a843fd73b7
|
Remove admin/shared/_order_tabs/add_customer_name, this is already in the order tabs view
|
2019-07-16 20:16:32 +01:00 |
|
luisramos0
|
9765b1e908
|
Move admin/shared/_head/replace_spree_title deface to head view
|
2019-07-16 20:16:32 +01:00 |
|
luisramos0
|
5ccadc1f7d
|
Convert spree/admin/shared/_head view from erb to haml
|
2019-07-16 20:16:32 +01:00 |
|
luisramos0
|
539805e2c2
|
Bring spree/admin/shared/head partial from spree_backend
|
2019-07-16 20:16:32 +01:00 |
|
luisramos0
|
fac64ef5bf
|
Remove layouts/spree_application/inside_head deface, this view is in spree_frontend which is not used in ofn anymore
|
2019-07-16 20:16:32 +01:00 |
|
luisramos0
|
a17a0a62bc
|
Move spree/layouts/bare_admin/add_login_nav deface to layout/bare_admin view
|
2019-07-16 20:16:32 +01:00 |
|
luisramos0
|
1e91de106f
|
Move admin html head deface to layout admin view and remove repeated (in shared/head partial) content type tag
|
2019-07-16 20:16:32 +01:00 |
|
luisramos0
|
73252132a6
|
Move add_i18n_script deface to layout/admin view
|
2019-07-16 20:16:32 +01:00 |
|
luisramos0
|
e3c383c61c
|
Convert spree/admin/shared/_tabs.html from erb to haml and move menu entries from layouts/admin to the tabs view
|
2019-07-16 20:16:32 +01:00 |
|
luisramos0
|
aafb134be7
|
Move spree/layouts/admin/ tabs deface to spree/layout/admin view
|
2019-07-16 20:16:32 +01:00 |
|
luisramos0
|
70a1996435
|
Move add_currency_config deface to spree/layout/admin view
|
2019-07-16 20:16:31 +01:00 |
|
luisramos0
|
1712cb2617
|
Move app_wrapper deface to spree/layouts/admin view
In admin layout, only adds a div after the body tag.
|
2019-07-16 20:16:31 +01:00 |
|
luisramos0
|
25df057d05
|
Move spree/layouts/admin/add_analytics deface to spree/layouts/admin view
|
2019-07-16 20:16:31 +01:00 |
|
luisramos0
|
24a9991162
|
Convert views/spree/layouts/admin.html from erb to haml
|
2019-07-16 20:16:31 +01:00 |
|
luisramos0
|
156ff2da89
|
Bring spree/layouts/admin from spree_backend to de-deface it
|
2019-07-16 20:16:31 +01:00 |
|
luisramos0
|
e36b4ed01a
|
Move temp_controller_list deface to shipping_categories index view
|
2019-07-16 20:16:23 +01:00 |
|
luisramos0
|
4f60273198
|
Move temperature_controlled_form_element deface to shipping_categories form view
|
2019-07-16 14:50:16 +01:00 |
|
luisramos0
|
856fa8685a
|
Convert spree/admin/shipping_categories views from erb to haml
|
2019-07-16 14:48:47 +01:00 |
|
luisramos0
|
9ac4c0ba30
|
Bring spree/admin/shipping categories from spree_backend so we can de-deface it
|
2019-07-16 14:46:26 +01:00 |
|
luisramos0
|
2709f237f5
|
Move image_format deface to image settings view
|
2019-07-16 14:44:38 +01:00 |
|
luisramos0
|
9db4edcd0d
|
Convert spree/admin/image_settings/edit.html from erb to haml
|
2019-07-16 14:43:20 +01:00 |
|
luisramos0
|
22c9f33f4c
|
Bring image_settings view from spree_backend
|
2019-07-16 14:39:14 +01:00 |
|
luisramos0
|
24ea2a4398
|
Move number_localization deface to general settings view
|
2019-07-16 14:28:47 +01:00 |
|
luisramos0
|
8178f5388c
|
Move legal settings deface to general settings view
|
2019-07-16 14:27:32 +01:00 |
|
luisramos0
|
c0c5e9d7dd
|
Move embedded_shopfronts deface to general settings view
|
2019-07-16 14:26:33 +01:00 |
|
luisramos0
|
19f8f5c6fa
|
Convert general_settings/edit.html from erb to haml
|
2019-07-16 14:15:51 +01:00 |
|
luisramos0
|
d6020cdb6f
|
Bring general_settings/edit.html.erb from spree_backend to de-deface it
|
2019-07-16 13:57:35 +01:00 |
|
Kristina Lim
|
77c78f35d3
|
Update all locales with the latest Transifex translations
v2.2.1
|
2019-07-16 18:53:24 +08:00 |
|
Luis Ramos
|
2280b15664
|
Merge pull request #4035 from kristinalim/fix/4033-remove_line_item_adjustments_when_line_item_removed
4033 Remove line item adjustments when line item removed
|
2019-07-16 09:54:33 +01:00 |
|
Kristina Lim
|
2c279fd02d
|
Remove line item adjustments if line item deleted
|
2019-07-13 03:58:01 +10:00 |
|
Kristina Lim
|
8a048cc155
|
Add proof line item adjustments remain after line item removal
|
2019-07-13 01:43:07 +08:00 |
|
Luis Ramos
|
b3c378e8c1
|
Merge pull request #4029 from Matt-Yorkley/js_render_blocking2
Js render blocking 2
|
2019-07-12 16:34:31 +01:00 |
|
Luis Ramos
|
39475be792
|
Merge pull request #4030 from Matt-Yorkley/line_item_errors
LineItems can always access soft-deleted variants
|
2019-07-12 16:33:36 +01:00 |
|
Pau Pérez Fabregat
|
bdeb56bfaf
|
Merge pull request #4028 from openfoodfoundation/transifex
Transifex
|
2019-07-11 17:28:38 +02:00 |
|
Matt-Yorkley
|
fb4e573cfa
|
Add a soft-deleted test in line_item_spec
|
2019-07-11 16:07:30 +01:00 |
|
Transifex-Openfoodnetwork
|
e65df31bc3
|
Updating translations for config/locales/nl_BE.yml
|
2019-07-12 00:29:50 +10:00 |
|
Transifex-Openfoodnetwork
|
ce1ac57522
|
Updating translations for config/locales/de_DE.yml
|
2019-07-11 23:53:17 +10:00 |
|
Transifex-Openfoodnetwork
|
09ff57d462
|
Updating translations for config/locales/en_BE.yml
|
2019-07-11 23:50:31 +10:00 |
|
Transifex-Openfoodnetwork
|
542cf0cf4f
|
Updating translations for config/locales/fr_BE.yml
|
2019-07-11 23:43:29 +10:00 |
|