vzikratyi
|
6ae75e295c
|
Removed LockService
|
2020-10-08 12:21:53 +03:00 |
|
vzikratyi
|
d2f45db0a6
|
Removed unused changes to AttributeDao
|
2020-10-08 11:47:11 +03:00 |
|
Igor Kulikov
|
c4b89e29ef
|
Merge branch 'master' of github.com:thingsboard/thingsboard
|
2020-10-08 11:46:01 +03:00 |
|
Igor Kulikov
|
305ec3067e
|
Update angular version
|
2020-10-08 11:45:50 +03:00 |
|
Andrii Shvaika
|
77d754ad90
|
Fetch Last Level Only improvement
|
2020-10-08 11:45:01 +03:00 |
|
vzikratyi
|
90234bf7a3
|
Fixed merge
|
2020-10-08 11:37:04 +03:00 |
|
vzikratyi
|
b02fbe860c
|
Merge branch 'develop/3.2' into feature/dynamic-oauth2-new-table
# Conflicts:
# application/src/main/java/org/thingsboard/server/controller/BaseController.java
# application/src/main/java/org/thingsboard/server/service/install/SqlDatabaseUpgradeService.java
# application/src/main/java/org/thingsboard/server/service/security/permission/Resource.java
# application/src/main/java/org/thingsboard/server/service/security/permission/SysAdminPermissions.java
# common/data/src/main/java/org/thingsboard/server/common/data/EntityType.java
# common/data/src/main/java/org/thingsboard/server/common/data/id/EntityIdFactory.java
# dao/src/main/java/org/thingsboard/server/dao/model/ModelConstants.java
# dao/src/test/resources/sql/hsql/drop-all-tables.sql
# dao/src/test/resources/sql/psql/drop-all-tables.sql
# dao/src/test/resources/sql/timescale/drop-all-tables.sql
# ui-ngx/src/app/modules/home/pages/tenant/tenant.component.ts
|
2020-10-08 11:22:13 +03:00 |
|
Andrii Shvaika
|
0cc52cd129
|
Merge branch 'master' of github.com:thingsboard/thingsboard
|
2020-10-08 10:57:58 +03:00 |
|
Andrii Shvaika
|
d508bb671b
|
Automatic update of the root rule chain in 3.2
|
2020-10-08 10:57:48 +03:00 |
|
Igor Kulikov
|
3c9a335910
|
Tests fix
|
2020-10-08 09:46:52 +03:00 |
|
Igor Kulikov
|
059b456f70
|
Move device/tenant profile entitiy type enums to the end of list.
|
2020-10-08 09:20:35 +03:00 |
|
Igor Kulikov
|
7db6158279
|
Increase MQTT attributes/timeseries tests timeouts.
|
2020-10-07 19:18:06 +03:00 |
|
Igor Kulikov
|
795e1fd634
|
Merge branch 'master' of github.com:thingsboard/thingsboard
|
2020-10-07 18:53:24 +03:00 |
|
Igor Kulikov
|
54b609e8bd
|
Fix Tenant Actor: Ack transport to device message when no tenant exists. Improve MQTT tests.
|
2020-10-07 18:53:10 +03:00 |
|
Andrii Shvaika
|
276397d9d0
|
Merge branch 'master' of github.com:thingsboard/thingsboard
|
2020-10-07 15:43:58 +03:00 |
|
Andrii Shvaika
|
15743bcf91
|
Fetch Last Level Only + Distinct values
|
2020-10-07 15:43:47 +03:00 |
|
Igor Kulikov
|
bc50ef88a6
|
Merge branch 'master' of github.com:thingsboard/thingsboard
|
2020-10-07 15:42:32 +03:00 |
|
Igor Kulikov
|
1abf320c99
|
Set spring.freemarker.checkTemplateLocation to false
|
2020-10-07 15:42:17 +03:00 |
|
Andrii Shvaika
|
931c740993
|
Merge branch 'master' of github.com:thingsboard/thingsboard
|
2020-10-07 15:17:17 +03:00 |
|
Andrii Shvaika
|
dfd0d2685b
|
Fix issue with locks
|
2020-10-07 15:17:06 +03:00 |
|
Andrii Shvaika
|
5dd460b81d
|
Some improvements
|
2020-10-07 14:13:25 +03:00 |
|
Dima Landiak
|
401bb3ff17
|
fix db name in yml
|
2020-10-07 13:46:37 +03:00 |
|
vzikratyi
|
91f05282ea
|
Validate domains for SchemeTypes combinations
|
2020-10-07 13:06:22 +03:00 |
|
Illia Barkov
|
ab9199d8b8
|
Update locale.constant-en_US.json
|
2020-10-07 12:56:35 +03:00 |
|
Andrii Shvaika
|
08e4b38b13
|
Merge branch 'feature/device-provision-3.2-onlyProfileVersion' of https://github.com/zbeacon/thingsboard into zbeacon-feature/device-provision-3.2-onlyProfileVersion
|
2020-10-07 12:13:19 +03:00 |
|
Andrii Shvaika
|
7b3d903cff
|
Merge with develop 2.5.5
|
2020-10-07 12:11:37 +03:00 |
|
zbeacon
|
4494f3dd67
|
Fix for tests
|
2020-10-07 12:10:05 +03:00 |
|
Andrew Shvayka
|
0356431856
|
Merge pull request #3548 from ShvaykaD/improvements/TbSendRPCRequestNode
[2.5.5] fix enqueue methods impl in DefaultTbContext
|
2020-10-07 12:06:51 +03:00 |
|
Andrii Shvaika
|
de9cd8939e
|
Fix for client certificate check
|
2020-10-07 12:06:24 +03:00 |
|
Igor Kulikov
|
4eeac7f96c
|
Merge branch 'master' of github.com:thingsboard/thingsboard
|
2020-10-07 11:58:54 +03:00 |
|
Igor Kulikov
|
69ec103588
|
UI: Completely remove letters capitalization in order to avoid issues in certain locales.
|
2020-10-07 11:58:43 +03:00 |
|
chienfuchen32
|
a6d69cc7a8
|
add validity on device X.509 certificate over MQTT transport connection
|
2020-10-07 11:50:22 +03:00 |
|
zbeacon
|
e8220e5102
|
Merge branch 'develop/3.2' of https://github.com/thingsboard/thingsboard into feature/device-provision-3.2-onlyProfileVersion
|
2020-10-07 10:36:15 +03:00 |
|
Igor Kulikov
|
907ed5ad83
|
Update upgrade scripts
|
2020-10-07 10:33:47 +03:00 |
|
Vladyslav Prykhodko
|
9c5b353a17
|
UI: Added validation unique domain
|
2020-10-07 00:44:36 +03:00 |
|
Vladyslav_Prykhodko
|
fd602dec7f
|
UI: Added device profile schedule setting for alarm setting
|
2020-10-06 19:22:40 +03:00 |
|
Igor Kulikov
|
1f5f411b4c
|
Merge with develop/2.5.5
|
2020-10-06 19:07:30 +03:00 |
|
Igor Kulikov
|
98227ea665
|
Merge branch 'master' into develop/3.2
|
2020-10-06 19:06:35 +03:00 |
|
ShvaykaD
|
7cfa97ab5e
|
refactoring
|
2020-10-06 19:04:54 +03:00 |
|
ShvaykaD
|
94bb9f5be3
|
update the fix in the API
|
2020-10-06 18:59:18 +03:00 |
|
Chantsova Ekaterina
|
aa82a478cb
|
Fix wrong number of digits after floating point in legend
|
2020-10-06 18:44:12 +03:00 |
|
Seok Hyun, Ga
|
95921a847a
|
Update locale.constant-ko_KR.json
Adding additional translation items.
|
2020-10-06 18:43:35 +03:00 |
|
Andrii Shvaika
|
67f8327cde
|
Minor improvements for event truncation
|
2020-10-06 18:41:48 +03:00 |
|
YevhenBondarenko
|
872a6fb45d
|
added checkAndTruncateDebugEvent
|
2020-10-06 18:36:49 +03:00 |
|
YevhenBondarenko
|
3bcebb0666
|
added annotation @Deprecated to the old methods "getTimeseries"
|
2020-10-06 18:35:26 +03:00 |
|
YevhenBondarenko
|
0faef1ad16
|
rest client improvments
|
2020-10-06 18:35:26 +03:00 |
|
Kalutka Zhenya
|
a50368a1ae
|
Refactoring
|
2020-10-06 18:31:40 +03:00 |
|
Kalutka Zhenya
|
c783a1c604
|
Fix knob control on 2.5.5
|
2020-10-06 18:31:40 +03:00 |
|
Serhii Mikhnytskyi
|
0227234a6d
|
removed test component property
|
2020-10-06 18:31:26 +03:00 |
|
Serhii Mikhnytskyi
|
762c6dae55
|
improved performance of table widgets - removed unused ngZone.run and detectChanges, changed functions trackByRowIndex - now is used index, not id, minor improvements for functions, used after data updating.
|
2020-10-06 18:31:26 +03:00 |
|