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

12140 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
0a0099207e Merge branch 'master' into develop/3.5 2022-12-28 12:30:52 +02:00
Andrew Shvayka
1ae77e5b13
Merge pull request #7867 from thingsboard/revert-7859-UITests 
Revert "[WIP][3.5] Add tests on delete phone number"
 2022-12-28 12:30:23 +02:00
Andrew Shvayka
6acc9c9ca4
Revert "[WIP][3.5] Add tests on delete phone number" 2022-12-28 12:29:53 +02:00
Andrew Shvayka
fc796a45f4
Merge pull request #7859 from Seraphym-Tuhai/UITests 
Add tests on delete phone number
 2022-12-27 15:45:27 +02:00
Andrew Shvayka
6424f89181
Merge pull request #7856 from AndriiLandiak/feature/improve-swagger-description 
[WIP][3.5] Improve swagger description for SaveAttributes
 2022-12-27 15:38:40 +02:00
Serafym Tuhai
42df526966 add tests on delete phone number 2022-12-27 15:11:43 +02:00
Andrii Shvaika
34d7a6ced8 Merge remote-tracking branch 'origin/master' into develop/3.5 2022-12-27 13:06:46 +02:00
Andrii Shvaika
9cb5889050 Merge branch 'develop/3.5' of github.com:thingsboard/thingsboard into develop/3.5 2022-12-27 13:06:36 +02:00
Andrii Landiak
89bb6cafce Improve swagger description for SaveAttributes 2022-12-27 11:15:00 +02:00
Andrew Shvayka
a0091c632a
Merge pull request #7670 from Seraphym-Tuhai/UITests 
[3.5] Added ui tests
 2022-12-26 16:50:49 +02:00
Andrew Shvayka
5cc449a686
Merge pull request #7838 from YevhenBondarenko/fix/device-sessions-dump 
[3.5] fixed device sessions dump
 2022-12-26 15:40:44 +02:00
Andrew Shvayka
6b461644e6
Merge pull request #7840 from volodymyr-babak/fix-upgrade-script 
[3.5] Fixed incorrect index creation for edge event migration
 2022-12-26 15:39:41 +02:00
Volodymyr Babak
f04753d3f9 Fixed incorrect index creation for edge event migration 2022-12-23 16:35:15 +02:00
YevhenBondarenko
36793c432d fixed device sessions dump 2022-12-23 15:07:44 +01: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
Andrii Shvaika
83b2005601 Merge branch 'feature/base-entity-service-improvement' of github.com:ShvaykaD/thingsboard into develop/3.5 2022-12-22 11:41:50 +02:00
zbeacon
5710f01c03 Merge remote-tracking branch 'upstream/develop/3.5' into feature-alarm-assigning 2022-12-22 08:30:42 +02:00
Seraphym-Tuhai
43a3fc7c6e Merge branch 'master' of https://github.com/thingsboard/thingsboard into UITests 2022-12-22 00:15:37 +02:00
Igor Kulikov
c12ab39ff4
Merge pull request #7824 from vvlladd28/bug/alarm-table/update-timewindow 
Fixed incorrect updated timewindow in Alarm table
 2022-12-21 17:34:49 +02:00
Vladyslav_Prykhodko
b9d361f1cf UI: Fixed incorrect updated timewindow in Alarm table 2022-12-21 17:23:51 +02:00
Serafym Tuhai
832b406420 fix tests after changes in UI 2022-12-21 14:24:15 +02:00
Igor Kulikov
1c53a90c1a Fix field constraint validation message 2022-12-21 12:36:24 +02:00
Serafym Tuhai
0c4762f968 Merge branch 'master' of github.com:thingsboard/thingsboard into UITests 2022-12-20 19:12:55 +02:00
Igor Kulikov
acfb357135 Update UI help link 2022-12-20 16:59:45 +02:00
Igor Kulikov
eb10ba3c3c Update pkg.upgradeVersion 2022-12-20 16:50:26 +02:00
Igor Kulikov
1d179b725b Update TBEL version to 1.0.5 2022-12-19 13:24:00 +02:00
Andrew Shvayka
84c82d08a7
Merge pull request #7792 from volodymyr-babak/edge/misc-fixes 
[3.4.3][Bug] Edge root rule chain update fix. USER entity support added. INACTIVITY_TIMEOUT pushed to edge.
 2022-12-19 11:56:47 +02:00
Andrew Shvayka
8326c75766
Merge pull request #7812 from ViacheslavKlimov/improvement/rule-node-config-validation 
[3.4.3] Validation for rule node configuration
 2022-12-19 11:54:29 +02:00
ViacheslavKlimov
55fc7131fb Validation for rule node configuration; improve validation error message 2022-12-17 16:58:58 +02:00
Igor Kulikov
a8fb435ab7
Merge pull request #7795 from vvlladd28/feauture/multiple-input-widget/fixed=action-button 
[3.4.3] UI: Always visible action button in multiple input widgets
 2022-12-16 16:04:54 +02:00
Igor Kulikov
52d12e044c
Merge pull request #7785 from vvlladd28/improvement/language/da-dk 
[3.4.3] UI: Add new Danish language
 2022-12-16 16:00:43 +02:00
Igor Kulikov
f53744ccff
Merge pull request #7782 from ArtemDzhereleiko/AD/bug-fix/catalan-designator 
[3.4.3] UI: Fixed Catalan locale designator
 2022-12-16 15:59:49 +02:00
Igor Kulikov
092a71dbb4
Merge pull request #7758 from vvlladd28/bug/bulk-import/validation-name 
[3.4.3] UI: Fixed validation in bulk import and improvement bulk import for Edge
 2022-12-16 15:54:41 +02:00
ShvaykaD
3d27340cb5 fix audit log tests 2022-12-16 15:52:20 +02:00
ShvaykaD
9e33a8d7be fix typo after refactoring in BaseEntityServiceRegistryTest 2022-12-15 16:59:26 +02:00
ShvaykaD
e74a5686a2 added message for assertNotNull check in BaseEntityServiceRegistryTest 2022-12-15 16:32:39 +02:00
ShvaykaD
1d5bf98504 removed unused import in DefaultEntityServiceRegistry 2022-12-15 15:22:53 +02:00
ShvaykaD
da0a0aed30 fix typo after refactoring 2022-12-15 15:18:01 +02:00
ShvaykaD
5c5b83c4ce updated logic & fix typos after review 2022-12-15 15:10:38 +02:00
Volodymyr Babak
268f0499bf Merge branch 'master' of github.com:thingsboard/thingsboard into edge/misc-fixes 2022-12-15 14:53:39 +02:00
Andrew Shvayka
985b985265
Merge pull request #7801 from dashevchenko/addedDeviceProfileServiceToTbContext 
[3.4.3] Added DeviceProfileService and AssetProfileService to TBContext
 2022-12-15 14:39:21 +02:00
Andrew Shvayka
6b53b609a3
Merge pull request #7803 from YevhenBondarenko/fix/bulk-import-test 
[3.4.3]fixed bulk import test infinite await
 2022-12-15 14:37:58 +02:00
Andrii Shvaika
aadc2e35b7 Merge with master 2022-12-15 14:27:13 +02:00
YevhenBondarenko
df28b21733 fixed bulk import test infinite await 2022-12-15 13:19:03 +01:00
Andrii Shvaika
bb79dbf273 Release notes autogeneration 2022-12-15 14:18:20 +02:00
Andrii Shvaika
f97fa79b2a Release notes auto-generation 2022-12-15 14:15:10 +02:00