3880 Commits

Author	SHA1	Message	Date
Luis Ramos	f2d25748b1	Merge pull request #4078 from HugsDaniel/defacepocalypse-variants ... [Defacepocalypse] De-deface variants	2019-08-25 22:51:15 +01:00
Luis Ramos	34ed86cf2d	Merge pull request #4132 from Matt-Yorkley/import_launch ... Product Import beta	2019-08-19 17:17:16 +01:00
Luis Ramos	d5b37a5171	Merge pull request #4079 from HugsDaniel/defacepocalypse-payments ... [Defacepocalypse] De-deface payments	2019-08-14 19:30:33 +01:00
Pau Pérez Fabregat	d4f2fcb98a	Merge pull request #4126 from Matt-Yorkley/cart_dropdown ... Cart dropdown now closes when clicking outside it.	2019-08-13 10:57:56 +02:00
Hugo Daniel	bf2c1a0c1d	Add ng directive for setting on demand	2019-08-09 14:42:39 +02:00
Pau Pérez Fabregat	910eca810a	Merge pull request #4124 from Matt-Yorkley/order_email ... Add SKU to order confirmation email	2019-08-08 18:35:20 +02:00
Pau Pérez Fabregat	92b05c76a3	Merge pull request #4068 from luisramos0/replace_oc_rabl ... Convert order_cycle.rabl to Api::OrderCycleSerializer	2019-08-08 12:23:09 +02:00
Hugo Daniel	fa6fa0be64	Add missing translation	2019-08-08 11:11:32 +02:00
Matt-Yorkley	2f5b0a5afb	Remove product import FeatureFlag	2019-08-07 09:59:55 +01:00
Matt-Yorkley	6ba98b4b2c	Add beta notice to Product Import	2019-08-06 17:02:38 +01:00
Maikel	229e6fa0a3	Merge pull request #4073 from luisramos0/kill_more_rabl ... Replace update_prod_image.rabl with ImageSerializer in api/product_image_controller	2019-08-06 15:00:33 +10:00
Matt-Yorkley	8a069787d1	Cart dropdown now closes when clicking outside it.	2019-08-05 21:48:37 +01:00
Pau Pérez Fabregat	64d21969f0	Merge pull request #4064 from luisramos0/convert_search_Rabl ... Replace views/admin/variants/search.rabl with Api::Admin::VariantSerializer	2019-08-05 15:07:10 +02:00
Matt-Yorkley	c07df6a5a6	Fix table column alignments	2019-08-04 20:45:00 +01:00
Matt-Yorkley	a7d109833d	Add SKU to order confirmation email	2019-08-04 20:43:55 +01:00
Hugo Daniel	60bdde6349	Convert variants/new from erb to haml and import new.js.erb	2019-08-01 11:23:44 +02:00
Hugo Daniel	5faf33fabe	Import variants/new.html.erb from spree_backend	2019-08-01 10:50:13 +02:00
Hugo Daniel	f3b1a5dd35	Convert variants/edit from erb to haml	2019-08-01 10:45:04 +02:00
Hugo Daniel	07ccbf7f98	Import variants/edit.html.erb from spree_backend	2019-07-31 16:55:47 +02:00
Luis Ramos	f9fabd088c	Merge pull request #4075 from HugsDaniel/defacepocalypse-payment-methods ... [Defacepocalypse] De-deface payment methods index	2019-07-31 15:49:48 +01:00
Hugo Daniel	a3af6617a9	Convert payments/show from erb to haml	2019-07-31 16:20:32 +02:00
Hugo Daniel	9f7fb654c8	Import payments/show.html.erb from spree_backend	2019-07-31 16:16:26 +02:00
Hugo Daniel	b4a6686eac	Convert payments/_list from erb to haml	2019-07-31 16:15:38 +02:00
Hugo Daniel	ac13ff114c	Import payments/_list.html.erb from spree_backend	2019-07-31 16:09:48 +02:00
Hugo Daniel	af9187947f	Convert erb to haml	2019-07-31 16:02:48 +02:00
Hugo Daniel	f0fdbf7cf4	Import payments/index from spree_backend	2019-07-31 14:33:38 +02:00
Hugo Daniel	74ab31c0e6	Import gateway.html.erb and convert to haml	2019-07-31 14:28:15 +02: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	58b43c7bc9	Remove update_product_image.v1.rabl and switch controller from respond_with to render json to switch from rabl to AMS	2019-07-30 12:19:42 +01:00
luisramos0	04e13e1136	Change css styling from id to class to make rubocop happy. Keeping id name as it may be needed in spree autocomplete css or js code	2019-07-29 19:46:12 +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
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
Hugo Daniel	3c2b6f4ed1	Remove data-hooks	2019-07-25 14:38:09 +02:00
Hugo Daniel	ec6f6056a8	Remove data-hooks	2019-07-25 14:34:06 +02:00
Hugo Daniel	6a621f47aa	Remove data-hooks	2019-07-25 14:31:07 +02:00
Hugo Daniel	aae5ae9f1e	De-deface payments/new	2019-07-25 13:27:41 +02:00
Hugo Daniel	888e0e0bb4	Convert erb partials to haml	2019-07-25 13:22:55 +02:00
Hugo Daniel	a0b0fb05a6	Import payments/new from spree_backend to ofn	2019-07-25 13:22:32 +02:00
Hugo Daniel	a11562e4dd	Fix incorrect indentation in variants table	2019-07-25 12:05:50 +02:00
Hugo Daniel	986837d601	Import variants/_form.html.erb from spree_backend to ofn and de-deface it	2019-07-25 11:07:35 +02: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