luisramos0
|
50765563f8
|
Bring spree/api_helpers from spree_api
|
2019-07-31 09:35:46 +01:00 |
|
luisramos0
|
18aa16650d
|
Remove dependency to Spree::ApiConfiguration, overall requires_authentication? is true, exceptions will be endpoint specific
|
2019-07-31 09:35:46 +01:00 |
|
luisramos0
|
314ed50e0f
|
Fix a rubocop issue in spree/api/products_controller
|
2019-07-31 09:34:20 +01:00 |
|
luisramos0
|
5182286218
|
Add necessary spree api routes related to api keys for users and bring respective implementations from spree_api
|
2019-07-31 09:34:20 +01:00 |
|
luisramos0
|
a267848394
|
Remove unused api routes from views/spree/admin/shared/routes view
|
2019-07-31 09:32:33 +01:00 |
|
luisramos0
|
c668677b8a
|
Bring spree/api/taxons_controller_spec from spree_api, adapt it, transpec it and fix rubocop issues
|
2019-07-31 09:32:33 +01:00 |
|
luisramos0
|
0e4fe08ac4
|
Fix logical problem in spree/api/base_controller and in spree/checkout_controller
See this stack overflow post for more info: https://stackoverflow.com/questions/39629976/ruby-return-vs-and-return
|
2019-07-31 09:32:33 +01:00 |
|
luisramos0
|
cf0f716534
|
Fix easy rubocop issues in spree/api/taxons_controller
|
2019-07-31 09:32:33 +01:00 |
|
luisramos0
|
b70cfa5968
|
Bring spree/api/taxons controller from spree_api as it is needed in OFN admin
|
2019-07-31 09:32:33 +01:00 |
|
luisramos0
|
f77beb50ff
|
Fix class scope in spree/api/products_controller, should not use Spree namespace here
Also, add missing dependency to spree/admin/products_controller_decorator
|
2019-07-31 09:32:33 +01:00 |
|
luisramos0
|
a941280982
|
Fix easy rubocop issues in spree/api/base_controller
|
2019-07-31 09:32:33 +01:00 |
|
luisramos0
|
9d40ee49e6
|
Bring spree/api/base_controller from spree_api
|
2019-07-31 09:32:33 +01:00 |
|
luisramos0
|
6abbdecb97
|
Fix the easy rubocop issues in the new spree api controllers
|
2019-07-31 09:32:33 +01:00 |
|
luisramos0
|
660ce92c27
|
Merge spree api controllers and its decorators
|
2019-07-31 09:32:33 +01:00 |
|
luisramos0
|
c5bcef6ae4
|
Delete unused spree/api/line_items_controller_decorator.rb
|
2019-07-31 09:32:33 +01:00 |
|
luisramos0
|
d26a0b6b73
|
Bring from spree_api the api controllers that are overriden in OFN so that we can merge the original and the override afterwards
|
2019-07-31 09:32:33 +01:00 |
|
Luis Ramos
|
75c7e0b939
|
Merge pull request #4089 from luisramos0/undeface-fix
Add doctype declaration in layouts/admin view
|
2019-07-30 19:29:17 +01:00 |
|
Luis Ramos
|
62eb2bba13
|
Merge pull request #4059 from luisramos0/kill_rabl
Convert 2 rabl templates to AMS and remove a few unused ones
|
2019-07-30 19:28:21 +01:00 |
|
Luis Ramos
|
3fa9e857a8
|
Merge pull request #4067 from luisramos0/oc_icon
Add icon to OC menu entry
|
2019-07-30 14:08:08 +01:00 |
|
luisramos0
|
ddf68444fb
|
Move head scripts from admin layout to haed partial
|
2019-07-29 17:04:57 +01:00 |
|
luisramos0
|
4867649fc9
|
Remove dead code related to unused variable in spree: expand_variants
|
2019-07-29 17:04:57 +01:00 |
|
luisramos0
|
9bc81f236c
|
Add doctype declaration as it is defined in spree layouts/admin so that html5 mode is enabled, otherwise html 4 mode is used by browsers and the observed layout problems happen
|
2019-07-29 13:46:35 +01:00 |
|
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 |
|
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 |
|
luisramos0
|
f64653db14
|
Add icon to OC menu entry
|
2019-07-26 10:52:31 +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 |
|
luisramos0
|
a1e6e4c38f
|
Fix rubocop issues
|
2019-07-23 14:35:24 +01:00 |
|
luisramos0
|
cf61254c9e
|
Remove unnecesary rabl template
|
2019-07-22 18:42:20 +01:00 |
|
luisramos0
|
1d92d6cc33
|
Remove unused api endpoint order_cycles and also action enterprises/managed and respective views
|
2019-07-22 17:35:41 +01:00 |
|
luisramos0
|
6b32764c99
|
Remove unused taxon.rabl from views/json
|
2019-07-22 16:29:54 +01:00 |
|
luisramos0
|
ea72a10b9a
|
Remove unused rabl files from views/json
|
2019-07-22 12:14:10 +01:00 |
|
luisramos0
|
9b567a6710
|
Remove injection_json that renders json partials, we only use ams serializers now, not rabl partials
|
2019-07-21 23:55:59 +01:00 |
|
luisramos0
|
a8ce31fa90
|
Replace views/json/_flash.rabl with an ams injector with serializer
|
2019-07-21 22:56:15 +01:00 |
|
luisramos0
|
4c964fea0d
|
Replace views/json/_current_user.rabl with an ams injector with serializer
|
2019-07-21 22:48:36 +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 |
|