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

4006 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrii Shvaika
6e82f4c8f0 Merge branch 'develop/2.5' 2020-04-28 14:09:36 +03:00
Andrii Shvaika
8abb718349 Merge with develop 2020-04-28 14:09:20 +03:00
Artem Halushko
c627e79947 small css fix 2020-04-28 13:48:55 +03:00
Artem Halushko
d56a3abaca saveEntity && minor fixes 2020-04-28 13:31:47 +03:00
Artem Halushko
77ec391185 merge fixes 2020-04-28 12:13:05 +03:00
Artem Halushko
dd98d761df Merge branch 'develop/3.0' of https://github.com/thingsboard/thingsboard into map/3.0 2020-04-28 12:07:46 +03:00
Vladyslav
a36de5d62c
Add gateway type and clear import (#2677) 2020-04-28 12:04:21 +03:00
Artem Halushko
2bd1a796e0 image map alias image support 2020-04-28 11:57:09 +03:00
Artem Halushko
0ce514b58c wip on image-map fixes 2020-04-27 19:20:23 +03:00
Igor Kulikov
8cfe4ef44f Merge branch 'develop/3.0' of github.com:thingsboard/thingsboard into develop/3.0 2020-04-27 18:37:36 +03:00
Igor Kulikov
2fc25ad33d Remove redudant css import 2020-04-27 18:37:26 +03:00
Artem Halushko
4f8942b112 update map bundles 2020-04-27 16:10:46 +03:00
Artem Halushko
26e5f69b32 map fixes 2020-04-27 14:46:43 +03:00
Andrii Shvaika
2728c7cd29 Merge remote-tracking branch 'origin/master' into develop/3.0 2020-04-27 14:45:18 +03:00
Andrii Shvaika
86f21023fe Improved PartitionService and fixed startup order in docker-compose.yml 2020-04-27 14:44:29 +03:00
YevhenBondarenko
ba140644c7 added Azure Service Bus queue settings 2020-04-27 11:16:53 +03:00
YevhenBondarenko
30e5af3627 added zookeeper configs to coap and http 2020-04-27 11:16:12 +03:00
YevhenBondarenko
5b8122e1b3 added <logger name="com.microsoft.azure.servicebus.primitives.CoreMessageReceiver" level="OFF" /> 2020-04-27 11:16:12 +03:00
YevhenBondarenko
4aa225baba added exclusions to azure dependency, and added logger level OFF to CoreMessageReceiver 2020-04-27 11:16:12 +03:00
Igor Kulikov
0289b0c1a2 UI: Get rid of 'multiple directives with 'exportAs' set to ngForm' 2020-04-27 10:39:18 +03:00
Igor Kulikov
3d71a5ba0e Update rule nodes ui 2020-04-27 09:46:39 +03:00
Igor Kulikov
77c6babff6 Fix tenant isolated checkbox fields 2020-04-27 09:43:33 +03:00
Vladyslav
e3e860fe3f
[3.0] Improvement code style (#2670) 
* Clear code and styles

* Clear import
 2020-04-27 09:27:14 +03:00
Vladyslav
e175b57110
[3.0] Entity list not correct find index for model (#2668) 
* Entity list not correct find index for model

* Clear import

* Revert change

* Revert change
 2020-04-27 09:26:17 +03:00
Andrii Shvaika
df3614f9e4 Fix Alarm repository. Add queue type list select. 2020-04-27 01:12:23 +03:00
Andrii Shvaika
91aa7a2700 Merge with master (2.5) 2020-04-27 00:40:21 +03:00
Adsumus
852d4ec954 WIP on es support 2020-04-26 22:50:26 +03:00
Adsumus
3fe468b276 wip on ie 11 fixes 2020-04-26 19:44:59 +03:00
Andrew Shvayka
f07d9c6440
Merge pull request #2667 from thingsboard/revert-2663-develop/3.0-merge 
Revert "Merge with master. AlarmRepository.findAlarms is failing"
 2020-04-24 19:43:49 +03:00
Andrew Shvayka
38ebbe2576 Revert "Merge with master. AlarmRepository.findAlarms is failing (#2663)" 
This reverts commit 2c02406ee5f41b08e655b634dd9871403f67149d.
 2020-04-24 19:42:32 +03:00
Andrii Shvaika
a779839081 Fixed transport 2020-04-24 19:16:25 +03:00
Igor Kulikov
99ef1cba28 IE11 fixes 2020-04-24 18:36:46 +03:00
Igor Kulikov
916579cf05 Fix bundles budget 2020-04-24 17:21:29 +03:00
Adsumus
9e866b68e8 public api import fix 2020-04-24 17:14:30 +03:00
Igor Kulikov
19601e40ed Update rule node core config. 2020-04-24 16:26:58 +03:00
Vladyslav
9c5ad303cd
Add support Safari and improvement view (#2662) 2020-04-24 15:49:53 +03:00
ArtemHalushko
241edc1d2b
Map/3.0 (#2664) 
* 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

* add bounds padding

* update map widget bendle && bugfixes

* update marker placement widget

* add licenses

* reomove log

* fix sizes

* entity and map fixes

* Fix tile server support  form OSM and zoom level fix

* add support custom actions

* map fixes

Co-authored-by: Artem Halushko <ahalushko@thingboards.io>
Co-authored-by: Adsumus <artemtv42@gmail.com>
 2020-04-24 15:48:00 +03:00
Andrew Shvayka
2c02406ee5
Merge with master. AlarmRepository.findAlarms is failing (#2663) 
* Merge with master. AlarmRepository.findAlarms is failing

* Fix Alarm repository. Add queue type list select.

Co-authored-by: Igor Kulikov <ikulikov@thingsboard.io>
 2020-04-24 15:44:31 +03:00
Andrii Shvaika
b5bedbfdf6 Refactoring of Docker Compose 2020-04-24 14:54:25 +03:00
Andrii Shvaika
a91a69c57f Fixed Docker Compose 2020-04-24 13:55:06 +03:00
Andrii Shvaika
9b0e92cac3 New Default Dashboard and Rule Chains 2020-04-24 12:46:48 +03:00
Andrii Shvaika
1510fe8448 Default Dashboard and Rule Chain 2020-04-24 12:22:34 +03:00
Adsumus
f9574d7041 Merge branch 'develop/3.0' of https://github.com/thingsboard/thingsboard into map/3.0 2020-04-24 11:22:45 +03:00
Adsumus
8979a511a3 map fixes 2020-04-24 11:22:26 +03:00
Igor Kulikov
a868f0064b Update MSA docker readme 2020-04-23 15:55:03 +03:00
Andrii Shvaika
6b212bb5d7 Merge branch 'master' of github.com:thingsboard/thingsboard 2020-04-23 14:11:08 +03:00
Andrii Shvaika
cf5aa84e67 Changed default partition sizes 2020-04-23 14:10:45 +03:00
Igor Kulikov
4f92af63d5 Fix: reset entity table sort and pagination on entities specific filtering changes 2020-04-23 13:40:02 +03:00
Igor Kulikov
00e7779f71 Minor UI fixes 2020-04-23 13:27:21 +03:00
Dmytro Shvaika
9a052ef0bc fix typo in EventEntity class 2020-04-23 13:15:55 +03:00