4605 Commits

Author SHA1 Message Date
zbeacon
2704696f2b Moved provisionDeviceKey as regular column 2020-10-01 12:23:12 +03:00
zbeacon
950907d398 Refactoring according to comments from @YevhenBondarenko 2020-09-29 11:30:32 +03:00
zbeacon
e86c07599c Merge branch 'develop/3.2' of https://github.com/thingsboard/thingsboard into feature/device-provision-3.2-onlyProfileVersion 2020-09-29 11:17:05 +03:00
zbeacon
b80fc6592b Refactoring 2020-09-28 15:54:13 +03:00
zbeacon
263dd8f9b3 Removed provision info from device dao 2020-09-28 15:48:23 +03:00
zbeacon
70b8647ef4 Refactoring to use provision data only from device profile 2020-09-28 15:16:38 +03:00
zbeacon
1e44303473 removed debuging 2020-09-28 14:24:46 +03:00
zbeacon
073225ab9f Working version with provision data only in device profile 2020-09-23 15:19:06 +03:00
zbeacon
8a8695f260 Working version for provision feature with provision credentials on device level 2020-09-23 14:24:44 +03:00
zbeacon
15be6d60a3 Added strategy checking 2020-09-22 08:36:08 +03:00
zbeacon
d228208072 Provision init 2020-09-18 16:11:49 +03:00
Igor Kulikov
259af14bb6 Fix DAO tests 2020-09-17 20:14:43 +03:00
Vladyslav_Prykhodko
08b346da7f UI Refactoring rule-chain-autocomplete component 2020-09-16 17:28:33 +03:00
Vladyslav_Prykhodko
b7718b91d4 Merge branch 'develop/3.2' of github.com:thingsboard/thingsboard into develop/3.2 2020-09-16 17:06:58 +03:00
Andrii Shvaika
2cd61fe6bb Merge branch 'develop/3.2' of github.com:thingsboard/thingsboard into develop/3.2 2020-09-16 16:18:30 +03:00
Andrii Shvaika
f67860bb09 Device Profile Rule Node 2020-09-16 16:16:31 +03:00
Vladyslav_Prykhodko
654a75f034 UI fix updated transport configuration 2020-09-16 14:11:50 +03:00
Vladyslav_Prykhodko
31ded103bc UI fix updated transport configuration 2020-09-16 13:56:37 +03:00
Igor Kulikov
f3e52cbd3b Merge branch 'master' into develop/3.2 2020-09-16 12:15:51 +03:00
Igor Kulikov
e7c1901346 Merge branch 'develop/2.5.5' 2020-09-16 12:15:33 +03:00
Igor Kulikov
10a3f26905
Merge pull request #3474 from YevhenBondarenko/develop/2.5.5-mqtt-transport
MqttTransportHandler improvements
2020-09-16 12:14:43 +03:00
Igor Kulikov
e9d0574918
Merge pull request #3456 from ShvaykaD/fix/ttlCleanUpServices
[2.5.5] added autoclose resultSet to TTL cleanUp Service
2020-09-16 12:13:51 +03:00
Igor Kulikov
692f575661 Merge with master 2020-09-16 12:12:59 +03:00
Igor Kulikov
2897ea446f Merge branch 'develop/2.5.5' 2020-09-16 12:11:16 +03:00
Igor Kulikov
827a1e3092
Merge pull request #3406 from ShvaykaD/improvements/queue-reprocessing-strategy-3.2
[3.2] Improvements/queue reprocessing strategy
2020-09-16 12:08:59 +03:00
Igor Kulikov
7604b78f0e
Merge pull request #3405 from ShvaykaD/improvements/queue-reprocessing-strategy
[2.5.5] Improvements/queue reprocessing strategy
2020-09-16 12:08:44 +03:00
Igor Kulikov
32b7ed5d8e
Merge pull request #3475 from ChantsovaEkaterina/bug/hide-key-in-legend
Fix hiding keys in legend
2020-09-16 12:07:18 +03:00
Vladyslav_Prykhodko
70ca190f59 UI add rule-chain autocompleted 2020-09-15 19:51:57 +03:00
Chantsova Ekaterina
b0372b3525 Fix hiding keys in legend 2020-09-15 19:51:40 +03:00
Igor Kulikov
c0ce47df87
Merge pull request #3472 from vvlladd28/bugs/map/disable-scroll
Improvement map widgets
2020-09-15 19:24:10 +03:00
YevhenBondarenko
e3957ea2aa MqttTransportHandler improvements 2020-09-15 18:29:54 +03:00
Andrii Shvaika
4a3b28d331 Method to create default rule chain for device profile 2020-09-15 18:17:06 +03:00
Vladyslav_Prykhodko
f305cbbed0 Fixed show multiple draw routes 2020-09-15 17:00:05 +03:00
Vladyslav_Prykhodko
5e109228eb Fixed error disabled scroll zoom 2020-09-15 16:50:05 +03:00
Vladyslav_Prykhodko
acc755926e Updated leaflet 2020-09-15 16:47:26 +03:00
Andrii Shvaika
e353ab3c81 Merge branch 'develop/3.2' of github.com:thingsboard/thingsboard into develop/3.2 2020-09-15 16:13:48 +03:00
Andrii Shvaika
4d012ac62d DeviceProfile rule node draft 2020-09-15 16:13:39 +03:00
Igor Kulikov
075138cc5c
Merge pull request #3463 from vvlladd28/improvement/menu/trackBy
Improvement draw menu and breadCrumb
2020-09-15 12:24:00 +03:00
Vladyslav_Prykhodko
dc77426dab Added field id in model MenuSection and BreadCrumb 2020-09-15 12:20:19 +03:00
Vladyslav_Prykhodko
784febf3fc Added TrackBy in breadcrumb 2020-09-15 11:23:03 +03:00
Vladyslav_Prykhodko
3adbb94e06 Added TrackBy in main menu 2020-09-15 11:14:43 +03:00
Igor Kulikov
3dc7fde4db UI: Add device profile wizard 2020-09-14 19:23:18 +03:00
Igor Kulikov
c4e6721596 UI: Device profile alarm rules improvements 2020-09-14 15:33:01 +03:00
Igor Kulikov
c2b4d9c8ae Merge with master 2020-09-14 14:25:08 +03:00
Igor Kulikov
745648a5ad Version set to 3.1.2-SNAPSHOT 2020-09-14 14:24:09 +03:00
Igor Kulikov
6a4c2791b3
Merge pull request #3459 from vvlladd28/improvement/entity-details-panel
Updated order set value in entity-panel
2020-09-14 14:22:20 +03:00
Igor Kulikov
6edf736e15 Version set to 3.1.2-SNAPSHOT 2020-09-14 11:45:07 +03:00
dshvaika
8bdbda914e added resultSet to try with resources 2020-09-14 11:25:28 +03:00
dshvaika
d5146b0d92 Merge remote-tracking branch 'upstream/develop/2.5.5' into fix/ttlCleanUpServices 2020-09-14 11:23:18 +03:00
Igor Kulikov
3a0673c29a Merge with develop/2.5.5 2020-09-14 11:21:28 +03:00