Luis Ramos
|
d162e8c087
|
Merge pull request #4300 from daningenthron/daningenthron/add-a-new-card
Translation: "Add new credit card"
|
2019-09-30 13:27:25 +01:00 |
|
Dan Ingenthron
|
e8f9ace8e6
|
Correct translation key on add card link
|
2019-09-24 13:42:31 -05:00 |
|
luisramos0
|
377b4a3755
|
Do not add ng-controller if main_ng_ctrl_name is not set
|
2019-09-11 10:36:19 +01:00 |
|
luisramos0
|
33472014f1
|
Do not add main_ng_app_name if it is not defined
|
2019-09-11 10:32:30 +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 |
|
luisramos0
|
3d718d9738
|
Move admin layout body contents to a separate partial
|
2019-09-11 10:32:29 +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 |
|
Pau Pérez Fabregat
|
369a5a8a2f
|
Merge pull request #4101 from luisramos0/remove_variants_rabl
Convert spree/api/products and spree/api/variants views from rabl to AMS
|
2019-09-02 12:14:26 +02:00 |
|
Luis Ramos
|
fa1becb791
|
Merge pull request #4063 from luisramos0/dead_code
Remove dead code under views/spree/shared
|
2019-08-30 22:39:01 +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
|
56a54db602
|
Remove admin login_nav override and move it to admin layout file
|
2019-08-18 21:39:19 +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 |
|
luisramos0
|
5f4429646d
|
Move override to the view that is now in our code base (from spree_auth_devise originally)
|
2019-08-18 21:33:23 +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 |
|
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 |
|
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 |
|
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 |
|
luisramos0
|
cc51537e93
|
Convert spree/api/products_controller from rabl to ams
|
2019-07-31 09:50:34 +01:00 |
|
luisramos0
|
c3fbf9cdf9
|
Remove unused pagination from index and respective specs, fix spec for search by sku by adding sku to the serializer and adapt a few specs to pass with AMS attrivbutes,
|
2019-07-31 09:40:19 +01:00 |
|
luisramos0
|
180598c603
|
Convert spree/api/variants_controller to AMS by changing base_controller, using render json instad of respond with, deleting rabl templates and adapting specs
Delete unused pagination spec
|
2019-07-31 09:40:19 +01:00 |
|