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

105 Commits

Author SHA1 Message Date
Vladyslav_Prykhodko
edcde714c7 UI: Added entity details page 2021-12-28 12:01:26 +02:00
Igor Kulikov
a69551f067 Angular 12 migration 2021-12-06 12:54:48 +02:00
Viacheslav Klimov
2d845c7840 Merge remote-tracking branch 'origin/master' into fields-validation 
# Conflicts:
#	application/src/main/java/org/thingsboard/server/controller/TelemetryController.java
#	common/data/src/main/java/org/thingsboard/server/common/data/Customer.java
#	common/data/src/main/java/org/thingsboard/server/common/data/DeviceProfile.java
#	common/data/src/main/java/org/thingsboard/server/common/data/EntityView.java
#	common/data/src/main/java/org/thingsboard/server/common/data/OtaPackageInfo.java
#	common/data/src/main/java/org/thingsboard/server/common/data/TbResource.java
#	common/data/src/main/java/org/thingsboard/server/common/data/TbResourceInfo.java
#	common/data/src/main/java/org/thingsboard/server/common/data/TenantProfile.java
#	common/data/src/main/java/org/thingsboard/server/common/data/alarm/Alarm.java
#	common/data/src/main/java/org/thingsboard/server/common/data/edge/Edge.java
#	common/data/src/main/java/org/thingsboard/server/common/data/relation/EntityRelation.java
#	common/data/src/main/java/org/thingsboard/server/common/data/rule/RuleChain.java
#	common/data/src/main/java/org/thingsboard/server/common/data/rule/RuleNode.java
#	common/data/src/main/java/org/thingsboard/server/common/data/widget/WidgetsBundle.java
 2021-11-04 12:43:54 +02:00
ArtemDzhereleiko
7077a81d61 Fixed entities table loading first page pagination if time window was changed 2021-09-30 16:49:38 +03:00
ArtemDzhereleiko
56d1c4677b remove reset button form filter panel and add clear filter button to table config 2021-09-01 12:15:00 +03:00
Viacheslav Klimov
f15f0e5483 Merge branch 'master' into fields-validation 
# Conflicts:
#	common/data/src/main/java/org/thingsboard/server/common/data/OtaPackageInfo.java
#	ui-ngx/src/app/modules/home/pages/admin/resource/resources-library.component.ts
#	ui-ngx/src/assets/locale/locale.constant-en_US.json
 2021-08-30 11:14:04 +03:00
Kalutka Zhenya
c7b1d70fbd Refactoring 2021-08-04 17:56:25 +03:00
Kalutka Zhenya
31f7ec9879 Fixed asset disappears menu 2021-08-04 13:46:44 +03:00
AndrewVolosytnykhThingsboard
f91509666c Merge remote-tracking branch 'upstream/master' 2021-07-15 11:50:52 +03:00
AndrewVolosytnykhThingsboard
e3d0da90be Implement fields validation 2021-07-14 12:26:55 +03:00
dharapatel1596@gmail.com
9414bae3a4 Merge branch 'bug/3682-fixed' of https://github.com/dharapatel1596/thingsboard into bug/3682-fixed 2021-06-27 13:43:55 +02:00
dharapatel1596@gmail.com
e179227967 fixed bug#3682 2021-06-27 13:42:30 +02:00
Vladyslav_Prykhodko
a0623e8e86 UI: Add cache cellContent, cellStyle, rowStyle in entity tables widget 2021-06-14 17:52:53 +03:00
Vladyslav_Prykhodko
d60318a709 UI: Refactoring entities-table-models 2021-06-07 14:05:10 +03:00
Vladyslav_Prykhodko
195ed51afa UI: Add copy button checksum 2021-06-04 20:49:01 +03:00
Vladyslav_Prykhodko
fa3bbb2851 UI: And confirm dialog after change ota package in device profile 2021-06-02 19:03:31 +03:00
Volodymyr Babak
7044e3e40f Merge remote-tracking branch 'upstream/master' into develop/3.3-edge 2021-03-30 19:35:58 +03:00
Igor Kulikov
dfcc5ec52e UI: Improve interval timestamp range calculation. 2021-03-20 01:27:19 +02:00
Igor Kulikov
3ed49e3f02 Add timezone support for timewindow 2021-03-17 18:38:57 +02:00
Volodymyr Babak
0f64b3764f Merge remote-tracking branch 'upstream/develop/3.3' into develop/3.3-edge 2021-03-16 16:59:15 +02:00
Vladyslav_Prykhodko
530c077b05 Merge remote-tracking branch 'upstream/master' into feature/dashboard/widget-select-preview 2021-03-03 15:03:06 +02:00
Igor Kulikov
99c9c099ba Add Entity Type alias. Fix Key filter value conditional processing. 2021-03-02 15:13:21 +02:00
Vladyslav_Prykhodko
7237497946 UI: Fixed merge additional info after save entity; Fixed updated alarm rules count 2021-02-25 15:52:13 +02:00
Vladyslav_Prykhodko
989b6e7a30 Merge branch 'master' 2021-02-23 18:01:04 +02:00
Volodymyr Babak
10d3dd01bb Merge branch 'develop/3.3' of github.com:thingsboard/thingsboard into develop/3.3-edge 2021-02-22 19:08:30 +02:00
Vladyslav_Prykhodko
3cc9ad5007 UI: Improvement alarm tabs in the entity details: default time interval 30 days 2021-02-16 17:06:03 +02:00
Volodymyr Babak
b58c831343 Merge remote-tracking branch 'upstream/develop/3.3' into develop/3.3-edge 2021-02-12 13:10:06 +02:00
Vladyslav_Prykhodko
ca8f04e1e9 Merge remote-tracking branch 'upstream/master' into feature/dashboard/widget-select-preview 2021-02-10 18:42:13 +02:00
Igor Kulikov
6f2a4409c1
Merge pull request #4059 from vvlladd28/bug/entities-panel/merge-additional-info 
Fixed merge additional info at updated entity
 2021-02-04 19:23:39 +02:00
