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

5495 Commits

Author SHA1 Message Date
Maksym Dudnik
bebee3e43b devices list make all tables same 
remove full screen from buttons widget
gateway config tabs changes jumping
mat slider label level fix
empty static for gateway
Rpc command change style fix
change config modal change selector
gateway config modal on mobile fix
config dialog -> gateway page bug fix
 2023-06-30 11:30:34 +03:00
Maksym Dudnik
62fbb2d5cd mobile layout update 2023-06-23 15:51:50 +03:00
Maksym Dudnik
64d4b9aa50 dashboard added 2023-06-22 14:41:16 +03:00
Maksym Dudnik
82c546feb3 Merge branch 'develop/3.5.2' of https://github.com/thingsboard/thingsboard into gateway_list 
 Conflicts:
	ui-ngx/src/app/modules/common/modules-map.ts
 2023-06-07 12:20:09 +03:00
Igor Kulikov
d992355a3c UI: Implement basic config form for Entities table widget. 2023-06-06 17:20:35 +03:00
Maksym Dudnik
1d71e2067f removed action buttons 2023-06-06 14:19:09 +03:00
Maksym Dudnik
c3cb3b4443 Merge branch 'develop/3.5.2' of https://github.com/thingsboard/thingsboard into gateway_list 
 Conflicts:
	ui-ngx/src/app/modules/home/components/widget/lib/settings/widget-settings.module.ts
	ui-ngx/src/app/shared/shared.module.ts
	ui-ngx/src/assets/locale/locale.constant-en_US.json
 2023-06-06 13:31:37 +03:00
Maksym Dudnik
c83667702f Merge remote-tracking branch 'origin/gateway-list' into gateway_list 
# Conflicts:
#	application/src/main/data/json/system/widget_bundles/gateway_widgets.json
 2023-06-06 13:21:40 +03:00
Maksym Dudnik
c9b9959f47 mk2 gateway dashboard 2023-06-06 13:19:53 +03:00
Igor Kulikov
4ab93c8c52 Merge branch 'develop/3.5.2' into feature/widget-config 2023-06-02 13:15:45 +03:00
Andrew Shvayka
4311b2f030
Merge pull request #8640 from thingsboard/delete_search_text_ce 
Remove deprecated search text field
 2023-06-02 12:01:07 +03:00
Andrii Shvaika
8ab5e1a2db Merge remote-tracking branch 'origin/master' into develop/3.5.2 2023-06-01 15:33:58 +03:00
Andrii Shvaika
be41ec8bef Fix minor issues. Merged with develop/3.5.2 2023-06-01 15:10:08 +03:00
Andrii Shvaika
d09dba8fcb Merge remote-tracking branch 'origin/delete_search_text_ce' into develop/3.5.2 2023-06-01 13:04:14 +03:00
Igor Kulikov
733dcea36a Update UI help branch 2023-05-31 12:56:50 +03:00
Igor Kulikov
eebfb5d0a4 Merge branch 'develop/3.5.2' into feature/widget-config 2023-05-30 18:47:56 +03:00
Igor Kulikov
ceda0f14e6 Merge branch 'master' into develop/3.5.2 2023-05-30 18:47:33 +03:00
Andrew Shvayka
1183195d23
Merge pull request #8611 from YevhenBondarenko/cookie-util-improvements 
ser/des in json format
 2023-05-30 17:10:05 +03:00
Igor Kulikov
3e332d9194 Merge with develop/3.5.2 2023-05-30 17:03:24 +03:00
Igor Kulikov
11b49146ce Merge with master 2023-05-30 17:01:30 +03:00
Andrew Shvayka
001d55fa0d
Merge pull request #8595 from Mr-Mime/master 
[3.5.1] Fix api documentation
 2023-05-30 14:55:52 +03:00
