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

959 Commits

Author SHA1 Message Date
deaflynx
b5d99e504f Minor naming change in default edge rule chains 2020-06-26 12:57:38 +03:00
Bohdan Smetaniuk
1f57524851 fixed bug with undefined rule chain type 2020-06-22 18:26:00 +03:00
deaflynx
eacb7dcb2e Merge remote-tracking branch 'origin/feature/edge' into feature/edge 2020-06-21 20:48:25 +03:00
deaflynx
c9d995858c Dashboard unused edge service deleted 2020-06-21 20:46:56 +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
nordmif
9b6b9e41fe changed minimal aggregation interval to 1/5 2020-06-10 19:17:38 +03:00
deaflynx
ef12b7bee3 Added spanish edge locale 2020-06-04 12:01:17 +03:00
deaflynx
e59ac007bd Added french edge locale 2020-06-04 10:16:08 +03:00
Vladyslav_Prykhodko
ac9c3731f8 Fixed problem widget-editor in Safari #2900 2020-06-03 11:36:20 +03:00
deaflynx
3b1e1416fb Merge with 2.5.1 2020-06-03 10:37:58 +03:00
deaflynx
36997c5c3f Added german locale for edge 2020-06-02 19:09:34 +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
nordmif
c3447c5a11 fixing the activation of on-row event on details click 2020-06-02 14:21:49 +03:00
Volodymyr Babak
134148c49f Removed edgeId. Code clean up and refactoring 2020-06-02 12:46:57 +03:00
deaflynx
9b16d93c6e Fixed default edge rule chain scope 2020-06-01 18:11:39 +03:00
deaflynx
0af0422a92 Default edge rule chains code optimization 2020-06-01 15:10:24 +03:00
deaflynx
0f24bd2912 Edge code cleaning. Not stable Default edges 2020-06-01 14:30:44 +03:00
Vladyslav_Prykhodko
a99d5d9fc2 Improvment view mail-setting 2020-06-01 11:50:25 +03:00
deaflynx
cc7bd63b62 Fixed edge dashboards breadcrumb 2020-05-30 18:39:14 +03:00
deaflynx
5d385809e7 Default edge rulechain label fixed. Fixed makeDefaultEdgeRuleChain server side 2020-05-30 17:35:51 +03:00
Igor Kulikov
81851db5c0 Alias: Batch support for fetching entities from relations 2020-05-29 16:31:15 +03:00
Volodymyr Babak
6ab3714ac5 Added default rule chain for server side 2020-05-27 09:22:25 +03:00
deaflynx
7ec2b8d310 Edge assignment cleaned all over CE entities, except Edge page. Fixed some locals for Unassign edge 2020-05-25 16:43:43 +03:00
Chantsova Ekaterina
7cd44d5577 Digital gauge: fix data displaying in mobile browser 2020-05-22 18:52:36 +03:00
Igor Kulikov
36457f8b13 Update mqtt paho client version. Completely remove old ui. 2020-05-15 10:23:45 +03:00
YevhenBondarenko
c2dd91d819 added proxy configs to send mail rule node and sysadmin 2020-05-13 17:59:31 +03:00
Volodymyr Babak
12b5a932c3 Fixes after code review 2020-05-10 23:20:30 +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
e3e037c93e Merge branch 'master' of github.com:thingsboard/thingsboard into develop/3.0 2020-05-07 12:46:43 +03:00
Vladyslav
15452dfe15
Fix error update websocket to change user (#2743) 2020-05-07 11:19:27 +03:00
Igor Kulikov
0ce5222072 Merge branch 'master' into develop/3.0 2020-05-06 20:04:33 +03:00
Igor Kulikov
d9bfd82926 Introduce OAuth failure handling 2020-05-06 20:04:09 +03:00
Igor Kulikov
f29c9c9452 Improve OAuth button style 2020-05-06 16:22:18 +03:00
Igor Kulikov
ab27084e7e Improve OAuth button style 2020-05-06 15:43:08 +03:00
Igor Kulikov
9a14dd385d Merge branch 'master' of github.com:thingsboard/thingsboard into develop/3.0 2020-05-05 18:19:43 +03:00
Vladyslav
69ca93e458
Updated URL for package markerClusterGoogle (#2732) 2020-05-05 18:07:18 +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
Vladyslav_Prykhodko
8b9bb6ebb2 Add translate login 2020-05-04 00:21:58 +03:00
Vladyslav
e66afcd26c Fix translate 2020-05-04 00:21:58 +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
Igor Kulikov
2f8c7bb6b0 Merge branch 'master' of github.com:thingsboard/thingsboard into develop/3.0 2020-04-30 15:48:21 +03:00
VoBa
e39ccaa2cc
[2.5] Improved login by params to support nagivation to different dashboards (#2702) 
* Improved login by params

* Fix

* Removed incorrect redirect

* Refactoring
 2020-04-30 15:48:07 +03:00