12528 Commits

Author SHA1 Message Date
ViacheslavKlimov
e3f971231a Notification api permission checks refactoring 2023-02-21 12:36:15 +02:00
ViacheslavKlimov
dd5c970b3a Merge remote-tracking branch 'origin/develop/3.5' into feature/notification-system
# Conflicts:
#	application/src/main/java/org/thingsboard/server/controller/BaseController.java
2023-02-20 12:57:32 +02:00
Vladyslav_Prykhodko
6945b96e3c UI: Change notification request support send without template 2023-02-20 11:30:26 +02:00
Vladyslav_Prykhodko
7e4d92e8eb Merge remote-tracking branch 'klimov/feature/notification-system' into feature/notification-system 2023-02-20 10:13:43 +02:00
ViacheslavKlimov
d1e135d004 Send notification without template creation 2023-02-17 15:44:30 +02:00
Andrew Shvayka
a1bc7533de
Merge pull request #8094 from dashevchenko/findUsersByQuery
Find users by query
2023-02-17 12:43:57 +02:00
dashevchenko
b261cb2ab1 renamed UserData to UserEmailInfo 2023-02-17 11:12:46 +02:00
dashevchenko
5dec719947 minor improvements to tests 2023-02-17 10:45:42 +02:00
dashevchenko
a111473a8f minor improvement 2023-02-17 00:12:11 +02:00
dashevchenko
bbbea0fc31 added tests, refactoring 2023-02-17 00:01:50 +02:00
dashevchenko
a613e1dbc6 refactoring 2023-02-16 17:46:24 +02:00
dashevchenko
4470ae9a05 added tests 2023-02-16 13:45:01 +02:00
Vladyslav_Prykhodko
8589047fcc UI: Refactoring web socket 2023-02-16 12:59:43 +02:00
dashevchenko
39070ead53 refactoring 2023-02-16 12:23:22 +02:00
dashevchenko
559b741749 added REST method in UserController to get users by query 2023-02-16 00:37:10 +02:00
Vladyslav_Prykhodko
eddb06b536 UI: Improvement notification components styles 2023-02-15 17:49:28 +02:00
Andrii Shvaika
75e9bb220d Rule node description update 2023-02-15 13:28:58 +02:00
Vladyslav_Prykhodko
82719b89ef UI: Improvement notification componets styles 2023-02-14 18:16:29 +02:00
Vladyslav_Prykhodko
3eba03cccc Fixed after merge 'upstream/develop/3.5' 2023-02-14 11:39:29 +02: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
7d6fcd85c0 UI: Add support create template without save when create notification 2023-02-13 18:12:12 +02:00
Vladyslav_Prykhodko
f395d9b7fc UI: Refactoring component 2023-02-13 16:11:23 +02:00
Andrew Shvayka
42c7a59f27
Merge pull request #8068 from dashevchenko/ignoredUnstableTests
Ignored unstable integration tests
2023-02-13 13:57:52 +02:00
Andrii Shvaika
a62a28a77f Minor improvement 2023-02-13 13:53:56 +02:00
Andrew Shvayka
84957614eb
Merge pull request #8075 from dashevchenko/user-settings
[WIP] Added controller methods for saving/updating/deleting user settings in UserController
2023-02-13 13:19:07 +02:00
dashevchenko
f812e02920 added possibility to specify non existing elements 2023-02-12 23:40:12 +02:00
dashevchenko
f9e3b63594 unignored tests 2023-02-12 21:04:02 +02:00
dashevchenko
4a9c4cc614 updated test 2023-02-12 20:59:52 +02:00
dashevchenko
683dee03da refactoring 2023-02-12 20:52:18 +02:00
dashevchenko
a25e328b7c fixed update settings method 2023-02-11 00:25:52 +02:00
Andrii Shvaika
b92fa8ce5d Minor code review improvements 2023-02-10 18:40:01 +02:00
Vladyslav_Prykhodko
72348b049e UI: add create notification and template from other wizard 2023-02-10 18:32:21 +02:00
Andrii Shvaika
92030e3fb1 Merge branch 'userSettings2' of github.com:dashevchenko/thingsboard into develop/3.5 2023-02-10 18:16:11 +02:00
Andrii Shvaika
60b8c15895 Merge branch 'develop/3.5' of github.com:thingsboard/thingsboard into develop/3.5 2023-02-10 18:16:03 +02:00
Andrii Shvaika
3e6b6349f8 Minor update of the doc 2023-02-10 18:15:52 +02:00
dashevchenko
565234f7a1 refactoring 2023-02-10 17:41:21 +02:00
dashevchenko
6c5054a6e8 added caching, added PUT methods, refactored code 2023-02-10 17:08:27 +02:00
dashevchenko
8bb22a3ac9 ignored unstable tests 2023-02-09 15:49:32 +02:00
Vladyslav_Prykhodko
6a0e8c03a4 Improvement date ago pipe 2023-02-09 14:36:11 +02:00
Vladyslav_Prykhodko
3bbf69c894 Improvement notification alarm style 2023-02-09 12:31:06 +02:00
Igor Kulikov
17d1dd258a Update rule nodes UI 2023-02-08 13:25:45 +02:00
dashevchenko
e9fb6fb97e merged with develop/3.5 2023-02-08 10:37:11 +02:00
Andrii Shvaika
8bd9f2e29c Merge with release 3.4.4 2023-02-07 18:47:38 +02:00
Andrii Shvaika
0791e04c09 Make UI tests annotation inherited 2023-02-07 18:35:18 +02:00
dashevchenko
4644401a53 unit test fix 2023-02-07 17:59:44 +02:00
Vladyslav_Prykhodko
b1a6264fd1 UI: Improvement notification web view 2023-02-07 17:31:01 +02:00
dashevchenko
eea206bb6d refactoring 2023-02-07 16:57:48 +02:00
Vladyslav_Prykhodko
6ac0024944 UI: Add notification setting 2023-02-07 16:42:36 +02:00
Igor Kulikov
68f3fb366b Add upgrade versions 2023-02-07 16:07:47 +02:00
Igor Kulikov
2c41820bdd Update rule nodes UI 2023-02-07 15:57:02 +02:00