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

262 Commits

Author SHA1 Message Date
Volodymyr Babak
e96452cdcf Merge remote-tracking branch 'upstream/develop/3.3' into develop/3.3-edge 2021-03-03 15:18:38 +02:00
Vladyslav
d3d6331e15
Merge pull request #4133 from thingsboard/lwm2m_create_device 
Lwm2m: front add validator json for security config value
 2021-02-23 16:39:39 +02:00
Volodymyr Babak
10d3dd01bb Merge branch 'develop/3.3' of github.com:thingsboard/thingsboard into develop/3.3-edge 2021-02-22 19:08:30 +02:00
Andrii Shvaika
4b43cd75f7 Merge branch 'master' into develop/3.3 2021-02-22 13:29:08 +02:00
nickAS21
2452aefff9 Lwm2m: front add validator json for security config value 2021-02-19 23:15:20 +02:00
Vladyslav_Prykhodko
5e990da0ba UI: Refactoring alarm-rule inherit 2021-02-16 17:04:23 +02:00
Volodymyr Babak
b58c831343 Merge remote-tracking branch 'upstream/develop/3.3' into develop/3.3-edge 2021-02-12 13:10:06 +02:00
Igor Kulikov
67aba9e4b1 Merge branch 'master' into develop/3.3 2021-02-11 11:05:10 +02:00
Igor Kulikov
008c2c5d5f
Merge pull request #4082 from ChantsovaEkaterina/improvement/delete-unused-translations 
Delete unused translations
 2021-02-11 08:57:30 +02:00
Chantsova Ekaterina
bf21ee3d67 Delete unused translations 2021-02-10 19:07:17 +02:00
nickAS21
ade09738eb Lwm2m: back: add key to profile - refactoring-light start2 2021-02-08 17:21:36 +02:00
nickAS21
c230e3fdcd Lwm2m: front: add key to profile - refactoring-light start2 2021-02-08 17:21:36 +02:00
nickAS21
793e43e9a8 Lwm2m: front: add key to profile - refactoring-light start 2021-02-08 17:21:36 +02:00
Vladyslav_Prykhodko
9b4309c61a Merge remote-tracking branch 'upstream/master' into develop/3.3 2021-02-08 10:28:55 +02:00
Igor Kulikov
3ea5314495 Home dashboard feature. Enable tooltips for flot chars in mobile mode. Disable widgets interaction in widget library and when adding widget to dashboard. 2021-02-03 12:21:55 +02:00
Javier Núñez
1cd4f950b6 Sync spanish translations, add device profile, tenant profiles, oauth, API usage 2021-02-01 12:05:07 +01:00
PetrTodorov
e4fe3f399b Updated Czech translation 2021-01-28 15:11:50 +01:00
Volodymyr Babak
499eb1aef4 Merge remote-tracking branch 'upstream/develop/3.3' into develop/3.3-edge 2021-01-27 15:12:58 +02:00
Vladyslav_Prykhodko
d5c3f4c997 Merge master in develop/3.3 2021-01-27 13:31:46 +02:00
VoBa
ea7411348b
Merge pull request #76 from deaflynx/develop/3.3-edge 
Develop/3.3 edge Show Edge Info for customer scope, get label, fix import edges
 2021-01-26 18:57:55 +02:00
Volodymyr Babak
555778bf7d Merge remote-tracking branch 'origin/develop/2.6-edge' into develop/3.3-edge 2021-01-22 20:54:40 +02:00
Andrii Shvaika
d06ce5555c Simplified implementation of the overwrite activity time flag 2021-01-22 16:06:48 +02:00
Andrii Shvaika
5a5f29610f Merge branch 'fix/lastActivityTime' of https://github.com/zbeacon/thingsboard into zbeacon-fix/lastActivityTime 2021-01-22 15:24:12 +02:00
Igor Kulikov
45192fc2f0
Merge pull request #3974 from lsyer/master 
Update some translations: locale.constant-zh_CN.json
 2021-01-21 18:38:14 +02:00
