231 Commits

Author SHA1 Message Date
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
Igor Kulikov
61723da391 Version set to 3.3.0-SNAPSHOT 2021-01-26 10:17:52 +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
Igor Kulikov
6814c21ee9 restore ver 3.2.1-SNAPSHOT 2020-12-23 18:24:42 +02:00
Volodymyr Babak
c5d93d17f4 Naming conventions update 2020-12-23 18:24:41 +02:00
Igor Kulikov
bfee301625 Set ver to 2.5.6-SNAPSHOT 2020-12-23 17:47:58 +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
Andrii Shvaika
460cec99ec Version set to 3.3-SNAPSHOT 2020-12-09 11:07:00 +02:00
Volodymyr Babak
d79d00aa87 Merge remote-tracking branch 'upstream/master' into develop/3.3-edge 2020-12-07 10:46:15 +02:00
Andrii Shvaika
87a8cec7b5 Version set to 3.2.1-SNAPSHOT 2020-12-01 18:05:47 +02:00
YevhenBondarenko
8f8814d167 moved sms configs to common package, rest client improvements 2020-11-27 12:03:22 +02:00
Volodymyr Babak
3cc0c5baf0 Set version to 3.3.0-SNAPSHOT 2020-11-10 16:43:28 +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
Igor Kulikov
98227ea665 Merge branch 'master' into develop/3.2 2020-10-06 19:06:35 +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
Volodymyr Babak
458550b853 Set version to 2.6.0 2020-09-23 12:07:16 +03:00
Igor Kulikov
6edf736e15 Version set to 3.1.2-SNAPSHOT 2020-09-14 11:45:07 +03:00
Volodymyr Babak
c526d13e45 Merge remote-tracking branch 'upstream/develop/2.5.5' into feature/edge 2020-09-10 19:17:20 +03:00
Igor Kulikov
7e55fd138d Restore version 3.1.1-SNAPSHOT 2020-09-01 14:55:41 +03:00
Igor Kulikov
f2822b2c3e Temporarily version set to 2.5.5-SNAPSHOT 2020-09-01 14:53:30 +03:00
Igor Kulikov
16f088ecf9 Merge with master 2020-09-01 14:40:28 +03:00
YevhenBondarenko
4df660fe03 added maven-source-plugin 2020-08-31 12:39:41 +03:00
Andrii Shvaika
8ec23f22d4 Version set 2.5.5-SNAPSHOT 2020-08-28 19:02:31 +03:00
Igor Kulikov
8e3c399087 Restore version 3.1.1-SNAPSHOT 2020-08-21 14:01:08 +03:00
Igor Kulikov
e40d13ebcb Temp versions set to 2.5.4-SNAPSHOT 2020-08-21 13:59:06 +03:00
Andrii Shvaika
b341030c8f Version set to 2.5.4-SNAPSHOT 2020-08-20 16:52:41 +03:00
Igor Kulikov
7d7a50628b Version set to 3.2.0-SNAPSHOT 2020-08-17 18:11:43 +03:00
Igor Kulikov
654e380efd Version set to 3.1.1-SNAPSHOT 2020-08-13 12:42:37 +03:00
Andrii Shvaika
c2e36851fc Merge with 2.5.3 2020-07-13 15:47:28 +03:00
Andrii Shvaika
749664bcda tmp version set to 2.5.3-SNAPSHOT 2020-07-10 20:26:25 +03:00
Igor Kulikov
fac7bcc0b9 Version set to 3.1.0-SNAPSHOT 2020-07-08 15:41:30 +03:00
VoBa
4c626c4335
Merge pull request #17 from BohdanSmetanyuk/ce_edge
more rest client methods for working with edge
2020-07-07 18:51:05 +03:00
Bohdan Smetaniuk
79020736a6 getEdgeEvents method 2020-07-03 15:33:43 +03:00