Merge vpp-v2 changes to master #200

Merged
pahansith merged 35 commits from osh.silva/device-mgt-core:vpp-v2 into master 1 year ago

35 Commits (master)

Author SHA1 Message Date
osh 90a513590e Merge branch 'master' of ssh://repository.entgra.net:222/community/device-mgt-core into vpp-v2
1 year ago
osh a20c5a723c Merge branch 'master' of ssh://repository.entgra.net:222/community/device-mgt-core into vpp-v2
1 year ago
Inosh Perara 8d552b3070 Merge pull request 'Add VPP token field' (#182) from osh.silva/device-mgt-core:vpp-token-change-10156 into vpp-v2
2 years ago
osh 4b9cad1c75 Update db queries
2 years ago
osh 32a289e10e Merge branch 'vpp-v2' of ssh://repository.entgra.net:222/community/device-mgt-core into vpp-token-change-10156
2 years ago
osh dd7910268e Add vpp token field
2 years ago
osh b576f3d9bb Merge branch 'master' of ssh://repository.entgra.net:222/community/device-mgt-core into vpp-v2
2 years ago
Inosh Perara ec88734831 Merge pull request 'Add db scripts for VPP feature' (#179) from osh.silva/device-mgt-core:vpp-db-scripts into vpp-v2
2 years ago
osh cd17d06158 Merge branch 'master' of ssh://repository.entgra.net:222/community/device-mgt-core into vpp-v2
2 years ago
osh 2249520132 Resolve conflicts
2 years ago
osh 01df370032 Add db scripts
2 years ago
Inosh Perara fefc66bc59 Merge pull request 'Improve update asset DAO' (#174) from osh.silva/device-mgt-core:vpp-daos into vpp-v2
2 years ago
osh eb740773aa Improve update asset DAO
2 years ago
Inosh Perara b3a4649b64 Merge pull request 'Add DAO Layer for VPP Associate' (#168) from osh.silva/device-mgt-core:vpp-associate into vpp-v2
2 years ago
osh 81fd5687ef Update user service and token retrieval
2 years ago
osh dae8c09761 Resolve comments
2 years ago
osh b978e31ab0 Resolve conflicts
2 years ago
osh 0e5478fb5e Add association DAO and fix meta issue
2 years ago
Inosh Perara 8507a88cad Merge pull request 'Add DAO improvements for user APIs' (#166) from inosh/device-mgt-core:vpp into vpp-v2
2 years ago
inoshperera 026986cd93 Add DAO improvements for user APIs
2 years ago
Inosh Perara 949fbef41b Merge pull request 'Add DAOs for asset management' (#162) from osh.silva/device-mgt-core:asset-dao-10179 into vpp-v2
2 years ago
osh c9ed09ee25 Resolve conflicts
2 years ago
Inosh Perara a69218d436 Merge pull request 'Add association apis' (#161) from inosh/device-mgt-core:vpp into vpp-v2
2 years ago
osh 1263c09079 Add DAOs for asset management
2 years ago
inoshperera 54111b4d94 Add association apis
2 years ago
Inosh Perara caa9959dcd Merge pull request 'Add asset apis' (#156) from inosh/device-mgt-core:vpp into vpp-v2
2 years ago
inoshperera 61ffd4abff Fixing conflics
2 years ago
Inosh Perara fa565eb1ea Merge pull request 'Adding the DAO layer for vpp user management' (#155) from osh.silva/device-mgt-core:vpp-user-dao-10169 into vpp-v2
2 years ago
osh 2e799a545f Resolve comments
2 years ago
inoshperera 665702d504 Add asset apis
2 years ago
osh cd42a2c48f Adding the DAO layer for vpp user management
2 years ago
Inosh Perara f246d6b8de Merge pull request 'add vpp user services' (#151) from inosh/device-mgt-core:vpp into vpp-v2
2 years ago
inoshperera cc8470d3c0 add vpp user services
2 years ago
Inosh Perara 9dd24eda17 Merge pull request 'Add vpp user apis' (#147) from inosh/device-mgt-core:vpp into vpp-v2
2 years ago
inoshperera 9ccf3a5fa5 Add vpp user apis
2 years ago