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

233 Commits

Author SHA1 Message Date
Vladyslav_Prykhodko
5739802fda Merge remote-tracking branch 'upstream/master' into feature/push-notifications 2024-01-09 15:20:49 +02:00
Igor Kulikov
c5a72ed8df Update license header to 2024 year. 2024-01-09 10:46:16 +02:00
Igor Kulikov
bc35df1dd7 Version set to 3.6.3-SNAPSHOT 2023-12-27 12:58:15 +02:00
ViacheslavKlimov
6c0c891f60 Merge branch 'master' into feature/push-notifications 
# Conflicts:
#	application/src/main/java/org/thingsboard/server/actors/ruleChain/DefaultTbContext.java
#	common/data/src/main/java/org/thingsboard/server/common/data/notification/NotificationDeliveryMethod.java
#	common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/NotificationTargetType.java
#	common/data/src/main/java/org/thingsboard/server/common/data/notification/template/DeliveryMethodNotificationTemplate.java
#	pom.xml
#	ui-ngx/src/app/modules/home/pages/notification/sent/sent-notification-dialog.component.html
#	ui-ngx/src/app/modules/home/pages/notification/sent/sent-notification-dialog.component.scss
#	ui-ngx/src/app/modules/home/pages/notification/template/template-configuration.ts
#	ui-ngx/src/app/modules/home/pages/notification/template/template-notification-dialog.component.html
#	ui-ngx/src/app/modules/home/pages/notification/template/template-notification-dialog.component.scss
#	ui-ngx/src/app/shared/models/notification.models.ts
 2023-12-27 11:49:28 +02:00
Andrii Shvaika
df24c363ce Version set to 3.6.2-SNAPSHOT 2023-11-13 17:07:32 +02:00
Igor Kulikov
8cefca23ac Version set to 3.6.1-SNAPSHOT 2023-09-25 11:27:00 +03:00
Igor Kulikov
98c245e293 Switch to version 3.6.0 2023-09-05 18:28:15 +03:00
ViacheslavKlimov
3150580dce Merge branch 'develop/3.5.2' into feature/push-notifications 
# Conflicts:
#	application/pom.xml
#	pom.xml
 2023-06-12 14:12:19 +03:00
dashevchenko
a85f5b4330 added initial implementation 2023-06-08 12:30:35 +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
Andrii Shvaika
6120fb132a Version set to 3.5.2. Migration script improved 2023-05-22 13:16:06 +03:00
Igor Kulikov
7058f99068 Version set to 3.5.1-SNAPSHOT 2023-05-12 15:45:11 +03:00
ViacheslavKlimov
9add2962a6 Push-notifications to mobile 2023-05-10 18:20:36 +03:00
Vladyslav_Prykhodko
069ef4de5b Merge remote-tracking branch 'upstream/develop/3.5' into feature/notification-system 2023-03-06 10:21:41 +02:00
Sergey Matvienko
27f5f8c077 Cassandra tests moved from cassandra-unit to testcontainers 2023-02-28 16:31:54 +01:00
Vladyslav_Prykhodko
2212a6d9be Merge remote-tracking branch 'upstream/develop/3.5' into feature/notification-system 2023-02-14 11:09:34 +02:00
Vladyslav_Prykhodko
8174a97926 Merge with klimov/feature/notification-system 2023-01-31 17:46:12 +02:00
Andrii Shvaika
a203c336f1 Merge with master 2023-01-31 16:20:04 +02:00
Igor Kulikov
cbdc4517e4 Update license header year to 2023 2023-01-31 10:43:56 +02:00
Andrii Shvaika
76082c7177 Version set to 3.5.0-SNAPSHOT 2023-01-10 17:24:26 +02:00
Andrii Shvaika
e23fc18dc6 Merge remote-tracking branch 'origin/master' into develop/3.5 2023-01-10 17:04:35 +02:00
Igor Kulikov
4c3154da4b Version set to 3.4.4-SNAPSHOT 2022-12-28 13:33:57 +02:00
Andrii Shvaika
509da5dee4 Merge branch 'feature/notification-system' of github.com:ViacheslavKlimov/thingsboard into feature/notification-system 2022-12-27 13:07:55 +02:00
ViacheslavKlimov
738b9dc494 Slack notification channel; refactoring 2022-12-19 19:56:20 +02:00
Andrii Shvaika
aadc2e35b7 Merge with master 2022-12-15 14:27:13 +02:00
Andrew Shvayka
f813073bfb
Merge pull request #7596 from imbeacon/mqtt5-codes 
[3.5] Added Mqtt v5 reason codes for ack messages
 2022-12-08 14:40:14 +02:00
