janis-commerce / ui-web

86%

master: 35%

LAST BUILD ON BRANCH slack-notificacion

branch: slack-notificacion

CHANGE BRANCH

x

Reset

Sync Branches

• slack-notificacion
• Fix-textarea-height-error
• HDI-2786-add-progressbar
• JMV-2753-link-in-chip
• JMV-2753-remove-internal-condition
• JMV-2753-restore-chip-and-update-link
• JMV-2774-component-color
• JMV-2874-ajustar-tooltip-userChip
• JMV-2928-Agregar-el-componente-button-icon-del-Package-Web-UI
• JMV-2929-control-uiweb
• JMV-2929-new-control-storybook
• JMV-3116-no-se-pueden-estilizar-componentes-ui-web
• JMV-3257-buttonIcon-theme-ui-web
• JMV-3258-missing-components-control
• JMV-3260-update-storybook-version
• JMV-3283-implementar-drawer-ui-web
• JMV-3297-Hacer-deploy-de-storybooks-al-publicar-en-npm
• JMV-3315-crear-componente-avatar-en-ui-web
• JMV-3349-create-uiweb-avatargroup
• JMV-3363-dar-imagen-de-janis-a-la-documentacion
• JMV-3363-revert
• JMV-3368-aplicar-los-colores-en-ui-web
• JMV-3384-Automatizar-el-deployment-de-storybook
• JMV-3441-add-colors-to-palette
• JMV-3502-Eliminar-switch-en-aplicar-estilos
• JMV-3517-agregar-color-tuquesa-a-ui-web
• JMV-3580-agregar-colores-a-ui-web
• JMV-3609-export-palette
• JMV-3613-fix-uiweb-storybook-addons
• JMV-3616-install-addon-docs-and-change-peerDependencie-value
• JMV-3626-hacer-cmpt-map-generico-ui-web
• JMV-3626-map-component
• JMV-3626-map-generic-component
• JMV-3661-agregar-iconos-a-ui-web
• JMV-3697-implementacion-mapa-refactor
• JMV-3709-mapa-pierde-centro-al-recargar
• JMV-3714-new-loader-component
• JMV-3716-Excesiva-informacion-en-el-mapa
• JMV-3725-marker-memo
• JMV-3725-marker-onclick
• JMV-3730-reordenar-agregar-stops-ruta-desde-mapa
• JMV-3737-Cambios-en-mapa-ui-web
• JMV-3761-fix-marker-state-update
• JMV-3772-add-iconColor-prop-to-Chip-styles
• JMV-3773-setear-centro-segun-markers-mapa
• JMV-3784-agregar-posibilidad-animacion-marker
• JMV-3805-add-new-logo
• JMV-3848-add-new-icon
• JMV-3868-fix-button-hover-ui-web
• JMV-3881-implementar-ProgressBar
• JMV-3905-fix-chip-max-width
• JMV-3918-cambiar-logica-info-window-en-componente-Map
• JUIP-40-image-component
• JUIP-41-migrate-html-component
• JUIP-42-color-picker-component
• JUIP-43-qacode-component
• JUIP-46-preparing-package
• JUIP-57-input-textare-implementation
• Typography-component
• add-components-documentation-data
• add-tests-for-coverage
• agregar-icono-drag-drop
• agregar-nuevo-icono-filtros
• change-rollups
• change-textarea
• correction-readme
• dgiannico19-patch-1
• feature/allow-react-16
• fix-fontcolor-on-button
• fix-runtime-error
• fix-styled-components-version
• fix-withConfig
• format-file-export
• master
• refs/tags/release-v0.0.1
• refs/tags/release-v0.0.10
• refs/tags/release-v0.0.11
• refs/tags/release-v0.0.12
• refs/tags/release-v0.0.13
• refs/tags/release-v0.0.14
• refs/tags/release-v0.0.15
• refs/tags/release-v0.0.2
• refs/tags/release-v0.0.3
• refs/tags/release-v0.0.4
• refs/tags/release-v0.0.5
• refs/tags/release-v0.0.6
• refs/tags/release-v0.0.7
• refs/tags/release-v0.0.8
• refs/tags/release-v0.0.9
• refs/tags/v0.1.0
• refs/tags/v0.1.1
• refs/tags/v0.10.0
• refs/tags/v0.11.0
• refs/tags/v0.12.0
• refs/tags/v0.13.0
• refs/tags/v0.14.0
• refs/tags/v0.15.0
• refs/tags/v0.16.0
• refs/tags/v0.17.0
• refs/tags/v0.18.0
• refs/tags/v0.19.0
• refs/tags/v0.2.0
• refs/tags/v0.2.1
• refs/tags/v0.20.0
• refs/tags/v0.21.0
• refs/tags/v0.22.0
• refs/tags/v0.23.0
• refs/tags/v0.24.0
• refs/tags/v0.25.0
• refs/tags/v0.26.0
• refs/tags/v0.27.0
• refs/tags/v0.27.1
• refs/tags/v0.28.0
• refs/tags/v0.28.2
• refs/tags/v0.28.3
• refs/tags/v0.28.4
• refs/tags/v0.28.5
• refs/tags/v0.28.7
• refs/tags/v0.29.0
• refs/tags/v0.29.1
• refs/tags/v0.3.0
• refs/tags/v0.30.0
• refs/tags/v0.31.0
• refs/tags/v0.32.0
• refs/tags/v0.33.0
• refs/tags/v0.34.0
• refs/tags/v0.35.0
• refs/tags/v0.36.0
• refs/tags/v0.37.0
• refs/tags/v0.38.0
• refs/tags/v0.39.0
• refs/tags/v0.4.0
• refs/tags/v0.40.0
• refs/tags/v0.40.1
• refs/tags/v0.40.2
• refs/tags/v0.41.1
• refs/tags/v0.42.0
• refs/tags/v0.43.0
• refs/tags/v0.45.0
• refs/tags/v0.5.0
• refs/tags/v0.6.0
• refs/tags/v0.6.1
• refs/tags/v0.6.2
• refs/tags/v0.7.0
• refs/tags/v0.7.1
• refs/tags/v0.7.2
• refs/tags/v0.7.3
• refs/tags/v0.8.0
• refs/tags/v0.9.0
• refs/tags/v0.9.1
• refs/tags/v1.0.0
• refs/tags/v1.1.0
• router-dependency
• validate-chip-with-icon
• yarn-install-node-validator

resolved conflicts