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

731 Commits

Author SHA1 Message Date
Bohdan Smetaniuk
3ca22aeba1 bug with empty dashboards list fixed, refractored 2020-06-30 13:18:15 +03:00
Volodymyr Babak
ad49fa9f5e Merge remote-tracking branch 'origin/feature/edge' into develop/3.0-edge 2020-06-19 17:19:36 +03:00
Volodymyr Babak
de11d1ce3d Test fixed. Other small updates 2020-06-19 16:46:33 +03:00
Volodymyr Babak
1633959912 Merge remote-tracking branch 'origin/feature/edge' into develop/3.0-edge 2020-06-19 16:06:49 +03:00
Volodymyr Babak
d96b845407 Merge remote-tracking branch 'upstream/master' into develop/3.0-edge 2020-06-19 10:19:40 +03:00
Volodymyr Babak
21ee2aec11 Merge remote-tracking branch 'upstream/develop/2.5.3' into feature/edge 2020-06-18 19:24:34 +03:00
Volodymyr Babak
f4baab4969 Edge Notifitcation Service 2020-06-18 13:30:45 +03:00
Volodymyr Babak
cd2908fb59 Refactoring notification engine 2020-06-16 16:49:27 +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
Volodymyr Babak
600c9ec565 Refactoring of notification to edge. Added EdgeNotificationService and queue msg proto 2020-06-14 22:24:25 +03:00
Volodymyr Babak
e8afd97605 Pushed users from CE to edge 2020-06-12 10:36:03 +03:00
Volodymyr Babak
3fc18988be Added update relation msg functionality 2020-06-11 20:10:47 +03:00
Andrii Shvaika
9d2e039220 Version set to 2.5.3-SNAPSHOT 2020-06-11 10:57:50 +03:00
Bohdan Smetaniuk
a540298a07 ref fixes 2020-06-05 13:02:48 +03:00
Bohdan Smetaniuk
9a749bf720 fixed bug with saving similar edges in db 2020-06-05 12:57:41 +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
Volodymyr Babak
3d3dd88710 Merge remote-tracking branch 'origin/develop/2.5.1' into feature/edge 2020-06-02 16:56:06 +03:00
Volodymyr Babak
2748a755c0 Code cleanup 2020-06-02 15:57:31 +03:00
Volodymyr Babak
bf0b730602 License fix 2020-06-02 12:48:24 +03:00
Volodymyr Babak
134148c49f Removed edgeId. Code clean up and refactoring 2020-06-02 12:46:57 +03:00
Volodymyr Babak
8416c206ff Fixed rule chain relation. Fixed default edge removal 2020-06-01 22:08:30 +03:00
Andrii Shvaika
a532ded5ae Version set to 2.5.2-SNAPSHOT 2020-06-01 16:11:57 +03:00
Volodymyr Babak
8b4c7cea1f Fixed remove default edge. Fixed edge tests 2020-06-01 12:54:23 +03:00
deaflynx
5d385809e7 Default edge rulechain label fixed. Fixed makeDefaultEdgeRuleChain server side 2020-05-30 17:35:51 +03:00
Volodymyr Babak
85a88ee499 Removed assigned edges from dashboard 2020-05-27 14:40:39 +03:00
Igor Kulikov
65fb9a91ec Merge with develop/2.5.1 2020-05-27 14:11:06 +03:00
Andrew Shvayka
bd40edfd14
Merge pull request #2830 from ShvaykaD/develop/2.5.1 
added inserts strategy for upgrade to 2.5 if copy to/from files failed
 2020-05-27 13:17:17 +03:00
Volodymyr Babak
6ab3714ac5 Added default rule chain for server side 2020-05-27 09:22:25 +03:00
Andrii Shvaika
02dd9ecdb9 Merge with develop/2.5.1 2020-05-25 17:27:02 +03:00
Dmytro Shvaika
f8a355fec8 added upgrade from version 2.5.0 2020-05-25 15:28:55 +03:00
Andrii Shvaika
b25b05c7ff Fix JS Build 2020-05-25 15:05:08 +03:00
viktor
4ed334a5d5 Merge branch 'develop/2.5.1' into oauth2-default-dashboard 2020-05-21 10:26:32 +03:00
viktor
cac7eb0d2b Added 'alwaysFullScreen' and 'defaultDashboardName' oauth2 properties 2020-05-20 18:27:26 +03:00
Volodymyr Babak
31a1e310f1 Rule chain refactoring 2020-05-15 19:36:32 +03:00
Andrii Shvaika
dc5eb6395a Version set to 2.5.1-SNAPSHOT 2020-05-13 14:07:31 +03:00
Volodymyr Babak
1bfe950f58 Fixes for downlink msg. Refactoring 2020-05-13 12:31:33 +03:00
Igor Kulikov
fa5bbcd91b Version set to 2.5.0 2020-05-12 10:28:15 +03:00
Volodymyr Babak
c114dd980c Refactoring 2020-05-09 02:15:12 +03:00
Volodymyr Babak
10f8039349 Merge remote-tracking branch 'upstream/master' into feature/edge 2020-05-08 22:39:51 +03:00
Igor Kulikov
2d235cf9eb Improve Cassandra resultSet pagination 2020-05-08 19:34:08 +03:00
Igor Kulikov
76300e400e Update Cassandra Driver 2020-05-08 15:45:54 +03:00
Igor Kulikov
e8ee8cb6d2 Fix tests 2020-05-07 11:09:12 +03:00
Igor Kulikov
0ce5222072 Merge branch 'master' into develop/3.0 2020-05-06 20:04:33 +03:00
VoBa
9b18c408b2
Added activate user config. Fixed https issue (#2737) 
* Added activate user config. Fixed https issue

* Update OAuth2User.java

Co-authored-by: Igor Kulikov <ikulikov82@gmail.com>
 2020-05-06 19:20:18 +03:00
Igor Kulikov
4d03c51743 Merge with master 2020-05-04 12:23:13 +03:00
Volodymyr Babak
fc46175e99 Renamed env variabled. Added sync 2020-05-04 12:09:21 +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
dab185208a Test fixed 2020-05-04 00:21:58 +03:00