ViacheslavKlimov
|
641008c262
|
onClick action from mobile notification center
|
2024-04-08 14:00:00 +03:00 |
|
ViacheslavKlimov
|
03cb21b79a
|
Merge branch 'hotfix/3.6.3' into master-with-hotfix
# Conflicts:
# common/util/src/main/java/org/thingsboard/common/util/SslUtil.java
|
2024-03-25 09:56:57 +02:00 |
|
IrynaMatveieva
|
242b712a90
|
fixed conflicts
|
2024-03-22 12:35:59 +02:00 |
|
IrynaMatveieva
|
837933a2e0
|
moved the static toPlainText() method to the JacksonUtil class
|
2024-03-12 18:53:45 +02:00 |
|
IrynaMatveieva
|
0177b5fdc7
|
added a method for getting a password with a null checking
|
2024-03-06 17:56:51 +02:00 |
|
dashevchenko
|
6a755ab0b7
|
deleted java keystore type of creds support
|
2024-02-06 15:10:09 +02:00 |
|
livk
|
8779c629e7
|
fix: fixed the error that the file could not be found after packing
|
2024-01-31 14:17:39 +08:00 |
|
dashevchenko
|
9af96ad5be
|
resolved conflicts after merge
|
2024-01-18 14:39:14 +02:00 |
|
Andrii Shvaika
|
5acf527f1a
|
Version set to 3.7.0-SNAPSHOT
|
2024-01-16 11:43:44 +02:00 |
|
YevhenBondarenko
|
60be820915
|
merge with master
|
2024-01-15 18:51:00 +01:00 |
|
Igor Kulikov
|
c5a72ed8df
|
Update license header to 2024 year.
|
2024-01-09 10:46:16 +02:00 |
|
YevhenBondarenko
|
61602330ec
|
merge with 3.7
|
2023-12-28 12:16:14 +01:00 |
|
Igor Kulikov
|
bc35df1dd7
|
Version set to 3.6.3-SNAPSHOT
|
2023-12-27 12:58:15 +02:00 |
|
YevhenBondarenko
|
feb44656f1
|
merge with master
|
2023-12-26 00:58:31 +01:00 |
|
YevhenBondarenko
|
5869378c2c
|
Implemented Json serialization, added custom serializer for the Device redis cache
|
2023-12-14 20:02:53 +01:00 |
|
Andrii Landiak
|
67aa74f1dc
|
Merge remote-tracking branch 'upstream/master' into feature/edge-json-refactoring
|
2023-12-05 13:49:43 +02:00 |
|
Andrii Shvaika
|
fc698b4f31
|
Revert changes to JacksonUtil
|
2023-12-05 13:22:59 +02:00 |
|
Andrew Shvayka
|
6a0a5750e0
|
Merge pull request #9768 from thingsboard/fix_bug_tbDate_default_Tz
[3.6.2]Fix_bug_Tbdate_default_tz
|
2023-12-05 12:59:02 +02:00 |
|
nick
|
240cd25cf4
|
tbel fix_bug tbDate parse toString with Object Mapper
|
2023-12-04 19:10:22 +02:00 |
|
ViacheslavKlimov
|
ebfab0e941
|
Merge branch 'master' into feature/image-resources
|
2023-12-04 12:57:57 +02:00 |
|
Andrew Shvayka
|
2283431702
|
Merge pull request #9619 from dashevchenko/pubsub
Pubsub executor thread pool size fix
|
2023-12-01 16:58:06 +02:00 |
|
Andrii Landiak
|
4430322b29
|
Refactor Jackson: fromStringIgnoreUnknownProperties to fromString(String string, Class<T> clazz, boolean ignoreUnknownFields)
|
2023-12-01 15:18:09 +02:00 |
|
Andrii Shvaika
|
50e743f27d
|
Merge with master
|
2023-11-30 17:39:08 +02:00 |
|
Andrii Landiak
|
bfb2547ad2
|
Merge remote-tracking branch 'upstream/master' into feature/edge-json-converter-impl
|
2023-11-17 08:17:51 +02:00 |
|
dashevchenko
|
1be39aa9aa
|
fixed license, env name refactoring
|
2023-11-16 16:16:38 +02:00 |
|
ViacheslavKlimov
|
f95fcdf3dd
|
Merge with master
|
2023-11-16 15:18:27 +02:00 |
|
ViacheslavKlimov
|
e7aabe80a4
|
Unique image resource key based on index
|
2023-11-15 16:10:18 +02:00 |
|
dashevchenko
|
08727b4c36
|
added executor provider for pubsub queue, added env variable to manage pubsub queue executor provider thread pool
|
2023-11-15 14:51:58 +02:00 |
|
dashevchenko
|
4f22ef9733
|
created PubSubExecutor to use each time publisher is created and do not produce too much threads created
|
2023-11-14 17:36:51 +02:00 |
|
Andrii Shvaika
|
df24c363ce
|
Version set to 3.6.2-SNAPSHOT
|
2023-11-13 17:07:32 +02:00 |
|
Andrii Landiak
|
6fa3a125c2
|
Mino refactoring: add json support for resources, fix test and edgeVersion for test
|
2023-11-13 13:28:54 +02:00 |
|
Andrii Landiak
|
ec4200d735
|
Refactoring after final review
|
2023-11-13 12:41:52 +02:00 |
|
Andrii Landiak
|
b14a304473
|
Refactoring for edge proto to send entity serialized in order not to update everytime entity changes its structure
|
2023-11-13 12:27:14 +02:00 |
|
Andrii Shvaika
|
5a2bc396f2
|
Merge with hotfix/3.6
|
2023-10-25 15:43:12 +03:00 |
|
ViacheslavKlimov
|
60900a0b96
|
Merge branch 'hotfix/3.6' into re-consumer-service-refactoring
# Conflicts:
# application/src/main/java/org/thingsboard/server/service/queue/DefaultTbRuleEngineConsumerService.java
|
2023-10-23 16:41:38 +03:00 |
|
Andrii Shvaika
|
3a0afd8a5a
|
Refactoring of the consumer service
|
2023-10-19 11:09:16 +03:00 |
|
YevhenBondarenko
|
cf32544e71
|
added SslUtil and tests
|
2023-10-17 23:20:00 +02:00 |
|
Andrew Shvayka
|
2b9575d81a
|
Merge branch 'master' into hotfix/3.6
|
2023-10-04 15:50:56 +03:00 |
|
ViacheslavKlimov
|
12d2c26279
|
Rule Engine stats: exception message truncation
|
2023-10-04 15:29:45 +03:00 |
|
Andrii Shvaika
|
e768afc948
|
Merge 3.6 -> 3.7
|
2023-09-28 12:20:06 +03:00 |
|
Andrii Shvaika
|
dd4b874b5f
|
Version set to 3.6.1-SNAPSHOT
|
2023-09-27 17:38:27 +03:00 |
|
Igor Kulikov
|
8cefca23ac
|
Version set to 3.6.1-SNAPSHOT
|
2023-09-25 11:27:00 +03:00 |
|
ViacheslavKlimov
|
4114c96571
|
Version control: fix ids replacement in dashboard config
|
2023-09-12 12:32:35 +03:00 |
|
Igor Kulikov
|
98c245e293
|
Switch to version 3.6.0
|
2023-09-05 18:28:15 +03:00 |
|
Andrii Shvaika
|
80f80496df
|
Merge with master
|
2023-08-17 14:14:13 +03:00 |
|
ViacheslavKlimov
|
cc1c2094c9
|
Fix UUIDs in rule node config replaced with tenant id
|
2023-08-16 15:13:16 +03:00 |
|
Andrii Shvaika
|
344ffb2e0b
|
Merge with master
|
2023-08-14 15:02:17 +03:00 |
|
Sergey Matvienko
|
e75307c2be
|
ExceptionUtil.lookupExceptionInCause refactored from recursion to a loop. Tests added
|
2023-07-27 21:38:02 +02:00 |
|
Sergey Matvienko
|
dfe21e3b00
|
ExceptionUtil moved to the common/util package
|
2023-07-27 21:38:02 +02:00 |
|
YevhenBondarenko
|
1a12d3c395
|
merge with develop/3.6
|
2023-06-29 23:40:43 +02:00 |
|