Andrew Shvayka
|
a3cb9724e3
|
Merge pull request #4191 from thingsboard/master
Merge master to develop 3.3
|
2021-03-03 15:57:51 +02:00 |
|
Vladyslav_Prykhodko
|
530c077b05
|
Merge remote-tracking branch 'upstream/master' into feature/dashboard/widget-select-preview
|
2021-03-03 15:03:06 +02:00 |
|
Andrii Shvaika
|
f8d1fff4cc
|
New Alias
|
2021-03-02 12:06:50 +02:00 |
|
Andrii Shvaika
|
3176c208a8
|
Data structures
|
2021-03-01 14:47:50 +02:00 |
|
Andrii Shvaika
|
3cd964327a
|
Constant filters for device profile
|
2021-02-26 19:26:31 +02:00 |
|
vzikratyi
|
29fd4fb02c
|
Save Attributes to cache
|
2021-02-25 10:42:24 +02:00 |
|
Vladyslav_Prykhodko
|
989b6e7a30
|
Merge branch 'master'
|
2021-02-23 18:01:04 +02:00 |
|
Volodymyr Babak
|
10d3dd01bb
|
Merge branch 'develop/3.3' of github.com:thingsboard/thingsboard into develop/3.3-edge
|
2021-02-22 19:08:30 +02:00 |
|
Andrii Shvaika
|
4b43cd75f7
|
Merge branch 'master' into develop/3.3
|
2021-02-22 13:29:08 +02:00 |
|
Andrew Volostnykh
|
6bc902756b
|
Code cleaning after review
|
2021-02-16 17:04:23 +02:00 |
|
Andrew Volostnykh
|
e70df09b08
|
Code cleaning and fix of tests
|
2021-02-16 17:04:23 +02:00 |
|
Andrew Volostnykh
|
6bf2b322af
|
Test and some code cleaning
|
2021-02-16 17:04:23 +02:00 |
|
Andrew Volostnykh
|
e93c975a01
|
Compound with front-end, fix of incorrect getter use
|
2021-02-16 17:04:23 +02:00 |
|
AndrewVolosytnykhThingsboard
|
77de9da2a8
|
DynamicValue: Rename 'useInherit' to correct name 'inheritMode'
|
2021-02-16 17:04:23 +02:00 |
|
AndrewVolosytnykhThingsboard
|
1c78a59fb2
|
Logic for inheritance in DynamicValue added
|
2021-02-16 17:04:23 +02:00 |
|
Volodymyr Babak
|
c46c1b08e7
|
Merge remote-tracking branch 'upstream/master' into develop/3.3-edge
|
2021-02-15 17:07:25 +02:00 |
|
Andrii Shvaika
|
dac7c5250f
|
Improvements to the DeviceStateService
|
2021-02-12 15:40:54 +02:00 |
|
Viacheslav Kukhtyn
|
c4b1f9ea7a
|
Process alarms on activity and inactivity events when device state is persisted to telemetry
|
2021-02-12 15:40:54 +02:00 |
|
Volodymyr Babak
|
b58c831343
|
Merge remote-tracking branch 'upstream/develop/3.3' into develop/3.3-edge
|
2021-02-12 13:10:06 +02:00 |
|
Vladyslav_Prykhodko
|
ca8f04e1e9
|
Merge remote-tracking branch 'upstream/master' into feature/dashboard/widget-select-preview
|
2021-02-10 18:42:13 +02:00 |
|
Igor Kulikov
|
59a54211f9
|
Fix compile errors and warnings.
|
2021-02-09 14:30:06 +02:00 |
|
Igor Kulikov
|
43178107c3
|
Merge with master
|
2021-02-08 20:02:54 +02:00 |
|
Vladyslav_Prykhodko
|
9b4309c61a
|
Merge remote-tracking branch 'upstream/master' into develop/3.3
|
2021-02-08 10:28:55 +02:00 |
|
Igor Kulikov
|
3f83be21da
|
Fix lombok config. Update base openjdk image
|
2021-02-05 14:28:26 +02:00 |
|
Igor Kulikov
|
22e5771120
|
JDK 11 Support
|
2021-02-04 19:31:20 +02:00 |
|
Vladyslav_Prykhodko
|
22a1d24291
|
Added to widgets bundles and widget functional preview and description
|
2021-02-04 19:00:28 +02:00 |
|
Igor Kulikov
|
3ea5314495
|
Home dashboard feature. Enable tooltips for flot chars in mobile mode. Disable widgets interaction in widget library and when adding widget to dashboard.
|
2021-02-03 12:21:55 +02:00 |
|
Volodymyr Babak
|
499eb1aef4
|
Merge remote-tracking branch 'upstream/develop/3.3' into develop/3.3-edge
|
2021-01-27 15:12:58 +02:00 |
|
Vladyslav_Prykhodko
|
2b47fe9202
|
Updated license header
|
2021-01-27 13:38:12 +02:00 |
|
Vladyslav_Prykhodko
|
d5c3f4c997
|
Merge master in develop/3.3
|
2021-01-27 13:31:46 +02:00 |
|
nickAS21
|
317dfdbc42
|
Lwm2m: front&back: refactoring add on the back ObjectIdFromTextSearch for search list models with filter by ObjectId
|
2021-01-22 19:11:00 +02:00 |
|
nickAS21
|
fa8df68207
|
Lwm2m: front: refactoring5
|
2021-01-22 14:46:55 +02:00 |
|
Artem Babak
|
5ef3abb077
|
Merged develop/3.3-edge with volodymyr-babak/develop/3.3
|
2021-01-21 15:12:36 +02:00 |
|
Volodymyr Babak
|
bc3008ad7b
|
Merge remote-tracking branch 'upstream/master' into develop/3.3-edge
|
2021-01-17 01:47:49 +02:00 |
|
Artem Babak
|
118ba1ad8d
|
Get edge label
|
2021-01-13 21:08:29 +02:00 |
|
Igor Kulikov
|
d31358b2ea
|
Update license header - set 2021 year
|
2021-01-11 13:42:16 +02:00 |
|
Volodymyr Babak
|
056889be97
|
Added edgeType and edgeSearchQuery support
|
2020-12-29 12:01:40 +02:00 |
|
Viacheslav Kukhtyn
|
f1fb0cedae
|
Add audit log details for telemetry deleted and telemetry updated types
|
2020-12-25 18:24:31 +02:00 |
|
Volodymyr Babak
|
b2de96fbff
|
Merge remote-tracking branch 'upstream/develop/3.3' into develop/3.3-edge
|
2020-12-24 15:13:57 +02:00 |
|
Volodymyr Babak
|
c5d93d17f4
|
Naming conventions update
|
2020-12-23 18:24:41 +02:00 |
|
Viacheslav Kukhtyn
|
9829dd17cc
|
Merge branch 'master' into feature/log-telemetry-updated
|
2020-12-23 16:16:15 +02:00 |
|
nickAS21
|
1150d4e4f3
|
Lwm2m: backEnd: add saveDeviceWithCredential
|
2020-12-22 16:23:03 +02:00 |
|
Volodymyr Babak
|
af8562c3a0
|
Added support for device profile entity on edge
|
2020-12-16 19:35:22 +02:00 |
|
Volodymyr Babak
|
b45bee7843
|
Merge remote-tracking branch 'origin/develop/2.6-edge' into develop/3.3-edge
|
2020-12-15 18:51:56 +02:00 |
|
Volodymyr Babak
|
59c55fb2c5
|
For devices from edge new id generated every time
|
2020-12-15 18:32:35 +02:00 |
|
Volodymyr Babak
|
32b608e10d
|
Merge remote-tracking branch 'origin/develop/2.6-edge' into develop/3.3-edge
|
2020-12-14 15:45:38 +02:00 |
|
Volodymyr Babak
|
b52d2aae17
|
Get rid of configuration field
|
2020-12-14 15:31:58 +02:00 |
|
Volodymyr Babak
|
64694532db
|
Merge remote-tracking branch 'origin/develop/2.6-edge' into develop/3.3-edge
|
2020-12-14 12:48:49 +02:00 |
|
nickAS21
|
ca46f5fb75
|
Lwm2m: backEnd: add DelayedRequest + in the start by to name
|
2020-12-13 16:55:48 +02:00 |
|
Volodymyr Babak
|
0ce128725d
|
License header fix
|
2020-12-12 20:03:24 +02:00 |
|