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

14167 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrew Shvayka
f4c63badf5
Merge pull request #8692 from Seraphym-Tuhai/fix_for_ui_tests 
[3.5.2] Fix for UI tests
 2023-06-02 12:53:04 +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
dashevchenko
dadde5535e added dependencies to avoid conflicts 2023-06-01 19:17:23 +03:00
Andrii Shvaika
aecea7d6a5 Removed SearchTextEntity 2023-06-01 16:01:45 +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
56338924a1 Remove Additional info from entities that do not have such field 2023-06-01 15:31:58 +03:00
Andrii Shvaika
be41ec8bef Fix minor issues. Merged with develop/3.5.2 2023-06-01 15:10:08 +03:00
Andrii Landiak
c2a87aba60 Add redis-sentinel mode support 2023-06-01 14:47:47 +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
Seraphym-Tuhai
6a7af5cc12 add tests on make device public/private 2023-06-01 12:14:01 +03:00
imbeacon
24b82939c3 Fixes for models in Swagger 2023-06-01 10:12:08 +03:00
Seraphym-Tuhai
7116491824 fix ui tests, add alarm assignee tests to suite 2023-05-31 23:29:00 +03:00
Igor Kulikov
733dcea36a Update UI help branch 2023-05-31 12:56:50 +03:00
Igor Kulikov
5b08e5d5a3 Update rule nodes UI 2023-05-31 12:54:13 +03:00
dashevchenko
20443a7256 upgraded version for azure-servicebus sdk 2023-05-30 23:00:23 +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
Igor Kulikov
a6e2f6aafb Update apache curator version to 5.5.0 2023-05-30 17:43:35 +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
Igor Kulikov
7037459235
Merge pull request #8670 from ArtemDzhereleiko/AD/bug-fix/table/alarm-infinite-loading 
Fixed infinite loading alarm table
 2023-05-30 15:23:46 +03:00
Igor Kulikov
2bbd3d1107
Merge pull request #8654 from ArtemDzhereleiko/AD/imp/help/jwt-security-settings 
Added help link for JWT security settings
 2023-05-30 15:01:59 +03:00
Igor Kulikov
0dacb2fe0d
Merge pull request #8647 from ArtemDzhereleiko/AD/bug-fix/chart/custom-settings-legend 
Fixed Chart widget legend settings expansion panel
 2023-05-30 14:59:23 +03:00
Igor Kulikov
744f483abe
Merge pull request #8597 from ArtemDzhereleiko/AD/bug-fix/tenant-profile-text-fit 
Fixed tenant profile form text fit
 2023-05-30 14:57:03 +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
ViacheslavKlimov
4ae401c54b Monitoring service refactoring (for compatibility with PE integrations monitoring) 2023-05-30 14:00:41 +03:00
Igor Kulikov
1aa2877634 UI: Fix widget config validation in basic mode 2023-05-30 13:47:52 +03:00
Artem Dzhereleiko
79e3b4351a UI: Refactoring 2023-05-30 13:31:56 +03:00
Artem Dzhereleiko
a8efae06c5 UI: Fixed infinite loading alarm table 2023-05-30 13:00:08 +03:00
Igor Kulikov
d30ed1243c Merge branch 'develop/3.5.2' into feature/widget-config 2023-05-30 12:38:22 +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
Andrii Shvaika
b37a708f40 Fix invalid return code for legacy 3.x MQTT clients 2023-05-30 12:01:32 +03:00
Artem Dzhereleiko
0f87014cb8 UI: Merge with master and resolve conflict 2023-05-30 10:34:43 +03:00
AndriiD
c863cf6c15 \changed ServiceType.valueOf to ServiceType.of 2023-05-29 20:24:13 +03:00
Andrew Shvayka
514aa025db
Merge pull request #8649 from AndriiLandiak/fix/mqtt-channel-handler-decode-result 
[3.5.2] Fix/mqttChannelHandler prevent class cast exception
 2023-05-29 18:51:32 +03:00
Andrii Shvaika
4ec990ca8a Fix duplicates in device view 2023-05-29 17:49:07 +03:00
Artem Dzhereleiko
92fa873215 UI: Fixed sort order rule chain 2023-05-29 17:38:23 +03:00
Andrew Shvayka
800c5aefaa
Merge pull request #8663 from ShvaykaD/feature/clear-rpc-awaiting-ack-map-on-session-close 
added logic to cleanup rpcAwaitingAck map before session close
 2023-05-29 16:20:40 +03:00
Andrew Shvayka
9b88303ddf
Merge pull request #8657 from smatvienko-tb/feature/metrics_endpoints_expose_for_new_services 
[3.5.2] METRICS_ENDPOINTS_EXPOSE:info for tb-vc-executor.yml to be able to expose prometheus metrics
 2023-05-29 16:17:26 +03:00
Andrew Shvayka
a708c6b8aa
Merge pull request #8650 from smatvienko-tb/feature/sql-test-initializer-update 
[3.5.2] SQL test initializer update
 2023-05-29 16:15:05 +03:00
Andrew Shvayka
63eb01aeb0
Merge pull request #8619 from Seraphym-Tuhai/ui-tests-device-filter 
[3.5.2] Added UI smoke tests on device filter
 2023-05-29 16:10:21 +03:00
ShvaykaD
b2ca9ce086 added logic to cleanup rpcAwaitingAck map when before session close 2023-05-29 14:08:53 +03:00
nickAS21
4edf1ade2f search_text: equals byteAdditionalInfo == null 3 2023-05-27 17:15:18 +03:00
nickAS21
7c1924446b search_text: equals byteAdditionalInfo == null 2 2023-05-27 13:30:45 +03:00
nickAS21
08b9bf9f14 search_text: equals byteAdditionalInfo == null 2023-05-27 10:16:04 +03:00
nickAS21
ca2b2cfdd4 search_text: rollback additionalInfo == null 2023-05-27 08:16:34 +03:00