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 |
|
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 |
|
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 |
|
Matt-Yorkley
|
b2c6e6271c
|
LineItems can always access soft-deleted variants
|
2019-07-11 11:33:34 +01:00 |
|
Luis Ramos
|
cdd36eeefc
|
Merge pull request #3674 from Matt-Yorkley/spree2/import_description
Allow import to proceed when updating a product and `description` is set
|
2019-07-10 21:09:30 +01:00 |
|
Matt-Yorkley
|
97148f6f57
|
Send embedded Stripe javascript to :injection_data
|
2019-07-10 19:28:20 +01:00 |
|
Matt-Yorkley
|
6219b3f0c3
|
Revert "Revert "Fix JS render-blocking in Darkswarm""
This reverts commit ffeca41e
|
2019-07-10 17:14:08 +01:00 |
|
Maikel
|
ffeca41ef4
|
Revert "Fix JS render-blocking in Darkswarm"
|
2019-07-10 10:24:25 +10:00 |
|
Luis Ramos
|
23b6267e30
|
Merge pull request #3916 from luisramos0/schedules_of_coordinator
OC schedules are now filtered to schedules of OCs with same coordinator
|
2019-07-09 14:21:34 +01:00 |
|
Luis Ramos
|
6872ccfb72
|
Merge pull request #3963 from luisramos0/hide_invoices
Hide invoices feature
|
2019-07-09 14:20:50 +01:00 |
|
Luis Ramos
|
83ce2ac3dc
|
Merge pull request #3988 from Matt-Yorkley/js_render_blocking
Fix JS render-blocking in Darkswarm
|
2019-07-09 12:30:30 +01:00 |
|
Luis Ramos
|
8a700307d2
|
Merge pull request #3992 from Matt-Yorkley/cart_button_bug
Fix display bug in cart button on mobile menu
|
2019-07-08 18:33:36 +01:00 |
|
Luis Ramos
|
1756ddd0e9
|
Merge pull request #3989 from Matt-Yorkley/preload_primary_font
Preload primary font to speed up page rendering
|
2019-07-08 17:43:15 +01:00 |
|
Luis Ramos
|
fe71781d70
|
Merge pull request #3791 from jazzdragon/1766-registration-scroll
1766 registration scroll
|
2019-07-08 15:10:35 +01:00 |
|
Luis Ramos
|
397729ed3d
|
Merge pull request #4001 from pacodelaluna/3990-display-enterprise-id-in-profile
Display enterprise ID in profile
|
2019-07-05 11:14:43 +01:00 |
|
luisramos0
|
88312b8e4a
|
Make OrdersHelper.invoice_links simpler
|
2019-07-05 11:08:51 +01:00 |
|
luisramos0
|
9be3ff90f7
|
Make OrdersHelper.complete_order_links simpler
|
2019-07-05 11:06:49 +01:00 |
|
luisramos0
|
e66dea7e03
|
Improve query in filter_schedules_by_enterprise_id. Makes join to OCs explicity.
|
2019-07-05 10:37:27 +01:00 |
|
François Turbelin
|
912483660f
|
Put the uid under the permalink
|
2019-07-04 09:51:32 +02:00 |
|
François Turbelin
|
d12a7c2c76
|
Apply last suggestions
|
2019-07-04 09:43:35 +02:00 |
|
François Turbelin
|
5ce2af454e
|
Clean id field
|
2019-07-03 23:00:36 +02:00 |
|
Luis Ramos
|
951787d456
|
Merge pull request #3987 from mkllnk/3978-optimise-products-cache
3978 Optimise products cache
|
2019-07-03 19:59:07 +01:00 |
|
Luis Ramos
|
b35743b6e4
|
Merge pull request #3968 from mkllnk/3924-rescue-failing-shipment
Rescue checkout on shipping id conflict
|
2019-07-03 19:56:24 +01:00 |
|