Matias Didier
|
250d65d94a
|
Merge branch 'ent-10740-mejoras-en-heatmap' into 'develop'
Ent 10740 mejoras en heatmap
See merge request artica/pandorafms!5660
|
2023-04-13 08:24:18 +00:00 |
daniel
|
086f742455
|
Merge remote-tracking branch 'origin/develop' into ent-9662-second-round
Conflicts:
pandora_console/operation/agentes/ver_agente.php
|
2023-04-10 16:42:41 +02:00 |
|
daniel
|
7302a108c0
|
fixed styles
|
2023-04-10 12:02:35 +02:00 |
Jonathan
|
55fc0c57ad
|
Merge branch 'develop' into ent-10864-conflicto-mergeo-fichero-ver_agentes-php
|
2023-04-10 09:24:30 +02:00 |
|
Jonathan
|
a0ae7327c7
|
Conflict solution inventory
|
2023-04-10 09:23:40 +02:00 |
Pablo Aragon
|
514c1b300c
|
10867-Tactical view status
|
2023-04-05 14:33:06 +02:00 |
|
Jonathan
|
17a9d6020f
|
#10864 Solution conflict files removed
|
2023-04-05 12:52:44 +02:00 |
Rafael Ameijeiras
|
cc2709c42c
|
Merge branch 'ent-10699-errores-en-los-mapas-varios' into 'develop'
Ent 10699 errores en los mapas varios
See merge request artica/pandorafms!5632
|
2023-04-05 06:47:31 +00:00 |
Daniel Maya
|
dc654c0b6d
|
#10740 heatmap improvements
|
2023-04-04 15:14:10 +02:00 |
Jimmy Olano
|
89aa227b98
|
Merge branch 'ent-10734-sistema-de-favoritos-no-actualiza-nombre-en-el-menu-lateral-del-objeto-favorito-consola-visual' into 'develop', JJOS.
Ent 10734 sistema de favoritos no actualiza nombre en el menu lateral del objeto favorito consola visual
See merge request artica/pandorafms!5613
|
2023-04-04 11:57:45 +00:00 |
Calvo
|
764823c93f
|
Merge remote-tracking branch 'origin/develop' into ent-9676-modulos-de-inventario-se-actualicen-datos-cuando-venga-el-xml-con-nombre-y-sin-datos
|
2023-04-03 10:25:58 +02:00 |
|
daniel
|
c315a7f8c5
|
Merge remote-tracking branch 'origin/develop' into ent-9662-second-round
|
2023-03-31 13:31:39 +02:00 |
|
Pablo Aragon
|
426690bc35
|
10843 & 10844
|
2023-03-31 10:44:51 +02:00 |
Daniel Rodriguez
|
ca16c5dd61
|
Merge branch 'ent-10441-control-de-cache-en-actualizaciones' into 'develop'
Ent 10441 control de cache en actualizaciones
See merge request artica/pandorafms!5623
|
2023-03-31 07:33:26 +00:00 |
|
Pablo Aragon
|
3a2cbb7a62
|
Datatables & styles fix
|
2023-03-30 16:50:30 +02:00 |
|
Calvo
|
307057f934
|
Merge remote-tracking branch 'origin/develop' into ent-9676-modulos-de-inventario-se-actualicen-datos-cuando-venga-el-xml-con-nombre-y-sin-datos
|
2023-03-30 15:29:55 +02:00 |
|
daniel
|
f2e1b2ef57
|
fixed styles
|
2023-03-30 12:36:05 +02:00 |
|
Pablo Aragon
|
e03e1e45ed
|
Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round
|
2023-03-30 12:26:06 +02:00 |
|
Pablo Aragon
|
5e24706f71
|
Style fix
|
2023-03-30 12:25:45 +02:00 |
|
daniel
|
27e13c26c6
|
fixed styles
|
2023-03-30 11:40:32 +02:00 |
|
Pablo Aragon
|
f26e70630a
|
Blue background & Datatable fix
|
2023-03-29 17:09:41 +02:00 |
|
Pablo Aragon
|
168d03eecc
|
New qrcode.js version & vcard
|
2023-03-29 15:35:18 +02:00 |
|
Pablo Aragon
|
2b121a2fd2
|
New qrcode.js version & vcard
|
2023-03-29 15:34:03 +02:00 |
|
daniel
|
e7d08fe6d3
|
fixed styles
|
2023-03-29 14:48:47 +02:00 |
|
Pablo Aragon
|
7ada30c9b1
|
10718 & 10821
|
2023-03-29 12:12:56 +02:00 |
|
Pablo Aragon
|
5969928003
|
10408-Fix action column & 10398-Events pure mode
|
2023-03-28 12:39:02 +02:00 |
|
Daniel Maya
|
712da9070f
|
#10699 Fixed maps
|
2023-03-28 10:45:41 +02:00 |
|
daniel
|
48a254c4b2
|
fixed styles
|
2023-03-27 14:34:05 +02:00 |
|
daniel
|
abf9fcf200
|
Merge remote-tracking branch 'origin/develop' into ent-9662-second-round
|
2023-03-24 14:05:30 +01:00 |
|
Matias Didier
|
f931a86f22
|
Merge branch 'ent-10792-en-version-open-la-vista-tactica-de-grupo-devuelve-error-500-al-solicitar-grupo-all' into 'develop'
Ent 10792 en version open la vista tactica de grupo devuelve error 500 al solicitar grupo all
See merge request artica/pandorafms!5624
|
2023-03-24 12:15:01 +00:00 |
|
Pablo Aragon
|
95edb47d01
|
10408
|
2023-03-24 12:29:03 +01:00 |
Daniel Cebrian
|
075d0a1c4f
|
#10441 added version file in css
|
2023-03-24 12:06:40 +01:00 |
|
Jimmy Olano
|
eb833f2ad8
|
Merge branch 'ent-10747-version-open-error-500-en-vista-principal-de-un-agente' into 'develop', JJOS.
Ent 10747 version open error 500 en vista principal de un agente
See merge request artica/pandorafms!5616
|
2023-03-24 10:14:01 +00:00 |
|
Daniel Cebrian
|
da742bc15e
|
#10441 added version file in js
|
2023-03-24 09:13:22 +01:00 |
|
daniel
|
95834b2de7
|
fixed styles
|
2023-03-23 12:41:39 +01:00 |
|
Daniel Cebrian
|
2683f9e6dc
|
#10792 fixed error 500 in agent status list
|
2023-03-23 12:39:55 +01:00 |
|
daniel
|
72c95a6274
|
Merge remote-tracking branch 'origin/develop' into ent-9662-second-round
|
2023-03-22 19:12:16 +01:00 |
|
daniel
|
e82de5d6aa
|
fixed styles
|
2023-03-22 14:08:03 +01:00 |
|
Rafael Ameijeiras
|
3fcf4dfbc5
|
Merge branch 'ent-10737-15246-error-500-en-mapa-servicios-metaconsola' into 'develop'
Ent 10737 15246 error 500 en mapa servicios metaconsola
See merge request artica/pandorafms!5617
|
2023-03-22 10:34:42 +00:00 |
|
Pablo Aragon
|
99b845db3f
|
progress bar
|
2023-03-21 18:12:02 +01:00 |
|
Jonathan
|
d2d8b43c87
|
Custom fields agent view change size svg
|
2023-03-21 13:09:32 +01:00 |
|
Daniel Cebrian
|
aec5e6b483
|
#10737 fixed error 500 in service map
|
2023-03-21 12:52:24 +01:00 |
|
Daniel Cebrian
|
8e88e0a603
|
#10747 fixed error 500 in agent
|
2023-03-21 11:45:38 +01:00 |
|
Daniel Cebrian
|
ed7b46eb22
|
#9662 fixed url tactic in list groups
|
2023-03-21 09:56:36 +01:00 |
|
Daniel Cebrian
|
b81b7ce7af
|
#fixed in fav menu when change name the original name
|
2023-03-17 12:25:43 +01:00 |
|
daniel
|
3f09fd16a7
|
fixed styles
|
2023-03-16 18:51:54 +01:00 |
|
Jonathan
|
b56cb0e78e
|
log sources view hide on empty
|
2023-03-16 12:23:58 +01:00 |
|
Pablo Aragon
|
4d6029ba3f
|
10408-Manage agents, Agent view
|
2023-03-15 17:02:25 +01:00 |
|
Pablo Aragon
|
797f43ff3c
|
Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round
|
2023-03-15 15:58:34 +01:00 |
|
Pablo Aragon
|
bed1e34fd2
|
Dashboards widgets
|
2023-03-15 15:58:28 +01:00 |