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

3918 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
a43d3f2fd2 UI: Minor improvements 2020-04-10 17:24:13 +03:00
Igor Kulikov
471ed87ff6 UI: Revert entity.component annotation to directive 2020-04-10 16:12:42 +03:00
Igor Kulikov
f446e749ba UI: Fix scss import to relative path 2020-04-10 15:48:20 +03:00
Igor Kulikov
3727d52f86 UI: Fix scss import to relative path 2020-04-10 15:45:53 +03:00
Igor Kulikov
67c8cb43e2 UI: Fix scss import to relative path 2020-04-10 15:44:47 +03:00
Igor Kulikov
6dbae67ae6 Merge branch 'ShvaykaD-develop/3.0' into develop/3.0 2020-04-10 15:11:10 +03:00
Igor Kulikov
b30370328f Minor fixes 2020-04-10 15:10:56 +03:00
Igor Kulikov
8caa2a54f7 Merge branch 'develop/3.0' of https://github.com/ShvaykaD/thingsboard into ShvaykaD-develop/3.0 2020-04-10 15:08:17 +03:00
Igor Kulikov
1b0fabb7ab Merge branch 'master' into develop/3.0 2020-04-10 15:07:44 +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
38617625c1
fix error create dialog new dashboard (#2606) 2020-04-10 15:05:34 +03:00
Vladyslav
2a1c55f022
[2.5] Revert change JSON form (#2598) 
* Revert change

* Revert file
 2020-04-10 15:04:55 +03:00
Vladyslav
39ba550d41
Fix not add entityLabel for header action open dashboard state (#2601) 2020-04-10 15:04:45 +03:00
Vladyslav
e8fffdbc4d
Fix manage dashboard states for Safari (#2602) 2020-04-10 15:04:34 +03:00
Vladyslav
3881dc8423
Add new alias Current tenant (#2596) 2020-04-10 15:04:24 +03:00
Vladyslav
2a1fa76c2f
Add new alias Current Tenant (#2604) 2020-04-10 15:04:12 +03:00
Igor Kulikov
352b073062 UI: Fixed add user dialog 2020-04-10 14:12:40 +03:00
YevhenBondarenko
1dd3334825 moved jsinvoke.proto to queue, fixed js-executor, added createRemoteJsRequestTemplate to RuleEngine and Core factories 2020-04-10 12:52:05 +03:00
Dmytro Shvaika
3fafffb33d fix activate method for new UI 2020-04-10 11:57:55 +03:00
Dmytro Shvaika
089dfe5402 Merge branch 'improvements/userActivate' into develop/3.0 2020-04-10 11:26:25 +03:00
Igor Kulikov
b12bd14e10 UI: Fix assets import columns 2020-04-10 09:16:15 +03:00
Yevhen Bondarenko
7b3d475267
[2.5] created rabbitmq queue (#2589) 
* created main classes for RabbitMq queue

* created temp version rabbitmq

* Merge branch 'develop/2.5' of https://github.com/thingsboard/thingsboard into develop/2.5-rabbitmq

# Conflicts:
#	common/queue/pom.xml

* rabbit improvements
 2020-04-09 18:41:37 +03:00
VoBa
fcf436c620
[2.5] Added possibility to login by url params (#2581) 
* Added possibility to login by url params

* Changes after code review
 2020-04-09 18:40:34 +03:00
Igor Kulikov
5e3c85a897 UI: Fix login url params 2020-04-09 18:39:58 +03:00
VoBa
cc123a9e67
[3.0] Added possibility to login by url params (#2592) 
* Added possibility to login by url params

* Fixes after code review
 2020-04-09 18:38:08 +03:00
Andrii Shvaika
ca193239ba RE Submit Strategies 2020-04-09 18:33:44 +03:00
Igor Kulikov
359c442365 UI: Attribute table disable edit for client side attributes 2020-04-09 18:06:10 +03:00
Vladyslav
f2b10edf1e
[3.0] Improvements import and tables for mobile view (#2594) 
* Fix width table in Safari

* Improvement in mobile view

* Improvement attributes-table from mobile view

* Relation-table improvement for mobile view

* Improvement entity-table from mobile view
 2020-04-09 17:53:24 +03:00
Igor Kulikov
7e66cb938c UI: Model improvement, new entity table methods 2020-04-09 17:48:16 +03:00
Dmytro Shvaika
8133cf4623 add sendActivationEmail as request param (default -> true) to activate method in auth controller and login service 2020-04-09 16:44:18 +03:00
Andrii Shvaika
ec4e2c036f No more failures on missing RE queue 2020-04-09 13:09:54 +03:00
Andrii Shvaika
5bebf098ab Ability to reset blacklisted functions 2020-04-09 13:03:30 +03:00
Igor Kulikov
b0c5479c64 UI: Entities table model improvements. 2020-04-08 19:31:08 +03:00
Andrii Shvaika
2f6c6ad1fe Merge with master 2020-04-08 18:24:52 +03:00
Andrii Shvaika
c7b428fbc7 Merge branch 'develop/2.5' of github.com:thingsboard/thingsboard into develop/2.5 2020-04-08 14:10:14 +03:00
Andrii Shvaika
3eaae1ef32 Statistics Implementation 2020-04-08 14:09:56 +03:00
Igor Kulikov
f9375a0fca UI: dynamic annotation for abstract entity component 2020-04-07 17:11:00 +03:00
Igor Kulikov
c60e99fad9 UI: Entity table models improvements 2020-04-07 17:06:04 +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
Yevhen Bondarenko
45bd764e6f
Azure ServiceBus queue 
* created event hubs queue

* created servicebus queue

* refactored

* refactored
 2020-04-07 11:45:28 +03:00
Andrii Shvaika
ff3fd89ace Added ability to process tellNext messages from Queue 2020-04-06 19:40:38 +03:00
Andrii Shvaika
c52d0d26d3 Refactoring of Message Routing 2020-04-06 19:23:33 +03:00
Andrii Shvaika
638ca0e1d1 Refactoring to multiple queues for rule engine 2020-04-06 18:35:43 +03:00
Igor Kulikov
e160b6e02b Remove unnecessary widgets bundle type 2020-04-06 17:07:37 +03:00
Igor Kulikov
3bf629b13a Merge branch 'vvlladd28-improvement/3.0/minor-fix' into develop/3.0 2020-04-06 17:02:56 +03:00
Igor Kulikov
ed90ca56f3 Fix conflicts 2020-04-06 17:02:29 +03:00
Igor Kulikov
eb1461a8a3 Add entity title function 2020-04-06 16:58:23 +03:00
Vladyslav_Prykhodko
81285446bf Fix revert thingsboard.yml 2020-04-06 11:49:56 +03:00
Vladyslav_Prykhodko
daa0c30e11 Fix widget library details 2020-04-06 11:46:56 +03:00