5506 Commits

Author SHA1 Message Date
Andrii Shvaika
59d21eb9d7 Simplify permission check 2023-06-08 17:59:08 +03:00
Andrii Shvaika
d34a65eada Resources access for Customer Users 2023-06-08 17:44:20 +03:00
Andrii Shvaika
1b15e78985 Merge branch 'resourcesByType' of github.com:dashevchenko/thingsboard into develop/3.5.2 2023-06-08 16:37:10 +03:00
Andrii Shvaika
aa6a136ef8 Merge remote-tracking branch 'origin/fixes/notification-system' into develop/3.5.2 2023-06-07 16:02:30 +03:00
Vladyslav_Prykhodko
2be9a1e1c3 Merge remote-tracking branch 'upstream/develop/3.5.2' into dashevchenko-resourcesByType 2023-06-07 15:40:44 +03:00
dashevchenko
87786ef72d refactoring 2023-06-07 15:27:44 +03:00
Andrew Shvayka
7bb8f8732c
Merge pull request #8682 from AndriiLandiak/feature/redis-sentinel
[3.5.2] Redis Sentinel support
2023-06-07 15:24:18 +03:00
dashevchenko
407effbc26 refactoring 2023-06-07 14:08:55 +03:00
dashevchenko
06dd204465 refactoring 2023-06-07 13:38:47 +03:00
dashevchenko
29384170d7 added tests 2023-06-07 13:16:55 +03:00
dashevchenko
f356a94b81 added new hash_code column to resource table 2023-06-07 00:06:55 +03:00
Igor Kulikov
d992355a3c UI: Implement basic config form for Entities table widget. 2023-06-06 17:20:35 +03:00
dashevchenko
31cf975495 Merge remote-tracking branch 'upstream/develop/3.5.2' into resourcesByType 2023-06-06 12:42:47 +03:00
dashevchenko
051c7c384d added etag header for resources/{id}/download endpoint 2023-06-06 11:52:08 +03:00
ViacheslavKlimov
f2684e124d Fix AlarmCommentControllerTest 2023-06-02 18:20:15 +03:00
ViacheslavKlimov
184a554d08 More tests for notification rules; fix unstable tests 2023-06-02 15:00:03 +03:00
ViacheslavKlimov
64571eeff2 Don't use Rule Engine message as notification rule trigger 2023-06-02 14:58:12 +03:00
ViacheslavKlimov
f5cd8a9a52 Notification system - less async operations 2023-06-02 14:57:00 +03:00
ViacheslavKlimov
67656a2757 Notifications deduplication 2023-06-02 14:50:23 +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 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
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