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

603 Commits

Author SHA1 Message Date
YevhenBondarenko
dc3c2cfec2 merge with develop/3.4 2022-05-09 22:27:21 +02:00
Vladyslav_Prykhodko
2ff2cf7ad8 Merge remote-tracking branch 'klimov/feature/2fa' into feature/2fa 2022-05-06 17:53:38 +03:00
Vladyslav_Prykhodko
70cbe29a5d UI: Add 2FA profile setting form and added support Email 2FA provider 2022-05-06 17:52:22 +03: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
fe-dev
7ef7613939 UI: Refactoring queue 2022-05-05 11:02:45 +03:00
fe-dev
aba3974a77 UI: add queues to tenant profile 2022-04-29 19:18:11 +03:00
Vladyslav_Prykhodko
e29be2bded UI: Add 2FA general setting form 2022-04-29 18:12:35 +03:00
Vladyslav Prykhodko
2cb6b6d425 UI: Add page setting fb2 2022-04-28 23:03:37 +03:00
Igor Kulikov
aebe4c5b20 UI: Add GPIO widgets settings forms. 2022-04-28 16:38:58 +03:00
Andrew Shvayka
b9b813385f
Merge pull request #5671 from ViacheslavKlimov/smpp-sms-sender 
[3.4] SMPP SMS provider
 2022-04-28 12:03:57 +03:00
Viacheslav Klimov
0c15bc8b01 Merge remote-tracking branch 'origin/develop/3.4' into rate-limits-to-tenant-profile 2022-04-26 12:13:19 +03:00
Andrew Shvayka
84dc8881ba
Merge pull request #6240 from ShvaykaD/feature/6233 
[3.4] MQTT added ability to send PUBACK instead of close session on publish request data validation exception
 2022-04-25 13:03:46 +03:00
YevhenBondarenko
9b19da096f removed max queues and max partitions per queue in tenant profile 2022-04-21 09:51:25 +02:00
YevhenBondarenko
75e2b60eb8 Implemented isolated rule engine queue consumers 2022-04-19 23:02:33 +02:00
kalutkaz
21599386df Added icon to the JSON field + change validation logic in JSON directive 2022-04-19 16:21:10 +03:00
YevhenBondarenko
4e4ac0012c used queueId instead of queueName in DeviceProfile and TbMsg 2022-04-13 21:55:03 +02:00
Igor Kulikov
83da5520fc UI: Add settings forms for flot chart widgets. 2022-04-13 18:31:20 +03:00
Igor Kulikov
9a0363593d UI: Add digiatal gauge widget settings form 2022-04-09 15:13:47 +03:00
YevhenBondarenko
5c2ee4434c added consumerPerPartition to Queue entity 2022-04-04 17:06:40 +02:00
Igor Kulikov
ac56d06a55 UI: Settings forms for Timeseries table widget 2022-04-01 17:03:57 +03:00
Igor Kulikov
2422cd7882 Merge with develop/3.4 2022-03-30 11:14:54 +03:00
Igor Kulikov
3c55b25f44 Implement latest values support for timeseries widgets 2022-03-28 13:39:26 +03:00
Igor Kulikov
ec6a7ae5a4 Add dashboard and widget reference to widget settings form. Add default value method. 2022-03-22 17:13:21 +02:00
Igor Kulikov
c2f4724ca2 Ability to define component form for advanced widget settings and widget data keys 2022-03-19 10:08:53 +02:00
ShvaykaD
d4e6c013d2 added fixes after review 2022-03-14 13:01:46 +02:00
ShvaykaD
a26a4c4787 Feature/6233 implementation 2022-03-11 14:13:47 +02:00
Viacheslav Klimov
89c74cac8d Merge branch 'develop/3.4' into smpp-sms-sender 2022-03-02 17:39:41 +02:00
YevhenBondarenko
4512185cad created Queue entity, dao and ui 2022-02-18 16:41:24 +02:00
desoliture
e6053e8e7d Merge branch 'master' into alarmScheduleDynamicValues 
# Conflicts:
#	rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/profile/AlarmRuleState.java
#	ui-ngx/src/app/modules/home/components/home-components.module.ts
 2022-02-08 13:28:45 +02:00
