dashevchenko
|
0427425f83
|
Added email for AlarmCommentInfo
|
2023-01-09 13:06:55 +02:00 |
|
dashevchenko
|
d3a975770b
|
Merge remote-tracking branch 'upstream/master' into alarmComments
|
2023-01-09 12:38:21 +02:00 |
|
Volodymyr Babak
|
ab924d6e13
|
Added default edge rule chain to asset/device profiles. Added propagation of software id to edge
|
2023-01-05 18:05:56 +02:00 |
|
Volodymyr Babak
|
46f8ce990b
|
Added getEdgeDockerInstallInstructions method to RestClient
|
2023-01-03 11:11:46 +02:00 |
|
zbeacon
|
a812a88db1
|
Refactoring to keep EntityService
|
2022-12-30 12:51:45 +02:00 |
|
zbeacon
|
022aee36d0
|
Merge with develop/3.5
|
2022-12-29 20:49:58 +02:00 |
|
zbeacon
|
d9add9bdf8
|
Merge remote-tracking branch 'upstream/develop/3.5' into feature-alarm-assigning
|
2022-12-29 20:49:29 +02:00 |
|
Andrii Shvaika
|
831f11829c
|
Merge with develop/3.5
|
2022-12-28 15:35:48 +02:00 |
|
nickAS21
|
eed3df829c
|
sparkplug: Comment1
|
2022-12-28 13:37:55 +02:00 |
|
Igor Kulikov
|
4c3154da4b
|
Version set to 3.4.4-SNAPSHOT
|
2022-12-28 13:33:57 +02:00 |
|
nickAS21
|
d73ab5f406
|
sparkplug: add Sparkplug as extends abstract
|
2022-12-27 16:43:53 +02:00 |
|
Andrii Shvaika
|
34d7a6ced8
|
Merge remote-tracking branch 'origin/master' into develop/3.5
|
2022-12-27 13:06:46 +02:00 |
|
nickAS21
|
e4d2d833bd
|
sparkplug: add Gateway as extends abstract
|
2022-12-26 17:58:45 +02:00 |
|
nickAS21
|
7babba1db4
|
sparkplug: Rename Gateway to abstract
|
2022-12-26 16:57:06 +02:00 |
|
Andrew Shvayka
|
19513ec027
|
Merge pull request #7804 from ShvaykaD/feature/base-entity-service-improvement
[3.5] improvements for base entity service v2
|
2022-12-22 14:14:47 +02:00 |
|
ShvaykaD
|
652a8c9e89
|
added getEntityType method in EntityDaoService
|
2022-12-22 13:02:39 +02:00 |
|
zbeacon
|
5710f01c03
|
Merge remote-tracking branch 'upstream/develop/3.5' into feature-alarm-assigning
|
2022-12-22 08:30:42 +02:00 |
|
dashevchenko
|
408afb67f3
|
fixed test
|
2022-12-21 16:10:34 +02:00 |
|
Andrii Shvaika
|
38ef27567c
|
Refactoring of the initial implementation
|
2022-12-21 14:21:36 +02:00 |
|
dashevchenko
|
2db28e2296
|
fixed test
|
2022-12-21 13:41:42 +02:00 |
|
nickAS21
|
ca54838f23
|
sparkplug: comments7
|
2022-12-21 08:08:16 +02:00 |
|
dashevchenko
|
df31723f58
|
pull request comments
|
2022-12-20 15:37:37 +02:00 |
|
dashevchenko
|
7203c15dec
|
fixed pull request comments
|
2022-12-20 15:07:50 +02:00 |
|
nickAS21
|
47d711345b
|
sparkplug: connection6
|
2022-12-20 12:59:18 +02:00 |
|
dashevchenko
|
ed37dc850a
|
merged with master
|
2022-12-20 12:09:34 +02:00 |
|
nickAS21
|
ee819e2d80
|
sparkplug: connection5
|
2022-12-20 11:37:59 +02:00 |
|
dashevchenko
|
81ed6a6702
|
added tests for alarm comment services
|
2022-12-20 11:26:11 +02:00 |
|
ViacheslavKlimov
|
55fc7131fb
|
Validation for rule node configuration; improve validation error message
|
2022-12-17 16:58:58 +02:00 |
|
ShvaykaD
|
3d27340cb5
|
fix audit log tests
|
2022-12-16 15:52:20 +02:00 |
|
nickAS21
|
f6aa9e6125
|
sparklug: comments4
|
2022-12-15 18:44:25 +02:00 |
|
ShvaykaD
|
5c5b83c4ce
|
updated logic & fix typos after review
|
2022-12-15 15:10:38 +02:00 |
|
Andrii Shvaika
|
aadc2e35b7
|
Merge with master
|
2022-12-15 14:27:13 +02:00 |
|
nickAS21
|
f27f1b9aa6
|
sparkplug: connection4
|
2022-12-15 13:29:45 +02:00 |
|
nickAS21
|
81c484d745
|
sparkplug: connection2
|
2022-12-15 11:41:12 +02:00 |
|
nickAS21
|
1bf02b75f2
|
sparkplug: connection
|
2022-12-15 11:40:04 +02:00 |
|
Andrii Shvaika
|
68ffd803fe
|
Merge branch 'feature/base-entity-service-improvement' of github.com:ShvaykaD/thingsboard into develop/3.5
|
2022-12-14 16:42:38 +02:00 |
|
ShvaykaD
|
7d9f437927
|
rollback optional changes for fetchEntityCustomerId method
|
2022-12-14 12:37:19 +02:00 |
|
ShvaykaD
|
f167c7c48b
|
code cleanup after review
|
2022-12-14 12:30:27 +02:00 |
|
dashevchenko
|
201078714c
|
added alarm comment info object, refactoring
|
2022-12-14 12:20:23 +02:00 |
|
zbeacon
|
f29d1b0eff
|
Added HasLabel, HasEmail, HasTitle interfaces to get correctly label in entityService, refactoring for alarms processing. The main point is swithing from Alarm entity to AlarmInfo
|
2022-12-13 13:39:09 +02:00 |
|
ShvaykaD
|
0bef324a1f
|
refactoring after review
|
2022-12-12 19:18:45 +02:00 |
|
Andrew Shvayka
|
5e1fa45a10
|
Merge pull request #7768 from ViacheslavKlimov/fix/pagelink-validation
[3.4.3] Additional pageLink validation
|
2022-12-12 16:35:46 +02:00 |
|
Andrew Shvayka
|
0ee678e234
|
Merge pull request #7761 from ViacheslavKlimov/fix/entity-view-ts
[3.4.3] Fix no timeseries data in widget for entity view; fix State Chart invalid behavior
|
2022-12-12 15:54:29 +02:00 |
|
zbeacon
|
08e356a415
|
Updated alarm assignment to send websocket update on assign, added originator label to alarm info
|
2022-12-12 13:00:22 +02:00 |
|
ViacheslavKlimov
|
4851f1af9f
|
Fix comparing entity versions: ignore tenantId and createdTime
|
2022-12-09 19:03:57 +02:00 |
|
ViacheslavKlimov
|
808b1dc0c5
|
'Show merge commits' option in repository settings
|
2022-12-09 18:31:59 +02:00 |
|
ShvaykaD
|
661480ff39
|
base entity service improvement: init commit
|
2022-12-09 17:33:17 +02:00 |
|
ViacheslavKlimov
|
2494cec616
|
Add validation for EntityDataPageLink
|
2022-12-09 16:25:09 +02:00 |
|
nickAS21
|
3865e36fc8
|
sparkPlug: start add Handler
|
2022-12-08 17:05:41 +02:00 |
|
dashevchenko
|
8a157397d4
|
added rest controller for alarm comments
|
2022-12-08 17:04:30 +02:00 |
|