Vladyslav_Prykhodko
22a1d24291 Added to widgets bundles and widget functional preview and description 2021-02-04 19:00:28 +02:00
Vladyslav_Prykhodko
58c12d1212 Fixed merge additional info at updated entity 2021-02-04 13:06:22 +02:00
Sergey Tarnavskiy
949d4db526 Added First/Last page-buttons to the tables-paginator 2021-02-01 17:19:00 +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
685e89ea87 Code review fixes 2021-01-08 21:39:34 +02:00
Volodymyr Babak
c5d93d17f4 Naming conventions update 2020-12-23 18:24:41 +02:00
Volodymyr Babak
846f5ba86b Merge remote-tracking branch 'deaflynx/develop/3.3-edge' into develop/3.3-edge 2020-12-14 12:55:07 +02:00
Artem Babak
5a04ebfdad Minor code beautify 2020-12-14 11:39:37 +02:00
Artem Babak
cf2da5c9b1 Fixed filter edge by type. Added edge to entity-filer/subtype 2020-12-08 10:34:34 +02:00
Volodymyr Babak
d79d00aa87 Merge remote-tracking branch 'upstream/master' into develop/3.3-edge 2020-12-07 10:46:15 +02:00
Igor Kulikov
449cb5941d Fix Api Usage State alias 2020-11-20 15:17:31 +02:00
Artem Babak
cb894d7059 Transform Injected Window to optional 2020-10-26 15:07:09 +02:00
Artem Babak
54f0bd4b7a Added default cloudEndpoint for new edges 2020-10-26 12:22:05 +02:00
Igor Kulikov
52e6e76ac6 Oauth2 - set provider name to created user additionalInfo. UI: Improve device profile alarm rules. 2020-10-13 19:48:46 +03:00
Vladyslav_Prykhodko
06c3fb8eab UI: Refactoring device profile 2020-10-12 09:45:34 +03:00
Igor Kulikov
c2b4d9c8ae Merge with master 2020-09-14 14:25:08 +03:00
Igor Kulikov
6a4c2791b3
Merge pull request #3459 from vvlladd28/improvement/entity-details-panel 
Updated order set value in entity-panel
 2020-09-14 14:22:20 +03:00
Igor Kulikov
d9321b4816 UI: Device profile alarm rules 2020-09-10 19:37:14 +03:00
Vladyslav_Prykhodko
b090081e09 Updated order set value in entity-panel 2020-09-10 19:09:03 +03:00
Vladyslav_Prykhodko
04b4a76048 Removed reset form from update entity 2020-09-10 17:23:42 +03:00