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

1490 Commits

Author SHA1 Message Date
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
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
Volodymyr Babak
1bfe950f58 Fixes for downlink msg. Refactoring 2020-05-13 12:31:33 +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
Volodymyr Babak
8dbc550fd3 Refactoring to review. Added tenantId and customerId. Added email tenant name strategy 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
Andrii Shvaika
91768dac40 Merge remote-tracking branch 'origin/master' into develop/3.0 2020-04-30 13:26:34 +03:00
ShvaykaD
56ac228662
[WIP] Improvements for PostgreSQL 11 partitioning. (#2681) 
* improvements for migration to postgres 11

* tests update

* fix typo

* throw exception if query execution failed
 2020-04-30 13:12:35 +03:00
Bohdan Smetaniuk
c1c725542a fixed bug with customer assignment to edge 2020-04-29 20:05:29 +03:00
Andrii Shvaika
df3614f9e4 Fix Alarm repository. Add queue type list select. 2020-04-27 01:12:23 +03:00
Andrii Shvaika
91aa7a2700 Merge with master (2.5) 2020-04-27 00:40:21 +03:00
Andrew Shvayka
38ebbe2576 Revert "Merge with master. AlarmRepository.findAlarms is failing (#2663)" 
This reverts commit 2c02406ee5f41b08e655b634dd9871403f67149d.
 2020-04-24 19:42:32 +03:00
Andrew Shvayka
2c02406ee5
Merge with master. AlarmRepository.findAlarms is failing (#2663) 
* Merge with master. AlarmRepository.findAlarms is failing

* Fix Alarm repository. Add queue type list select.

Co-authored-by: Igor Kulikov <ikulikov@thingsboard.io>
 2020-04-24 15:44:31 +03:00
Andrii Shvaika
b5bedbfdf6 Refactoring of Docker Compose 2020-04-24 14:54:25 +03:00
Dmytro Shvaika
9a052ef0bc fix typo in EventEntity class 2020-04-23 13:15:55 +03:00
Dmytro Shvaika
6d20ed0550 fix event insert repository 2020-04-22 18:09:47 +03:00
Dmytro Shvaika
71bf15caf7 improvements 2020-04-22 16:16:58 +03:00
Dmytro Shvaika
005921433c merge with master 2020-04-22 13:29:10 +03:00
Dmytro Shvaika
dc3d1dd794 added ttl for events 2020-04-22 13:03:53 +03:00
Andrii Shvaika
076cf655f8 Improved tests 2020-04-21 23:54:26 +03:00
Andrii Shvaika
53eb09bcb9 Improvements to tests due to new architecture 2020-04-21 22:31:25 +03:00
Igor Kulikov
15a31044b2 Cleanup 2020-04-21 11:41:43 +03:00
Volodymyr Babak
7d10134f77 Merge branch 'feature/edge' into develop/3.0-edge 2020-04-20 15:54:18 +03:00
Volodymyr Babak
3da17789aa Test fixed. Increased limit for assigned edges 2020-04-20 15:45:04 +03:00
Volodymyr Babak
767d0cfc58 Merge branch 'feature/edge' into develop/3.0-edge 2020-04-20 14:58:31 +03:00
Andrii Shvaika
0c54f836b3 Fixed tests 2020-04-14 16:17:08 +03:00
Volodymyr Babak
9dbe3d4d6b Fixed fetch or SYSTEM rule chains 2020-04-14 12:53:22 +03:00
Andrii Shvaika
6c4b50a380 Implemented dedicated RE per tenant 2020-04-13 14:59:48 +03:00
hamza.slama
5b8ce2fb69 Move AlarmId To Id Package 2020-04-13 10:40:03 +03:00
Yevhen Bondarenko
7869fb5ef4
added to tenant fields isolatedTbCore and isolatedTbRuleEngine (#2611) 
Co-authored-by: Andrew Shvayka <ashvayka@thingsboard.io>
 2020-04-13 10:24:40 +03:00
Yevhen Bondarenko
8442159811
[2.5] vulnerabilities (#2608) 
* Version updates

* added @Retention(RetentionPolicy.RUNTIME) for all custom Dao annotations.

* changed getId, setId to getUuid, setUuid from BaseEntity, improvement AbstractControllerTest

* fix rabbitmq

* fix RuleChainManagerActor

* refactored InMemory queue

Co-authored-by: Andrii Shvaika <ashvayka@thingsboard.io>
 2020-04-13 09:34:35 +03:00
Igor Kulikov
1b0fabb7ab Merge branch 'master' into develop/3.0 2020-04-10 15:07:44 +03:00
ShvaykaD
11479935c2
SQL TTL Implemenation 
* init commit

* improvements for ttl-functions

* added drop partitions by ttl function

* add load ttl function to upgrade script

* fix typo

* add IF NOT EXISTS for json_v in timescale upgrade

* changed logic for removing customer records from ts_kv

* improvements in upgrade scenario

* improvements

* added intial delay for TTL task execution
 2020-04-07 11:55:26 +03:00
Volodymyr Babak
f3aa410c17 Merge branch 'feature/edge' into develop/3.0-edge 2020-03-25 23:27:26 +02:00
Volodymyr Babak
bfb25845e9 Merge branch 'develop/3.0' into develop/3.0-edge 2020-03-24 11:50:34 +02:00
Volodymyr Babak
660b7fc62b Merge branch 'feature/edge' into feature/edge-last-week 2020-03-17 18:56:46 +02:00