Sam
|
202a1b14f6
|
added gadm geo package dataset
|
2021-02-11 11:25:56 +00:00 |
|
Diego Calvo
|
95e5a70690
|
Merge branch 'development' of https://bitbucket.org/enreda/back-latienda into diego
|
2021-02-11 11:53:55 +01:00 |
|
Sam
|
d577a6b202
|
changed company.city to charfield
|
2021-02-11 10:21:31 +00:00 |
|
Diego Calvo
|
862b65a5b2
|
my_company correction
|
2021-02-10 15:02:57 +01: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
|
4d35f67587
|
readme update
|
2021-02-10 12:03:12 +00:00 |
|
Sam
|
fa237142ad
|
added ip and geoip functionality to email_manager action
|
2021-02-10 11:55:03 +00:00 |
|
Sam
|
dad8c00b84
|
improvement to email_manager action as per documentation
|
2021-02-10 11:01:33 +00:00 |
|
Sam
|
25231b3b16
|
improvements to email templates
|
2021-02-10 10:43:26 +00:00 |
|
Diego Calvo
|
3b801768e4
|
handle errors
|
2021-02-10 10:58:09 +01: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
|
202369e189
|
added empty action "related" to ProductViewSet
|
2021-02-09 13:40:40 +00:00 |
|
Sam
|
94b62ce494
|
replaced StatsLog.model with a generic foreign key
|
2021-02-09 13:20:49 +00:00 |
|
Sam
|
d3862629e9
|
cleanup
|
2021-02-09 13:08:48 +00:00 |
|
Sam
|
9be0971fb8
|
implemented basic filter creation during product search
|
2021-02-09 13:07:56 +00:00 |
|
Sam
|
742f78b4b6
|
improvemets to product search
|
2021-02-09 12:20:01 +00: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 |
|
Sam
|
d0deec9417
|
added drf-extra-fields to handle PointField serialization
|
2021-02-09 11:41:26 +00:00 |
|
Diego Calvo
|
02037d5b43
|
create coop user endpoint
|
2021-02-09 10:29:45 +01:00 |
|
Diego Calvo
|
8223032ef7
|
split search and serializer
|
2021-02-08 14:51:24 +01:00 |
|
Sam
|
4460f1121a
|
added missing import
|
2021-02-05 13:54:54 +00:00 |
|
Sam
|
39f6a8bcfb
|
added action endpoint for emailing company manager
|
2021-02-05 13:53:55 +00:00 |
|
Sam
|
a9cb7cedd6
|
email verification sent for users loaded thru CSV
|
2021-02-05 13:11:09 +00:00 |
|
Sam
|
75234953c0
|
improvement to search test
|
2021-02-05 09:57:11 +00:00 |
|
Sam
|
b9822edc8d
|
search optimization broken by tags
|
2021-02-04 14:10:51 +00:00 |
|
Sam
|
67ce92c33f
|
more search optimization
|
2021-02-04 13:39:56 +00:00 |
|
Sam
|
1441644b74
|
search improvement
|
2021-02-04 13:35:26 +00:00 |
|
Sam
|
1f58661f76
|
conflict resolution
|
2021-02-04 13:25:35 +00:00 |
|
Sam
|
9fd8c87517
|
auto-add creator from request use in viewsets
|
2021-02-04 13:24:14 +00:00 |
|
Sam
|
65c571a887
|
undid regressions from code merge with diego
|
2021-02-04 13:19:43 +00:00 |
|
Diego Calvo
|
a3629c2313
|
save Company creator
|
2021-02-04 13:52:30 +01: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 |
|
Diego Calvo
|
1bfe41c000
|
Merge branch 'development' into diego
|
2021-02-04 12:07:32 +01:00 |
|
Diego Calvo
|
65d0c6d946
|
merge develoment to diego
|
2021-02-04 12:00:39 +01:00 |
|
Sam
|
1c55f7da98
|
test fixes
|
2021-02-04 10:59:13 +00:00 |
|
Sam
|
89b68dd516
|
history sync created when adding products from csv
|
2021-02-04 10:56:34 +00:00 |
|
Sam
|
0107d86a27
|
readme update
|
2021-02-04 10:27:02 +00:00 |
|
Sam
|
904db3b794
|
very basic and unoptimized search functionality is working
|
2021-02-04 10:19:38 +00:00 |
|
Sam
|
77acc668b8
|
added user-specific endpoints
|
2021-02-04 10:14:28 +00:00 |
|