5485 Commits

Author SHA1 Message Date
YevhenBondarenko
ce87bc5e13 to springdoc migration 2023-06-12 13:25:37 +02:00
YevhenBondarenko
7f9a9c7fb3 merge with develop/3.6 2023-06-05 15:58:16 +02:00
YevhenBondarenko
db6f310284 migration to spring boot 3.1 2023-06-05 15:24:47 +02:00
Andrii Shvaika
4c470583f3 Correct package name 2023-06-02 16:31:38 +03:00
Andrii Shvaika
c9966ef3ef Extracted proto files to a separate module 2023-06-02 16:27:06 +03:00
Andrii Shvaika
790513788a Merge remote-tracking branch 'origin/develop/3.5.2' into develop/3.6 2023-06-02 14:59:40 +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
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
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
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
YevhenBondarenko
c29e0dbf75 Merge branch 'develop/3.6' of github.com:thingsboard/thingsboard into feature/java-17 2023-05-29 14:48:45 +02:00
Andrii Shvaika
da90c21b6c Merge with develop/3.5.2. Version set to 3.6.0-SNAPSHOT 2023-05-29 13:45:17 +03:00
Andrii Shvaika
2a1259570b Temporary version set to 3.5.2-SNAPSHOT to merge 2023-05-29 13:43:10 +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
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
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
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
e8ba135f70 Merge branch 'develop/3.5.1' into develop/3.5.2 2023-05-22 16:20:34 +03:00
Igor Kulikov
f1db4c44c3 Merge branch 'master' into develop/3.5.1 2023-05-22 15:50:52 +03:00
Andrii Shvaika
c0b0c7ac5d Merge branch 'develop/3.5.1' into develop/3.5.2 2023-05-22 15:27:47 +03:00
Andrew Shvayka
7e1d06b3cd
Merge pull request #8456 from thingsboard/improvements/rate-limits
Rate limits improvements
2023-05-22 15:25:30 +03:00
Andrii Shvaika
916d5d80b5 Fix 3.5.1 update script location 2023-05-22 13:27:58 +03:00
Andrii Shvaika
6120fb132a Version set to 3.5.2. Migration script improved 2023-05-22 13:16:06 +03:00
dashevchenko
9b461272c4 fixed xxe vulnerability 2023-05-22 13:11:14 +03:00
Mr-Mime
b6e56d7a74
Fix api documentation 2023-05-22 11:07:40 +02:00
YevhenBondarenko
f2545fb942 Merge branch 'develop/3.6' of github.com:thingsboard/thingsboard into feature/java-17 2023-05-19 19:06:45 +02:00
YevhenBondarenko
b5bce3e187 merge with develop/3.5.1 2023-05-19 19:03:11 +02:00