|
|
43e9851ae8
|
Trabajando en perfil (tarde)
|
2023-05-23 22:16:01 +02:00 |
|
|
|
176f11bef0
|
Haciendo perfil
|
2023-05-23 15:34:20 +02:00 |
|
|
|
7e50c53eea
|
arraglado la tabla de PapelGenerico. Parece que el nombre del controlador es el problema. Regenerar
|
2023-05-23 14:02:36 +02:00 |
|
|
|
3774573829
|
funcionando la vista papel generico. investiganto ruta del boton añadir. falta poder quitar botones primera col
|
2023-05-22 20:47:18 +02:00 |
|
|
|
0ddd37b0c5
|
funcionando la vista papel generico. investiganto ruta del boton añadir. falta poder quitar botones primera col
|
2023-05-22 20:47:03 +02:00 |
|
|
|
aa43f9f28d
|
Merge branch 'dev/imn' into 'main'
Selector idioma
See merge request jjimenez/safekat!18
|
2023-05-19 12:34:53 +00:00 |
|
|
|
0493dddfe6
|
Selector idioma
|
2023-05-19 09:41:46 +02:00 |
|
|
|
671f196191
|
añadido ci4/app/Models/Collection.php
|
2023-05-18 20:36:22 +02:00 |
|
|
|
10a057493f
|
trabajando en papel generico. Problema al generar el datatable
|
2023-05-18 20:28:07 +02:00 |
|
|
|
2c69b6e69c
|
Merge branch 'dev/usersperrol' into 'main'
creada funcion dentro del modelo de la tabla pivote group_user para tener el...
See merge request jjimenez/safekat!17
|
2023-05-18 16:50:16 +00:00 |
|
|
|
ac76fa88a0
|
creada funcion dentro del modelo de la tabla pivote group_user para tener el numero de user de un rol
|
2023-05-18 18:48:40 +02:00 |
|
|
|
1a84536e2a
|
Merge branch 'dev/ui' into 'main'
Dev/ui
See merge request jjimenez/safekat!16
|
2023-05-18 07:11:21 +00:00 |
|
|
|
21ce38edd3
|
Merge branch 'dev/tarifas' into 'main'
Dev/tarifas
See merge request jjimenez/safekat!15
|
2023-05-18 07:09:46 +00:00 |
|
|
|
dc9fa91aa6
|
Select simple y multiple. Cambios en formularios de usuarios y grupos
|
2023-05-17 21:49:09 +02:00 |
|
|
|
5788d392d9
|
tarifas acabado/manipulado/preimpresion terminadas. Faltan envios
|
2023-05-17 20:38:05 +02:00 |
|
|
|
39598b697d
|
trabajando en tarifas (listas, formularios)
|
2023-05-17 19:14:00 +02:00 |
|
|
|
790e9c3111
|
Selector de bandera automatico y quitado estilo node-waves
|
2023-05-16 14:53:22 +02:00 |
|
|
|
5c5cd77bc2
|
arreglado idioma tablas tarifas. Linea 114 viewList
|
2023-05-16 14:32:19 +02:00 |
|
|
|
2cac0df34f
|
Arreglado el idioma en tablas tarifas acabado, manp y preimp
|
2023-05-16 14:30:32 +02:00 |
|
|
|
dd9686d966
|
Recuperando cambios peridos en el merge?
|
2023-05-16 14:13:42 +02:00 |
|
|
|
224ea78c3c
|
Merge branch 'dev/formateando2' into 'main'
Dev/formateando2
See merge request jjimenez/safekat!14
|
2023-05-16 11:10:01 +00: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 |
|
|
|
f05ec163df
|
Demo View
|
2023-05-16 13:05:33 +02:00 |
|
|
|
a85f9c8688
|
Merge branch 'newmerge' into 'main'
Newmerge
See merge request jjimenez/safekat!13
|
2023-05-16 11:03:29 +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 |
|
|
|
ab9a667845
|
vuelta atras de los formularios y listas tarifaacabado
|
2023-05-11 09:48:28 +02:00 |
|
|
|
3cbf5cf8a8
|
arraglando la tabla tarifas con la forma nueva
|
2023-05-11 07:33:06 +02:00 |
|
|
|
ff9bf6a000
|
IMN 10052023 morning work!!
|
2023-05-10 15:36:02 +02:00 |
|
|
|
3f580a18a7
|
Merge branch 'dev/vuexy' into 'main'
Primera integracion de vistas IMN. Se necesita la ultima version de Jaime para...
See merge request jjimenez/safekat!7
|
2023-05-10 10:58:22 +00: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 |
|
|
|
95d79d1dc5
|
Primera integracion de vistas IMN. Se necesita la ultima version de Jaime para avanzar. Merge de ambas ramas para proceder
|
2023-05-10 12:54:02 +02:00 |
|
|
|
fc0d7e0298
|
Merge branch 'dev/legacytables2' into 'main'
Dev/legacytables2
See merge request jjimenez/safekat!6
|
2023-05-10 10:46:45 +00:00 |
|
|
|
e591a50a22
|
modificada la forma de obtener la lista de grupos para el index de los usuarios
|
2023-05-09 13:11:42 +02:00 |
|
|
|
6c6b603fd7
|
falta lenguaje de user y usermodel. Repasar funcionalidades
|
2023-05-09 07:39:50 +02:00 |
|
|
|
7e62ba3924
|
Work on 08/05/2023 morning
|
2023-05-08 15:11:08 +02:00 |
|
|
|
81ef01dc01
|
Added login forms and styles initial version.
|
2023-05-07 22:10:35 +02:00 |
|
|
|
50e8cb9fd5
|
trabajando en user y groups con el nuevo formato
|
2023-05-07 21:16:35 +02:00 |
|
|
|
b083b918c8
|
Added favicons and main logo resources
|
2023-05-07 20:27:09 +02:00 |
|
|
|
ab99ba508b
|
Added original Vuexy files and cloned focus2 views into vuexy views for its conversion
|
2023-05-06 13:01:53 +02:00 |
|
|
|
b7b4821f8a
|
trabajando en formularios/vista paises
|
2023-05-05 15:05:24 +02:00 |
|
|
|
f0772cf1a6
|
Merge branch 'dev/legacyTables' into 'main'
Integracion de la lista tarifaacabado sacada del Mac.Comit antes del merge...
See merge request jjimenez/safekat!5
|
2023-05-05 11:40:23 +00: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 |
|
|
|
e9e6421b50
|
Merge branch 'dev/controllersmenu' into 'main'
Dev/controllersmenu
See merge request jjimenez/safekat!4
|
2023-05-04 08:19:36 +00:00 |
|
|
|
b4ac9bcee5
|
Merge branch 'main' into 'dev/controllersmenu'
# Conflicts:
# .vscode/sftp.json
|
2023-05-04 08:19:22 +00:00 |
|
|
|
baa30c2cfd
|
Comentado el menu de setings y notificaciones. Quitado idioma pt y activities del icono del profile
|
2023-05-04 10:17:11 +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 |
|
