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

209 Commits

Author SHA1 Message Date
Chris Elston
3c308dc242 Merge branch 'master' of https://github.com/thingsboard/thingsboard 2021-01-14 12:27:02 +00:00
Chris Elston
d3f018b0ef Add config params for server and client key algs 
This change adds new parameters to keygen.properties to allow the
configuration of the server and client TLS key algorithms:

SERVER_KEY_ALG, SERVER_KEY_SIZE, CLIENT_KEY_ALG, CLIENT_KEY_SIZE

Default values for these have been set at RSA and 2048 to preserve
previous operation.

I have also tested SERVER_KEY_ALG=EC and SERVER_KEY_SIZE=256, along with
CLIENT_KEY_ALG=EC and CLIENT_KEY_SIZE=256. Other algorithms and sizes
may be supported, YMMV.
 2021-01-14 12:12:13 +00:00
Igor Kulikov
d31358b2ea Update license header - set 2021 year 2021-01-11 13:42:16 +02:00
Igor Kulikov
6814c21ee9 restore ver 3.2.1-SNAPSHOT 2020-12-23 18:24:42 +02:00
Igor Kulikov
bfee301625 Set ver to 2.5.6-SNAPSHOT 2020-12-23 17:47:58 +02:00
Andrii Shvaika
87a8cec7b5 Version set to 3.2.1-SNAPSHOT 2020-12-01 18:05:47 +02:00
YevhenBondarenko
0f662a679c Merge with develop/2.5.5 2020-11-13 12:02:13 +02:00
YevhenBondarenko
eece6418c3 updated versions 2020-11-12 13:22:32 +02:00
Andrii Shvaika
c0934b959b Fix for Cassandra Unit 2020-10-06 12:40:29 +03:00
Andrii Shvaika
8ec23f22d4 Version set 2.5.5-SNAPSHOT 2020-08-28 19:02:31 +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
Andrii Shvaika
9d2e039220 Version set to 2.5.3-SNAPSHOT 2020-06-11 10:57:50 +03:00
Igor Kulikov
bd98ce8deb Merge with develop/2.5.2 2020-06-04 10:11:35 +03:00
Igor Kulikov
78a91b8c27 Temporarily version set to 2.5.2-SNAPSHOT 2020-06-04 10:09:02 +03:00
Igor Kulikov
b32e0de731 Version set to 3.0.1-SNAPSHOT 2020-06-04 10:05:41 +03:00
Andrii Shvaika
a532ded5ae Version set to 2.5.2-SNAPSHOT 2020-06-01 16:11:57 +03:00
Andrii Shvaika
dc5eb6395a Version set to 2.5.1-SNAPSHOT 2020-05-13 14:07:31 +03:00
Igor Kulikov
fa5bbcd91b Version set to 2.5.0 2020-05-12 10:28:15 +03:00
Igor Kulikov
76300e400e Update Cassandra Driver 2020-05-08 15:45:54 +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
58d9c313a8 Fixed tests 2020-04-20 16:12:03 +03:00
Igor Kulikov
7e8c90ec6d Merge branch 'master' into develop/3.0 2020-04-01 09:48:16 +03:00
YAMAMOTO Takashi
194d628bfd
tools/src/main/shell/*.sh: Fix "yes" patterns (#2553) 
So that it accepts "yes".
 2020-04-01 09:43:06 +03:00
Igor Kulikov
1077def2f5 Merge branch 'master' into develop/3.0 2020-03-26 14:51:36 +02:00
YAMAMOTO Takashi
dfd5ab3942
tools/src/main/shell/*.sh: Expand tabs for consistency (#2548) 2020-03-26 14:51:01 +02:00
Andrii Shvaika
45e3172cb3 Merge branch 'master' into develop/3.0 2020-02-21 15:48:31 +02:00
YevhenBondarenko
54b0de0c2c move rest-client to own module 2020-02-21 13:42:44 +02:00
Igor Kulikov
96d3b245b0 Revert to version 3.0.0-SNAPSHOT 2020-02-20 12:35:01 +02:00
Igor Kulikov
e9b2c3107e Merge with master 2020-02-20 12:33:36 +02:00
Igor Kulikov
3e2a87135f Prepare for merge with master 2020-02-20 10:26:43 +02:00
Andrii Shvaika
2a58c6f209 fixed RestClient.saveRelation method 2020-02-20 10:13:37 +02:00
Andrii Shvaika
4cd45e4b3e Fix for RestClient.getActivateToken method 2020-02-20 08:13:48 +02:00
YevhenBondarenko
64e0c42ab7 Rest Client improvements 2020-02-19 15:39:22 +02:00
Yevhen Bondarenko
e7dfe75e41
Feature/rest client (#2428) 
* refactored and improvement Rest Client

* refactored Rest Client, made old methods deprecated
 2020-02-19 14:11:20 +02:00
YevhenBondarenko
a670b77251 refactored and improvement Rest Client 2020-02-19 11:55:58 +02:00
Yevhen Bondarenko
fbed56555f
Feature/rest client (#2368) 
* refactored URLs

* refactored

* refactored

* refactored

* refactored

* refactored rest client

* changed executorService from RestClient

* refactored rest client and JsonConverter

* refactored rest client
 2020-01-29 17:25:55 +02:00
Yevhen Bondarenko
e583b0a1d3 Feature/rest client (#2347) 
* refactored URLs

* refactored

* refactored

* refactored

* refactored

* refactored rest client

* changed executorService from RestClient

* refactored rest client and JsonConverter
 2020-01-20 15:02:00 +02:00
Igor Kulikov
850d6d948c Update License header year to 2020 2020-01-06 16:52:41 +02:00
Igor Kulikov
1265a9a1e3 Revert "Update License header year to 2020" 
This reverts commit 9b42397c4a820688daf07117cb7efefa3f387f46.
 2020-01-06 16:48:55 +02:00
Igor Kulikov
9b42397c4a Update License header year to 2020 2020-01-06 16:41:04 +02:00
VoBa
f23cfc9880 Added device creation with token (#2272) 
* Added device creation with token

* Fixes after code review

* Added device creation with token
 2019-12-16 16:06:51 +02:00
Igor Kulikov
c84a8a5e67 Version set to 2.5.0-SNAPSHOT 2019-12-10 15:25:03 +02:00
YevhenBondarenko
93cc222ab9 refactored URLs 2019-12-09 12:55:22 +02:00