luisramos0
|
3c0e6eeee2
|
Make inject_current_order_cycle render {} instad of null if current_order_cycle is null
|
2019-07-29 18:13:29 +01:00 |
|
luisramos0
|
ca5a5bf301
|
Convert oc.rabl to oc serializer and use it in both haml file and controller
|
2019-07-29 18:13:29 +01:00 |
|
Luis Ramos
|
af50bde088
|
Merge pull request #3786 from ja9-look/feature/sticky_header_on_scroll_mobile
sticky header for mobile
|
2019-07-26 11:22:33 +01:00 |
|
Luis Ramos
|
340b92e580
|
Merge pull request #3700 from luisramos0/2-0-without-auth-devise
Remove dependency to spree_auth_devise
|
2019-07-26 10:57:38 +01:00 |
|
Kristina Lim
|
dae23d3c3b
|
Remove unused inclusion of $window in OffcanvasCtrl
|
2019-07-25 20:22:51 +08:00 |
|
Kristina Lim
|
def2693afc
|
Move offcanvas JS to Angular controller
|
2019-07-25 17:01:46 +08:00 |
|
Luis Ramos
|
55f26f0a3d
|
Merge pull request #4043 from luisramos0/bring_shipment
Bring spree/admin/orders/shipment and shipment_manifest partials from spree_backend and fix an authorization bug
|
2019-07-24 21:59:47 +01:00 |
|
Luis Ramos
|
7245d1eff4
|
Merge pull request #4049 from luisramos0/deface_admin_orders
De-deface admin orders adjustments page and customer details page
|
2019-07-24 21:59:08 +01:00 |
|
luisramos0
|
b9b8bc70dd
|
Remove stock location name from shipment header in the order edit page
|
2019-07-24 11:50:17 +01:00 |
|
Kristina Lim
|
d42da8737e
|
Improve readability of selectors in page alert JS directive
|
2019-07-24 12:44:42 +08:00 |
|
Kristina Lim
|
6419edcb1f
|
Integrate styles/animations for page alert, top bar, tab bar, off canvas
|
2019-07-24 12:44:42 +08:00 |
|
Kristina Lim
|
fca82375e8
|
Render home page alert as :page_alert outside main content
|
2019-07-24 12:44:42 +08:00 |
|
Kristina Lim
|
ca0f746cf1
|
Fix animation and layout for offcanvas menu
Uses strategy from this forum comment:
http://foundation.zurb.com/forum/posts/547#comment_8840
|
2019-07-24 12:43:44 +08:00 |
|
Kristina Lim
|
a93cf46f50
|
Fix syntax of existing animations for offcanvas
|
2019-07-24 12:37:42 +08:00 |
|
Luis Ramos
|
1f75c7e5e4
|
Merge pull request #4047 from luisramos0/undeface
De-deface some admin configuration pages and the general admin layout and menu
|
2019-07-23 18:36:09 +01:00 |
|
Luis Ramos
|
a6a695660f
|
Merge pull request #4002 from luisramos0/more_rails4
Adapting queries in permissions to Rails 4
|
2019-07-19 15:17:01 +01:00 |
|
Luis Ramos
|
0058ef5e04
|
Merge pull request #4048 from idanceinbetween/4034
Add grey line below nav bar, change logo img max height 44px
|
2019-07-19 12:13:14 +01:00 |
|
Luis Ramos
|
4831bae9cb
|
Merge pull request #3953 from mkllnk/3727-first-credit-card-default
First stored credit card becomes default again
|
2019-07-19 12:12:09 +01:00 |
|
Luis Ramos
|
f7679780de
|
Merge pull request #4032 from luisramos0/subs_oc_date_issue
3544 Add date format to moment date conversion
|
2019-07-18 19:52:49 +01:00 |
|
luisramos0
|
a75a0da981
|
Remove unused deface in spree/admin/orders/show, this action doesnt exist in ofn v2
|
2019-07-16 21:12:48 +01:00 |
|
luisramos0
|
5744240f91
|
Move customer_details/_form defaces to the view
|
2019-07-16 21:12:09 +01:00 |
|
luisramos0
|
873c56a642
|
Move customer_details/edit/replace_customer_search deface to view
|
2019-07-16 21:09:48 +01:00 |
|
luisramos0
|
f53a75660f
|
Convert spree/admin/orders/customer_details view from erb to haml
|
2019-07-16 21:05:19 +01:00 |
|
luisramos0
|
50dcbe0b57
|
Bring spree/admin/order/customer_details from spree_backend
|
2019-07-16 21:03:35 +01:00 |
|
luisramos0
|
f9861fee79
|
De-deface spree/admin/adjustments/_adjustments_table by moving deface content to the view
|
2019-07-16 21:01:08 +01:00 |
|
luisramos0
|
d8ae97f923
|
Move spree/admin/adjustments/_form/add_tax_rate deface to view
|
2019-07-16 20:53:24 +01:00 |
|
luisramos0
|
9f5db217fe
|
Convert spree/admin/adjustments views from erb to haml
|
2019-07-16 20:51:55 +01:00 |
|
luisramos0
|
c1c5dcac09
|
Bring spree/admin/adjustments pages from spree_backend
|
2019-07-16 20:51:55 +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 |
|