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 |
|
daniel
|
e4383a0573
|
fixed styles
|
2023-03-29 14:07:56 +02:00 |
|
Pablo Aragon
|
1a82056039
|
Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round
|
2023-03-29 12:13:05 +02:00 |
|
Pablo Aragon
|
7ada30c9b1
|
10718 & 10821
|
2023-03-29 12:12:56 +02:00 |
Jimmy Olano
|
5044c23ef3
|
Merge branch 'ent-9529-14208-definir-timezone-por-defecto-para-nuevos-usuarios' into 'develop', JJOS.
Draft: Ent 9529 14208 definir timezone por defecto para nuevos usuarios
See merge request artica/pandorafms!5492
|
2023-03-29 02:28:47 +00:00 |
|
Pablo Aragon
|
dab2a29b6b
|
Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round
|
2023-03-28 17:07:19 +02:00 |
|
Pablo Aragon
|
ce014e4c6b
|
Datatables. Treeview graph meta
|
2023-03-28 17:07:06 +02:00 |
|
daniel
|
0df3ad3ff3
|
fixed styles
|
2023-03-28 13:44:24 +02:00 |
|
Pablo Aragon
|
5969928003
|
10408-Fix action column & 10398-Events pure mode
|
2023-03-28 12:39:02 +02:00 |
|
daniel
|
ebffb004e9
|
Merge remote-tracking branch 'origin/develop' into ent-9662-second-round
|
2023-03-27 21:22:06 +02:00 |
|
daniel
|
48a254c4b2
|
fixed styles
|
2023-03-27 14:34:05 +02:00 |
Diego Muñoz-Reja
|
6bdecc43e7
|
Merge branch 'ent-8642-nuevo-widget-heatmap' into 'develop'
Ent 8642 nuevo widget heatmap
See merge request artica/pandorafms!5557
|
2023-03-27 10:43:48 +00:00 |
Jonathan
|
3057e67d1f
|
Merge conflict solution
|
2023-03-27 12:11:53 +02:00 |
Matias Didier
|
2daea0e5c4
|
Merge branch 'ent-10764-favoritos-y-nuevos-menus' into 'develop'
Ent 10764 favoritos y nuevos menus
See merge request artica/pandorafms!5618
|
2023-03-27 09:01:48 +00:00 |
|
Jonathan
|
0ae7630714
|
Gis map fix view
|
2023-03-27 08:44:45 +02:00 |
|
Jonathan
|
f8aefa6e34
|
Merge conflict solution
|
2023-03-27 08:31:00 +02:00 |
|
daniel
|
abf9fcf200
|
Merge remote-tracking branch 'origin/develop' into ent-9662-second-round
|
2023-03-24 14:05:30 +01:00 |
|
daniel
|
25ea15fe0f
|
fixed styles
|
2023-03-24 14:04:38 +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 |
|
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 |
|
Matias Didier
|
5529c33f0c
|
Merge branch 'ent-10650-bugs-funcionales-en-consolas-visuales' into 'develop'
Ent 10650 bugs funcionales en consolas visuales
See merge request artica/pandorafms!5601
|
2023-03-24 09:11:26 +00:00 |
Rafael Ameijeiras
|
a30ba4cf27
|
Merge branch 'ent-9624-meter-soporte-a-sflow-en-nuestro-gestor-de-flujos' into 'develop'
Ent 9624 meter soporte a sflow en nuestro gestor de flujos
See merge request artica/pandorafms!5587
|
2023-03-24 07:25:52 +00:00 |
|
daniel
|
bac1a7bf65
|
fixed styles
|
2023-03-23 17:44:06 +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 Maya
|
52231615f6
|
Merge branch 'develop' into ent-8642-nuevo-widget-heatmap
|
2023-03-23 11:51:54 +01:00 |
|
Daniel Maya
|
94c843dac2
|
#9662 Fixed gis map menu
|
2023-03-23 10:41:08 +01:00 |
|
daniel
|
72c95a6274
|
Merge remote-tracking branch 'origin/develop' into ent-9662-second-round
|
2023-03-22 19:12:16 +01:00 |
|
Jonathan
|
c52ca613b2
|
Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round
|
2023-03-22 14:22:08 +01:00 |
|
Jonathan
|
a063c7a0ac
|
Fix header and menu
|
2023-03-22 14:21:56 +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 |
|
daniel
|
5eaa4a10bb
|
fixed styles
|
2023-03-22 11:13:56 +01:00 |
|
Rafael Ameijeiras
|
87421e772d
|
Merge branch 'develop' into 'ent-9624-meter-soporte-a-sflow-en-nuestro-gestor-de-flujos'
# Conflicts:
# pandora_console/install.php
|
2023-03-22 08:23:07 +00:00 |
|
Pablo Aragon
|
99b845db3f
|
progress bar
|
2023-03-21 18:12:02 +01:00 |
|
Daniel Cebrian
|
a21e43a452
|
#10764 ignore selected action in fav menu
|
2023-03-21 15:40:46 +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 |
|
Jonathan
|
9654ba4fa2
|
Snmp browser select multiple post
|
2023-03-21 12:35:25 +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 |
|
Jonathan
|
82dd6ebb37
|
Metaconsole view reports change
|
2023-03-21 09:52:21 +01:00 |
|
Daniel Cebrian
|
9dea38f440
|
Merge branch 'develop' into ent-9624-meter-soporte-a-sflow-en-nuestro-gestor-de-flujos
|
2023-03-21 09:38:56 +01:00 |
|
daniel
|
594d34931c
|
fixed styles
|
2023-03-17 13:20:58 +01:00 |
|
daniel
|
a9633085bc
|
fixed styles
|
2023-03-17 12:00:51 +01:00 |
|
daniel
|
3f09fd16a7
|
fixed styles
|
2023-03-16 18:51:54 +01:00 |