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

181 Commits

Author SHA1 Message Date
zbeacon
9250af1904 Merge remote-tracking branch 'upstream/develop/3.5' into feature-alarm-assigning 2023-02-13 19:55:24 +02:00
dashevchenko
f3b6531362 merged with develop/3.5 2023-02-07 14:59:21 +02:00
dashevchenko
f214864503 added controller methods for saving user settings in UserController 2023-02-07 13:55:16 +02:00
Andrii Shvaika
a203c336f1 Merge with master 2023-01-31 16:20:04 +02:00
Igor Kulikov
cbdc4517e4 Update license header year to 2023 2023-01-31 10:43:56 +02:00
zbeacon
2524965ea1 Merge remote-tracking branch 'upstream/develop/3.5' into feature-alarm-assigning 2023-01-18 16:03:11 +02:00
zbeacon
44dcda3bc5 Changes, accroding to comments 2023-01-17 08:15:00 +02:00
Volodymyr Babak
687cabdfcb Merge remote-tracking branch 'upstream/develop/3.5' into edge/rule-chain-in-profiles 2023-01-16 11:15:00 +02:00
zbeacon
5494bc7d2b Merge remote-tracking branch 'upstream/develop/3.5' into feature-alarm-assigning 2023-01-16 10:00:45 +02:00
dashevchenko
36b0e80a23 updated comment length 2023-01-11 17:43:08 +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
dashevchenko
81ed6a6702 added tests for alarm comment services 2022-12-20 11:26:11 +02:00
dashevchenko
201078714c added alarm comment info object, refactoring 2022-12-14 12:20:23 +02:00
zbeacon
0dcde60443 Added alarm assignment feature and tests for it 2022-11-30 13:06:00 +02:00
Andrii Landiak
11ee41bf34 Adding partition to edge_event table 2022-11-07 14:42:49 +02:00
ViacheslavKlimov
a9f776587c Merge with origin/master 2022-10-04 09:35:41 +03:00
ViacheslavKlimov
d85737b84b TTL and table partitioning for audit logs 2022-10-03 18:36:52 +03:00
Igor Kulikov
34339c6532 Minor changes 2022-09-23 19:26:50 +03:00
Igor Kulikov
085e3c1580 Implement Asset Profile feature 2022-09-23 15:37:17 +03:00
Andrii Shvaika
25f58b0bb5 Remove old cleanup events function 2022-08-19 13:45:16 +03:00
Andrii Shvaika
219e97ff4a Implementation of Rule Chain and Rule Node debug events 2022-07-26 16:28:55 +03:00
Andrii Shvaika
e89554aaf4 WIP: improvement to fetch of the events 2022-07-25 19:36:13 +03:00
Andrii Shvaika
a720009b55 Initial DB structure 2022-07-22 18:53:41 +03:00
Andrii Shvaika
e6fe7e6833 Unique constraint for external id 2022-07-15 18:00:33 +03:00
Andrii Shvaika
cd633c72c8 No more Queue Id in the Device Profile 2022-07-12 12:56:40 +03:00
Andrii Shvaika
488e05ac6c Queue ID and Queue Name 2022-07-11 18:51:38 +03:00
Andrii Shvaika
fa5335130b Entities import/export for CE 2022-06-17 16:10:29 +03:00
Viacheslav Klimov
e78a891044 Entity views export/import 2022-06-13 13:47:45 +03:00
Viacheslav Klimov
fcd84f6277 Export/import of Widgets Bundles 2022-06-07 15:18:40 +03:00
Andrii Shvaika
63750ef8a0 Merge with develop/3.4 2022-06-02 13:59:15 +03:00
YevhenBondarenko
44403cd2c2 merge with develop/3.4 2022-06-01 21:55:34 +02:00
Andrii Shvaika
62c5c73237 Merge with queue API 2022-05-20 10:59:05 +03:00
Igor Kulikov
0b6de71768 Implement version control ssh access with private key. Improve VC settings REST methods. Add tenantId field to admin settings. Add DB upgrade. 2022-05-19 12:01:06 +03:00
Andrii Shvaika
0905aff7a0 Merge with develop/3.4 2022-05-17 17:00:25 +03:00
YevhenBondarenko
d5ef34cfb8 added additional info to Queue 2022-05-10 19:44:58 +02:00
YevhenBondarenko
dc3c2cfec2 merge with develop/3.4 2022-05-09 22:27:21 +02:00
Viacheslav Klimov
a85dcdbd3c Merge branch 'develop/3.4' into feature/2fa 
# Conflicts:
#	application/src/test/java/org/thingsboard/server/controller/AbstractWebTest.java
#	pom.xml
#	ui-ngx/src/assets/locale/locale.constant-en_US.json
 2022-05-06 11:42:10 +03:00
Viacheslav Klimov
bcc736991e Multiple used 2FA providers for account 2022-05-04 14:29:36 +03:00
YevhenBondarenko
9b19da096f removed max queues and max partitions per queue in tenant profile 2022-04-21 09:51:25 +02:00
YevhenBondarenko
4e4ac0012c used queueId instead of queueName in DeviceProfile and TbMsg 2022-04-13 21:55:03 +02:00
YevhenBondarenko
5c2ee4434c added consumerPerPartition to Queue entity 2022-04-04 17:06:40 +02:00
Viacheslav Klimov
6dc962882e Add more options for entity export and import settings; refactoring 2022-03-30 18:42:12 +03:00
Viacheslav Klimov
8eb68ff7a6 Revert changes to UserCredentials 2022-03-30 10:50:57 +03:00
Viacheslav Klimov
190430ffc4 Store 2FA account config in UserAuthSettings table 2022-03-29 19:18:00 +03:00
Viacheslav Klimov
95f41810ac Store 2FA account config is UserCredentials' additionalInfo 2022-03-29 11:32:27 +03:00
Viacheslav Klimov
50422363f0 Fix install script for fk_device_profile_ota_package constraint to work on repeated install 2022-03-28 14:26:56 +03:00
Viacheslav Klimov
4062dc70fb Initial export/import API for devices, device profiles, assets, rule chains, dashboards and customers 2022-03-16 15:03:55 +02:00
Viacheslav Klimov
5bf9107deb Merge branch 'master' into fix/ota-device-profile 
# Conflicts:
#	application/src/main/java/org/thingsboard/server/service/install/SqlDatabaseUpgradeService.java
 2022-03-02 17:32:41 +02:00
YevhenBondarenko
4512185cad created Queue entity, dao and ui 2022-02-18 16:41:24 +02:00
Andrii Shvaika
64d3f5c803 Remove redundant event types from cleanup procedure 2022-02-18 12:12:39 +02:00