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

5459 Commits

Author SHA1 Message Date
Igor Kulikov
bf749ff19b UI: Basic widget config mode directive support 2023-05-30 12:37:47 +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
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
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
Igor Kulikov
26562afbdb Merge branch 'develop/3.5.1' into feature/widget-config 2023-05-22 15:52:15 +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
Igor Kulikov
8ae1b1b2e1 Merge branch 'develop/3.5.1' into feature/widget-config 2023-05-19 17:55:36 +03:00
Andrew Shvayka
c48510407d
Merge pull request #8575 from YevhenBondarenko/feature/swagger-enabled 
added ability to disable swagger
 2023-05-19 17:09:46 +03:00
Andrew Shvayka
263b3132bc
Merge pull request #8573 from YevhenBondarenko/refactoring/table-name-constant 
table name constants refactoring
 2023-05-19 17:09:22 +03:00
Andrew Shvayka
da9bea1f20
Merge pull request #8519 from adovh/replace_ObjectMapper_usages_with_JacksonUtil 
[3.5.1]Replace object mapper usages with jackson utils
 2023-05-19 17:07:16 +03:00
Andrew Shvayka
27c88e914d
Merge pull request #8556 from dashevchenko/smsDisabledFlag 
Added feature to disable sms messaging
 2023-05-19 16:51:43 +03:00
dashevchenko
9ef6501225 refactoring 2023-05-19 16:47:34 +03:00
Viacheslav Klimov
e3646c9ea9
Merge branch 'develop/3.5.1' into feature/notification-configs-vc 2023-05-19 15:40:48 +02:00
Andrii Shvaika
7d3e7ef11f Skip DB Version check during upgrade based on env variable SKIP_SCHEMA_VERSION_CHECK 2023-05-19 16:35:57 +03:00
ViacheslavKlimov
3cdd293173 Merge with develop/3.5.1 2023-05-19 14:21:21 +03:00
ViacheslavKlimov
b163fb8e2d Upgrade from 3.5.0 2023-05-19 13:58:55 +03:00
Vladyslav_Prykhodko
31858ea48e Merge remote-tracking branch 'upstream/develop/3.5.1' into feature/notification-rules-disabling 2023-05-19 13:51:57 +03:00
YevhenBondarenko
ef735934f2 added ability to disable swagger 2023-05-18 22:25:33 +02:00
YevhenBondarenko
57674888ca table name constants refactoring 2023-05-18 17:29:29 +02:00
Andrew Shvayka
52a31dffc5
Merge pull request #8565 from YevhenBondarenko/fix/oauth-exploit-vulnerability 
fixed cookie deserialization vulnerability
 2023-05-18 12:21:57 +03:00
Andrew Shvayka
6a802c5784
Merge pull request #8429 from YevhenBondarenko/improvements-widgets-bundle 
added logs for widgets bundle
 2023-05-18 12:21:34 +03:00
Andrii Shvaika
b869f39722 Merge branch 'master' into develop/3.5.1 2023-05-18 12:14:22 +03:00
YevhenBondarenko
bdbc04e800 merge with develop/3.5.1 2023-05-18 11:04:05 +02:00
YevhenBondarenko
e3b9099bb1 fixed cookie deserialization vulnerability 2023-05-17 20:46:59 +02:00
Andrew Shvayka
a050422090
Merge pull request #8560 from smatvienko-tb/hotfix/alarm_repository_fix_This_statement_does_not_declare_an_OUT_parameter 
[hotfix][3.5.0] alarm repository fix this statement does not declare an out parameter
 2023-05-17 16:33:03 +03:00
ViacheslavKlimov
ce83ee4444 Merge remote-tracking branch 'origin/develop/3.5.1' into improvements/rate-limits 
# Conflicts:
#	application/src/test/java/org/thingsboard/server/service/notification/NotificationRuleApiTest.java
 2023-05-17 12:28:51 +03:00
ViacheslavKlimov
2483c89055 Merge remote-tracking branch 'origin/develop/3.5.1' into improvements/rate-limits 2023-05-17 12:28:24 +03:00
Sergey Matvienko
66ac54e5f6 exposed env SPRING_DATASOURCE_HIKARI_LEAK_DETECTION_THRESHOLD 2023-05-17 10:33:41 +02:00