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

4145 Commits

Author SHA1 Message Date
ivankozka
dd9dd6bae0 implement support for timeout in DefaultMailService 2022-07-01 12:58:23 +03:00
Andrii Shvaika
240e1ffc3b Merge branch 'develop/3.4' of github.com:thingsboard/thingsboard into develop/3.4 2022-06-30 13:34:14 +03:00
Andrii Shvaika
f0dd3db39e Fix EntityView and Rule Chain auto-commit 2022-06-30 13:33:54 +03:00
Andrew Shvayka
fff137b8db
Merge pull request #6816 from thingsboard/refactoring_tests_08 
[3.4]Refactoring tests 08
 2022-06-30 12:09:48 +03:00
nickAS21
361e96f611 refactoring: tests Asset add to delete .andExpect... 2022-06-29 18:04:53 +03:00
Igor Kulikov
4b5e94e3cc Add Version control REST API methods to Rest Client. Remove redudant branch request parameter from some version control REST API methods. 2022-06-29 17:35:13 +03:00
nickAS21
af69872a1d refactoring: tests Device add .andExpect... 2022-06-29 17:11:41 +03:00
nickAS21
fb0a38fe16 refactoring: tests magError from function 2022-06-29 15:02:43 +03:00
nickAS21
79483a601e Merge branch 'develop/3.4' into refactoring_tests_08 2022-06-29 12:35:16 +03:00
nickAS21
50abe7e00d refactoring: tests Dashboard add .andExpect(. Commits2 2022-06-29 11:38:32 +03:00
Andrew Shvayka
343b14833a
Merge pull request #6845 from ViacheslavKlimov/vc-fixes 
[3.4] Minor fixes for VC
 2022-06-29 10:33:26 +03:00
nickAS21
b658b4956a refactoring: tests Alarm, Customer add .andExpect( 2022-06-28 22:18:58 +03:00
nickAS21
ea04b56076 refactoring: tests comments1 2022-06-28 21:21:45 +03:00
nickAS21
102787499d refactoring: tests Asset add .andExpect(statusReason(containsString(msgError)) 2022-06-28 15:30:31 +03:00
Viacheslav Klimov
4f74df66cd Fix invalid error message on relations import failure 2022-06-28 15:25:36 +03:00
Igor Kulikov
33e736d4ca Merge branch 'develop/3.4' of github.com:thingsboard/thingsboard into develop/3.4 2022-06-28 14:44:43 +03:00
Igor Kulikov
80f1df4695 Improve TB security configuration - remove deprecated configurations. 2022-06-28 14:44:33 +03:00
nickAS21
d852043bfa refactoring: tests testPushMsgToRuleEngineTime add matcherOriginatorId 2022-06-28 14:06:47 +03:00
Andrew Shvayka
a9a7df92f4
Merge pull request #6840 from volodymyr-babak/bug/fix-edge-black-box-tests 
[3.4][Bug] Saving of edge event in batches should be single threaded
 2022-06-28 13:14:01 +03:00
Volodymyr Babak
055919c8a7 Saving of edge event in batches should be single threaded. persisten attributes should not be propagated to edge 2022-06-28 12:33:45 +03:00
nickAS21
cb8f11e210 refactoring: tests Device, Dashboard add int cntTimeEdge, int cntTimeRuleEngine 2022-06-28 11:42:09 +03:00
nickAS21
3ca714d3d4 Merge branch 'develop/3.4' into refactoring_tests_08 
# Conflicts:
#	application/src/main/java/org/thingsboard/server/service/entitiy/DefaultTbNotificationEntityService.java
#	application/src/main/java/org/thingsboard/server/service/entitiy/TbNotificationEntityService.java
#	application/src/main/java/org/thingsboard/server/service/entitiy/device/DefaultTbDeviceService.java
 2022-06-28 11:20:49 +03:00
Andrii Shvaika
50e6ca548d Merge branch 'vc-fixes' of github.com:ViacheslavKlimov/thingsboard into develop/3.4 2022-06-28 11:02:23 +03:00
Andrew Shvayka
3c85ca2f8b
Merge pull request #6836 from smatvienko-tb/cache-flush-all-for-update-service 
[3.4] Flush all cache - Redis cluster support
 2022-06-28 10:39:24 +03:00
Andrii Shvaika
8886ea5434 Merge branch 'develop/3.4' of github.com:thingsboard/thingsboard into develop/3.4 2022-06-28 10:24:28 +03:00
Andrii Shvaika
18893d9cf3 Fix tenants and User Update Time cache 2022-06-28 10:24:15 +03:00
Andrew Shvayka
fb8e38c6c4
Merge pull request #6757 from YevhenBondarenko/feature/tb-services-refactoring 
[3.4] refactoring tb services
 2022-06-28 10:19:25 +03:00
Andrew Shvayka
c2cdd8aa74
Merge pull request #6796 from desoliture1/mapping-api-enpoints-swagger-fix 
[3.4.x] Fix mapping the API endpoints in Swagger
 2022-06-28 10:18:12 +03:00
YevhenBondarenko
c97f9d0c70 merge with develop/3.4 2022-06-27 23:04:35 +02:00
nickAS21
dcdd347892 refactoring: tests Device 2022-06-27 19:57:29 +03:00
nickAS21
d94012d9e8 Merge branch 'develop/3.4' into refactoring_tests_08 2022-06-27 19:42:26 +03:00
Sergey Matvienko
9bea1f2e0c cache flush all - redis cluster support 2022-06-27 18:09:38 +03:00
Andrew Shvayka
dadaa524df
Merge pull request #6804 from thingsboard/fix_bug_additinalinfo 
[3.4] fix bug: additionalInfo Asset, Alarm, Customer
 2022-06-27 17:22:03 +03:00
Andrii Shvaika
3e962e151f Improved Redis Serialization 2022-06-27 17:12:09 +03:00
YevhenBondarenko
c5ae7bfbc4 Merge branch 'feature/tb-services-refactoring' of github.com:YevhenBondarenko/thingsboard into feature/tb-services-refactoring 2022-06-27 15:08:07 +02:00
YevhenBondarenko
faa07360d5 fixed alarn tests and refactored tb resource service 2022-06-27 15:06:37 +02:00
Viacheslav Klimov
204b6197f1 Do not register import result on reimport 2022-06-27 14:44:55 +03:00
Yevhen Bondarenko
aae0d39fb2
Merge branch 'develop/3.4' into feature/tb-services-refactoring 2022-06-27 12:11:35 +02:00
YevhenBondarenko
c78017ecb2 merge with develop/3.4 2022-06-27 12:01:11 +02:00
ivankozka
dcfdd7afc3 Merge branch 'develop/3.4' into mapping-api-enpoints-swagger-fix 2022-06-27 12:41:29 +03:00
Andrii Shvaika
24e856516f Fix integration test 2022-06-27 12:33:02 +03:00
Andrii Shvaika
48c3ce7047 Fix cache value serialization issue 2022-06-27 11:48:58 +03:00
Andrii Shvaika
3e7086cc6f Merge remote-tracking branch 'origin/develop/3.4' into develop/3.4 2022-06-27 10:36:03 +03:00
Andrii Shvaika
e9c9e24e2f Improvements to the chunks processing 2022-06-27 10:35:50 +03:00
Andrew Shvayka
160cd07053
Merge pull request #6814 from ViacheslavKlimov/vc-fixes 
[3.4] Version control fixes
 2022-06-27 10:27:28 +03:00
YevhenBondarenko
c8753ef725 merge with develop/3.4 2022-06-27 09:14:31 +02:00
Viacheslav Klimov
850aed8b82 Add Swagger api params description for EntitiesVersionControlController 2022-06-24 17:12:57 +03:00
Viacheslav Klimov
8dc799709c Fix entity relations import 2022-06-24 17:01:27 +03:00
Andrii Shvaika
a107c1ac44 Merge branch 'vc-queue-msg-chunking' of github.com:ViacheslavKlimov/thingsboard into develop/3.4 2022-06-24 14:56:47 +03:00
Andrew Shvayka
2c17de997c
Merge pull request #6603 from YuriyLytvynchuk/feature/refactor-coap-tests-spead-up 
[3.4] Refactor coap tests spead up
 2022-06-24 14:49:15 +03:00