|
|
77af1d69ce
|
tarifas manipulado actualizado
|
2023-06-18 20:49:35 +02:00 |
|
|
|
325ae2bd95
|
trabajando en el form
|
2023-06-15 21:53:01 +02:00 |
|
|
|
f49e83b582
|
tarifas acabado a falta de check duplicados y guardar tarifa acabado
|
2023-06-14 11:29:28 +02:00 |
|
|
|
f10226606c
|
Merge branch 'main' into 'dev/papelimp_tip3'
# Conflicts:
# ci4/app/Views/themes/backend/vuexy/form/configuracion/papel/viewPapelImpresionForm.php
|
2023-06-12 07:43:28 +00:00 |
|
|
|
4ca43ad7ef
|
papel impresion terminado a falta de añadir maquinas y revisar UI
|
2023-06-12 08:21:57 +02:00 |
|
|
|
37afc63e2e
|
Menus segun JM
|
2023-06-06 13:57:34 +02:00 |
|
|
|
7a2c4026f1
|
Menus laterales
|
2023-06-05 15:30:42 +02:00 |
|
|
|
614487f17f
|
Creando Menu_impresion
|
2023-06-02 14:47:23 +02:00 |
|
|
|
cdb0b29003
|
Creando Menu_impresion
|
2023-06-02 14:45:12 +02:00 |
|
|
|
38e9feb4c8
|
Edicion de algunos formularios
|
2023-06-02 09:10:19 +02:00 |
|
|
|
c4ff55654d
|
Merge branch 'main' into 'dev/settings'
# Conflicts:
# ci4/app/Config/Routes.php
|
2023-05-28 14:58:36 +00:00 |
|
|
|
b1951de661
|
Settings and UI changes
|
2023-05-28 16:50:56 +02:00 |
|
|
|
1cfa5bd60b
|
papel generico terminado. papel impresion a falta de maquinas y tipologias
|
2023-05-28 12:33:07 +02:00 |
|
|
|
c80847062a
|
Settings 25/05 day
|
2023-05-25 22:42:44 +02:00 |
|
|
|
10a057493f
|
trabajando en papel generico. Problema al generar el datatable
|
2023-05-18 20:28:07 +02:00 |
|
|
|
d4c86212a7
|
Merge branch 'main' into 'dev/formateando2'
# Conflicts:
# ci4/app/Filters/LoginAuthFilter.php
# ci4/app/Views/themes/backend/vuexy/form/group/viewUserGroupForm.php
# ci4/app/Views/themes/backend/vuexy/form/group/viewUserGroupList.php
|
2023-05-16 11:09:50 +00:00 |
|
|
|
5a0b82dcbb
|
cambios de legacytables3
|
2023-05-16 12:59:12 +02:00 |
|
|
|
ec2835ad59
|
Igualando a rama dev/formateando
|
2023-05-16 10:49:31 +02:00 |
|
|
|
ea0c714550
|
Arreglos login y recuperar contraseña
|
2023-05-15 15:15:52 +02:00 |
|
|
|
efceab14d4
|
Arreglos UI
|
2023-05-11 15:18:10 +02:00 |
|
|
|
ff9bf6a000
|
IMN 10052023 morning work!!
|
2023-05-10 15:36:02 +02:00 |
|
|
|
aa87d0325f
|
Merge branch 'main' into 'dev/vuexy'
# Conflicts:
# ci4/app/Controllers/Home.php
# ci4/app/Controllers/Test.php
|
2023-05-10 10:56:57 +00:00 |
|
|
|
81ef01dc01
|
Added login forms and styles initial version.
|
2023-05-07 22:10:35 +02:00 |
|
|
|
b7b4821f8a
|
trabajando en formularios/vista paises
|
2023-05-05 15:05:24 +02:00 |
|
|
|
80016b57f5
|
Integracion de la lista tarifaacabado sacada del Mac.Comit antes del merge para que nacho lo coja y meta el vuexy
|
2023-05-05 13:38:24 +02:00 |
|
|
|
88f0853425
|
Menu lateral inicial creado
|
2023-05-03 21:15:18 +02:00 |
|
|
|
b21686c78a
|
Añadido lenguaje a los roles. Orden por grupos
|
2023-05-02 14:32:27 +02:00 |
|
|
|
8c4d77a598
|
Commit realizando cambios en los roles de los usuarios
|
2023-04-24 13:00:46 +02:00 |
|
