|
|
fdf838c909
|
quitado rellenar presupuesto
|
2024-10-16 03:46:35 +02:00 |
|
|
|
b5924dceb5
|
falta preview resumen
|
2024-10-16 03:45:10 +02:00 |
|
|
|
2c5ea4d7ba
|
Merge branch 'dev/presu_cliente_v2' of https://git.imnavajas.es/jjimenez/safekat into dev/presu_cliente_v2
|
2024-10-15 15:42:19 +02:00 |
|
|
|
19be8591f3
|
trabajando en el backend para papeles diferentes
|
2024-10-15 15:41:38 +02:00 |
|
|
|
a8a741f0bf
|
trabajando en añadir las tiradas a las direcciones
|
2024-10-15 11:43:44 +02:00 |
|
|
|
de9cf30aac
|
solucionados todos los select2 en conflicto
|
2024-10-14 18:29:50 +02:00 |
|
|
|
668d0d79e6
|
problema ruta papelformato
|
2024-10-14 18:19:41 +02:00 |
|
|
|
52303e9185
|
trabajando en el selector de cliente
|
2024-10-14 14:45:40 +02:00 |
|
|
|
7857e5992a
|
test
|
2024-10-14 14:33:49 +02:00 |
|
|
|
f9b7de63fd
|
Merge branch 'dev/presu_cliente_v2' of https://git.imnavajas.es/jjimenez/safekat into dev/presu_cliente_v2
|
2024-10-14 14:33:06 +02:00 |
|
|
|
9c3a7848f3
|
arreglado los select2 para que funcionen con el select2 de alvaro
|
2024-10-14 14:29:43 +02:00 |
|
|
|
6b49984c28
|
Merge branch 'main' into 'dev/presu_cliente_v2'
Main
See merge request jjimenez/safekat!347
|
2024-10-14 12:04:48 +00:00 |
|
|
|
44fc60372b
|
Cogido el select2 de alvaro para problema del merge.
|
2024-10-14 14:03:24 +02:00 |
|
|
|
287335dc6b
|
cogido select2 de alvaro
|
2024-10-14 13:58:50 +02:00 |
|
|
|
cb1d280b35
|
Merge branch 'bug/save_tarifas_extra' into 'main'
arreglado bug de tarifas extra importe fijo
See merge request jjimenez/safekat!345
|
2024-10-14 11:55:14 +00:00 |
|
|
|
c5c4a31521
|
arreglado bug de tarifas extra importe fijo
|
2024-10-14 13:54:08 +02:00 |
|
|
|
612b67883c
|
Merge branch 'feat/mensajes-internos' into 'main'
feat : mensajes internos module
See merge request jjimenez/safekat!344
|
2024-10-13 23:13:14 +00:00 |
|
|
|
2012ada27f
|
feat : mensajes internos module
|
2024-10-13 23:10:17 +00:00 |
|
|
|
7ad3133a15
|
acabando el tema de las direcciones
|
2024-10-14 00:50:15 +02:00 |
|
|
|
0eaac5af28
|
trabajando en el backend
|
2024-10-13 21:10:02 +02:00 |
|
|
|
e64022a7b7
|
falta boton add direcciones
|
2024-10-09 20:04:58 +02:00 |
|
|
|
a069b4109c
|
trabajando en el componente direccion
|
2024-10-09 13:02:49 +02:00 |
|
|
|
92389bb5f5
|
Merge branch 'dev/presu_cliente_v2' of https://git.imnavajas.es/jjimenez/safekat into dev/presu_cliente_v2
mergeo de main
|
2024-10-08 15:15:25 +02:00 |
|
|
|
032b09f0a3
|
añadido direcciones
|
2024-10-08 15:14:12 +02:00 |
|
|
|
91f26520cb
|
Merge branch 'main' into 'dev/presu_cliente_v2'
Main
See merge request jjimenez/safekat!343
|
2024-10-08 13:13:52 +00:00 |
|
|
|
dfd915e47f
|
corregidos errores en logica
|
2024-10-08 14:07:29 +02:00 |
|
|
|
4045771c2d
|
paginas para cosido multiplo de 4
|
2024-10-08 13:49:53 +02:00 |
|
|
|
1d3f817709
|
terminada la vista cubierta
|
2024-10-08 13:20:22 +02:00 |
|
|
|
2e2888ec26
|
solucionado el click de los gramajes
|
2024-10-07 11:31:01 +02:00 |
|
|
|
78b255fa0d
|
problema con los custom radiobutons
|
2024-10-06 19:52:24 +02:00 |
|
|
|
cece606bb1
|
trbajando en los custom checks
|
2024-10-05 19:17:52 +02:00 |
|
|
|
ba3ec185ef
|
Merge branch 'feat/config-variables-app' into 'main'
feat: add config variable menu
See merge request jjimenez/safekat!342
|
2024-10-02 18:37:49 +00:00 |
|
|
|
8b10aa655a
|
feat: add config variable menu
|
2024-10-02 18:32:52 +00:00 |
|
|
|
13e3a69cd6
|
añadido coger el idioma
|
2024-09-30 11:06:00 +02:00 |
|
|
|
f09d5aeceb
|
modificado calssselect.js
|
2024-09-30 08:53:37 +02:00 |
|
|
|
daca044cf3
|
modificado datosgenerales.js
|
2024-09-30 08:52:14 +02:00 |
|
|
|
cb982bd38a
|
añadidos los ficheros
|
2024-09-30 08:38:22 +02:00 |
|
|
|
69b27f0cd8
|
cambiando presupuesto cliente
|
2024-09-29 18:07:54 +02:00 |
|
|
|
8617553dea
|
Merge branch 'dev/chat' into 'main'
Dev/chat
See merge request jjimenez/safekat!341
|
2024-09-26 13:14:14 +00:00 |
|
|
|
2049cb1e02
|
fix:conflicts
|
2024-09-26 13:13:58 +00:00 |
|
|
|
bdc5b0c442
|
feat:chat
|
2024-09-26 13:11:01 +00:00 |
|
|
|
c5a5f01fa0
|
fix : chat modules, notifications
|
2024-09-26 13:10:12 +00:00 |
|
|
|
c0e90a723b
|
Merge branch 'dev/tokens' into 'main'
Configuracion inicial para usar atentificacion via JWT (requerido tocar el...
See merge request jjimenez/safekat!340
|
2024-09-26 12:03:47 +00:00 |
|
|
|
130c5dad88
|
Configuracion inicial para usar atentificacion via JWT (requerido tocar el composer para firebase/jwt
|
2024-09-26 14:01:58 +02:00 |
|
|
|
bd22e89a28
|
Merge branch 'dev/chat' into 'main'
Dev/chat
See merge request jjimenez/safekat!339
|
2024-09-26 07:53:15 +00:00 |
|
|
|
d3722440c3
|
fix chat
|
2024-09-26 07:51:53 +00:00 |
|
|
|
21c1bd9bd2
|
fix : add chat presupuesto cliente
|
2024-09-26 07:50:53 +00:00 |
|
|
|
a6dbe6de07
|
fix : cliente show departments chats
|
2024-09-26 07:33:34 +00:00 |
|
|
|
68d5a7157e
|
Merge branch 'fix/porcentaje_total_presupuesto' into 'main'
corregida division por cero
See merge request jjimenez/safekat!338
|
2024-09-26 07:07:14 +00:00 |
|
|
|
bf568fec92
|
corregida division por cero
|
2024-09-26 09:06:34 +02:00 |
|
