luisramos0
|
a57504ba1f
|
Bring api_helper.image from spree_api to support spree/api/products_controller_spec
|
2019-07-31 09:36:48 +01:00 |
|
luisramos0
|
25451eed6b
|
Bring api spec helpers from spree_api into ofn/api_helper
|
2019-07-31 09:36:48 +01:00 |
|
luisramos0
|
50765563f8
|
Bring spree/api_helpers from spree_api
|
2019-07-31 09:35:46 +01:00 |
|
luisramos0
|
2ae75ce13e
|
Add ControllerSetup from spree_api as it is used in spree/api/base_controller
|
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
|
7346a49982
|
Move routes in ofn api namespace to separate routes file
|
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
|
104bd31f9b
|
Add necessary spree api routes: taxons, variants and shipments
|
2019-07-31 09:32:33 +01:00 |
|
luisramos0
|
8bc9985edb
|
Transpec and fix rubocop issues in spree/api/variants_controller_spec
|
2019-07-31 09:32:33 +01:00 |
|
luisramos0
|
6dfc927730
|
Make spree/api/variant_controllers_spec pass
|
2019-07-31 09:32:33 +01:00 |
|
luisramos0
|
3771e26eba
|
Bring tests from spree/api/variants_controller_spec from spree_api
|
2019-07-31 09:32:33 +01:00 |
|
luisramos0
|
fd21d35aee
|
Transpec and fix rubocop issues in spree/api/shipments_controller_spec
|
2019-07-31 09:32:33 +01:00 |
|
luisramos0
|
1417b924d2
|
Bring and adapt tests from spree/api/shipments_controller_spec and mix them with exiting tests in OFN
|
2019-07-31 09:32:33 +01:00 |
|
luisramos0
|
2912c1b87d
|
Transpec and fix rubocop issues in spree/api/product_controller_spec
|
2019-07-31 09:32:33 +01:00 |
|
luisramos0
|
e746a0db7d
|
Bring tests from spree/api/products_controller_spec and add them to existing ones on the ofn side
Adapt these tests to have a green build
|
2019-07-31 09:32:33 +01:00 |
|
luisramos0
|
84a2886003
|
Improve auth code in spree/api/taxons_controller_spec
|
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
|
2490cbfccb
|
Transpec and fix rubocop issues in spree/api/base_controller_spec
|
2019-07-31 09:32:33 +01:00 |
|
luisramos0
|
20a46a791c
|
Bring and adapt spree/api/base_controller_spec from spree_api
|
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 |
|
Pau Pérez Fabregat
|
35841066d1
|
Merge pull request #4086 from openfoodfoundation/transifex
Transifex
|
2019-07-29 17:33:19 +02: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 |
|
Transifex-Openfoodnetwork
|
ed1d637eb5
|
Updating translations for config/locales/es.yml
|
2019-07-29 19:06:20 +10:00 |
|
Transifex-Openfoodnetwork
|
831284c5c8
|
Updating translations for config/locales/es.yml
|
2019-07-29 19:03:13 +10:00 |
|
Transifex-Openfoodnetwork
|
e45b8f6981
|
Updating translations for config/locales/ca.yml
|
2019-07-29 19:02:24 +10:00 |
|
Transifex-Openfoodnetwork
|
d0f8f985fb
|
Updating translations for config/locales/es.yml
|
2019-07-29 19:00:02 +10:00 |
|
Transifex-Openfoodnetwork
|
33eec61af8
|
Updating translations for config/locales/ca.yml
|
2019-07-29 18:59:14 +10:00 |
|
Transifex-Openfoodnetwork
|
00c324ae45
|
Updating translations for config/locales/fr.yml
|
2019-07-29 18:01:09 +10:00 |
|
Transifex-Openfoodnetwork
|
12a016d31d
|
Updating translations for config/locales/fr.yml
|
2019-07-29 17:57:59 +10: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 |
|
Maikel
|
e6ef661f0d
|
Merge pull request #4066 from luisramos0/reorg_spec_serializers
Organizing spec/serializers - put each file in the correct place
|
2019-07-26 16:23:23 +10:00 |
|