Andrew Shvayka
|
3d97371ac5
|
Merge pull request #8105 from rusikv/alarm-assign-ui-dev
User search by email, first name and last name, disabling of alarm assignment setting
|
2023-02-20 17:12:16 +02:00 |
|
Andrii Shvaika
|
feb84ace48
|
Deprecation of the alarm status
|
2023-02-20 17:11:49 +02:00 |
|
rusikv
|
80ec4d85e2
|
Amendments due to backend changes, added ability to search users by name and email, added setting to disable reassignment of alarm to alarm widget
|
2023-02-20 14:13:41 +02:00 |
|
Andrew Shvayka
|
7f642f5415
|
Merge pull request #8102 from imbeacon/feature/alarm-assign
|
2023-02-18 18:42:01 +02:00 |
|
zbeacon
|
0427eeea9d
|
Added check - does assigned information available
|
2023-02-18 13:07:32 +02:00 |
|
zbeacon
|
aa18dde0dc
|
Refactored method name
|
2023-02-18 12:15:01 +02:00 |
|
Andrii Shvaika
|
c16dfd4407
|
Alarm query updates
|
2023-02-17 16:15:17 +02:00 |
|
Andrii Shvaika
|
d77e8f0cba
|
Merge branch 'develop/3.5' of github.com:thingsboard/thingsboard into feature/alarm-assign
|
2023-02-17 12:44:36 +02:00 |
|
Andrew Shvayka
|
a1bc7533de
|
Merge pull request #8094 from dashevchenko/findUsersByQuery
Find users by query
|
2023-02-17 12:43:57 +02:00 |
|
Andrii Shvaika
|
b9f5e45fa0
|
Assignee query keys
|
2023-02-17 12:43:02 +02:00 |
|
Andrii Shvaika
|
f877fdef3f
|
Alarm assignee as an object
|
2023-02-17 12:37:30 +02:00 |
|
Andrii Shvaika
|
8b6950031e
|
Alarm asignee updates
|
2023-02-17 12:14:59 +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 |
|
Andrew Shvayka
|
33ecbb238b
|
Merge pull request #8097 from rusikv/alarm-assign-ui-dev
[WIP][3.5] UI: Alarm assignment
|
2023-02-16 18:48:15 +02:00 |
|
Andrii Shvaika
|
04eb8c989a
|
Revert the AlarmInfo items. We will update the assignee via separate message
|
2023-02-16 18:47:51 +02:00 |
|
dashevchenko
|
a613e1dbc6
|
refactoring
|
2023-02-16 17:46:24 +02:00 |
|
rusikv
|
994971a5cd
|
UI alarm assignment implementation
|
2023-02-16 14:51:24 +02:00 |
|
Andrii Shvaika
|
c392df2b8f
|
Alarm Query to fetch onloy assigned alarms
|
2023-02-16 14:10:50 +02:00 |
|
zbeacon
|
dda627b63e
|
Added getting NameLabelAndCustomerDetails to EntityService
|
2023-02-16 14:03:20 +02:00 |
|
dashevchenko
|
4470ae9a05
|
added tests
|
2023-02-16 13:45:01 +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 |
|
Andrii Shvaika
|
74fca60cd2
|
License header
|
2023-02-15 19:17:27 +02:00 |
|
Andrii Shvaika
|
3932993b58
|
Alarm assignment improvements
|
2023-02-15 19:14:11 +02:00 |
|
Andrew Shvayka
|
c4f5d43618
|
Merge pull request #8090 from imbeacon/feature-alarm-assigning-with-revert
Feature alarm assigning with revert
|
2023-02-15 19:13:24 +02:00 |
|
zbeacon
|
0eff914d69
|
Fix for test
|
2023-02-15 15:44:23 +02:00 |
|
Andrii Shvaika
|
75e9bb220d
|
Rule node description update
|
2023-02-15 13:28:58 +02:00 |
|
zbeacon
|
9250af1904
|
Merge remote-tracking branch 'upstream/develop/3.5' into feature-alarm-assigning
|
2023-02-13 19:55:24 +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 |
|
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 |
|
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 |
|