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

241 Commits

Author SHA1 Message Date
deaflynx
00a40e63ba Deleted edges hierarchy widget 2020-12-18 11:56:24 +02:00
deaflynx
5b340c33f3 Merge remote-tracking branch 'origin/develop/2.6-edge' into develop/2.6-edge 2020-12-18 08:27:50 +02:00
Artem Babak
e23d2c7465 Edge import finished 2020-12-17 05:40:42 +02:00
deaflynx
6a56607058 Edge hierarchy widget starting implementation 2020-12-16 14:32:50 +02:00
deaflynx
9d4372dc0f Import edge implementation 2020-12-16 14:18:27 +02:00
Artem Babak
05771cd900 getEdge, getTenantEdges, getCustomerEdges refactored 2020-12-15 15:29:10 +02:00
Artem Babak
00caacf6c2 Delete UI filtering for getEdgeRuleChains 2020-12-15 13:29:17 +02:00
Artem Babak
1463de7c01 Delete UI filtering for getEdgeDashboards 2020-12-15 13:25:27 +02:00
Artem Babak
cb0201e87a Delete UI filtering for getEdge assets/entity-views/devices 2020-12-15 13:22:24 +02:00
Artem Babak
8c05171dc3 Minor ruleChainType code refactor 2020-12-08 11:53:12 +02:00
Bohdan Smetaniuk
c9dcbda18d ui side + handle exceptions 2020-10-02 14:21:52 +03:00
deaflynx
73ef6e0798 Rule chains EDGE & CORE types refactored 2020-09-18 12:21:33 +03:00
deaflynx
87601a4c63 Micro code refactoring in component-descriptor.service.js 2020-09-18 12:09:21 +03:00
Volodymyr Babak
c526d13e45 Merge remote-tracking branch 'upstream/develop/2.5.5' into feature/edge 2020-09-10 19:17:20 +03:00
Valerii Sosliuk
92a7ee9e7d UI: Attribute Service pass config on delete attributes 2020-08-14 20:30:49 +03:00
deaflynx
cc645a938e Code cleaning from PE comparison of master vs. develop/2.5.3 2020-08-13 16:53:10 +03:00
deaflynx
9352e19135 Merge remote-tracking branch 'origin/feature/edge' into feature/edge 2020-07-29 13:32:54 +03:00
Volodymyr Babak
2b3e195c20 Merge remote-tracking branch 'upstream/develop/2.5.3' into feature/edge 2020-07-28 17:38:45 +03:00
deaflynx
5ab81b98a6 Edge Events Status Update 2020-07-13 17:13:18 +03:00
deaflynx
1545a8cd76 Fixed EDGE_EVENT events fetch by edgeId 2020-07-07 11:28:15 +03:00
nordmif
019ac3d2f8 changed interval to 1/7 2020-06-26 16:24:02 +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
nordmif
9b6b9e41fe changed minimal aggregation interval to 1/5 2020-06-10 19:17:38 +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
134148c49f Removed edgeId. Code clean up and refactoring 2020-06-02 12:46:57 +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
Volodymyr Babak
12b5a932c3 Fixes after code review 2020-05-10 23:20:30 +03:00
Volodymyr Babak
10f8039349 Merge remote-tracking branch 'upstream/master' into feature/edge 2020-05-08 22:39:51 +03:00
Vladyslav
15452dfe15
Fix error update websocket to change user (#2743) 2020-05-07 11:19:27 +03:00
Igor Kulikov
d9bfd82926 Introduce OAuth failure handling 2020-05-06 20:04:09 +03:00
Volodymyr Babak
a563fdab3f Added basic and custom OAuth2 user mappers 2020-05-04 00:21:58 +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
ShvaykaD
0a136588eb
CheckPoint Node ui, Queue Controller, queue-type-list directive (#2612) 
* init commit

* ui: service for queue

* merge with develop/2.5 & fix license

* queue directive

* queue directive

* queue-type-list directive & TbCheckPointNode

* added rulenode-core-config.js file

* added new rulenode-core-config.js

* Develop/2.5 check point node (#3)

* fixed mistakes to pull https://github.com/thingsboard/thingsboard/pull/2612

* fixed mistakes to pull https://github.com/thingsboard/thingsboard/pull/2612

* fixed mistakes to pull https://github.com/thingsboard/thingsboard/pull/2612

* fixed mistakes to pull https://github.com/thingsboard/thingsboard/pull/2612

* Develop/2.5 check point node (#4)

* fixed mistakes to pull https://github.com/thingsboard/thingsboard/pull/2612

* fixed mistakes to pull https://github.com/thingsboard/thingsboard/pull/2612

* fixed mistakes to pull https://github.com/thingsboard/thingsboard/pull/2612

* fixed mistakes to pull https://github.com/thingsboard/thingsboard/pull/2612

* fixed mistakes to pull https://github.com/thingsboard/thingsboard/pull/2612

* fixed mistakes to pull https://github.com/thingsboard/thingsboard/pull/2612

* fixed mistakes to pull https://github.com/thingsboard/thingsboard/pull/2612

Co-authored-by: Dmitriymush <powder322@gmail.com>
Co-authored-by: Dmitriy Mushat <54553744+Dmitriymush@users.noreply.github.com>
 2020-04-15 17:48:47 +03:00
ShvaykaD
a3a17dc828
add sendActivationEmail as request param (default -> true) to activate method in auth controller and login service (#2597) 2020-04-10 15:06:44 +03:00
Vladyslav
3881dc8423
Add new alias Current tenant (#2596) 2020-04-10 15:04:24 +03:00
Volodymyr Babak
660b7fc62b Merge branch 'feature/edge' into feature/edge-last-week 2020-03-17 18:56:46 +02:00
Volodymyr Babak
f5034b4dcd Merge remote-tracking branch 'upstream/master' into feature/edge 2020-03-17 18:43:22 +02:00
Volodymyr Babak
24d4aed56c Added rule chain type definition into rule node 2020-03-10 18:45:35 +02:00
Volodymyr Babak
6751c511f1 Added default edge root rule chain 2020-03-09 13:57:38 +02:00
Vladyslav
0ed0725643
[2.5] Feature add support json[ui] (#2446) 
* Merge with master

* Refactoring code

* Add license header

Co-authored-by: Andrew Shvayka <ashvayka@thingsboard.io>
 2020-03-02 17:50:37 +02:00
Vladyslav
2ea3b0bdaf
Add service methods to claim a device (#2391) 2020-02-19 15:50:19 +02:00
DudnikMaksym
308fa1fd8c
UI: (#2372) 
Added fetchLastLevelOnly checkbox to alias query filter.
Updated ENG, RUS, UKR locales.
Updated getRelatedEntities and (constructRelatedEntitiesSearchQuery) function(s) by adding fetchLastLevelOnly attribute.
 2020-02-19 15:24:02 +02:00
Igor Kulikov
7c9f8d755f
Dmitriymush table columns assignment gateway (#2429) 
* added: import of gateway value

* expressions changed

* fixed refactor rename

* changed key and value for translating

* feature/: description added to the list of columns assingment and could be imported/exported from now

* Delete package-lock.json

* Revert package-lock

Co-authored-by: Dmitriy Mushat <54553744+Dmitriymush@users.noreply.github.com>
 2020-02-19 15:19:48 +02:00
Volodymyr Babak
c409e2d9c1 Rule chains refactoring: 2020-02-06 19:29:49 +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