24 Commits

Author SHA1 Message Date
Vladyslav_Prykhodko
9b4309c61a Merge remote-tracking branch 'upstream/master' into develop/3.3 2021-02-08 10:28:55 +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
Igor Kulikov
d31358b2ea Update license header - set 2021 year 2021-01-11 13:42:16 +02:00
nickAS21
1150d4e4f3 Lwm2m: backEnd: add saveDeviceWithCredential 2020-12-22 16:23:03 +02:00
Viacheslav Kukhtyn
8e279bbbd7 Methods findInfoByTo() and findInfoByQuery() should return EntityRelationInfo but no EntityRelation 2020-12-21 17:07:44 +02:00
YevhenBondarenko
8f8814d167 moved sms configs to common package, rest client improvements 2020-11-27 12:03:22 +02:00
YevhenBondarenko
b0126a9d47 added new APIs 2020-10-13 15:52:03 +03:00
YevhenBondarenko
3bcebb0666 added annotation @Deprecated to the old methods "getTimeseries" 2020-10-06 18:35:26 +03:00
YevhenBondarenko
0faef1ad16 rest client improvments 2020-10-06 18:35:26 +03:00
Andrii Shvaika
91aa7a2700 Merge with master (2.5) 2020-04-27 00:40:21 +03:00
Andrew Shvayka
38ebbe2576 Revert "Merge with master. AlarmRepository.findAlarms is failing (#2663)"
This reverts commit 2c02406ee5f41b08e655b634dd9871403f67149d.
2020-04-24 19:42:32 +03:00
Andrew Shvayka
2c02406ee5
Merge with master. AlarmRepository.findAlarms is failing (#2663)
* Merge with master. AlarmRepository.findAlarms is failing

* Fix Alarm repository. Add queue type list select.

Co-authored-by: Igor Kulikov <ikulikov@thingsboard.io>
2020-04-24 15:44:31 +03:00
Andrii Shvaika
d965df8c27 Merge remote-tracking branch 'origin/master' into develop/2.5 2020-04-21 21:20:48 +03:00
Bohdan Smetaniuk
eab6ba4598 StringBuilder replaced with String 2020-04-21 13:31:30 +03:00
Bohdan Smetaniuk
c3bd2a0ebe Fixed incorrect params in the get timeseries request 2020-04-21 13:31:30 +03:00
hamza.slama
5b8ce2fb69 Move AlarmId To Id Package 2020-04-13 10:40:03 +03:00
Igor Kulikov
87ade8ada3 Merge branch 'master' into develop/3.0 2020-02-24 18:27:08 +02:00
Yevhen Bondarenko
1ce365d8df
Improvements RestJsonConverter (#2452)
* Improvements RestJsonConverter

* Refactored RestJsonConverter
2020-02-24 18:24:10 +02:00
Andrii Shvaika
c4fd267f9e Merge branch 'master' of github.com:thingsboard/thingsboard into develop/3.0 2020-02-21 18:01:45 +02:00
Andrii Shvaika
4b0aae896d Rest API support of strict data types in getTelemetry requests 2020-02-21 18:01:15 +02:00
Andrii Shvaika
45e3172cb3 Merge branch 'master' into develop/3.0 2020-02-21 15:48:31 +02:00
YevhenBondarenko
30eaa28f6c added rest-client dependencies 2020-02-21 13:42:44 +02:00
YevhenBondarenko
54b0de0c2c move rest-client to own module 2020-02-21 13:42:44 +02:00