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
|
3 years ago |
Vladyslav_Prykhodko
|
6945b96e3c
|
UI: Change notification request support send without template
|
3 years ago |
|
Vladyslav_Prykhodko
|
7e4d92e8eb
|
Merge remote-tracking branch 'klimov/feature/notification-system' into feature/notification-system
|
3 years ago |
|
ViacheslavKlimov
|
d1e135d004
|
Send notification without template creation
|
3 years ago |
Andrew Shvayka
|
a1bc7533de
|
Merge pull request #8094 from dashevchenko/findUsersByQuery
Find users by query
|
3 years ago |
dashevchenko
|
b261cb2ab1
|
renamed UserData to UserEmailInfo
|
3 years ago |
|
dashevchenko
|
5dec719947
|
minor improvements to tests
|
3 years ago |
|
dashevchenko
|
a111473a8f
|
minor improvement
|
3 years ago |
|
dashevchenko
|
bbbea0fc31
|
added tests, refactoring
|
3 years ago |
|
dashevchenko
|
a613e1dbc6
|
refactoring
|
3 years ago |
|
dashevchenko
|
4470ae9a05
|
added tests
|
3 years ago |
|
Vladyslav_Prykhodko
|
8589047fcc
|
UI: Refactoring web socket
|
3 years ago |
|
dashevchenko
|
39070ead53
|
refactoring
|
3 years ago |
|
dashevchenko
|
559b741749
|
added REST method in UserController to get users by query
|
3 years ago |
|
Vladyslav_Prykhodko
|
eddb06b536
|
UI: Improvement notification components styles
|
3 years ago |
|
Andrii Shvaika
|
75e9bb220d
|
Rule node description update
|
3 years ago |
|
Vladyslav_Prykhodko
|
82719b89ef
|
UI: Improvement notification componets styles
|
3 years ago |
|
Vladyslav_Prykhodko
|
3eba03cccc
|
Fixed after merge 'upstream/develop/3.5'
|
3 years ago |
|
Vladyslav_Prykhodko
|
2212a6d9be
|
Merge remote-tracking branch 'upstream/develop/3.5' into feature/notification-system
|
3 years ago |
|
Vladyslav_Prykhodko
|
7d6fcd85c0
|
UI: Add support create template without save when create notification
|
3 years ago |
|
Vladyslav_Prykhodko
|
f395d9b7fc
|
UI: Refactoring component
|
3 years ago |
|
Andrew Shvayka
|
42c7a59f27
|
Merge pull request #8068 from dashevchenko/ignoredUnstableTests
Ignored unstable integration tests
|
3 years ago |
|
Andrii Shvaika
|
a62a28a77f
|
Minor improvement
|
3 years ago |
|
Andrew Shvayka
|
84957614eb
|
Merge pull request #8075 from dashevchenko/user-settings
[WIP] Added controller methods for saving/updating/deleting user settings in UserController
|
3 years ago |
|
dashevchenko
|
f812e02920
|
added possibility to specify non existing elements
|
3 years ago |
|
dashevchenko
|
f9e3b63594
|
unignored tests
|
3 years ago |
|
dashevchenko
|
4a9c4cc614
|
updated test
|
3 years ago |
|
dashevchenko
|
683dee03da
|
refactoring
|
3 years ago |
|
dashevchenko
|
a25e328b7c
|
fixed update settings method
|
3 years ago |
|
Andrii Shvaika
|
b92fa8ce5d
|
Minor code review improvements
|
3 years ago |
|
Vladyslav_Prykhodko
|
72348b049e
|
UI: add create notification and template from other wizard
|
3 years ago |
|
Andrii Shvaika
|
92030e3fb1
|
Merge branch 'userSettings2' of github.com:dashevchenko/thingsboard into develop/3.5
|
3 years ago |
|
Andrii Shvaika
|
60b8c15895
|
Merge branch 'develop/3.5' of github.com:thingsboard/thingsboard into develop/3.5
|
3 years ago |
|
Andrii Shvaika
|
3e6b6349f8
|
Minor update of the doc
|
3 years ago |
|
dashevchenko
|
565234f7a1
|
refactoring
|
3 years ago |
|
dashevchenko
|
6c5054a6e8
|
added caching, added PUT methods, refactored code
|
3 years ago |
|
dashevchenko
|
8bb22a3ac9
|
ignored unstable tests
|
3 years ago |
|
Vladyslav_Prykhodko
|
6a0e8c03a4
|
Improvement date ago pipe
|
3 years ago |
|
Vladyslav_Prykhodko
|
3bbf69c894
|
Improvement notification alarm style
|
3 years ago |
Igor Kulikov
|
17d1dd258a
|
Update rule nodes UI
|
3 years ago |
|
dashevchenko
|
e9fb6fb97e
|
merged with develop/3.5
|
3 years ago |
|
Andrii Shvaika
|
8bd9f2e29c
|
Merge with release 3.4.4
|
3 years ago |
|
Andrii Shvaika
|
0791e04c09
|
Make UI tests annotation inherited
|
3 years ago |
|
dashevchenko
|
4644401a53
|
unit test fix
|
3 years ago |
|
Vladyslav_Prykhodko
|
b1a6264fd1
|
UI: Improvement notification web view
|
3 years ago |
|
dashevchenko
|
eea206bb6d
|
refactoring
|
3 years ago |
|
Vladyslav_Prykhodko
|
6ac0024944
|
UI: Add notification setting
|
3 years ago |
|
Igor Kulikov
|
68f3fb366b
|
Add upgrade versions
|
3 years ago |
|
Igor Kulikov
|
2c41820bdd
|
Update rule nodes UI
|
3 years ago |
|
Igor Kulikov
|
5102f04bfb
|
Merge pull request #8037 from ChantsovaEkaterina/bug/other-modules-not-included-when-loading-resource-as-module
Fix loading widget resources, when one of the resources is marked as module
|
3 years ago |
