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 |
|
Sam
|
cf60622d23
|
added file to ignore contents of static folder
|
2021-03-15 11:24:43 +00:00 |
|
Sam
|
6c70a430e8
|
improvements on new templates
|
2021-03-15 11:21:01 +00:00 |
|
Diego Calvo
|
d11c4a5c36
|
revert last commit
|
2021-03-15 12:04:27 +01:00 |
|
Sam
|
a920a9fa61
|
trying to get new templates to work
|
2021-03-15 10:49:17 +00:00 |
|
Diego Calvo
|
048f6dbb70
|
perform_create in MyProductsViewSet for creating with creator and company
|
2021-03-15 11:45:44 +01:00 |
|
Sam
|
5714a661aa
|
new purchase notification template
|
2021-03-15 10:03:32 +00:00 |
|
Diego Calvo
|
4a737d4287
|
user can update notify
|
2021-03-12 15:03:50 +01:00 |
|
Sam
|
5da01b318e
|
fixed email sending for html content type
|
2021-03-12 13:45:36 +00:00 |
|
Sam
|
ffb39ba62f
|
applied new html template to all email templates
|
2021-03-12 12:45:26 +00:00 |
|
Sam
|
778d65d84e
|
implemented new email templates, but not rendering
|
2021-03-12 12:37:27 +00:00 |
|
Sam
|
d0609fd1fa
|
finished admin_stats endpoint
|
2021-03-12 12:14:30 +00:00 |
|
Sam
|
712cabe3da
|
fixed for stats_admin geo filtering
|
2021-03-12 11:17:17 +00:00 |
|
Sam
|
7a2e80b43e
|
first stab at admin_stats endpoint
|
2021-03-12 11:10:51 +00:00 |
|
Sam
|
341ea2d54d
|
create_company_user endpoint open for auth and anon users
|
2021-03-12 10:39:17 +00:00 |
|
Diego Calvo
|
760927c024
|
Merge branch 'development' into diego
|
2021-03-12 11:32:18 +01:00 |
|
Sam
|
37f222e6c9
|
changes for my endpoints
|
2021-03-12 10:22:23 +00:00 |
|
Sam
|
6862d62bf5
|
user activation now redirects to home
|
2021-03-12 10:13:24 +00:00 |
|
Sam
|
9e5fb89274
|
cleanup
|
2021-03-11 13:56:09 +00:00 |
|
Sam
|
4cf22fd969
|
bunch of stuff
|
2021-03-11 13:51:14 +00:00 |
|
Sam
|
5fe3883fcd
|
my products ordered by created date, descending
|
2021-03-11 13:18:50 +00:00 |
|
Sam
|
dd4b079895
|
fixes user creation test
|
2021-03-11 13:10:54 +00:00 |
|
Sam
|
67644512ff
|
fixed error in user creation
|
2021-03-11 13:04:30 +00:00 |
|
Sam
|
f23e1670c5
|
removed geo search code, moved it to geosearch branch
|
2021-03-11 12:45:55 +00:00 |
|
Sam
|
fc3ea28b5c
|
fix for create_company_user
|
2021-03-11 12:33:37 +00:00 |
|
Sam
|
ef0fe3716e
|
fixed error in create_company_user view
|
2021-03-11 12:32:13 +00:00 |
|
Sam
|
8de48c6698
|
more tweaks for geo search
|
2021-03-11 12:17:40 +00:00 |
|