Igor Kulikov
109caee7c7 Version set to 3.4.3-SNAPSHOT 2022-12-05 17:54:19 +02:00
Andrii Shvaika
770f069f22 Version set to 3.4.2 2022-12-01 12:04:14 +02:00
imbeacon
02d9fef0f1 Added Mqtt v5 reason codes for ack messages and tests 2022-11-10 17:55:31 +02:00
Andrii Shvaika
9769f95c27 Refactoring of the JS API to separate module: Script API 2022-10-17 16:36:57 +03:00
Yuriy Lytvynchuk
3c4618c8dc Merge remote-tracking branch 'upstream/master' into feature/node_json_path 2022-09-23 13:49:30 +03:00
Andrii Shvaika
dea933d906 Version set to 3.4.2 2022-08-19 15:25:18 +03:00
Yuriy Lytvynchuk
33153616c1 check dependency 2022-08-17 17:01:49 +03:00
Andrii Shvaika
fa0433a7eb Version set to 3.4.1-SNAPSHOT 2022-07-19 15:30:16 +03:00
Andrii Shvaika
63750ef8a0 Merge with develop/3.4 2022-06-02 13:59:15 +03:00
Viacheslav Klimov
906d421f2d Merge branch 'develop/3.4' into feature/2fa 2022-05-26 17:44:38 +03:00
Andrii Shvaika
c6ebf049a2 Version Control Service refactoring 2022-05-18 14:46:54 +03:00
Andrii Shvaika
7ec45fd5f1 Rename Data structures. Create separate module. 2022-05-18 10:40:02 +03:00
Viacheslav Klimov
41fede9b43 Add checks for SMS and mail service when setting up 2FA provider; 2Fa verification mail template 2022-05-17 18:31:49 +03:00
Andrii Shvaika
0905aff7a0 Merge with develop/3.4 2022-05-17 17:00:25 +03:00
Viacheslav Klimov
f82be0153b Entities VC with Git - initial implementation 2022-05-14 17:26:18 +03:00
Viacheslav Klimov
a85dcdbd3c Merge branch 'develop/3.4' into feature/2fa 
# Conflicts:
#	application/src/test/java/org/thingsboard/server/controller/AbstractWebTest.java
#	pom.xml
#	ui-ngx/src/assets/locale/locale.constant-en_US.json
 2022-05-06 11:42:10 +03:00
Sergey Matvienko
8adc0c739f removed sql test suites in favour independent test run, fixed NoSqlDaoServiceTestSuite 2022-04-28 18:45:58 +03:00
Andrew Shvayka
b9b813385f
Merge pull request #5671 from ViacheslavKlimov/smpp-sms-sender 
[3.4] SMPP SMS provider
 2022-04-28 12:03:57 +03:00
Viacheslav Klimov
d746a04186 Merge branch 'develop/3.4' into feature/2fa 
# Conflicts:
#	application/src/test/java/org/thingsboard/server/controller/AbstractWebTest.java
 2022-03-22 15:54:53 +02:00
Viacheslav Klimov
e2c9a5ffdf TOTP and SMS 2FA providers; 2FA set-up API 2022-03-10 17:59:59 +02:00
Viacheslav Klimov
89c74cac8d Merge branch 'develop/3.4' into smpp-sms-sender 2022-03-02 17:39:41 +02:00
Igor Kulikov
dabd25e760 Version set to 3.4.0-SNAPSHOT 2022-02-21 12:19:59 +02:00
Igor Kulikov
312924a19b Version set to 3.3.4-SNAPSHOT 2022-02-07 09:55:37 +02:00