Igor Kulikov
9b8cf75c1a UI: Refactor dashboard page. Add ability to open dashboard state in separate dialog. 2021-01-21 18:03:36 +02:00
Artem Babak
5ef3abb077 Merged develop/3.3-edge with volodymyr-babak/develop/3.3 2021-01-21 15:12:36 +02:00
Artem Babak
90802fa676 Merge remote-tracking branch 'deaflynx/develop/3.3-edge' into develop/3.3-edge 2021-01-21 09:01:19 +02:00
lsyer
03b5ca3571 Update some translations: locale.constant-zh_CN.json 2021-01-21 11:05:27 +08:00
nickAS21
e6d4e91e25 Lwm2m: front: refactoring n number validators 2021-01-20 19:17:13 +02:00
nickAS21
cfa9a5778a Lwm2m: front: refactoring 2021-01-19 16:24:58 +02:00
lsyer
0f24e00fea Merge branch 'master' of https://github.com/thingsboard/thingsboard 2021-01-17 14:58:07 +08:00
Volodymyr Babak
bc3008ad7b Merge remote-tracking branch 'upstream/master' into develop/3.3-edge 2021-01-17 01:47:49 +02:00
zbeacon
1bdd7d69bf Fix for lastActivityTime in devices created by gateway 2021-01-15 18:55:35 +02:00
Volodymyr Babak
57bf6c0903 Code review updates 2021-01-15 17:56:41 +02:00
Artem Babak
c90eb8bb63 ES,DE,FR locale update for Edge 2021-01-15 06:02:34 +02:00
Artem Babak
51bc0a2f17 US locale update 2021-01-15 05:29:42 +02:00
Vladyslav_Prykhodko
149a1dc990 UI: Added a new settings "Open in a new browser tab" in the widget action "Navigate to other dashboard" 2021-01-14 13:17:23 +02:00
Artem Babak
4b94ffe5b5 Show edge info for Tenant in edgeScope === 'customer' 2021-01-13 16:16:01 +02:00
Artem Babak
e6b156df63 Hide edge management for customers if Edge is disabled 2021-01-13 15:34:00 +02:00
lsyer
fb193bf66e Update locale.constant-zh_CN.json 2021-01-12 15:20:01 +08:00
deaflynx
746d17185c Edge widget message warning 2021-01-04 14:57:32 +02:00
deaflynx
c519936ae9 Edge widget refactored 2021-01-04 14:28:42 +02:00
deaflynx
48fd55a6cb Edge widget customerTitle refactored 2021-01-04 07:22:32 +02:00
lsyer
eccd9d2a0d Update 'locale.constant-zh_CN.json' 2020-12-29 17:19:07 +08:00
Volodymyr Babak
78a4710c66 Merge remote-tracking branch 'origin/develop/2.6-edge' into develop/3.3-edge 2020-12-29 11:18:26 +02:00
Igor Kulikov
6409383dd4
Merge pull request #3900 from shga89/patch-6 
Improving Korean translations.
 2020-12-28 19:10:06 +02:00
Seok Hyun, Ga
41d081bf7f
Update locale.constant-ko_KR.json 
Add new items which are added in new version.
Add new translations which was not translated yet.
 2020-12-27 22:54:23 +09:00
Seok Hyun, Ga
f0b791e085
Update locale.constant-en_US.json 
Since “Hangul(한글)” means letters, the expression “Korean(한국어)” is more appropriate.
 2020-12-27 22:52:12 +09:00
Viacheslav Kukhtyn
f1fb0cedae Add audit log details for telemetry deleted and telemetry updated types 2020-12-25 18:24:31 +02:00
Volodymyr Babak
b2de96fbff Merge remote-tracking branch 'upstream/develop/3.3' into develop/3.3-edge 2020-12-24 15:13:57 +02:00