Diego Calvo
|
aa14de0645
|
emails
|
2021-03-30 09:56:54 +02:00 |
|
Diego Calvo
|
ca3566121e
|
get related products exclude duplicates
|
2021-03-29 15:03:42 +02:00 |
|
Diego Calvo
|
16f41bfa57
|
emails fix images
|
2021-03-29 14:11:16 +02:00 |
|
Diego Calvo
|
a64dd745e2
|
product.image in templates
|
2021-03-29 13:32:07 +02:00 |
|
Diego Calvo
|
c627cbb2f1
|
Merge branch 'development' into diego
|
2021-03-26 13:34:13 +01:00 |
|
Sam
|
9805468b57
|
Merge branch 'sam' into development
|
2021-03-26 11:35:30 +00:00 |
|
Diego Calvo
|
9604eee0ef
|
headers validation in CSV
|
2021-03-26 12:07:50 +01:00 |
|
Sam
|
2629292c64
|
added product id to image path
|
2021-03-26 10:16:19 +00:00 |
|
Maria Ozamiz
|
0251ce034e
|
responsive email verification
|
2021-03-26 09:40:47 +01:00 |
|
Maria Ozamiz
|
1399e9ac6e
|
add if else for default image
|
2021-03-26 09:06:24 +01:00 |
|
Maria Ozamiz
|
d6593188ef
|
hardcoded image fixed
|
2021-03-26 08:59:54 +01:00 |
|
Diego Calvo
|
70d50dc763
|
Merge branch 'development' of https://bitbucket.org/enreda/back-latienda into development
|
2021-03-25 15:17:24 +01:00 |
|
Diego Calvo
|
75751f9c89
|
active and verify users
|
2021-03-25 15:16:31 +01:00 |
|
Sam
|
7eb4695174
|
Merge branch 'development' into sam
|
2021-03-25 10:18:44 +00:00 |
|
Sam
|
c2fc97d01e
|
Merge branch 'sam'
|
2021-03-25 10:17:29 +00:00 |
|
Sam
|
cba1c5bad6
|
Merge branch 'sam' into development
|
2021-03-25 10:16:36 +00:00 |
|
Sam
|
74b006264f
|
Merge branch 'development' of bitbucket.org:enreda/back-latienda into development
|
2021-03-25 10:16:32 +00:00 |
|
Sam
|
86aaa0ef2e
|
admin user forms handle passwords correctly
|
2021-03-25 10:16:08 +00:00 |
|
Sam
|
a13d6d1f36
|
changes to core.admin, useradmin still not showing password correctly
|
2021-03-25 10:08:22 +00:00 |
|
Diego Calvo
|
0f7e14c001
|
Merge branch 'master' of https://bitbucket.org/enreda/back-latienda
|
2021-03-23 13:48:13 +01:00 |
|
Diego Calvo
|
190f14f44d
|
admin stats
|
2021-03-23 13:47:20 +01:00 |
|
Sam
|
6a2b32f00c
|
fixed company name search in custom user admin
|
2021-03-22 11:17:48 +00:00 |
|
Diego Calvo
|
79393320c1
|
get_descendats categories in search_products
|
2021-03-19 14:31:59 +01:00 |
|
Diego Calvo
|
815a55f45c
|
real solve conflicts with categories
|
2021-03-19 14:13:24 +01:00 |
|
Diego Calvo
|
3c7dfe731f
|
solve conflicts with categories
|
2021-03-19 14:11:56 +01:00 |
|
Sam
|
23109cfb39
|
new way of handling category searches
|
2021-03-19 10:53:49 +00:00 |
|
Diego Calvo
|
48f7a82af1
|
categories by name
|
2021-03-19 11:24:28 +01:00 |
|
Diego Calvo
|
ff1afb714f
|
min and max prices values instead of dict
|
2021-03-19 08:14:36 +01:00 |
|
Sam
|
2673aa51aa
|
changed product categories from label to name
|
2021-03-18 11:20:30 +00:00 |
|
Sam
|
d2ee4273b9
|
filtering product searches with empty string working now
|
2021-03-17 11:30:11 +00:00 |
|
Sam
|
696e2f49d1
|
company search filter working
|
2021-03-17 11:09:26 +00:00 |
|
Sam
|
0c70763345
|
new company search endpoint, but searchfilter not working
|
2021-03-17 11:00:37 +00:00 |
|
Sam
|
6a3bd7acea
|
fixing changes to product search
|
2021-03-17 10:31:39 +00:00 |
|
Sam
|
62c6b76e36
|
Merge branch 'diego' into development
|
2021-03-17 10:18:07 +00:00 |
|
Sam
|
aac2c5777e
|
small fixes
|
2021-03-17 10:16:31 +00:00 |
|
Sam
|
29d6bc56cb
|
Merge branch 'development'
|
2021-03-17 10:02:58 +00:00 |
|
Sam
|
402681e0ae
|
disabled social login tests, until its working
|
2021-03-17 10:01:45 +00:00 |
|
Diego Calvo
|
440c845286
|
Merge branch 'master' into diego
|
2021-03-16 15:03:46 +01:00 |
|
Diego Calvo
|
11465f4a6a
|
list of categories in search_products
|
2021-03-16 15:02:31 +01:00 |
|
Sam
|
3cccdad35b
|
some more work on test, prior to use
|
2021-03-16 14:00:52 +00:00 |
|
Sam
|
b81f868cac
|
more work on social login
|
2021-03-16 13:24:25 +00:00 |
|
Sam
|
6dec6be283
|
adding Social login
|
2021-03-16 12:22:14 +00:00 |
|
pablogg
|
5a3455fa60
|
fix merge
|
2021-03-16 13:09:26 +01:00 |
|
pablogg
|
28ed2f8f0f
|
Search in companies
|
2021-03-16 13:08:41 +01:00 |
|
Sam
|
9e476f4007
|
created endpoint to get all categories
|
2021-03-16 12:06:08 +00:00 |
|
Sam
|
4b05782ca6
|
removing changes to template system
|
2021-03-15 13:52:41 +00:00 |
|
Sam
|
6557207e45
|
new purchase email templates working
|
2021-03-15 12:21:18 +00:00 |
|
Diego Calvo
|
fc7e80eb5c
|
send email to manager if coop has no email
|
2021-03-15 13:07:47 +01:00 |
|
Sam
|
23b78dd11a
|
Merge branch 'sam' into development
|
2021-03-15 11:26:03 +00:00 |
|
Sam
|
c0bc86a1a6
|
Merge branch 'diego' into development
|
2021-03-15 11:25:04 +00:00 |
|