Commit Graph

123 Commits

Author SHA1 Message Date
Sam
24ff07bda7 user password change working in admin 2021-04-05 11:55:09 +01:00
Diego Calvo
50ada7c6b6 script to send email to every COOP_MANAGERS 2021-03-31 14:55:21 +02:00
Diego Calvo
7399b6a480 restore password 2021-03-31 10:14:36 +02:00
Diego Calvo
373e892463 Fixed emails 2021-03-30 14:19:16 +02:00
Sam
9805468b57 Merge branch 'sam' into development 2021-03-26 11:35:30 +00:00
Sam
2629292c64 added product id to image path 2021-03-26 10:16:19 +00: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
c2fc97d01e Merge branch 'sam' 2021-03-25 10:17:29 +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
Sam
402681e0ae disabled social login tests, until its working 2021-03-17 10:01:45 +00: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
c0bc86a1a6 Merge branch 'diego' into development 2021-03-15 11:25:04 +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
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
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
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
0eaaf2bc49 fixed create_company_user endoint, tests working 2021-03-10 13:24:02 +00:00
Sam
a033fa3606 readme update 2021-03-10 12:44:23 +00:00
Sam
faf3cfc3fa new user activation working 2021-03-10 12:37:24 +00:00
Sam
e31d725ed1 email verification being sent upon user creation 2021-03-10 12:24:59 +00:00
Sam
9b1405ecda another change but still not working 2021-03-09 12:06:02 +00:00
Sam
170ca94022 changes but still not working 2021-03-09 11:59:16 +00:00
Sam
2eb6bf3acd extended DjangoSuitConfig to customize admin navbar, not working yet 2021-03-09 11:43:14 +00:00
Sam
1aa2698763 customization to model admin forms 2021-03-05 12:38:17 +00:00
Diego Calvo
0b3f91d566 add full_name to user in create_company_user 2021-03-03 13:28:28 +01:00
Sam
794250a6ab cleanup 2021-03-02 13:55:10 +00:00
Sam
54cebf842d Merge branch 'master' of bitbucket.org:enreda/back-latienda 2021-02-26 14:01:19 +00:00
Sam
223b944199 improvements in product loader 2021-02-26 13:59:30 +00:00
pablogg
d4160316fb fix ipdb 2021-02-26 14:41:08 +01:00
pablogg
7f86d979ed Merge branch 'master' of bitbucket.org:enreda/back-latienda 2021-02-26 14:28:41 +01:00
Sam
25b8e561d3 improvements to coop loader 2021-02-26 13:16:37 +00:00
Sam
874068881d improvements to csv loading code 2021-02-26 12:47:23 +00:00
Sam
0f7af9c0fb isolated cooploading functionality 2021-02-26 11:46:40 +00:00
pablogg
85b3bcba0d fix error Point (lat,log) 2021-02-25 16:55:04 +01:00