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
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
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
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
François Turbelin
97a401a307
Display enterprise ID in profile
2019-07-03 18:10:59 +02:00
Kristina Lim
3e37c8a3f1
Change underscores in CSS classes to hyphens
...
These were triggering a warning from scss-lint.
2019-07-03 04:43:35 +08:00
Kristina Lim
6d1dd76590
Cap width of hub name in top bar and wrap
2019-07-03 04:30:06 +08:00
Kristina Lim
653067f58c
Omit text for top bar items with icon in large
...
This affects only top bar menu items for:
* Language
* Profile
This does not update the "Log in" menu item, because the currently
selected icon might not be self explanatory.
2019-07-03 01:49:36 +08:00
Matt-Yorkley
fbb97c3db8
Fix JS render-blocking in Darkswarm
2019-07-02 13:43:20 +01:00
Matt-Yorkley
cea8cbd924
Preload primary font to speed up page rendering
2019-07-02 13:23:03 +01:00
Luis Ramos
d8785bdaba
Merge pull request #3932 from luisramos0/shpfront_message
...
Improve message in private shopfront when user is not logged in or not a customer
2019-06-26 15:31:06 +01:00
luisramos0
95170bacd5
Show print invoices button in orders list page only if invoices are enabled in the backoffice
2019-06-26 14:17:25 +01:00
luisramos0
567196fe0e
Fix line item verification of stock on the browser side by adding logic to handle completed orders with some reserved stock
...
The shopping/orders_spec is now validating this edge case by using all stock available in one of the line items
2019-06-25 14:50:03 +01:00
luisramos0
a6ea975848
Fix editing cart when variant on_demand but on_hand is zero or negative
2019-06-24 22:07:46 +01:00
Maikel
5b0c8bbaef
Merge pull request #3836 from Matt-Yorkley/fast_and_furious2
...
Improve /shops, /producers, and /groups performance
2019-06-21 15:02:19 +10:00
luisramos0
bcc02f35e7
Add new preference to invoice settings: enable invoices
2019-06-19 13:29:30 +01:00
luisramos0
8daf9b9247
Revert fix in previous commit (orders/populate route used in product import view) and adding a simple fix by setting the product import route to use in the form
2019-06-18 10:49:20 +01:00
luisramos0
02b9fca620
Remove unused spree checkout and spree cart routes
2019-06-18 10:49:19 +01:00
luisramos0
c97925aa4a
Improve message in private shopfront when closed or when user is not logged in
2019-06-14 10:13:33 +01:00
luisramos0
a370216f54
Change default translation in the registration introduction so that it looks better when collapsed
2019-06-13 19:28:31 +01:00
luisramos0
473fb45132
Remove an extra break line to remove html space and make sure alignment is correct
2019-06-13 19:28:10 +01:00
luisramos0
ae0563a58f
Merge branch 'master' into 1766-registration-scroll
2019-06-13 19:10:05 +01:00
Luis Ramos
2b593a59f5
Merge pull request #3900 from luisramos0/subs_trans
...
Missing translations in Subscriptions
2019-06-13 18:51:20 +01:00
Luis Ramos
7d24bcf868
Merge pull request #3798 from m-budryte/order_cycles_add_fee_remove_link
...
the translations for Remove in the exchange forms added
2019-06-13 16:15:28 +01:00
Luis Ramos
1a2703f630
Merge pull request #3886 from luisramos0/fees_translations
...
Make a few more things translatable in the Enterprise Fees management page
2019-06-13 14:12:16 +01:00
Luis Ramos
bb7a2d7a5e
Merge pull request #3252 from mllocs/fix/navbar-right-items-styles
...
Top navbar redesign and cleanup
2019-06-13 12:04:20 +01:00
Matt-Yorkley
785595a951
Reduce initial queries on shop page by ~95%
2019-06-12 09:47:01 +01:00
Matt-Yorkley
0aa8b1a30e
Make shop hidden ams injection consistent with other uses
2019-06-12 09:47:01 +01:00
Matt-Yorkley
874fb884b8
Refactor Angular controllers further
2019-06-12 09:47:01 +01:00
Matt-Yorkley
a91ae8947b
Only query visible enterprises
2019-06-12 09:47:01 +01:00
