dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
24,205 Commits 106 Branches 71 Tags
Commit Graph

154 Commits

Author SHA1 Message Date
AndrewVolosytnykhThingsboard
5d64775f67 Correct call of dependent methods 2021-04-19 17:08:54 +03:00
AndrewVolosytnykhThingsboard
fad1040f24 Refactoring: offset added to request URL 2021-04-19 17:08:54 +03:00
AndrewVolosytnykhThingsboard
a100d07daf Fixed incorrect RestClient method getAlarms 2021-04-19 17:08:54 +03:00
Igor Kulikov
04df24c97a Rename getTenantDevices to getDeviceProfiles 2021-04-14 15:08:14 +03:00
Volodymyr Babak
0f64b3764f Merge remote-tracking branch 'upstream/develop/3.3' into develop/3.3-edge 2021-03-16 16:59:15 +02:00
Andrew Shvayka
a3cb9724e3
Merge pull request #4191 from thingsboard/master 
Merge master to develop 3.3
 2021-03-03 15:57:51 +02:00
Andrew Volostnykh
240422aa94 Correction of the same typos 2021-02-24 19:00:50 +02:00
Andrew Volostnykh
72ea3273c7 Fix of incorrect url for getTenantProfiles in REST Client 2021-02-24 19:00:50 +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
9b4309c61a Merge remote-tracking branch 'upstream/master' into develop/3.3 2021-02-08 10:28: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
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
Volodymyr Babak
bc3008ad7b Merge remote-tracking branch 'upstream/master' into develop/3.3-edge 2021-01-17 01:47:49 +02:00
Igor Kulikov
d31358b2ea Update license header - set 2021 year 2021-01-11 13:42:16 +02:00
Volodymyr Babak
78a4710c66 Merge remote-tracking branch 'origin/develop/2.6-edge' into develop/3.3-edge 2020-12-29 11:18:26 +02:00
Volodymyr Babak
995bac539c Added findMissingToRelatedRuleChains method 2020-12-24 14:15:39 +02:00
Volodymyr Babak
e58af8fb22 Added findMissingToRelatedRuleChains method 2020-12-24 13:39:24 +02:00
Volodymyr Babak
df11b383c1 Naming conventions update 2020-12-23 19:12:05 +02:00
Volodymyr Babak
c5d93d17f4 Naming conventions update 2020-12-23 18:24:41 +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
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
d79d00aa87 Merge remote-tracking branch 'upstream/master' into develop/3.3-edge 2020-12-07 10:46:15 +02:00
YevhenBondarenko
8f8814d167 moved sms configs to common package, rest client improvements 2020-11-27 12:03:22 +02:00
Artem Babak
74b150b384 Added getCustomerEdgeInfos() implementation 2020-10-21 05:40:25 +03:00
YevhenBondarenko
b0126a9d47 added new APIs 2020-10-13 15:52:03 +03:00
Volodymyr Babak
95786f858c Merge remote-tracking branch 'origin/feature/edge' into feature/3.0-edge 2020-10-12 15:19:06 +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
Bohdan Smetaniuk
93363f81bb sync edge api 2020-10-01 20:12:24 +03:00
Bohdan Smetaniuk
c39cfe490a fixed getDefaultEdgeRuleChains method 2020-09-25 14:19:22 +03:00
Bohdan Smetaniuk
05a7f3b2de fixed setRootRuleChain for Edges 2020-09-25 13:12:30 +03:00
Bohdan Smetaniuk
3f36e15ee6 last methods 2020-09-24 19:49:31 +03:00
Bohdan Smetaniuk
79020736a6 getEdgeEvents method 2020-07-03 15:33:43 +03:00
Bohdan Smetaniuk
15b6574bf2 fix in getEdgeEntityViews 2020-07-01 18:58:21 +03:00
Bohdan Smetaniuk
b38f8b61f4 added all methods for working with Edge 2020-06-30 18:19:25 +03:00
Bohdan Smetaniuk
1cfb7fa501 removed wildcard import 2020-06-25 10:53:12 +03:00
Bohdan Smetaniuk
66b3b1eca4 methods for working with Edge 2020-06-12 18:48:21 +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