Commit Graph

106 Commits

Author SHA1 Message Date
Sam
c4faa89a99 fixes to the my_ views, and their tests 2021-02-12 12:03:16 +00:00
Sam
0a61cea599 query params filter working with tags in Product 2021-02-12 11:28:55 +00:00
Sam
83241cd788 loadgisdata working, removed old addgeo 2021-02-11 13:03:25 +00:00
Sam
20a4040aa7 improvements to loadgisdata 2021-02-11 12:51:59 +00:00
Sam
2de6a66af1 working on adding geospatial data to geo models 2021-02-11 12:33:09 +00:00
Sam
0a69fd8b89 added gadm geo package dataset 2021-02-11 11:26:05 +00:00
Sam
202a1b14f6 added gadm geo package dataset 2021-02-11 11:25:56 +00:00
Sam
d577a6b202 changed company.city to charfield 2021-02-11 10:21:31 +00:00
Sam
208f96add7 changes to addtestdata 2021-02-10 13:52:39 +00:00
Sam
02f6b29e5f created TreeTag model, fixes for addtaxonomy command 2021-02-10 13:03:10 +00:00
Sam
41e68031fa work on initial tag load 2021-02-10 12:50:25 +00:00
Sam
07c3a42ee8 Merge branch 'sam' into development 2021-02-10 12:03:54 +00:00
Sam
fa237142ad added ip and geoip functionality to email_manager action 2021-02-10 11:55:03 +00:00
Diego Calvo
c4c03653e2 Merge branch 'development' of https://bitbucket.org/enreda/back-latienda into development 2021-02-09 14:56:15 +01:00
Diego Calvo
0675c48903 create coop user with geo 2021-02-09 14:55:42 +01:00
Sam
7e7552742a conflict resolution 2021-02-09 12:06:28 +00:00
Sam
a5979b9373 enabled custom serializers in my_ endpoints 2021-02-09 12:04:47 +00:00
Diego Calvo
02037d5b43 create coop user endpoint 2021-02-09 10:29:45 +01:00
Sam
a9cb7cedd6 email verification sent for users loaded thru CSV 2021-02-05 13:11:09 +00:00
Sam
65c571a887 undid regressions from code merge with diego 2021-02-04 13:19:43 +00:00
Sam
b11a5afa8b fixed string 2021-02-04 12:30:15 +00:00
Sam
275c4fd57e cleanup 2021-02-04 12:15:58 +00:00
Sam
8d359cdb71 merged with diegos changes 2021-02-04 12:13:12 +00:00
Sam
a61f11465c Merge branch 'diego' into sam 2021-02-04 11:49:49 +00:00
Sam
e30af924f0 added missing history field to Company 2021-02-04 11:22:25 +00:00
Diego Calvo
7a7b27cc2b edit users solved conflicts 2021-02-04 12:16:47 +01:00
Sam
12c0ddcbe8 small fixes 2021-02-04 11:10:47 +00:00
Sam
89b68dd516 history sync created when adding products from csv 2021-02-04 10:56:34 +00:00
Sam
77acc668b8 added user-specific endpoints 2021-02-04 10:14:28 +00:00
Sam
ae043b24fc updated to readme 2021-02-03 13:23:40 +00:00
Sam
ae7fac60dc added user role SITE_ADMIN 2021-02-03 13:11:39 +00:00
Sam
b7ab7eb5d3 added test for product load 2021-02-03 12:33:32 +00:00
Sam
05fa09a8f3 massive product load implementation, not tested 2021-02-03 12:24:18 +00:00
Sam
f3698014e6 change to user serializer 2021-02-03 11:46:46 +00:00
Sam
e6ada44704 implemented required fields for csv data load 2021-02-03 11:32:58 +00:00
Sam
cc0bb2ebbf csv loading working 2021-02-03 09:59:01 +00:00
Sam
a80d4565db more work on load_coop_managers endpoint, unfinished 2021-02-02 14:22:38 +00:00
Sam
b906ef0be9 added default roles to user: shop_user, coop_manager 2021-02-02 12:51:51 +00:00
Sam
b5887c5c51 reenabled django suit 2021-02-02 12:21:42 +00:00
Sam
3e54061733 update to requirements, fix dataset file location in management command 2021-02-02 11:51:00 +00:00
Sam
c8d433c3f9 fixed regression introduced 2021-02-02 11:46:43 +00:00
Sam
ec584b7aab fixed password update not working 2021-02-01 14:13:58 +00:00
Sam
ee33b327fa user modification enabled 2021-02-01 13:32:34 +00:00
Sam
b8cd663fee fix for user registration 2021-02-01 12:56:28 +00:00
Sam
d94eb9882c changes to addtestdata 2021-01-26 14:05:39 +00:00
Sam
9b78fba142 moved data files to datasets/, created addtestdata command 2021-01-26 13:36:15 +00:00
Sam
9c88019700 enabled django-suit for admin 2021-01-26 12:32:19 +00:00
Sam
c3c9f54c54 improvement to custom user endpoint 2021-01-25 12:28:46 +00:00
Sam
f94d822d5e added custom user endpoints 2021-01-25 12:15:11 +00:00
Sam
2b46d01369 improvements to router, y tests 2021-01-22 12:33:59 +00:00