Ignacio Martinez Navajas d8400dd195 Merge branch 'main' into 'dev/ui-ajustes' ...

# Conflicts:
#   ci4/app/Entities/Tarifas/TarifapreimpresionEntity.php
#   ci4/app/Language/es/Tarifaacabado.php
#   ci4/app/Language/es/Tarifamanipulado.php
#   ci4/app/Language/es/Tarifapreimpresion.php
#   ci4/app/Views/themes/backend/vuexy/form/tarifas/preimpresion/_tarifapreimpresionFormItems.php

2023-07-13 20:00:25 +00:00

..

activity

Menus segun JM

2023-06-06 13:57:34 +02:00

clientes/cliente

Revision UI Maquinas e iniciada UI clientes para revision con JM

2023-07-13 21:52:13 +02:00

configuracion

Merge branch 'main' into 'dev/ui-ajustes'

2023-07-13 20:00:25 +00:00

dashboard

Added original Vuexy files and cloned focus2 views into vuexy views for its conversion

2023-05-06 13:01:53 +02:00

group

Settings 24/05 morning

2023-05-24 15:36:21 +02:00

login

Igualando a rama dev/formateando

2023-05-16 10:49:31 +02:00

my

Added original Vuexy files and cloned focus2 views into vuexy views for its conversion

2023-05-06 13:01:53 +02:00

notification

Added original Vuexy files and cloned focus2 views into vuexy views for its conversion

2023-05-06 13:01:53 +02:00

presupuestos

Propuesta presupuestos

2023-07-07 12:36:33 +02:00

profile

Trabajando en perfil (tarde)

2023-05-23 22:16:01 +02:00

settings

Arreglo login y configuracion modal borrado

2023-06-27 22:28:30 +02:00

tarifas

Merge branch 'main' into 'dev/ui-ajustes'

2023-07-13 20:00:25 +00:00

user

Edicion de algunos formularios

2023-06-02 09:10:19 +02:00