Igor Kulikov
29a6e7d91c
Replace Velocity with Freemarker
2020-05-15 12:21:50 +03:00
Igor Kulikov
3fd0c5e0a3
Update js-executor dependencies
2020-05-15 10:29:04 +03:00
Igor Kulikov
36457f8b13
Update mqtt paho client version. Completely remove old ui.
2020-05-15 10:23:45 +03:00
Igor Kulikov
eea4c5185c
Improve json content component
2020-05-14 19:49:44 +03:00
Igor Kulikov
4718eac882
Improve json content component
2020-05-14 17:21:14 +03:00
Igor Kulikov
096b2944d0
Improve kv-map component disable state handling
2020-05-13 17:06:15 +03:00
Igor Kulikov
359723b05c
Merge pull request #2765 from vvlladd28/bug/3.0/map/minor-fix
...
[3.0] Minor improvement for the map widgets
2020-05-13 09:51:31 +03:00
Vladyslav_Prykhodko
9200018e6a
Add default value
2020-05-12 23:54:06 +03:00
Vladyslav_Prykhodko
2f622a2e72
Fix update tooltip polygon
2020-05-12 23:45:18 +03:00
Igor Kulikov
597231c749
Merge pull request #2764 from vvlladd28/bug/3.0/tooltip
...
[3.0] Fix tooltip data
2020-05-12 18:17:06 +03:00
Vladyslav_Prykhodko
1b9cf7c527
Fix tooltip data
2020-05-12 17:24:36 +03:00
Igor Kulikov
6bad93042d
Merge pull request #2763 from thingsboard/develop/3.0
...
Develop/3.0
2020-05-12 15:21:15 +03:00
Igor Kulikov
cdec671b3c
Revert "Develop/3.0 ( #2760 )" ( #2762 )
...
This reverts commit 72c7002f619263d1ef1170eaac8105182248cca8.
2020-05-12 15:20:20 +03:00
Igor Kulikov
72c7002f61
Develop/3.0 ( #2760 )
...
* save position fix
* [3.0] Add support ticks to digital gauge (#2508 )
* Add support ticks to digital gauge
* Add link code
* [3.0] Add inputs widgets (#2526 )
* Add location widget
* Fix translate, clear code
* Fix translate
* Add date input widgets
* Add image input widgets
* Init web camera input widget
* Add functional web camera input widget
* Add styles to webcamera iputs widget
* Add link code
* 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>
* Fix UI budget
* add bounds padding
* update map widget bendle && bugfixes
* update marker placement widget
* add licenses
* reomove log
* Update packages
* fix sizes
* Map/3.0 (#2542 )
* 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
Co-authored-by: Artem Halushko <ahalushko@thingboards.io>
Co-authored-by: Adsumus <artemtv42@gmail.com>
* Update node and npm versions
* Minor fixes
* Update license
* entity and map fixes
* Map/3.0 (#2543 )
* 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
Co-authored-by: Artem Halushko <ahalushko@thingboards.io>
Co-authored-by: Adsumus <artemtv42@gmail.com>
* Page not found rouring
* Fix tile server support form OSM and zoom level fix
* Map/3.0 (#2544 )
* 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
Co-authored-by: Artem Halushko <ahalushko@thingboards.io>
Co-authored-by: Adsumus <artemtv42@gmail.com>
* Remove empty strings from Spanish translations (#2541 )
* Remove empty string from Spanish translation
* Map widget types improvements
* Map widget types improvements
* Metadata improvements
* Update rule node config ui
* UI: Fix toast target for editor components
* UI: fix routing
* Fix Map fitBounds method
* [3.0] Add gateway widget (#2547 )
* Create gateway widget
* Refacoring and add styled
* Update bundle
* Add model and refactoring
* [3.0] New samples for custom action with html (#2549 )
* Update example custom action to new Angular
* Save settings to change type custom action
* Revert change
* UI: Import/export code improvements
* UI: minor improvements
* UI: Theme improvement
* Fix JSON object edit component
* Update styles
* [3.0] [WIP] Minor fixed to style (#2562 )
* Added support Safari browser (not support DragEvent)
* Imporovement style login page
* Change flex responsive API breakpoint
* Add support long name menu item
* Home page add link to page
* Revert .mat-icon vertical-align to middle
* Revert .mat-icon vertical-align to middle
* Fix value input style
* Headline styles
* [3.0] Minor fix (#2571 )
* Fix breadcrumb and breakroint api to header
* Fix layout profile
* Clear code and fix layout (admin and profile pages)
* Improvements import
* Fix entity table
* Fix rulenode tooltip header
* Clear import-export (Safari)
* Entities table actions improvement
* Improvement dialog and component style
* Ace based editors disabled state handling
* Improvement view on mobile device
* Fix widget library details
* Fix revert thingsboard.yml
* Add entity title function
* Remove unnecessary widgets bundle type
* UI: Entity table models improvements
* UI: dynamic annotation for abstract entity component
* UI: Entities table model improvements.
* add sendActivationEmail as request param (default -> true) to activate method in auth controller and login service
* UI: Model improvement, new entity table methods
* [3.0] Improvements import and tables for mobile view (#2594 )
* Fix width table in Safari
* Improvement in mobile view
* Improvement attributes-table from mobile view
* Relation-table improvement for mobile view
* Improvement entity-table from mobile view
* UI: Attribute table disable edit for client side attributes
* [3.0] Added possibility to login by url params (#2592 )
* Added possibility to login by url params
* Fixes after code review
* UI: Fix login url params
* UI: Fix assets import columns
* fix activate method for new UI
* UI: Fixed add user dialog
* Add new alias Current Tenant (#2604 )
* fix error create dialog new dashboard (#2606 )
* Minor fixes
* UI: Fix scss import to relative path
* UI: Fix scss import to relative path
* UI: Fix scss import to relative path
* UI: Revert entity.component annotation to directive
* UI: Minor improvements
* UI: Breadcrumb component improvements
* UI: Minor improvements
* UI: Improve page link default search function
* [3.0] Minor fix (#2615 )
* Improvement tenant setting from mobile view
* Improvement timewindow setting from mobile view
* Improvement entity-view setting from mobile view
* Update license header and license config
* UI: Entity details panel improvements
* UI: Entities table improvements
* UI: Json React Form - textarea height fix
* UI: Entity autocomplete error handling
* UI: Entity autocomplete error handling
* Update rule nodes ui
* Rule node models improvements
* Add utils to public-api
* UI: Rule node ui external modules
* UI: Rule nodes ui api
* add support custom actions
* Cleanup
* [3.0] minor fix (#2645 )
* Improvement layout-setting setting from mobile/tablet view
* Fix EntityView not show type in translate
* Clear code and update tablet/mobile view
* Update tablet/mobile view
* Fix hide title and text-overflow
* Add support Safari
* Minor fix
* Update package.json versions
* Angular update
* Angular update
* Fix issues after angular update
* Update rule nodes UI
* Fix toolbar and share buttons (#2646 )
* Change resize events to observer (#2652 )
* Remove javascript-detect-element-resize
* Update package.lock
* Improvement resize (#2654 )
* Fix typo
* UI: Minor fixes
* Minor UI fixes
* Fix: reset entity table sort and pagination on entities specific filtering changes
* Update MSA docker readme
* map fixes
* 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>
* 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>
* Add support Safari and improvement view (#2662 )
* Update rule node core config.
* public api import fix
* Fix bundles budget
* IE11 fixes
* Revert "Merge with master. AlarmRepository.findAlarms is failing (#2663 )"
This reverts commit 2c02406ee5f41b08e655b634dd9871403f67149d.
* wip on ie 11 fixes
* WIP on es support
* Fix Alarm repository. Add queue type list select.
* [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
* [3.0] Improvement code style (#2670 )
* Clear code and styles
* Clear import
* Fix tenant isolated checkbox fields
* Update rule nodes ui
* UI: Get rid of 'multiple directives with 'exportAs' set to ngForm'
* map fixes
* update map bundles
* Remove redudant css import
* wip on image-map fixes
* image map alias image support
* Add gateway type and clear import (#2677 )
* merge fixes
* saveEntity && minor fixes
* small css fix
* Minor fixes
* Add new widgetContext field currentUser
* entity save fix #2
* entity save fix#3
* Update dashboard (#2684 )
* fix some ds problems
* UI: Migrate gateway widgets and gateways demo dashboard to 3.0
* tile layers and locations set fixes
* input bundles updates
* Update default dashboard thermostats (#2689 )
* Dashboard page fixes and improvements
* Clear code (#2692 )
* Improve database migration - create indexes after inserts
* Handle component_descriptor contraints during migration
* [3.0] Improved login by params to support nagivation to different dashboards (#2703 )
* Improved login by params to support nagivation to different dashboards
* Refactorting
* Minor improvements
* bugfixes
* bugfixes (#2705 )
* [3.0] Improvement map (#2706 )
* Fix load custom marker image for Firefox
* Fix update polygon color
* [WIP] [3.0] Added OAuth2 Support (#2709 )
* Added base impl for OAuth-2
* Added basic and custom OAuth2 user mappers
* Removed comment line
* Refactoring to review. Added tenantId and customerId. Added email tenant name strategy
* Revert debug logger
* Fixed compilation
* Test fixed
* Create UI for OAuthService
* Revert package-lock.json
* Add translate login es_ES
Co-authored-by: Vladyslav_Prykhodko <vprykhodko@thingsboard.io>
* provide entity to custom actions
* Fix Manage dashboard customers
* remove image map zoom
* Fix docker hybrid db mode
* fix empty center position & fix entity id
* Minor refactoring
* Refactoring
* Minor fixes
* [3.0] Improvment image map (#2729 )
* Add support setting position function
* Improved setting image map
* Add support setting offset marker
* Minor fixes
* Fix Auth guard
* Cassandra to SQL boolean column fix
* Fix entity state controller name resolution
* Fix oauth2 login button
* Improve OAuth buttons style
* OAuth button style improvement
* Update haproxy.cfg with oauth rules
* Introduce OAuth failure handling
* Fix tests
* [3.0] Improvement image map (#2740 )
* Fixed not correct center image map
Fixed update position marker for image map
* Add support IE and clear code
* Fix not correct update image for datasource
* Update marker position
* Fix tests
* Fix error update websocket to change user (#2744 )
* Map/3.0 (#2738 )
* WIP on trip-animation settings
* trip-animation points & anchors
* fixes
Co-authored-by: Adsumus <artemtv42@gmail.com>
Co-authored-by: Igor Kulikov <ikulikov@thingsboard.io>
* Fix typo
* Improve table widgets mobile mode
* Update Cassandra Driver
* [3.0] Fixed polygon functionality (#2747 )
* Add default setting and title for group
* Fix polygon: updateColor, functions tooltip and color polygon, update coordinate polygon
* Improvement code
* Refactoring code
* Improve Cassandra resultSet pagination
Co-authored-by: Artem Halushko <ahalushko@thingsboard.io>
Co-authored-by: Vladyslav <vprykhodko@thingsboard.io>
Co-authored-by: ArtemHalushko <61501795+ArtemHalushko@users.noreply.github.com>
Co-authored-by: Artem Halushko <ahalushko@thingboards.io>
Co-authored-by: Adsumus <artemtv42@gmail.com>
Co-authored-by: Chantsova Ekaterina <chantsova.ekaterina@gmail.com>
Co-authored-by: Dmytro Shvaika <dshvaika@thingsboard.io>
Co-authored-by: VoBa <volodymyr.babak@gmail.com>
Co-authored-by: Andrew Shvayka <ashvayka@thingsboard.io>
2020-05-12 14:11:26 +03:00
Igor Kulikov
6bab8bd6d3
Merge branch 'master' into develop/3.0
2020-05-12 14:09:17 +03:00
ShvaykaD
b9bc280d57
Fix typo in upgrade logs ( #2757 )
...
* update psql & timescale update
* fix windows upgrade
* fix typo in logging
2020-05-11 11:47:17 +03:00
Andrii Shvaika
45af758f46
Merge branch 'volodymyr-babak-feature/stateful-services'
2020-05-11 11:24:08 +03:00
Andrii Shvaika
888329436b
Fixed License Headers
2020-05-11 11:23:55 +03:00
Andrii Shvaika
e31bc3d3b3
Merge branch 'feature/stateful-services' of https://github.com/volodymyr-babak/thingsboard into volodymyr-babak-feature/stateful-services
2020-05-11 11:22:19 +03:00
ShvaykaD
8d0d23e620
psql & timescale upgrade ( #2748 )
...
* update psql & timescale update
* fix windows upgrade
2020-05-11 11:19:01 +03:00
YevhenBondarenko
bedc624e09
change tb-js-executor scale in docker-compose.yml
2020-05-11 11:15:09 +03:00
YevhenBondarenko
95ddde3e38
added docker-compose and environment for queues
2020-05-11 11:15:09 +03:00
Igor Kulikov
2d235cf9eb
Improve Cassandra resultSet pagination
2020-05-08 19:34:08 +03:00
Volodymyr Babak
c0fde32a43
Revert changes
2020-05-08 16:55:05 +03:00
Volodymyr Babak
4fd263d3ea
moved thirdparty services to a separate file
2020-05-08 16:51:15 +03:00
Volodymyr Babak
0d0cdb8d9a
Revert versions
2020-05-08 16:43:28 +03:00
Volodymyr Babak
ef21d2ae41
Merge remote-tracking branch 'upstream/master' into feature/stateful-services
2020-05-08 16:41:55 +03:00
Igor Kulikov
34da0fe811
Merge branch 'master' of github.com:thingsboard/thingsboard into develop/3.0
2020-05-08 16:25:14 +03:00
VoBa
7e66fd2693
Fix for pem key with password ( #2752 )
...
* Added activate user config. Fixed https issue
* Added possibility to encode PEM files encrypted with a private key - Integration
* Remove PE fixes
2020-05-08 16:11:59 +03:00
Vladyslav
7f53d53163
[3.0] Fixed polygon functionality ( #2747 )
...
* Add default setting and title for group
* Fix polygon: updateColor, functions tooltip and color polygon, update coordinate polygon
* Improvement code
* Refactoring code
2020-05-08 15:50:13 +03:00
Igor Kulikov
76300e400e
Update Cassandra Driver
2020-05-08 15:45:54 +03:00
Yevhen Bondarenko
424d631a69
added extra properties to kafka consumer ( #2751 )
...
* added extra properties to kafka consumer
* added default values for kafka consumer properties in TbKafkaSettings
* Update TbKafkaSettings.java
* Update thingsboard.yml
Co-authored-by: Andrew Shvayka <ashvayka@thingsboard.io>
2020-05-08 14:38:04 +03:00
Igor Kulikov
b81370b6a0
Merge branch 'master' into develop/3.0
2020-05-07 14:21:35 +03:00
Igor Kulikov
f2757e0535
Use source ip load balancing algorithm for http requests
2020-05-07 14:21:17 +03:00
Igor Kulikov
4659ab7dd0
Improve table widgets mobile mode
2020-05-07 13:07:11 +03:00
Igor Kulikov
e3e037c93e
Merge branch 'master' of github.com:thingsboard/thingsboard into develop/3.0
2020-05-07 12:46:43 +03:00
Igor Kulikov
0e45e45f55
Fix typo
2020-05-07 12:42:27 +03:00
ArtemHalushko
416d045893
Map/3.0 ( #2738 )
...
* WIP on trip-animation settings
* trip-animation points & anchors
* fixes
Co-authored-by: Adsumus <artemtv42@gmail.com>
Co-authored-by: Igor Kulikov <ikulikov@thingsboard.io>
2020-05-07 12:25:43 +03:00
Vladyslav
7a87e6c16d
Fix error update websocket to change user ( #2744 )
2020-05-07 11:27:29 +03:00
Igor Kulikov
9db9c36bb3
Fix tests
2020-05-07 11:23:36 +03:00
Vladyslav
15452dfe15
Fix error update websocket to change user ( #2743 )
2020-05-07 11:19:27 +03:00
Igor Kulikov
bf258a94a3
Merge branch 'master' of github.com:thingsboard/thingsboard into develop/3.0
2020-05-07 11:10:21 +03:00
Vladyslav
65015bfd73
[3.0] Improvement image map ( #2740 )
...
* Fixed not correct center image map
Fixed update position marker for image map
* Add support IE and clear code
* Fix not correct update image for datasource
* Update marker position
2020-05-07 11:09:56 +03:00
Igor Kulikov
e8ee8cb6d2
Fix tests
2020-05-07 11:09:12 +03:00
Andrii Shvaika
864a98fd8b
Merge branch 'master' of github.com:thingsboard/thingsboard
2020-05-07 10:49:57 +03:00
Andrii Shvaika
71f94358c4
Fix typos and added break statement
2020-05-07 10:49:44 +03:00
Igor Kulikov
e9553b627b
Introduce OAuth failure handling
2020-05-06 20:30:02 +03:00
Igor Kulikov
0ce5222072
Merge branch 'master' into develop/3.0
2020-05-06 20:04:33 +03:00
Igor Kulikov
d9bfd82926
Introduce OAuth failure handling
2020-05-06 20:04:09 +03:00
VoBa
9b18c408b2
Added activate user config. Fixed https issue ( #2737 )
...
* Added activate user config. Fixed https issue
* Update OAuth2User.java
Co-authored-by: Igor Kulikov <ikulikov82@gmail.com>
2020-05-06 19:20:18 +03:00
