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

7040 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Vladyslav_Prykhodko
81b203efeb Merge branch 'develop/3.3-firmware' of https://github.com/YevhenBondarenko/thingsboard into YevhenBondarenko-develop/3.3-firmware 2021-04-13 15:10:50 +03:00
Vladyslav_Prykhodko
e31a95619c UI: Added firmware autocomplete component; Add firmware to device and device profile 2021-04-13 15:10:13 +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
YevhenBondarenko
7b2e512cd8 added multipart max size 50MB 2021-04-12 19:08:27 +03:00
YevhenBondarenko
401e41f7c3 implemented FirmwareControllerSqlTest 2021-04-12 17:50:12 +03:00
Vladyslav_Prykhodko
45fc32ce3e UI: Added firmware configuration 2021-04-12 16:56:00 +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
Vladyslav_Prykhodko
3c4ee1288d Merge branch 'develop/3.3-firmware' of https://github.com/YevhenBondarenko/thingsboard into YevhenBondarenko-develop/3.3-firmware 2021-04-12 13:45:48 +03:00
YevhenBondarenko
8860eef1ba added hasData for firmware 2021-04-12 13:35:02 +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
Vladyslav_Prykhodko
2e5bbe2032 Merge remote-tracking branch 'origin/feature/multiple-file-input' into YevhenBondarenko-develop/3.3-firmware 2021-04-12 09:31:01 +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
YevhenBondarenko
95c9562418 refactored 2021-04-09 15:35:07 +03:00
YevhenBondarenko
935aab7535 added checksum and checksum algorithm for firmware 2021-04-09 15:32:06 +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
YevhenBondarenko
7954f91fee added upgrade for firmware 2021-04-08 11:45:29 +03:00
YevhenBondarenko
b51fee8740 created firmware dao 2021-04-08 10:30:30 +03:00
Vladyslav_Prykhodko
8ae20e05bd UI: Fixed incorrect calculate minIntervalLimit 2021-04-07 18:03:02 +03:00
Vladyslav_Prykhodko
45277c8789 UI: Fixed error: Expression has changed after it was checked. 2021-04-06 11:57:48 +03:00
YevhenBondarenko
bb90b2f137 lwm2m queue mode 2021-04-06 07:38:52 +03:00
mdheer
f0413055b0
Merge pull request #2 from TTvanWillegen/dashboard_logo 
Dashboard logo - added functionality to change the desired logo path from the settings menu
 2021-04-06 00:39:05 +02:00
mdheer
38f81df839
Merge branch 'master' into dashboard_logo 2021-04-06 00:38:48 +02:00