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

1466 Commits

Author SHA1 Message Date
Andrii Shvaika
dd4b874b5f Version set to 3.6.1-SNAPSHOT 2023-09-27 17:38:27 +03:00
Andrii Shvaika
002f780905 Merge branch 'develop/3.5.2' into develop/3.6 2023-06-30 16:13:03 +03:00
Andrew Shvayka
ab56f651c7
Merge pull request #8839 from dashevchenko/resourceInfoCache 
Added cache for resource info
 2023-06-30 16:00:08 +03:00
YevhenBondarenko
1a12d3c395 merge with develop/3.6 2023-06-29 23:40:43 +02:00
Andrii Shvaika
d17c7dbc28 Merge remote-tracking branch 'origin/develop/3.5.2' into develop/3.6 2023-06-29 18:26:23 +03:00
Andrew Shvayka
707244a7ea
Merge pull request #8830 from volodymyr-babak/edge-event-seq-id 
Edge event table - added sequential ID column to handle properly heavy load and cluster cases
 2023-06-29 18:24:23 +03:00
Andrii Shvaika
ecae72e994 Merge with develop/3.5.2 2023-06-29 17:00:23 +03:00
dashevchenko
eab633632a added cache for TBResourceInfo 2023-06-28 11:35:54 +03:00
ViacheslavKlimov
d0cbf4efd1 Add acknowledged and cleared properties to AlarmNotificationInfo 2023-06-27 17:14:33 +03:00
Volodymyr Babak
4a0ff8b968
Edge event seq (#82) 
* edge event - added seq id auto generated column to fix issue with concurrent write of multiple edge events with the same created time

* kotlin Pair replaced by springframework class

* Handle cases when seq_id column started new cycle

* Added check for null in case entity was deleted

* GeneralEdgeEventFetched - sort order by seqId and not created time

* Edge event table - added migration script to add seq_id column

* Code review updates to be in sync with PE

* Improved handling cases when edge_event.seqId started new cycle

* Edge event table - seq_id column make to be cycled

* Improved handling of cases when seq_id column of edge_event table started new cycle

* Improved stability by properly handling exceptions
 2023-06-27 15:42:23 +03:00
ViacheslavKlimov
0bd7f74c47 Fix issues 2023-06-13 14:12:54 +03:00
ViacheslavKlimov
f98eee5407 Merge branch 'develop/3.5.2' into feature/exceeded-rate-limits-notifications 
# Conflicts:
#	application/src/main/java/org/thingsboard/server/install/ThingsboardInstallService.java
#	application/src/main/resources/thingsboard.yml
#	application/src/test/java/org/thingsboard/server/service/notification/NotificationRuleApiTest.java
#	dao/src/main/java/org/thingsboard/server/dao/notification/DefaultNotifications.java
#	ui-ngx/src/app/modules/common/modules-map.ts
 2023-06-13 13:49:51 +03:00
Andrew Shvayka
7d31d25aa0
Merge pull request #8729 from thingsboard/fixes/notification-system 
Notifications deduplication improvements
 2023-06-13 12:25:07 +03:00
Andrii Shvaika
997b915905 Merge with develop/3.5.2 2023-06-13 11:30:29 +03:00
ViacheslavKlimov
39d7498c59 Merge branch 'develop/3.5.2' into fixes/notification-system 2023-06-12 21:37:21 +03:00
YevhenBondarenko
ce87bc5e13 to springdoc migration 2023-06-12 13:25:37 +02:00
Andrew Shvayka
e30cf55988
Merge pull request #8723 from dashevchenko/mailConfigTemplates 
Mail config templates, oauth2 protocol for mail server
 2023-06-09 16:05:43 +03:00
ViacheslavKlimov
b77078c24e Notifications deduplication improvements 2023-06-08 18:15:56 +03:00
Andrii Shvaika
d34a65eada Resources access for Customer Users 2023-06-08 17:44:20 +03:00
Andrii Shvaika
1b15e78985 Merge branch 'resourcesByType' of github.com:dashevchenko/thingsboard into develop/3.5.2 2023-06-08 16:37:10 +03:00
dashevchenko
a85f5b4330 added initial implementation 2023-06-08 12:30:35 +03:00
Andrii Shvaika
aa6a136ef8 Merge remote-tracking branch 'origin/fixes/notification-system' into develop/3.5.2 2023-06-07 16:02:30 +03:00
Vladyslav_Prykhodko
2be9a1e1c3 Merge remote-tracking branch 'upstream/develop/3.5.2' into dashevchenko-resourcesByType 2023-06-07 15:40:44 +03:00
dashevchenko
87786ef72d refactoring 2023-06-07 15:27:44 +03:00
dashevchenko
29384170d7 added tests 2023-06-07 13:16:55 +03:00
dashevchenko
f356a94b81 added new hash_code column to resource table 2023-06-07 00:06:55 +03:00
Andrew Shvayka
835f8b48f9
Merge pull request #8706 from imbeacon/fix/swagger-models 
Fixes for models in Swagger
 2023-06-06 16:44:25 +03:00
dashevchenko
31cf975495 Merge remote-tracking branch 'upstream/develop/3.5.2' into resourcesByType 2023-06-06 12:42:47 +03: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
ViacheslavKlimov
2f560315d1 Exceeded rate limits notifications; their deduplication; refactoring 2023-06-02 15:09:09 +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
ViacheslavKlimov
f5cd8a9a52 Notification system - less async operations 2023-06-02 14:57:00 +03:00
ViacheslavKlimov
67656a2757 Notifications deduplication 2023-06-02 14:50:23 +03:00
Andrii Shvaika
aecea7d6a5 Removed SearchTextEntity 2023-06-01 16:01:45 +03:00
Andrii Shvaika
56338924a1 Remove Additional info from entities that do not have such field 2023-06-01 15:31:58 +03:00
Andrii Shvaika
be41ec8bef Fix minor issues. Merged with develop/3.5.2 2023-06-01 15:10:08 +03:00
imbeacon
24b82939c3 Fixes for models in Swagger 2023-06-01 10:12:08 +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
4edf1ade2f search_text: equals byteAdditionalInfo == null 3 2023-05-27 17:15:18 +03:00
nickAS21
7c1924446b search_text: equals byteAdditionalInfo == null 2 2023-05-27 13:30:45 +03:00
nickAS21
08b9bf9f14 search_text: equals byteAdditionalInfo == null 2023-05-27 10:16:04 +03:00
nickAS21
ca2b2cfdd4 search_text: rollback additionalInfo == null 2023-05-27 08:16:34 +03:00
nickAS21
1d35acd340 search_text: additionalInfo == null 2023-05-26 21:56:45 +03:00
nickAS21
35bbff3cac regactoring text_search for entity 2023-05-25 17:05:46 +03:00
Andrii Shvaika
1de437b1e6 Merge with develop/3.5.2 2023-05-25 12:25:51 +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
f05f2e2053 Remove SearchText from Device 2023-05-24 14:17:00 +03:00