nickAS21
|
31b51cfc9f
|
Lwm2m: back: start fix
|
2021-01-27 16:04:20 +02:00 |
|
Volodymyr Babak
|
c05de7c94b
|
Fix UI compilation
|
2021-01-27 15:19:09 +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
|
c041b3f44d
|
Merge pull request #4012 from vvlladd28/develop-3.3-maerge-master
Merge master in develop/3.3
|
2021-01-27 15:06:58 +02:00 |
|
YevhenBondarenko
|
f1c3e1a578
|
default value for prohibitDifferentUrl changed to false
|
2021-01-27 14:45:34 +02:00 |
|
Volodymyr Babak
|
abf2202e78
|
Formatting
|
2021-01-27 14:37:13 +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 |
|
AndrewVolostnykhThingsboard
|
5ce512b853
|
rest-client: getDeviceTypes fixed
|
2021-01-27 12:34:57 +02:00 |
|
AndrewVolostnykhThingsboard
|
82ae2eb36f
|
findHighestAlarmStatus: code cleaning (i believe that last)
|
2021-01-27 12:25:29 +02:00 |
|
AndrewVolostnykhThingsboard
|
f54dc932f7
|
findHighestAlarmStatus: test for no alarm created, code cleaning
|
2021-01-27 12:22:36 +02:00 |
|
AndrewVolostnykhThingsboard
|
beeade8b07
|
findHighestAlarmStatus: code cleaning
|
2021-01-27 12:16:43 +02:00 |
|
AndrewVolostnykhThingsboard
|
581bb536f5
|
findHighestAlarmStatus: fixed using Repository Query
|
2021-01-27 12:00:20 +02:00 |
|
Andrew Shvayka
|
b9d3904171
|
Merge pull request #3840 from thingsboard/lwm2m_tests
[3.3] Lwm2m tests
|
2021-01-27 01:08:46 +02:00 |
|
nickAS21
|
5f3cf1e3a2
|
Lwm2m: front: update filter for keyName
|
2021-01-26 22:10:26 +02:00 |
|
ponvalavan annamalai
|
68eebaf041
|
removed spaces -dynamic color for data points
|
2021-01-26 18:15:00 +00:00 |
|
ponvalavan annamalai
|
0219b8a6fd
|
Dynamic color for data points
|
2021-01-26 18:12:21 +00:00 |
|
ponvalavan annamalai
|
fc40047a5e
|
Dynamic color for data points
|
2021-01-26 18:01:55 +00:00 |
|
Volodymyr Babak
|
e911183254
|
Merge remote-tracking branch 'origin/develop/2.6-edge' into develop/3.3-edge
|
2021-01-26 19:28:22 +02:00 |
|
Volodymyr Babak
|
f9347cda17
|
Added missing break. Reduced log level
|
2021-01-26 19:27:45 +02:00 |
|
ponvalavan annamalai
|
6cd6568ee3
|
Dynamic color for data points
|
2021-01-26 17:24:31 +00:00 |
|
Vladyslav_Prykhodko
|
c14e2c81b1
|
UI: Refactoring LwM2M
|
2021-01-26 19:20:36 +02:00 |
|
Volodymyr Babak
|
712e756e58
|
Refactoring to simplify reading and merge
|
2021-01-26 19:05:37 +02:00 |
|
VoBa
|
ea7411348b
|
Merge pull request #76 from deaflynx/develop/3.3-edge
Develop/3.3 edge Show Edge Info for customer scope, get label, fix import edges
|
2021-01-26 18:57:55 +02:00 |
|
nickAS21
|
f770f40797
|
Lwm2m: front: update filter for models
|
2021-01-26 14:40:32 +02:00 |
|
AndrewVolostnykhThingsboard
|
3c558a7d2a
|
getHighestAlarmSeverity: cleared unwanted code
|
2021-01-26 11:45:57 +02:00 |
|
Igor Kulikov
|
61723da391
|
Version set to 3.3.0-SNAPSHOT
|
2021-01-26 10:17:52 +02:00 |
|
Vladyslav_Prykhodko
|
ca940ba1b6
|
UI: Refactoring LwM2M
|
2021-01-25 19:54:01 +02:00 |
|
AndrewVolostnykhThingsboard
|
a4981a869f
|
highestAlarmSeverity fixed
|
2021-01-25 18:01:17 +02:00 |
|
Volodymyr Babak
|
ae8564110a
|
Code clean up
|
2021-01-25 17:30:12 +02:00 |
|
Igor Kulikov
|
072d0e49c3
|
Merge pull request #3990 from vvlladd28/bug/reset-password-required-email
UI: Fixed email validation in form reset password
|
2021-01-25 17:15:31 +02:00 |
|
Igor Kulikov
|
a67ea023d1
|
Merge pull request #3989 from YevhenBondarenko/improvements
reset password improvements
|
2021-01-25 17:15:02 +02:00 |
|
Vladyslav_Prykhodko
|
fdfd090b0b
|
UI: Fixed email validation in form reset password
|
2021-01-25 17:07:14 +02:00 |
|
YevhenBondarenko
|
6a458e85b0
|
reset password improvements
|
2021-01-25 17:05:01 +02:00 |
|
nickAS21
|
a8e093910a
|
Lwm2m: back&front: update filter for objectIds
|
2021-01-25 15:57:09 +02:00 |
|
YevhenBondarenko
|
4d4d189816
|
getPropagationEntityIds improvements
|
2021-01-25 13:06:11 +02:00 |
|
Igor Kulikov
|
d9f1872c8c
|
Device wizard: Rollback(delete) device when failed to save device credentials.
|
2021-01-25 13:01:13 +02:00 |
|
nickAS21
|
1ed44010e4
|
Lwm2m: update serverKetStore.jks
|
2021-01-23 11:20:35 +02:00 |
|
Volodymyr Babak
|
8f429bee0d
|
Merge remote-tracking branch 'origin/develop/2.6-edge' into develop/3.3-edge
|
2021-01-23 00:18:13 +02:00 |
|
Volodymyr Babak
|
97b410c4ac
|
Fixed assign edge to customer test
|
2021-01-23 00:16:51 +02:00 |
|
Volodymyr Babak
|
555778bf7d
|
Merge remote-tracking branch 'origin/develop/2.6-edge' into develop/3.3-edge
|
2021-01-22 20:54:40 +02:00 |
|
Volodymyr Babak
|
0e7af5a649
|
Label fixes
|
2021-01-22 19:44:40 +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 |
|
Igor Kulikov
|
4e3a7ed897
|
Add overwriteActivityTime checkbox to device wizard. Update rule node ui.
|
2021-01-22 18:34:16 +02:00 |
|
Andrii Shvaika
|
90334db157
|
Refactoring of HTTP and MQTT client credentials
|
2021-01-22 17:06:53 +02:00 |
|
Vladyslav_Prykhodko
|
de77c53fcc
|
UI: Refactoring LwM2M
|
2021-01-22 16:14:39 +02:00 |
|
Andrii Shvaika
|
e97c742828
|
Merge branch 'feature/rest_api_node_ssl' of https://github.com/vkukhtyn/thingsboard
|
2021-01-22 16:11:43 +02:00 |
|
Andrii Shvaika
|
beff831d5d
|
git push origin masterMerge branch 'zbeacon-fix/lastActivityTime'
|
2021-01-22 16:07:17 +02:00 |
|
Andrii Shvaika
|
d06ce5555c
|
Simplified implementation of the overwrite activity time flag
|
2021-01-22 16:06:48 +02:00 |
|
Andrii Shvaika
|
5a5f29610f
|
Merge branch 'fix/lastActivityTime' of https://github.com/zbeacon/thingsboard into zbeacon-fix/lastActivityTime
|
2021-01-22 15:24:12 +02:00 |
|