885 Commits

Author	SHA1	Message	Date
Luis Ramos	4540b32d3a	Merge branch 'master' into spree_be_config_taxons	2019-10-02 15:35:15 +01:00
Luis Ramos	14047c620a	Merge branch 'master' into spree_be_config_tax	2019-10-02 15:31:25 +01:00
Luis Ramos	2be1c231f7	Merge pull request #4290 from luisramos0/spree_be_config_zones ... Move zones, countries and states from spree_backend to OFN	2019-10-02 14:30:59 +01:00
Luis Ramos	3f7aff4b8b	Merge pull request #4305 from luisramos0/new_product_translations ... Make translations in new product page relative and specific to the page	2019-10-01 22:38:49 +01:00
Pau Pérez Fabregat	c2f8803d72	Merge pull request #4297 from luisramos0/inv_levels ... Remove all usages of Spree Config track_inventory_levels	2019-10-01 10:35:20 +02:00
luisramos0	f3bc038c05	Make translations in new product page relative and specific to the page	2019-09-23 17:02:30 +01:00
luisramos0	cd6d34663e	Remove all usages of Spree Config track_inventory_levels, this is always true in OFN since v2.0.0	2019-09-22 15:25:24 +01:00
luisramos0	4f9eee2682	Fix feature specs added from spree_backend in the configuration area	2019-09-20 15:43:55 +01:00
luisramos0	cc0dabcd1e	Convert spree/admin/tax_rates from erb to haml	2019-09-20 15:36:58 +01:00
luisramos0	e79c672263	Convert spree/admin/tax_categories from erb to haml	2019-09-20 15:36:54 +01:00
luisramos0	bc6f7934e0	Add spree_backend views related to admin/configuration menu that are missing in ofn	2019-09-20 15:35:49 +01:00
luisramos0	def9ab7c47	Convert spree/admin/taxons from erb to haml	2019-09-20 15:24:06 +01:00
luisramos0	2a68d34fb0	Convert spree/admin/taxonomies from erb to haml	2019-09-20 15:24:06 +01:00
luisramos0	2ce56aef2c	Add spree_backend views related to admin/configuration taxonomies that are missing in ofn	2019-09-20 15:23:45 +01:00
luisramos0	4a83eca832	Fix feature specs added from spree_backend in the configuration area	2019-09-20 15:05:21 +01:00
luisramos0	32c1eecece	Convert spree/admin/zones from erb to haml	2019-09-20 15:01:06 +01:00
luisramos0	6d8c7a4bee	Fix minor detail in states and countries views	2019-09-20 14:57:48 +01:00
luisramos0	bd2045cad7	Convert spree/admin/states from erb to haml	2019-09-20 14:55:36 +01:00
luisramos0	e1c3d2442a	Convert spree/admin/countries from erb to haml	2019-09-20 14:55:10 +01:00
luisramos0	3df65d0463	Add spree_backend views related to admin/configuration menu that are missing in ofn	2019-09-20 14:54:55 +01:00
luisramos0	d038c27f1f	Fix app_wrapper_attr code by making the content_for tag be only the name of the ng-app and ng-ctrller	2019-09-11 10:32:30 +01:00
Luis Ramos	500ef901fd	Merge pull request #4164 from luisramos0/little_de_deface ... Remove some unused deface overrides and move some others to their views	2019-09-11 10:26:56 +01:00
Luis Ramos	2dc85463ce	Merge pull request #4226 from HugsDaniel/4090-missing-translations-order ... Add missing translations for orders	2019-09-09 15:16:47 +01:00
Luis Ramos	e3ce2a7486	Merge pull request #4104 from luisramos0/convert_taxons_to_ams ... Convert spree/api/taxons views from rabl to AMS	2019-09-06 00:04:10 +01:00
Hugo Daniel	f88d54b862	Add missing translations for orders	2019-09-05 15:13:10 +02:00
Matt-Yorkley	a72c662b97	Update per_page dropdown UX	2019-09-02 14:35:00 +01:00
Matt-Yorkley	e9c60a33b9	Hide search in dropdown for per_page options	2019-09-02 14:35:00 +01:00
Matt-Yorkley	5a4be24df0	Add "filter results" button	2019-09-02 11:56:00 +01:00
Matt-Yorkley	1822fd97a6	Tidy up filters	2019-09-02 11:54:28 +01:00
Matt-Yorkley	4ff3e9fe10	Update Angular loading conditionals	2019-09-02 11:54:28 +01:00
Matt-Yorkley	a63994440d	Add pagination to UI	2019-09-02 11:54:28 +01:00
Luis Ramos	265e76e8ca	Merge pull request #4074 from HugsDaniel/defacepocalypse ... [Defacepocalypse] De-deface product properties index	2019-08-28 22:18:18 +01:00
luisramos0	ece0652ca3	Adapt spree/admin/shared/_routes.html.erb to new location of the api/taxons routes	2019-08-28 22:06:56 +01:00
Luis Ramos	cd263b761c	Merge pull request #4055 from luisramos0/remove_spree_api ... Remove dependency to spree_api - step 1 - controllers and routes	2019-08-28 15:34:08 +01:00
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
luisramos0	8a4e5b445f	Delete unused frontend auth toekn script override and move the backend one to the head partial	2019-08-18 21:53:56 +01:00
luisramos0	4c3d15b42b	Remove users menu entry override and file and add it directly to the tabs view together with all the other entries	2019-08-18 21:36:50 +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
Hugo Daniel	bf2c1a0c1d	Add ng directive for setting on demand	2019-08-09 14:42:39 +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
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
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