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

6794 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Igor Kulikov
6c93ed0142
Merge pull request #4405 from ShvaykaD/fix/event-and-component-descriptor-dao 
fixed typo in AbstractComponentDescriptorInsertRepository and AbstractEventInsertRepository
 2021-04-14 16:11:37 +03:00
Igor Kulikov
c1e09038cf
Merge pull request #4404 from deaflynx/improvement/edge/rule-chains-routes 
UI: Edge rulechains: open from 'edge' scope
 2021-04-14 16:10:31 +03:00
Igor Kulikov
0940ce8494
Merge pull request #4403 from deaflynx/fix/edge/entity-tables-and-component-actions 
UI: Fixed: entity tables config for edge_customer_user; edge component; translation
 2021-04-14 16:08:20 +03:00
Igor Kulikov
1142502e6a
Merge pull request #4391 from vvlladd28/feature/multiple-file-input 
UI: Added multiple-file-input; Add support load multiple resource
 2021-04-14 16:02:03 +03:00
Igor Kulikov
8fcb609a03
Merge pull request #4377 from vvlladd28/improvement/calculate-min-interval 
UI: Fixed incorrect calculate minIntervalLimit
 2021-04-14 15:58:16 +03:00
Igor Kulikov
eea073a1ce
Merge pull request #4372 from vvlladd28/bug/dashboard/ExpressionChangedAfterItHasBeenCheckedError 
UI: Fixed error: Expression has changed after it was checked.
 2021-04-14 15:57:29 +03:00
Igor Kulikov
168b8d86eb
Merge pull request #4368 from YevhenBondarenko/develop/3.3-lwm2m-queue-mode 
lwm2m queue mode
 2021-04-14 15:55:18 +03:00
