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 |
|
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 |
|
Sam
|
ea8cd97baf
|
search function basics
|
2021-02-03 14:20:55 +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
|
b4eaa0f287
|
massive load of products working
|
2021-02-03 13:00:08 +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
|
569ba6515b
|
readme update
|
2021-02-03 10:28: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
|
02b6e9545e
|
updated to readme about user management
|
2021-02-02 12:01:05 +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
|
ca89ac73f2
|
update to readme
|
2021-02-01 13:36:42 +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
|
b385767232
|
readme update
|
2021-01-26 12:50:29 +00:00 |
|
Sam
|
9c88019700
|
enabled django-suit for admin
|
2021-01-26 12:32:19 +00:00 |
|
Sam
|
7175dab55e
|
cleanup
|
2021-01-26 12:16:46 +00:00 |
|
Sam
|
a9658c1009
|
applied tags field to company model
|
2021-01-26 12:06:20 +00:00 |
|
Sam
|
2a05beec07
|
serialized tags working
|
2021-01-26 12:00:44 +00:00 |
|
Sam
|
4437037710
|
everythin working except for creation product insance with category
|
2021-01-26 11:20:48 +00:00 |
|
Sam
|
0e5aee73c3
|
more work on serializing tags
|
2021-01-26 10:58:57 +00:00 |
|
Diego Calvo
|
4597eb0a2e
|
bug in simplejwt
|
2021-01-25 15:17:52 +01:00 |
|
Sam
|
e42559bfbe
|
Merge branch 'sam' into development
|
2021-01-25 14:08:24 +00:00 |
|
Sam
|
00b2cf9f22
|
more improvements for tag serializer
|
2021-01-25 14:07:11 +00:00 |
|
Sam
|
8059cd3667
|
more tests for tagging serializer
|
2021-01-25 13:51:38 +00:00 |
|
Diego Calvo
|
84cfffabaf
|
Readme and requirements
|
2021-01-25 14:20:31 +01:00 |
|
Diego Calvo
|
6d21fce9d8
|
readme correction
|
2021-01-25 14:11:41 +01:00 |
|