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

2226 Commits

Author SHA1 Message Date
Vladyslav_Prykhodko
708b7038d4 UI: Clear code 2022-05-18 17:53:54 +03:00
Vladyslav_Prykhodko
ebcfa52e8d UI: Refactoring 2022-05-18 17:49:25 +03:00
Vladyslav_Prykhodko
57924394db UI: Fixed config totp provider 2022-05-18 16:15:59 +03:00
Vladyslav_Prykhodko
1ab9ed2467 UI: Add 2FA login page 2022-05-18 15:44:42 +03:00
Vladyslav_Prykhodko
4e8be657ea UI: Add mail template - Email verification code; refactoring 2022-05-18 10:27:59 +03:00
Vladyslav_Prykhodko
bd43ebc204 UI: Refactoring sysadmin Two-factor authentication page 2022-05-17 18:06:35 +03:00
Vladyslav_Prykhodko
a80e83cb12 UI: Add security page for user 2022-05-17 17:38:30 +03:00
Vladyslav_Prykhodko
664d337a99 UI: Refactoring 2FA system admin settings 2022-05-16 17:21:04 +03: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
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
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
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
Andrii Shvaika
9dacc93c2d Merge remote-tracking branch 'origin/master' into develop/3.4 2022-04-20 11:49:21 +03:00
Igor Kulikov
9a83a4ae47
Merge pull request #6350 from ArtemDzhereleiko/bug-fix/candeactivate-shows-double-time 
[3.4] UI: Fixed show double dialog with redirect
 2022-04-05 11:16:57 +03:00
fe-dev
53e1654651 Fixed double time dialog with redirect 2022-03-31 19:49:41 +03:00
fe-dev
b774db583c Fixed double time dialog with redirect 2022-03-31 16:24:11 +03:00
Vladyslav Prykhodko
87fed7d235 UI: Fixed generate types and build in Windows OS 2022-03-30 13:31:45 +03:00
Igor Kulikov
739b21bab2 Merge branch 'develop/3.4' into feature/timeseries-widget-latest-values 2022-03-29 16:24:06 +03:00
Igor Kulikov
c7e75eb5b8 UI: Fix legend style 2022-03-29 16:23:39 +03:00
Igor Kulikov
c35d60abd9 Add support of latest values for timeseries map widgets 2022-03-28 16:25:07 +03:00
Igor Kulikov
1b95f32b19 Merge branch 'develop/3.4' into feature/timeseries-widget-latest-values 2022-03-28 13:40:46 +03:00
Igor Kulikov
3c55b25f44 Implement latest values support for timeseries widgets 2022-03-28 13:39:26 +03:00
Igor Kulikov
94b648d7fd Merge branch 'master' into develop/3.4 2022-03-22 12:03:56 +02:00
Igor Kulikov
1b0b8e4e19 Merge branch 'master' into develop/3.4 2022-03-22 11:56:44 +02:00
Vladyslav Prykhodko
697965d3ca UI: Fixed build, incorrect github URL 2022-03-21 22:04:05 +02:00
Igor Kulikov
d9b9d44e39 UI: Fix assets page permissions for customer 2022-03-19 10:15:50 +02:00
Igor Kulikov
d7efbd6eba Merge with master 2022-03-15 12:42:18 +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
Igor Kulikov
51fd7e8523
Merge pull request #5984 from T5750/master 
Update locale.constant-zh_CN.json
 2022-03-08 15:16:23 +02:00
Igor Kulikov
53323077ae Update delete device profile warning text to mention associated OTA updates 2022-03-07 14:33:42 +02:00
Viacheslav Klimov
066f40c63f Test for SmppSmsSender 2022-03-03 21:36:40 +02:00
Igor Kulikov
0266a9703c
Merge pull request #6128 from ArtemDzhereleiko/bug-fix/ota-autocomplete/default-type-value 
[3.3.4] UI: Added default OtaUpdateType
 2022-03-03 18:40:46 +02:00
Viacheslav Klimov
89c74cac8d Merge branch 'develop/3.4' into smpp-sms-sender 2022-03-02 17:39:41 +02:00
Igor Kulikov
a0bbaf6f7d Update import/export service 2022-03-01 12:28:20 +02:00
Igor Kulikov
603abff599 Handle old rule chain connections while rule chain import 2022-02-28 18:45:33 +02:00
Igor Kulikov
dabd25e760 Version set to 3.4.0-SNAPSHOT 2022-02-21 12:19:59 +02:00
ArtemDzhereleiko
c438de58fa UI: Added default OtaUpdateType 2022-02-17 19:32:13 +02:00
Andrew Shvayka
282a6bc990
Merge pull request #6035 from volodymyr-babak/edge-ce-refactoring 
[3.3.4] Edge Community Edition support
 2022-02-15 17:29:01 +02:00
Igor Kulikov
8a868c1e3d UI: Improve popover to not close when top overlay is clicked. 2022-02-15 17:06:51 +02:00
Igor Kulikov
5f1a5aeb2d
Merge pull request #6091 from vvlladd28/bug/image-map/load-background-image 
[3.3.4] UI: Fixed image map widget not updated image after firt load empty data
 2022-02-11 19:08:48 +02:00
Igor Kulikov
8e51f5530a
Merge pull request #6003 from pinkevmladchy/pinkevlmladchy/Alarms-table-widget-allows-alarms-to-be-cleared-when-Allow-alarms-clear-disabled 
[3.3.4] UI: Alarms table widget allows alarms to be cleared when "Allow alarms clear" is disabled
 2022-02-11 19:06:15 +02:00
Vladyslav_Prykhodko
ca7da9e396 UI: Fixed image map widget - incorrect process first empty data 2022-02-11 16:05:46 +02:00
ArtemDzhereleiko
6a91c6418d UI: decode base64 and return normal value 2022-02-11 15:38:12 +02:00
Volodymyr Babak
95f6fcfe33 Merge branch 'master' of github.com:thingsboard/thingsboard into edge-ce-refactoring 2022-02-10 20:13:12 +02:00
Igor Kulikov
9cf12cbdfb UI: Map widgets - Fixed autozoom in edit mode. 2022-02-10 16:43:06 +02:00
Igor Kulikov
8bca3b4fce Merge branch 'feature/map/circle' of https://github.com/vvlladd28/thingsboard into vvlladd28-feature/map/circle 2022-02-10 15:41:45 +02:00