Igor Kulikov
0aa5b06c1d Merge branch 'ChantsovaEkaterina-feature/json-input-widget' 2021-04-14 15:52:44 +03:00
Igor Kulikov
3e014ea3cb Fix merge conflicts. 2021-04-14 15:52:23 +03:00
Andrew Shvayka
a84103f1e4
Restore old Nashorn sandbox version until bug in library is fixed (#4408) 
* Restore old nashorn sandbox version until bug in library is fixed

* Change version of Nashorn Sandbox to 0.1.16
 2021-04-14 15:31:51 +03:00
Igor Kulikov
8088dc7159
Merge pull request #4360 from vvlladd28/bugs/maps/parse-data 
UI: Fixed multiple datasource processing data in map widgets
 2021-04-14 15:30:34 +03:00
Igor Kulikov
247e871e29
Merge pull request #4353 from vvlladd28/improvement/web-config/localhost 
Fixed local environment variable resolve assets page 404
 2021-04-14 15:27:20 +03:00
Igor Kulikov
d1c103d3d3
Merge pull request #4350 from blackstar-baba/master 
Fixed title ex when make rule chain root in chinese
 2021-04-14 15:25:47 +03:00
Igor Kulikov
2eafc77cd4
Merge pull request #4345 from vvlladd28/bug/widget-selector/filter-type 
UI: Fixed didn't save widget type filter in widgets selector
 2021-04-14 15:18:19 +03:00
Igor Kulikov
d28312ef96
Merge pull request #4341 from vvlladd28/improvement/time-window/mobile 
UI: Improvement mobile view timeWindow; Add show time in 24 format
 2021-04-14 15:17:38 +03:00
Igor Kulikov
6517d7937a
Merge pull request #4331 from vvlladd28/bug/control-widget/switch-control 
UI: Fixed switch control widget, didn't update state after get value in call RPC
 2021-04-14 15:15:53 +03:00
Igor Kulikov
59b5f7352e
Merge pull request #4327 from vvlladd28/bug/validator/alarm-rule 
UI: Fixed alarm rules validation in change keyType or valueType
 2021-04-14 15:14:39 +03:00
Igor Kulikov
477d640e65
Merge pull request #4318 from vvlladd28/bug/profiles/sys-admin/select-home-dashboard 
UI: Fixed error access is forbidden in the system admin change profile
 2021-04-14 15:12:08 +03:00
Igor Kulikov
04df24c97a Rename getTenantDevices to getDeviceProfiles 2021-04-14 15:08:14 +03:00
Igor Kulikov
38de483806 Load edge rule chains when load demo data if edges enabled 2021-04-14 13:57:37 +03:00
Andrii Shvaika
123457f8eb Prepared Statement initialization lock 2021-04-14 13:49:09 +03:00
Igor Kulikov
ae5632f8ab Fix docker images. Upgrade docker postgres to version 12. 2021-04-14 12:40:25 +03:00
ShvaykaD
5a648467bf fixed typo in AbstractComponentDescriptorInsertRepository and AbstractEventInsertRepository 2021-04-13 15:52:29 +03:00
Viacheslav Klimov
fdd126303a Validate more entities' fields 2021-04-13 14:31:40 +03:00
Viacheslav Klimov
d4718ae354 Fix XSS policy file loading 2021-04-13 14:31:40 +03:00
Artem Babak
585f60fe15 Edge rulechains: open/export from 'edge' scope 2021-04-13 13:14:10 +03:00
Igor Kulikov
54ba69a82c Fix code style issues 2021-04-13 13:09:19 +03:00
Artem Babak
d60bb58fe2 Fixed translation: unassign edges 2021-04-13 12:58:00 +03:00
Artem Babak
790cef385d Edge component: hide sensitive buttons for customer_user/customer 2021-04-13 12:56:48 +03:00
Artem Babak
185e7a0874 Entities table config: fixed addEnabled, detailsReadonly for edge_customer_user 2021-04-13 12:53:39 +03:00
Igor Kulikov
29f64d9380 Update banner. Fix lwm2m transport jks config path 2021-04-13 11:49:15 +03:00
Vladyslav_Prykhodko
4a4a747301 UI: Refactoring resource library 2021-04-13 10:12:56 +03:00
Vladyslav_Prykhodko
77eafb1442 Merge remote-tracking branch 'upstream/master' into feature/multiple-file-input 2021-04-13 08:57:44 +03:00
Igor Kulikov
ce30a3b04a Merge branch 'master' of github.com:thingsboard/thingsboard 2021-04-12 19:12:05 +03:00
Igor Kulikov
0acb4272a5 Create default edge rule chains oauth2 2021-04-12 19:11:41 +03:00
Viacheslav Klimov
a00e3be7ba Merge branch 'master' into master-to-develop-snmp 
# Conflicts:
#	common/dao-api/src/main/java/org/thingsboard/server/dao/device/DeviceService.java
#	common/data/src/main/java/org/thingsboard/server/common/data/device/profile/DeviceProfileTransportConfiguration.java
#	common/transport/coap/src/main/java/org/thingsboard/server/transport/coap/CoapTransportService.java
#	common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/LwM2mTransportServiceImpl.java
#	common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/SessionMsgListener.java
#	dao/src/main/java/org/thingsboard/server/dao/device/DeviceDao.java
#	dao/src/main/java/org/thingsboard/server/dao/device/DeviceServiceImpl.java
#	pom.xml
 2021-04-12 15:45:39 +03:00
Andrew Shvayka
6b14d23e8c
Merge pull request #4304 from ViacheslavKlimov/feature/snmp-refactoring 
SNMP refactoring
 2021-04-12 13:55:59 +03:00
nickAS21
c634859e90
lwm2m: front start add attributes Lwm2m (#4388) 
* lwm2m: front start add attributes Lwm2m

* lwm2m: front finish add attributes Lwm2m for resources

* lwm2m: front add attributes Lwm2m for resources if isAttribte or isTelemetry

* lwm2m: front add attributes Lwm2m for objects if isAttribte or isTelemetry

* lwm2m: back add resource one

* lwm2m: back fix bug resource controller test
 2021-04-12 13:16:43 +03:00
Igor Kulikov
1b531e2858 Update haproxy config. Enable HTTP/2. 2021-04-12 12:37:03 +03:00
Igor Kulikov
0d733455c1 Enable edge configuration for docker compose 2021-04-12 12:31:16 +03:00
Igor Kulikov
e0f978992e
Merge pull request #3811 from volodymyr-babak/develop/3.3-edge 
Edge functionality
 2021-04-12 12:17:09 +03:00
Volodymyr Babak
4e5c726ea1 Fixed correct class for widget type details 2021-04-09 20:19:21 +03:00
Volodymyr Babak
c5f5acdba1 Improved disconnect process - try 5 times before force close session 2021-04-09 19:53:46 +03:00
Volodymyr Babak
770d3f91f2 Code review changes 2021-04-09 19:38:45 +03:00
Volodymyr Babak
df6f4c9924 Merge remote-tracking branch 'upstream/master' into develop/3.3-edge 2021-04-09 19:04:26 +03:00
ShvaykaD
dc87550835
Extract coap-server component to separate module to be used in coap transport and core (CoAP integrations). 
* init commit: coap-server component

* move coap-server to separate module

* fix typo
 2021-04-09 13:06:43 +03:00
Igor Kulikov
a207e31841 Merge with master 2021-04-09 12:40:43 +03:00
Igor Kulikov
4a63660e1d Version set to 3.3.0-SNAPSHOT 2021-04-09 12:37:08 +03:00
Vladyslav_Prykhodko
5672d2c451 UI: Added multiple-file-input; Add support load multiple resource 2021-04-09 11:43:11 +03:00
Vladyslav_Prykhodko
8ae20e05bd UI: Fixed incorrect calculate minIntervalLimit 2021-04-07 18:03:02 +03:00