14 Commits

Author SHA1 Message Date
Igor Kulikov
da4c742872 Update license year to 2022 2022-01-17 14:07:46 +02:00
Vladyslav_Prykhodko
90c84f84d0 UI: Add control widget support persistent command (Add settings: persistent and persistentPollingInterval) 2021-08-06 18:56:35 +03:00
Volodymyr Babak
df6f4c9924 Merge remote-tracking branch 'upstream/master' into develop/3.3-edge 2021-04-09 19:04:26 +03:00
Vladyslav_Prykhodko
b033b51712 UI: Added manager resources; added new entity type TB_RESOURCE 2021-03-23 18:51:53 +02:00
Volodymyr Babak
bc3008ad7b Merge remote-tracking branch 'upstream/master' into develop/3.3-edge 2021-01-17 01:47:49 +02:00
Igor Kulikov
d31358b2ea Update license header - set 2021 year 2021-01-11 13:42:16 +02:00
Volodymyr Babak
d79d00aa87 Merge remote-tracking branch 'upstream/master' into develop/3.3-edge 2020-12-07 10:46:15 +02:00
Vladyslav_Prykhodko
1f7623352a UI: refactoring OAuth2/Login Page and added oauth mapperType GITHUB 2020-10-12 18:11:22 +03:00
deaflynx
5a07a7aca4 Merged UI-NGX with develop/3.0-edge-fixed 2020-06-21 20:38:43 +03:00
Andrii Shvaika
df3614f9e4 Fix Alarm repository. Add queue type list select. 2020-04-27 01:12:23 +03:00
Andrew Shvayka
38ebbe2576 Revert "Merge with master. AlarmRepository.findAlarms is failing (#2663)"
This reverts commit 2c02406ee5f41b08e655b634dd9871403f67149d.
2020-04-24 19:42:32 +03:00
Andrew Shvayka
2c02406ee5
Merge with master. AlarmRepository.findAlarms is failing (#2663)
* Merge with master. AlarmRepository.findAlarms is failing

* Fix Alarm repository. Add queue type list select.

Co-authored-by: Igor Kulikov <ikulikov@thingsboard.io>
2020-04-24 15:44:31 +03:00
Igor Kulikov
3e2a87135f Prepare for merge with master 2020-02-20 10:26:43 +02:00
Igor Kulikov
a42bd5d7ee UI: RuleNode configuration 2019-12-23 14:36:44 +02:00