ArtemDzhereleiko
85be2745c9 UI: Finish form, added responsive and locale translation 2022-02-07 12:06:51 +02:00
Volodymyr Babak
ffcc5be0ae Removed edge license and cloud endpoint from edge instance - refactoring edge ce 2022-02-04 17:34:46 +02:00
ArtemDzhereleiko
ddca2d318f Merge branch 'smpp-sms-sender' of git://github.com/ViacheslavKlimov/thingsboard into ViacheslavKlimov-smpp-sms-sender 2022-01-28 18:37:07 +02:00
Kalutka Zhenya
d05887baa4 Refactoring 2022-01-28 12:26:13 +02:00
Kalutka Zhenya
f17380597f Added main UI functional 2022-01-28 12:17:21 +02:00
Viacheslav Klimov
ffd2a02742 Tenant profile rate limits configuration UI refactoring 2022-01-21 11:37:53 +02:00
Viacheslav Klimov
cb071ac0a2 Merge remote-tracking branch 'origin/master' into rate-limits-to-tenant-profile 
# Conflicts:
#	application/src/main/java/org/thingsboard/server/service/install/update/DefaultDataUpdateService.java
#	application/src/main/java/org/thingsboard/server/service/telemetry/DefaultTelemetryWebSocketService.java
#	dao/src/main/java/org/thingsboard/server/dao/nosql/CassandraBufferedRateReadExecutor.java
#	dao/src/main/java/org/thingsboard/server/dao/util/AbstractBufferedRateExecutor.java
#	ui-ngx/src/app/modules/home/components/profile/tenant/default-tenant-profile-configuration.component.html
#	ui-ngx/src/app/modules/home/components/profile/tenant/default-tenant-profile-configuration.component.ts
#	ui-ngx/src/app/shared/models/tenant.model.ts
 2022-01-20 13:40:53 +02:00
Igor Kulikov
f4ba4b35d2
Merge pull request #5923 from ChantsovaEkaterina/improvement/public-api-asset-models 
[3.3.3] UI: asset models added to public api
 2022-01-20 12:01:58 +02:00
Igor Kulikov
1e70670af9 UI: Add new propagate alarm fields 2022-01-20 11:06:25 +02:00
Igor Kulikov
7e9d711f5c UI: Improve entity details usability 2022-01-19 17:02:18 +02:00
Chantsova Ekaterina
7d7d7f5d8e UI: asset models added to public api 2022-01-19 13:30:07 +02:00
Igor Kulikov
da4c742872 Update license year to 2022 2022-01-17 14:07:46 +02:00
Igor Kulikov
7f747fcf1a UI: Fix cycle dependency 2022-01-12 19:15:38 +02:00
Vladyslav_Prykhodko
a5aa5c999a Merge remote-tracking branch 'upstream/master' into feature/persistent-page-link 2022-01-12 17:51:27 +02:00
Igor Kulikov
a532d81702
Merge pull request #5805 from ArtemDzhereleiko/fixed/ota-updates-help-link 
[3.3.3] UI: Fixed help link for Add OTA updates
 2022-01-12 16:51:18 +02:00
Igor Kulikov
d741a3f948
Merge pull request #5797 from vvlladd28/feature/entity-details-page 
[3.3.3] UI: Created entity detail page
 2022-01-12 16:50:58 +02:00
Igor Kulikov
6306a27909
Merge pull request #5629 from ArtemDzhereleiko/control-widget/rpc-persistent-table 
[3.3.3] UI: New control widget Persistent table
 2022-01-12 16:30:29 +02:00
Vladyslav_Prykhodko
e4579d21d7 UI: Added persistent page link models and subscribe to router query params 2022-01-12 11:01:29 +02:00
Kalutka Zhenya
6875df9dab Added Dynamic value to alarm schedule 2022-01-10 16:49:15 +02:00
ArtemDzhereleiko
f8052e61c8 UI: Fixed help link for OTA updates 2021-12-31 13:20:40 +02:00
Andrew Shvayka
c875e36dc0
Merge pull request #5200 from van-vanich/command_in 
[3.3.3] Add operation IN and NOT_IN for String value type to key filter
 2021-12-30 13:05:39 +02:00