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

938 Commits

Author SHA1 Message Date
Igor Kulikov
c9e3a62f6e Merge with master 2020-04-14 11:47:14 +03:00
Vladyslav
2a2a0f9caf
Added new settings to web-camera input widget (#2616) 2020-04-14 11:42:37 +03:00
Igor Kulikov
1b0fabb7ab Merge branch 'master' into develop/3.0 2020-04-10 15:07:44 +03:00
ShvaykaD
a3a17dc828
add sendActivationEmail as request param (default -> true) to activate method in auth controller and login service (#2597) 2020-04-10 15:06:44 +03:00
Vladyslav
2a1c55f022
[2.5] Revert change JSON form (#2598) 
* Revert change

* Revert file
 2020-04-10 15:04:55 +03:00
Vladyslav
39ba550d41
Fix not add entityLabel for header action open dashboard state (#2601) 2020-04-10 15:04:45 +03:00
Vladyslav
e8fffdbc4d
Fix manage dashboard states for Safari (#2602) 2020-04-10 15:04:34 +03:00
Vladyslav
3881dc8423
Add new alias Current tenant (#2596) 2020-04-10 15:04:24 +03:00
VoBa
fcf436c620
[2.5] Added possibility to login by url params (#2581) 
* Added possibility to login by url params

* Changes after code review
 2020-04-09 18:40:34 +03:00
Igor Kulikov
7e8c90ec6d Merge branch 'master' into develop/3.0 2020-04-01 09:48:16 +03:00
Vladyslav
fef74373e0
Fix timeseries table layout (#2569) 2020-04-01 09:42:03 +03:00
Vladyslav_Prykhodko
903e459851 The map was not loaded with empty entity(not set longitude/latitude) 2020-03-28 02:27:18 +02:00
Igor Kulikov
1077def2f5 Merge branch 'master' into develop/3.0 2020-03-26 14:51:36 +02:00
Vladyslav
5cf35dae94
Add delete translate and change setting name (#2546) 2020-03-26 14:47:24 +02:00
Igor Kulikov
42ef20114d Merge branch 'master' into develop/3.0 2020-03-24 15:55:37 +02:00
Chantsova Ekaterina
cb2278ed56
Remove empty strings from Spanish translations (#2539) 2020-03-24 15:53:18 +02:00
Chantsova Ekaterina
b780b16c28
Remove empty strings from Spanish translations (#2541) 2020-03-24 15:52:08 +02:00
Oleg Kolesnik
08c8d93568
UI:fix. Map widget2 (#2413) 
preserves previous data on map if no data for current date range received
 2020-03-24 15:50:52 +02:00
ArtemHalushko
42c52bfdba
Map/3.0 (#2535) 
* add base map infrastructure

* add leaflet css

* add tencent map

* add google maps support

* added image map support

* refactor schemes

* here maps support && WIP on markers

* add simple marker suppor

* data update & polyline support

* map bouds support

* add some settings support

* add map provider select to settings

* labels support

* WIP on trip animation widget

* WIP on history control and route interpolation

* trip-animation map provider & custom markers

* comleted track marker & history controls

* add license headers

* label fix & tooltips support

* WIP on polygons

* marker dropping support

* add polygon support

* add label to trip animation

* WIP on tooltips

* lint anf typed leaflet AddMarker

* some typing and poly improvements

* add typing

* add marker creation

* update proxy

* save position fix

Co-authored-by: Artem Halushko <ahalushko@thingboards.io>
Co-authored-by: Adsumus <artemtv42@gmail.com>
 2020-03-20 16:57:35 +02:00
Igor Kulikov
c55ddd9f71 Merge with master 2020-03-20 16:21:19 +02:00
Vladyslav
2f8ea30846
Add init value 2020-03-11 16:53:05 +02:00
Vladyslav
c4b11f9857
Add default value 2020-03-11 16:45:25 +02:00
Vladyslav_Prykhodko
49be7d1ec3 Add support ticks to digital gauge 2020-03-11 15:16:17 +02:00
Igor Kulikov
957a0c9e61 Merge with master 2020-03-11 14:14:46 +02:00
Vladyslav
29429cb0c4 Fix create color range 2020-03-05 13:33:02 +02:00
Igor Kulikov
ecda407012 Merge branch 'master' into develop/3.0 2020-03-04 15:48:48 +02:00
Yevhen Bondarenko
244bcc7822
fix tls version (#2450) 2020-03-04 15:47:49 +02:00
Igor Kulikov
80fae20d21 Merge branch 'master' into develop/3.0 2020-03-04 10:12:01 +02:00
Vladyslav
90ae060cbe
Add gauge color limit (#2479) 2020-03-04 10:09:59 +02:00
Igor Kulikov
25ba81394d Merge branch 'master' of github.com:thingsboard/thingsboard into develop/3.0 2020-03-02 17:50:52 +02:00
Vladyslav
0ed0725643
[2.5] Feature add support json[ui] (#2446) 
* Merge with master

* Refactoring code

* Add license header

Co-authored-by: Andrew Shvayka <ashvayka@thingsboard.io>
 2020-03-02 17:50:37 +02:00
Igor Kulikov
e9b2c3107e Merge with master 2020-02-20 12:33:36 +02:00
Chantsova Ekaterina
9f0871af7f
Update field alignment on init, not only on resize; prevent dispaying in a row, when fields should be displayed in a column (#2434) 2020-02-20 10:17:35 +02:00
Igor Kulikov
c17b8cd96c Fix: Add missing groupId to json forms builder function. 2020-02-20 10:15:57 +02:00
Igor Kulikov
ea25db121b Merge branch 'bugs/translate_lv_LV' of https://github.com/vvlladd28/thingsboard into vvlladd28-bugs/translate_lv_LV 2020-02-19 17:19:53 +02:00
Chantsova Ekaterina
37173bba10
Features/flot thresholds (#2412) 
* Thresholds draft

* Make generated thresholds unique

* Code refactoring
 2020-02-19 17:12:22 +02:00
Igor Kulikov
01108b89a1 Merge branch 'master' of github.com:thingsboard/thingsboard 2020-02-19 17:08:57 +02:00
Igor Kulikov
9d212bf39e fixed: infinite loop caused by default md-dialog resize function in Safari 2020-02-19 17:08:43 +02:00
Vladyslav_Prykhodko
284638e093 Fix translate language Latvian 2020-02-19 16:48:25 +02:00
Dmitriy Mushat
d5c3a9cc5d
fixed: focus on fullscreen for react schema grouped forms (#2400) 2020-02-19 16:14:18 +02:00
Chantsova Ekaterina
1540f08695
Add ability to use custom translations and labels containing apostrophe in table default sort order (#2397) 2020-02-19 16:10:54 +02:00
Igor Kulikov
8ed03b22bd Fix conflicts. Store locale translations only in default en_US 2020-02-19 16:06:19 +02:00
Vladyslav
2ea3b0bdaf
Add service methods to claim a device (#2391) 2020-02-19 15:50:19 +02:00
Igor Kulikov
0d6cde3ff8 Fix conflicts 2020-02-19 15:35:32 +02:00
DudnikMaksym
308fa1fd8c
UI: (#2372) 
Added fetchLastLevelOnly checkbox to alias query filter.
Updated ENG, RUS, UKR locales.
Updated getRelatedEntities and (constructRelatedEntitiesSearchQuery) function(s) by adding fetchLastLevelOnly attribute.
 2020-02-19 15:24:02 +02:00
Igor Kulikov
7c9f8d755f
Dmitriymush table columns assignment gateway (#2429) 
* added: import of gateway value

* expressions changed

* fixed refactor rename

* changed key and value for translating

* feature/: description added to the list of columns assingment and could be imported/exported from now

* Delete package-lock.json

* Revert package-lock

Co-authored-by: Dmitriy Mushat <54553744+Dmitriymush@users.noreply.github.com>
 2020-02-19 15:19:48 +02:00
Dmitriy Mushat
e4d701598b
Scroll timseries table (#2360) 
* fixed: md-table-container overflox-x changed to visible

* fixed: md-table-container overflox-x changed to visible

* fixed: md-table-container overflox-x changed to visible

* fixed: md-tabs min-height is set to 0

* fixed: md-tabs min-height is set to 0

* fixed: 1) md-table-container overflox-x changed to visible; 2) md-tabs min-height is set to 0

* changed specificity for overriding
 2020-02-19 15:03:45 +02:00
zbcumt
07eaf4dd77
Update tencent-map.js (#2329) 
Solve the problem that the polygonOpacity attribute does not work in Tencent map.
 2020-02-19 14:49:02 +02:00
Mirco Pizzichini
9d6b1c5d7a
Add option to set bar alignment in 'flot-bar-widget' (#2320) 2020-02-19 14:47:56 +02:00
YevhenBondarenko
ec4362a8d2 added list with tls versions for outgoing-mail-settings 2020-02-17 18:12:52 +02:00