Ignacio Martinez Navajas c4ff55654d Merge branch 'main' into 'dev/settings' ...

# Conflicts:
#   ci4/app/Config/Routes.php

2023-05-28 14:58:36 +00:00

..

activity

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

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

configuracion

papel generico terminado. papel impresion a falta de maquinas y tipologias

2023-05-28 12:33:07 +02: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

profile

Trabajando en perfil (tarde)

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

settings

Settings and UI changes

2023-05-28 16:50:56 +02:00

tarifas

Settings and UI changes

2023-05-28 16:50:56 +02:00

user

Settings 24/05 morning

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