Andrii Shvaika
11b6e8ebd0 Merge branch 'master' of github.com:thingsboard/thingsboard 2023-05-30 14:52:06 +03:00
Andrii Shvaika
29602c208e Fix MQTT connection tests according to specification 2023-05-30 14:51:54 +03:00
Igor Kulikov
bf749ff19b UI: Basic widget config mode directive support 2023-05-30 12:37:47 +03:00
Andrew Shvayka
7a68daf3f3
Merge pull request #8645 from adovh/fix-swagger-queue-servicetype 
Fix swagger queue servicetype
 2023-05-30 12:28:05 +03:00
AndriiD
c863cf6c15 \changed ServiceType.valueOf to ServiceType.of 2023-05-29 20:24:13 +03:00
nickAS21
7076c1719f search_text: system-data.sql 2023-05-26 19:20:03 +03:00
nickAS21
cb17a94a97 Merge branch 'develop/3.5.2' into delete_search_text_ce 2023-05-26 19:01:50 +03:00
Igor Kulikov
36f1cd00e7 Merge with develop/3.5.2 2023-05-26 18:00:04 +03:00
Igor Kulikov
2f7b1730d5 Merge with master 2023-05-26 13:48:28 +03:00
Igor Kulikov
6ccc21632d Add upgrade script to fix dashboard templates after Angular migration to ver.15 2023-05-26 13:39:15 +03:00
nickAS21
35bbff3cac regactoring text_search for entity 2023-05-25 17:05:46 +03:00
Igor Kulikov
ee159be366 UI: Introduce device datasource type. Implement basic and advanced widget config modes. 2023-05-25 17:03:52 +03:00
Igor Kulikov
7c6c7e5f67 Merge branch 'develop/3.5.2' into feature/widget-config 2023-05-24 19:14:15 +03:00
Andrii Shvaika
193b37e292 Merge with master 2023-05-24 18:40:57 +03:00
Andrew Shvayka
1ccd7f9fd5
Merge pull request #8533 from thingsboard/feature/notification-configs-vc 
Version control for notification configs
 2023-05-24 17:29:16 +03:00
Andrii Shvaika
138c0e4f8f Simplify upgrage procedure 2023-05-24 17:05:23 +03:00
Andrii Shvaika
8311017b92 Fixed alarm details on alarm clear 2023-05-24 16:51:00 +03:00
Andrii Shvaika
fa41086e6d Refactoring improvements 2023-05-24 13:40:37 +03:00
ViacheslavKlimov
597696eabc Try to fix testNotificationRuleDisabling 2023-05-24 13:12:33 +03:00
ViacheslavKlimov
508a990ab1 Merge remote-tracking branch 'origin/develop/3.5.2' into feature/notification-configs-vc 2023-05-23 15:20:21 +03:00
YevhenBondarenko
4f28a45c88 ser/des in json format 2023-05-23 13:59:24 +02:00
Igor Kulikov
1659257f74 Merge branch 'develop/3.5.2' into feature/widget-config 2023-05-23 09:40:01 +03:00
Andrii Shvaika
bf63eaccfe Merge branch 'master' into develop/3.5.2 2023-05-22 17:50:05 +03:00
Andrew Shvayka
07cba2b16c
Merge pull request #8598 from dashevchenko/xxe_fixed 
Fixed xxe vulnerability
 2023-05-22 17:46:51 +03:00
Igor Kulikov
9ae1f1e329 Version set to 3.5.2-SNAPSHOT 2023-05-22 16:32:24 +03:00
Igor Kulikov
59cc8244b5 Version set to 3.5.1-SNAPSHOT 2023-05-22 16:31:19 +03:00
Igor Kulikov
c422e39724 Version set to 3.5.1-SNAPSHOT 2023-05-22 16:26:54 +03:00
Igor Kulikov
40662144c6 Merge branch 'develop/3.5.2' into feature/widget-config 2023-05-22 16:20:57 +03:00
Igor Kulikov
e8ba135f70 Merge branch 'develop/3.5.1' into develop/3.5.2 2023-05-22 16:20:34 +03:00