kit-eco.social/consumocuidado-server
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Commit Graph

  • 682a41e828 leftover file deleted Sam 2021-02-12 12:35:57 +00:00
  • bd8d05bd39 changes to readme, and addtaxonomy Sam 2021-02-12 12:34:08 +00:00
  • e5fdeb7cdb added tag filtering for companies Sam 2021-02-12 12:18:06 +00:00
  • c4faa89a99 fixes to the my_ views, and their tests Sam 2021-02-12 12:03:16 +00:00
  • c4e7ce4fef Merge branch 'development' of https://bitbucket.org/enreda/back-latienda into diego Diego Calvo 2021-02-12 12:45:42 +01:00
  • 0a61cea599 query params filter working with tags in Product Sam 2021-02-12 11:28:55 +00:00
  • 9a6a30553a added custom filter with tag support to products Sam 2021-02-12 11:09:32 +00:00
  • 77b1660fc3 testing tag filtering Sam 2021-02-12 10:49:09 +00:00
  • 5f0c81d947 Merge branch 'development' of https://bitbucket.org/enreda/back-latienda into diego Diego Calvo 2021-02-12 11:23:13 +01:00
  • 58797d2972 added local TagTreeModel for testing Sam 2021-02-11 13:51:05 +00:00
  • 82a6273b3d increased tag count in product model Sam 2021-02-11 13:29:06 +00:00
  • 83241cd788 loadgisdata working, removed old addgeo Sam 2021-02-11 13:03:25 +00:00
  • 20a4040aa7 improvements to loadgisdata Sam 2021-02-11 12:51:59 +00:00
  • 2de6a66af1 working on adding geospatial data to geo models Sam 2021-02-11 12:33:09 +00:00
  • 2ad212b192 added multipolygon field to geo modls Sam 2021-02-11 11:28:07 +00:00
  • 0a69fd8b89 added gadm geo package dataset Sam 2021-02-11 11:26:05 +00:00
  • 202a1b14f6 added gadm geo package dataset Sam 2021-02-11 11:25:56 +00:00
  • 95e5a70690 Merge branch 'development' of https://bitbucket.org/enreda/back-latienda into diego Diego Calvo 2021-02-11 11:53:55 +01:00
  • d577a6b202 changed company.city to charfield Sam 2021-02-11 10:21:31 +00:00
  • 862b65a5b2 my_company correction Diego Calvo 2021-02-10 15:02:57 +01:00
  • 208f96add7 changes to addtestdata Sam 2021-02-10 13:52:39 +00:00
  • 02f6b29e5f created TreeTag model, fixes for addtaxonomy command Sam 2021-02-10 13:03:10 +00:00
  • 41e68031fa work on initial tag load Sam 2021-02-10 12:50:25 +00:00
  • 07c3a42ee8 Merge branch 'sam' into development Sam 2021-02-10 12:03:54 +00:00
  • 4d35f67587 readme update Sam 2021-02-10 12:03:12 +00:00
  • fa237142ad added ip and geoip functionality to email_manager action Sam 2021-02-10 11:55:03 +00:00
  • dad8c00b84 improvement to email_manager action as per documentation Sam 2021-02-10 11:01:33 +00:00
  • 25231b3b16 improvements to email templates Sam 2021-02-10 10:43:26 +00:00
  • 3b801768e4 handle errors Diego Calvo 2021-02-10 10:58:09 +01:00
  • c4c03653e2 Merge branch 'development' of https://bitbucket.org/enreda/back-latienda into development Diego Calvo 2021-02-09 14:56:15 +01:00
  • 0675c48903 create coop user with geo Diego Calvo 2021-02-09 14:55:42 +01:00
  • 202369e189 added empty action "related" to ProductViewSet Sam 2021-02-09 13:40:40 +00:00
  • 94b62ce494 replaced StatsLog.model with a generic foreign key Sam 2021-02-09 13:20:49 +00:00
  • d3862629e9 cleanup Sam 2021-02-09 13:08:48 +00:00
  • 9be0971fb8 implemented basic filter creation during product search Sam 2021-02-09 13:07:56 +00:00
  • 742f78b4b6 improvemets to product search Sam 2021-02-09 12:20:01 +00:00
  • 7e7552742a conflict resolution Sam 2021-02-09 12:06:28 +00:00
  • a5979b9373 enabled custom serializers in my_ endpoints Sam 2021-02-09 12:04:47 +00:00
  • d0deec9417 added drf-extra-fields to handle PointField serialization Sam 2021-02-09 11:41:26 +00:00
  • 02037d5b43 create coop user endpoint Diego Calvo 2021-02-09 10:29:45 +01:00
  • 8223032ef7 split search and serializer Diego Calvo 2021-02-08 14:51:24 +01:00
  • 4460f1121a added missing import Sam 2021-02-05 13:54:54 +00:00
  • 39f6a8bcfb added action endpoint for emailing company manager Sam 2021-02-05 13:53:55 +00:00
  • a9cb7cedd6 email verification sent for users loaded thru CSV Sam 2021-02-05 13:11:09 +00:00
  • 75234953c0 improvement to search test Sam 2021-02-05 09:57:11 +00:00
  • b9822edc8d search optimization broken by tags Sam 2021-02-04 14:10:51 +00:00
  • 67ce92c33f more search optimization Sam 2021-02-04 13:39:56 +00:00
  • 1441644b74 search improvement Sam 2021-02-04 13:35:26 +00:00
  • 1f58661f76 conflict resolution Sam 2021-02-04 13:25:35 +00:00
  • 9fd8c87517 auto-add creator from request use in viewsets Sam 2021-02-04 13:24:14 +00:00
  • 65c571a887 undid regressions from code merge with diego Sam 2021-02-04 13:19:43 +00:00
  • a3629c2313 save Company creator Diego Calvo 2021-02-04 13:52:30 +01:00
  • b11a5afa8b fixed string Sam 2021-02-04 12:30:15 +00:00
  • 275c4fd57e cleanup Sam 2021-02-04 12:15:58 +00:00
  • 8d359cdb71 merged with diegos changes Sam 2021-02-04 12:13:12 +00:00
  • a61f11465c Merge branch 'diego' into sam Sam 2021-02-04 11:49:49 +00:00
  • e30af924f0 added missing history field to Company Sam 2021-02-04 11:22:25 +00:00
  • 7a7b27cc2b edit users solved conflicts Diego Calvo 2021-02-04 12:16:47 +01:00
  • 12c0ddcbe8 small fixes Sam 2021-02-04 11:10:47 +00:00
  • 1bfe41c000 Merge branch 'development' into diego Diego Calvo 2021-02-04 12:07:32 +01:00
  • 65d0c6d946 merge develoment to diego Diego Calvo 2021-02-04 12:00:39 +01:00
  • 1c55f7da98 test fixes Sam 2021-02-04 10:59:13 +00:00
  • 89b68dd516 history sync created when adding products from csv Sam 2021-02-04 10:56:34 +00:00
  • 0107d86a27 readme update Sam 2021-02-04 10:27:02 +00:00
  • 904db3b794 very basic and unoptimized search functionality is working Sam 2021-02-04 10:19:38 +00:00
  • 77acc668b8 added user-specific endpoints Sam 2021-02-04 10:14:28 +00:00
  • ea8cd97baf search function basics Sam 2021-02-03 14:20:55 +00:00
  • ae043b24fc updated to readme Sam 2021-02-03 13:23:40 +00:00
  • ae7fac60dc added user role SITE_ADMIN Sam 2021-02-03 13:11:39 +00:00
  • b4eaa0f287 massive load of products working Sam 2021-02-03 13:00:08 +00:00
  • b7ab7eb5d3 added test for product load Sam 2021-02-03 12:33:32 +00:00
  • 05fa09a8f3 massive product load implementation, not tested Sam 2021-02-03 12:24:18 +00:00
  • f3698014e6 change to user serializer Sam 2021-02-03 11:46:46 +00:00
  • e6ada44704 implemented required fields for csv data load Sam 2021-02-03 11:32:58 +00:00
  • 569ba6515b readme update Sam 2021-02-03 10:28:58 +00:00
  • cc0bb2ebbf csv loading working Sam 2021-02-03 09:59:01 +00:00
  • a80d4565db more work on load_coop_managers endpoint, unfinished Sam 2021-02-02 14:22:38 +00:00
  • b906ef0be9 added default roles to user: shop_user, coop_manager Sam 2021-02-02 12:51:51 +00:00
  • b5887c5c51 reenabled django suit Sam 2021-02-02 12:21:42 +00:00
  • 02b6e9545e updated to readme about user management Sam 2021-02-02 12:01:05 +00:00
  • 3e54061733 update to requirements, fix dataset file location in management command Sam 2021-02-02 11:51:00 +00:00
  • c8d433c3f9 fixed regression introduced Sam 2021-02-02 11:46:43 +00:00
  • ec584b7aab fixed password update not working Sam 2021-02-01 14:13:58 +00:00
  • ca89ac73f2 update to readme Sam 2021-02-01 13:36:42 +00:00
  • ee33b327fa user modification enabled Sam 2021-02-01 13:32:34 +00:00
  • b8cd663fee fix for user registration Sam 2021-02-01 12:56:28 +00:00
  • d94eb9882c changes to addtestdata Sam 2021-01-26 14:05:39 +00:00
  • 9b78fba142 moved data files to datasets/, created addtestdata command Sam 2021-01-26 13:36:15 +00:00
  • b385767232 readme update Sam 2021-01-26 12:50:29 +00:00
  • 9c88019700 enabled django-suit for admin Sam 2021-01-26 12:32:19 +00:00
  • 7175dab55e cleanup Sam 2021-01-26 12:16:46 +00:00
  • a9658c1009 applied tags field to company model Sam 2021-01-26 12:06:20 +00:00
  • 2a05beec07 serialized tags working Sam 2021-01-26 12:00:44 +00:00
  • 4437037710 everythin working except for creation product insance with category Sam 2021-01-26 11:20:48 +00:00
  • 0e5aee73c3 more work on serializing tags Sam 2021-01-26 10:58:57 +00:00
  • 4597eb0a2e bug in simplejwt Diego Calvo 2021-01-25 15:17:52 +01:00
  • e42559bfbe Merge branch 'sam' into development Sam 2021-01-25 14:08:24 +00:00
  • 00b2cf9f22 more improvements for tag serializer Sam 2021-01-25 14:07:11 +00:00
  • 8059cd3667 more tests for tagging serializer Sam 2021-01-25 13:51:38 +00:00
  • 84cfffabaf Readme and requirements Diego Calvo 2021-01-25 14:20:31 +01:00