20373 Commits

Author SHA1 Message Date
ViacheslavKlimov
79db9ea5be Configurable branch for gateways dashboard sync 2024-10-17 13:41:53 +03:00
ViacheslavKlimov
84fd3129ee Load gateways dashboard on install/upgrade 2024-10-17 13:37:38 +03:00
ViacheslavKlimov
3e6e5adde6 Disable gateways dashboard sync in tests 2024-10-15 17:23:13 +03:00
ViacheslavKlimov
bfc8231d87 Merge branch 'master' of github.com:thingsboard/thingsboard into feature/dashboard-sync 2024-10-15 17:19:33 +03:00
ViacheslavKlimov
2a71abbd52 Fix InstallScriptsTest 2024-10-15 14:10:05 +03:00
ViacheslavKlimov
86616e3b08 Gateways dashboard sync; new 'DASHBOARD' resource type 2024-10-15 13:55:19 +03:00
Igor Kulikov
fdbe59c610 Version set to 3.9.0-SNAPSHOT 2024-10-14 18:32:35 +03:00
Igor Kulikov
8e20cf1827 Merge with rc 2024-10-14 18:31:55 +03:00
Igor Kulikov
d11f866856 Version set to 3.8.1-RC 2024-10-14 18:27:21 +03:00
Igor Kulikov
82c642c97f Version 3.8.1-RC 2024-10-14 18:19:21 +03:00
ViacheslavKlimov
40e596ef75 Merge branch 'master' into feature/dashboard-sync
# Conflicts:
#	common/version-control/src/main/java/org/thingsboard/server/service/sync/vc/DefaultGitRepositoryService.java
#	common/version-control/src/main/java/org/thingsboard/server/service/sync/vc/GitRepository.java
2024-10-14 12:12:41 +03:00
Igor Kulikov
10e1d93958
Merge pull request #11857 from thingsboard/fix/layout-resize
Fix overlapping widgets when changing layout columns count
2024-10-14 11:19:50 +03:00
Igor Kulikov
61029fd0e0 Fix overlapping widgets when changing layout columns count 2024-10-14 11:11:27 +03:00
Igor Kulikov
075b33f0fa Fix overlapping widgets when changing layout columns count 2024-10-14 10:40:43 +03:00
Viacheslav Klimov
b09266a54c
Merge pull request #11850 from thingsboard/rc
rc
2024-10-11 18:36:37 +03:00
Viacheslav Klimov
c6636ff6b8
Merge pull request #11849 from thingsboard/fix/git-repo-init
Improve Git repository init
2024-10-11 18:34:10 +03:00
ViacheslavKlimov
a6a29a6ca7 Improve check that Git repository exists 2024-10-11 18:31:58 +03:00
Andrew Shvayka
da8e4bb7ba
Merge pull request #11820 from YevhenBondarenko/fix/versioned-insert-repository
fixed IndexOutOfBoundsException during saving old latestTs
2024-10-11 14:15:36 +03:00
Andrew Shvayka
c7b487e1eb
Merge pull request #11845 from thingsboard/tbel_1_2_4_rc
tbel: version 1.2.4
2024-10-11 14:10:12 +03:00
nick
55505aea92 Merge branch 'rc' into tbel_1_2_4_rc 2024-10-11 13:09:51 +03:00
nick
e85f9f8afd tbel: version 1.2.4 2024-10-11 13:06:29 +03:00
Viacheslav Klimov
0d0c2f6101
Merge pull request #11830 from dashevchenko/efentoPulseCounterFix
Fixed accumulative pulse counter total value calculation
2024-10-11 12:55:29 +03:00
dashevchenko
517fb4e67d fixed accumulative pulse counter total value calculation 2024-10-09 17:50:50 +03:00
ViacheslavKlimov
37f2ec134d Git: minor refactoring 2024-10-09 16:28:04 +03:00
ViacheslavKlimov
7248279a88 Introduce Git sync service 2024-10-09 15:58:31 +03:00
Igor Kulikov
c88a05ef5c Merge branch 'rc' 2024-10-08 16:12:39 +03:00
Igor Kulikov
6e5c6eee6c
Merge pull request #11823 from vvlladd28/bug/timewindow-updated/history-group-interval
Fixed not updated group interval in history time windows
2024-10-08 16:11:30 +03:00
Vladyslav_Prykhodko
2101d54f79 UI: Fixed not updated group interval in history time windows 2024-10-08 15:25:59 +03:00
Igor Kulikov
4ca215fdee UI: Resources service - avoid modules scan recursion. Update markdown template sanitize according to the latest angular template requirements. 2024-10-08 14:02:39 +03:00
Igor Kulikov
1d6b6a3f40 UI: Update rule nodes config. 2024-10-08 13:24:14 +03:00
Igor Kulikov
1d80aacece Update rule nodes config UI 2024-10-08 10:25:23 +03:00
YevhenBondarenko
0907cc081a fixed IndexOutOfBoundsException during saving old latestTs 2024-10-07 20:28:45 +02:00
Igor Kulikov
5ea072ca9e
Merge pull request #11780 from rusikv/bug/qr-code-home-title
Fixed cropped "qr mobile app" widget title on tenant home page
2024-10-07 17:13:18 +03:00
Igor Kulikov
0412c1b7e9
Merge pull request #11819 from thingsboard/develop/angular18
Migrate to Angular 18
2024-10-07 17:11:35 +03:00
Igor Kulikov
605549b1b7 Fix rulechain context menu style. 2024-10-07 17:10:05 +03:00
Igor Kulikov
d34b2ada01 Update ui-ngx yarn version 2024-10-04 18:41:07 +03:00
Igor Kulikov
a20967d488 Merge branch 'develop/angular18' of github.com:thingsboard/thingsboard into develop/angular18 2024-10-04 18:30:29 +03:00
Igor Kulikov
c19924065c UI: Remove deprecated ComponentFactory usage. Improve typings in tsx files. 2024-10-04 18:30:19 +03:00
Igor Kulikov
ed2edc6f19
Merge pull request #11805 from vvlladd28/improvement/update-leaflet/1.9.4
Updated leaflet to 1.9.12
2024-10-04 18:17:33 +03:00
Vladyslav_Prykhodko
fdda9ffdb4 UI: Updated leaflet to 1.9.12 2024-10-04 16:42:15 +03:00
Igor Kulikov
74a75bfcf6 Angular 18 migration 2024-10-03 18:41:38 +03:00
Igor Kulikov
d3295579dc Angular 18 migration 2024-10-03 17:32:28 +03:00
Igor Kulikov
ac0c6c1190 Merge branch 'master' into develop/angular18 2024-10-03 16:28:18 +03:00
Igor Kulikov
bca03bf3a5 Merge branch 'rc' 2024-10-03 16:27:46 +03:00
Igor Kulikov
a39e0a8536
Merge pull request #11798 from vvlladd28/bug/recource-library/select-recource-type
Fixed the inability to edit resource type in resource library when created resource
2024-10-03 15:47:43 +03:00
Vladyslav_Prykhodko
8c0fbbc69b UI: Fixed the inability to edit resource type in resource library when created resource 2024-10-03 15:21:10 +03:00
Igor Kulikov
134e66459a Merge with mas 2024-10-03 13:51:22 +03:00
Igor Kulikov
a4ff61b623 Merge branch 'rc' 2024-10-03 13:49:30 +03:00
Viacheslav Klimov
3ae6cfb30a
Merge pull request #11797 from thingsboard/dedicated-datasource-pool-size
Drop max Hikari pool size to 4 for dedicated datasource
2024-10-03 13:05:15 +03:00
ViacheslavKlimov
3925d92fd4 Drop max Hikari pool size to 4 for dedicated datasource 2024-10-03 13:04:06 +03:00