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

226 Commits

Author SHA1 Message Date
Igor Kulikov
fac7bcc0b9 Version set to 3.1.0-SNAPSHOT 2020-07-08 15:41:30 +03:00
Igor Kulikov
6c5971a12c Merge branch 'master' into feature/entity-data-query 2020-07-08 15:23:53 +03:00
vzikratyi-tb
89419c6999
Prometheus Metrics (#3052) 
* Moved resetting ruleEngineStats to Consumer

* Moved counters to Map in TbCoreConsumerStats

* Added actuator and MetricsService

* Added metrics to core and rule_engine consumers

* Replaced summary with counters

* Removed most setters and getters from TbRuleEngine stats

* Added stats to Transport consumer

* Added JsInvoke actuator stats

* Removed MetricsService
 2020-07-06 14:47:36 +03:00
Volodymyr Babak
d96b845407 Merge remote-tracking branch 'upstream/master' into develop/3.0-edge 2020-06-19 10:19:40 +03:00
Andrii Shvaika
5aa055d73d Websocket refactoring 2020-06-18 11:08:06 +03:00
Andrii Shvaika
9d2e039220 Version set to 2.5.3-SNAPSHOT 2020-06-11 10:57:50 +03:00
YevhenBondarenko
5f8bc97221 Changed Jenkins repo url scheme to https 2020-06-11 10:52:08 +03:00
YevhenBondarenko
fc1547c929 Changed Jenkins repo url scheme to https 2020-06-11 10:51:25 +03:00
Igor Kulikov
3749d44a61 Merge with develop/2.5.2 2020-06-04 18:26:41 +03:00
Andrii Shvaika
bb1585592b Actor System refactoring 2020-06-04 17:59:55 +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
02dd9ecdb9 Merge with develop/2.5.1 2020-05-25 17:27:02 +03:00
Andrii Shvaika
551d2609fb Refactored DEB/RPM builds for JS based components 2020-05-21 19:31:44 +03:00
Andrii Shvaika
68151e6561 Refactored DEB/RPM builds for Java-based components 2020-05-21 15:43:01 +03:00
Andrii Shvaika
3ea881f03b Stage 1 refactoring 2020-05-21 11:51:51 +03:00
Igor Kulikov
29a6e7d91c Replace Velocity with Freemarker 2020-05-15 12:21:50 +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
Igor Kulikov
66db4c7fef Merge branch 'master' of github.com:thingsboard/thingsboard into develop/3.0 2020-05-05 09:34:38 +03:00
YevhenBondarenko
b8de64f3fb fix problem with duplication mail dependencies 2020-05-05 00:18:20 +03:00
VoBa
c0dfa4861b
[WIP] [3.0] Added OAuth2 Support (#2709) 
* Added base impl for OAuth-2

* Added basic and custom OAuth2 user mappers

* Removed comment line

* Refactoring to review. Added tenantId and customerId. Added email tenant name strategy

* Revert debug logger

* Fixed compilation

* Test fixed

* Create UI for OAuthService

* Revert package-lock.json

* Add translate login es_ES

Co-authored-by: Vladyslav_Prykhodko <vprykhodko@thingsboard.io>
 2020-05-04 11:51:08 +03:00
Volodymyr Babak
7fc46010b7 Added base impl for OAuth-2 2020-05-04 00:21:58 +03:00
Volodymyr Babak
451c158742 Added EDGE backend support 2020-03-03 12:25:44 +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
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
Igor Kulikov
580e751398 Use gradle-maven-plugin from org.thingsboard groupId 2020-01-16 18:29:51 +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
Igor Kulikov
c84a8a5e67 Version set to 2.5.0-SNAPSHOT 2019-12-10 15:25:03 +02:00
Igor Kulikov
41527ca059 Version set to 2.4.2-SNAPSHOT. Restore Black Box Tests. 2019-10-18 12:44:52 +03:00
Igor Kulikov
fd02c9b96f ThingsBoard UI - Angular 8 - Initial structure. 2019-08-08 19:39:06 +03:00
Igor Kulikov
c19adf3684 Version set to 3.0.0-SNAPSHOT 2019-08-07 17:31:23 +03:00
Andrew Shvayka
467feb967f Added Common Utils as a new home for DonAsynchron 2019-07-25 18:37:29 +03:00
VoBa
79e21575ad Fixed broken swagger-ui (#1878) 2019-07-23 18:50:52 +03:00
Igor Kulikov
8d5d8b2c23 Password policy setting. Login/Logout audit log. 2019-07-18 18:11:58 +03:00
Igor Kulikov
b482238ef3 Version set to 2.4.1-SNAPSHOT 2019-07-12 16:15:00 +03:00
Igor Kulikov
c631d51e24 Version set to 2.4.0-SNAPSHOT 2019-06-27 10:12:30 +03:00
Igor Kulikov
e0ab0159fb Version set to 2.3.1-SNAPSHOT 2019-02-12 17:16:24 +02:00
Igor Kulikov
7ff0ecd7e5 Version set to 2.3.0 2019-02-06 17:38:19 +02:00
Igor Kulikov
6062ba0143 Merge branch 'master' into develop/2.3 2019-02-01 16:39:56 +02:00
Igor Kulikov
ced63c4e70 Update License Header year to 2019 2019-02-01 16:39:33 +02:00
Igor Kulikov
a1e8ed8ff4 Merge branch 'master' into develop/2.3 2019-01-30 19:28:26 +02:00