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

221 Commits

Author SHA1 Message Date
Igor Kulikov
614d1b1f38 Version set to 3.1.1 2020-08-28 16:34:44 +03:00
Igor Kulikov
cf5d827709 Version set to 3.1.1-SNAPSHOT 2020-08-28 16:32:44 +03:00
Igor Kulikov
27abffc959 Version set to 3.1.0 2020-08-12 16:02:40 +03:00
Andrii Shvaika
2fc39132cd Merge with develop/2.5.3 2020-07-24 11:37:34 +03:00
vzikratyi
0ccf7f13d1 Moved 'stats' to separate module 2020-07-24 11:28:27 +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
61785f550e Fix Java websocket version 2020-07-08 15:44:08 +03:00
Igor Kulikov
fac7bcc0b9 Version set to 3.1.0-SNAPSHOT 2020-07-08 15:41:30 +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
Andrii Shvaika
5aa055d73d Websocket refactoring 2020-06-18 11:08:06 +03:00
Yevhen Bondarenko
7a555fca8d
removed Apache Email Validator (#2945) 
* removed Apache Email Validator

* improvements Email Validator regex

* refactored Email Validator
 2020-06-15 12:37:43 +03:00
Andrii Shvaika
9d2e039220 Version set to 2.5.3-SNAPSHOT 2020-06-11 10:57:50 +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
b25b05c7ff Fix JS Build 2020-05-25 15:05:08 +03:00
Igor Kulikov
465bbfd796 Remove struts 2020-05-25 12:29:42 +03:00
Andrii Shvaika
e39d5c9f53 Test commit for build system 2020-05-21 19:38:17 +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
872e9f528c Remove duplicate snakeyaml dependency entry 2020-05-18 11:35:55 +03:00
Igor Kulikov
29a6e7d91c Replace Velocity with Freemarker 2020-05-15 12:21:50 +03:00
Igor Kulikov
36457f8b13 Update mqtt paho client version. Completely remove old ui. 2020-05-15 10:23:45 +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
cd5434587f Merge with master 2020-05-06 10:01:05 +03:00
VoBa
549ab8addf
Exclude old spring-core version (#2733) 
* Renamed env variabled. Added sync

* Exclude old spring-core version
 2020-05-05 19:24:35 +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
YevhenBondarenko
3e92a6a8d8 fix spring versions conflict 2020-05-04 21:55:36 +03:00
YevhenBondarenko
f1e651bb7d improvements 2020-05-04 21:55:36 +03:00
YevhenBondarenko
9f773fb37f updated spring and netty versions, excluded log4j from zookeeper dependency 2020-05-04 21:55:36 +03:00
Andrew Shvayka
a6648163bb Revert "updated spring and netty versions, excluded log4j from zookeeper dependency" 
This reverts commit 73805759f6866c505586f813e5d860fe1f5b4bc9.
 2020-05-04 18:54:38 +03:00
Andrew Shvayka
a167ee2e32 Revert "improvements" 
This reverts commit 9d8a7f04265b4e4944b7668a5a1b443d75c5282c.
 2020-05-04 18:54:38 +03:00
YevhenBondarenko
9d8a7f0426 improvements 2020-05-04 17:35:08 +03:00
YevhenBondarenko
73805759f6 updated spring and netty versions, excluded log4j from zookeeper dependency 2020-05-04 17:35:08 +03:00
Igor Kulikov
4d03c51743 Merge with master 2020-05-04 12:23:13 +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
Andrew Shvayka
c1b5fd5c57
Merge pull request #2714 from thingsboard/feature/queue-consumers-refactoring 
Feature/queue consumers refactoring
 2020-05-04 10:17:46 +03:00
Volodymyr Babak
a563fdab3f Added basic and custom OAuth2 user mappers 2020-05-04 00:21:58 +03:00
Volodymyr Babak
7fc46010b7 Added base impl for OAuth-2 2020-05-04 00:21:58 +03:00
YevhenBondarenko
06c3caf082 refactored 2020-05-02 13:34:11 +03:00
Igor Kulikov
a4cd853a20 Merge branch 'master' of github.com:thingsboard/thingsboard into develop/3.0 2020-04-28 18:48:44 +03:00