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

1521 Commits

Author SHA1 Message Date
ViacheslavKlimov
8fcbe876e8 Merge branch 'develop/3.5' into feature/notification-system 
# Conflicts:
#	pom.xml
 2023-03-08 18:16:16 +02:00
Andrii Shvaika
3477ddac0f Refactoring due to comments 2023-03-08 17:39:39 +02:00
Igor Kulikov
11f54d96fd UI: Improve default time window calculation 2023-03-08 16:02:04 +02:00
Igor Kulikov
3688c6aa44 UI: Improve default time window calculation 2023-03-08 15:45:39 +02:00
Vladyslav_Prykhodko
c5fc212c79 Merge remote-tracking branch 'klimov/feature/notification-system' into feature/notification-system 2023-03-08 15:16:48 +02:00
Vladyslav_Prykhodko
da8962ac54 UI: Change style notification system and improv notification ws 2023-03-08 15:16:07 +02:00
Igor Kulikov
b81612e249 Merge branch 'develop/3.5' of github.com:thingsboard/thingsboard into develop/3.5 2023-03-08 15:00:01 +02:00
Igor Kulikov
e4671e10a6 UI: markdown component and markdown widget improvements 2023-03-08 14:59:49 +02:00
Andrii Shvaika
c905f20224 Merge remote-tracking branch 'origin/develop/3.5' into feature/mqtt/sparkplug 2023-03-08 13:27:17 +02:00
ViacheslavKlimov
a56261ac9d Merge with develop/3.5 2023-03-08 13:11:31 +02:00
Andrew Shvayka
6cc8b8e6a8
Merge pull request #8098 from thingsboard/feature/alarm-assign 
Alarm assignment to users
 2023-03-08 11:06:55 +02:00
rusikv
411da14083 Moved changed to optional assignee id in alarm query constructor to end 2023-03-07 18:30:58 +02:00
Igor Kulikov
43783f0379 UI: Markdown component and markdown widget style improvements 2023-03-07 18:25:15 +02:00
Artem Dzhereleiko
2e807f319d UI: Fixed form style 2023-03-07 16:03:14 +02:00
Vladyslav_Prykhodko
571574f0f8 UI: Fixed notification system after update Angular15 2023-03-07 12:14:49 +02:00
Andrii Shvaika
aadf7f8295 Merge with develop/3.5 2023-03-06 17:59:37 +02:00
Vladyslav_Prykhodko
7f122a9d5f UI: Fixed build after merge 2023-03-06 11:27:07 +02:00
Vladyslav_Prykhodko
069ef4de5b Merge remote-tracking branch 'upstream/develop/3.5' into feature/notification-system 2023-03-06 10:21:41 +02:00
Igor Kulikov
6577141516 UI: entity type list chips improvement 2023-03-03 16:23:49 +02:00
Volodymyr Babak
dc7e872b16 Fixed correct approach for deprecated ts field 2023-03-03 13:44:12 +02:00
Volodymyr Babak
c2b1a948da Removed check of deprecated entity alias filter type from backend to frontend 2023-03-03 10:17:42 +02:00
Igor Kulikov
d936d9a7aa UI: help popup button improvements 2023-03-02 18:11:45 +02:00
ViacheslavKlimov
79670d9f9d Notification system improvements 2023-02-28 19:19:59 +02:00
Andrii Shvaika
6b121514fc Merge with develop/3.5 2023-02-28 19:06:54 +02:00
Andrii Shvaika
ce77d5d1bc Merge remote-tracking branch 'origin/feature/angular15' into feature/alarm-assign 2023-02-28 18:34:02 +02:00
Igor Kulikov
1b73595e59 UI: Angular 15 migration 2023-02-28 15:14:36 +02:00
Igor Kulikov
d81add6fd7 UI: Angular 15 migration 2023-02-27 16:24:50 +02:00
Igor Kulikov
ae8c44d54a UI: Angular 15 migration 2023-02-24 19:25:19 +02:00
rusikv
d5d2b043a2 Merge branch 'alarmCommentsUI' of github.com:rusikv/thingsboard into alarmCommentsUI 2023-02-24 16:23:16 +02:00
Vladyslav_Prykhodko
902cd73000 UI: Add support in web notification action open dashboard 2023-02-24 11:29:36 +02:00
Igor Kulikov
f99fa3c038 UI: Angular 15 migration 2023-02-23 19:01:53 +02:00
Igor Kulikov
8711048ca6 UI: Angular 15 migration 2023-02-21 19:18:04 +02:00
Igor Kulikov
78caf17e07 UI: Angular 15 migration 2023-02-20 19:23:26 +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
Vladyslav_Prykhodko
6945b96e3c UI: Change notification request support send without template 2023-02-20 11:30:26 +02:00
Igor Kulikov
e5a9dbc795 UI: Angular 15 migration 2023-02-17 19:24:01 +02:00
Igor Kulikov
55267a6a08 UI: Angular 15 migration 2023-02-17 12:39:08 +02:00
Igor Kulikov
f4f7e8f284 UI: Angular15 migration 2023-02-16 19:32:02 +02:00
Vladyslav_Prykhodko
8589047fcc UI: Refactoring web socket 2023-02-16 12:59:43 +02:00
Vladyslav_Prykhodko
82719b89ef UI: Improvement notification componets styles 2023-02-14 18:16:29 +02:00
Igor Kulikov
290e15ecb8 UI: Use user settings service. 2023-02-14 12:04:23 +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
zbeacon
9250af1904 Merge remote-tracking branch 'upstream/develop/3.5' into feature-alarm-assigning 2023-02-13 19:55:24 +02:00
Igor Kulikov
916faae774 UI: Menu improvements 2023-02-13 19:09:05 +02:00
Vladyslav_Prykhodko
f395d9b7fc UI: Refactoring component 2023-02-13 16:11:23 +02:00
Vladyslav_Prykhodko
72348b049e UI: add create notification and template from other wizard 2023-02-10 18:32:21 +02:00
rusikv
372450e0d7 Date ago pipe update, added ability to change sort direction of comments 2023-02-10 16:17:12 +02:00
rusikv
a943e04e2d Merge remote-tracking branch 'upstream/develop/3.5' into alarmCommentsUI 2023-02-10 15:49:24 +02:00
Igor Kulikov
61e117f320 UI: Refactor menu for System administrator 2023-02-09 19:13:44 +02:00