|
|
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 |
|
|
|
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 |
|
|
|
5aa1aa6222
|
Merge branch 'dev/chat' into 'main'
feat:chat modules
See merge request jjimenez/safekat!337
|
2024-09-25 17:44:02 +00:00 |
|
|
|
c651db61ff
|
feat:chat modules
|
2024-09-25 17:42:55 +00:00 |
|
|
|
a2f91866f7
|
Merge branch 'dev/chat' into 'main'
Dev/chat
See merge request jjimenez/safekat!336
|
2024-09-23 08:10:57 +00:00 |
|
|
|
2fc9af9db4
|
Merge branch 'main' into dev/chat
|
2024-09-23 10:04:55 +02:00 |
|
|
|
d6a95f78ee
|
feat : add chat in facturas,presupuestos y pedidos
|
2024-09-23 10:00:47 +02:00 |
|
|
|
766347ad81
|
feat: chat module
|
2024-09-23 09:19:45 +02:00 |
|
|
|
70fa74333d
|
Merge branch 'fix/porcentaje_margen_total' into 'main'
añadido porcentaje al margen total
See merge request jjimenez/safekat!334
|
2024-09-22 10:13:04 +00:00 |
|
|
|
0b0b928619
|
añadido porcentaje al margen total
|
2024-09-22 12:12:40 +02:00 |
|
|
|
b1eeddc5bc
|
Merge branch 'dev/add_precio_coste_servicios' into 'main'
añadido el coste en las tablas de los servicios
See merge request jjimenez/safekat!333
|
2024-09-22 09:56:47 +00:00 |
|
|
|
74041042c5
|
añadido el coste en las tablas de los servicios
|
2024-09-22 11:55:52 +02:00 |
|
|
|
bfea4aa67c
|
feat : migration and chat models
|
2024-09-20 11:25:34 +02:00 |
|
|
|
b25abc19d9
|
feat : chat migrations
|
2024-09-20 08:54:43 +02:00 |
|
|
|
b7cfdf87b9
|
Merge branch 'fix/resumen_presupuesto2' into 'main'
cogerrido error margen
See merge request jjimenez/safekat!332
|
2024-09-19 07:18:56 +00:00 |
|
|
|
7d26975ac3
|
cogerrido error margen
|
2024-09-19 09:18:39 +02:00 |
|
|
|
0177ca0f73
|
Merge branch 'fix/resumen_presupuesto' into 'main'
cambiado el margen de servicios para que coincida con las tarifas. Las horas...
See merge request jjimenez/safekat!331
|
2024-09-19 07:13:47 +00:00 |
|
|
|
19e3e6ce0e
|
cambiado el margen de servicios para que coincida con las tarifas. Las horas se meten como margen impresion
|
2024-09-19 09:13:25 +02:00 |
|
