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

2604 Commits

Author SHA1 Message Date
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
790513788a Merge remote-tracking branch 'origin/develop/3.5.2' into develop/3.6 2023-06-02 14:59:40 +03:00
Andrii Shvaika
aecea7d6a5 Removed SearchTextEntity 2023-06-01 16:01:45 +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
11b49146ce Merge with master 2023-05-30 17:01:30 +03:00
Andrii Shvaika
4ec990ca8a Fix duplicates in device view 2023-05-29 17:49:07 +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
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
Sergey Matvienko
6cbe5642f8 sql test initializer update 2023-05-26 12:00:12 +02:00
nickAS21
a15028fec0 refactoring ComponentDescriptionInsert 2023-05-25 18:31:29 +03:00
nickAS21
2eb1aa5b30 refactoring Asset and Customer 2023-05-25 18:10:06 +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
8311017b92 Fixed alarm details on alarm clear 2023-05-24 16:51:00 +03:00
Andrii Shvaika
f05f2e2053 Remove SearchText from Device 2023-05-24 14:17:00 +03:00
Andrii Shvaika
fa41086e6d Refactoring improvements 2023-05-24 13:40:37 +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
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
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
6120fb132a Version set to 3.5.2. Migration script improved 2023-05-22 13:16:06 +03: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
YevhenBondarenko
bba26ca676 merge with develop/3.5.1 2023-05-19 18:20:27 +02: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
Viacheslav Klimov
e3646c9ea9
Merge branch 'develop/3.5.1' into feature/notification-configs-vc 2023-05-19 15:40:48 +02:00
ViacheslavKlimov
3cdd293173 Merge with develop/3.5.1 2023-05-19 14:21:21 +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
57674888ca table name constants refactoring 2023-05-18 17:29:29 +02:00
Andrew Shvayka
b42159cb6f
Merge pull request #8442 from YevhenBondarenko/model-constants-refactoring 
removed redundant constants
 2023-05-18 12:16:28 +03:00
Andrii Shvaika
b869f39722 Merge branch 'master' into develop/3.5.1 2023-05-18 12:14:22 +03:00
Sergey Matvienko
1c67d36c47 alarm repository: fixed tests 2023-05-17 18:30:12 +02:00
Andrew Shvayka
001d088873
Merge pull request #8559 from smatvienko-tb/hotfix/SqlPartitioningRepository_hotfix_partition_already_pending_detach_in_partitioned_table 
[hotfix][3.5.0] SqlPartitioningRepository hotfix: partition already pending detach in partitioned table
 2023-05-17 17:41:14 +03:00
Andrii Shvaika
519a5c7688 Line wrap 2023-05-17 16:34:30 +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
333159373d removed unused import org.springframework.data.jpa.repository.query.Procedure; 2023-05-17 10:32:30 +02:00
Sergey Matvienko
a6c39fe68c alarm repository fix: This statement does not declare an OUT parameter 2023-05-17 10:30:42 +02:00
Sergey Matvienko
c499f701b1 SqlPartitioningRepository hotfix: partition already pending detach in partitioned table 2023-05-17 10:15:01 +02:00
dashevchenko
a6c52809cd added sms disabled feature for tenant profile configuration 2023-05-16 15:04:39 +03:00