Pablo Aragon
|
2dcba8c8fb
|
10643
|
2023-04-03 08:43:24 +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 |
Daniel Cebrian
|
075d0a1c4f
|
#10441 added version file in css
|
2023-03-24 12:06:40 +01:00 |
|
daniel
|
96d03ca31c
|
Merge remote-tracking branch 'origin/develop' into ent-9662-second-round
|
2023-03-23 17:47:58 +01:00 |
|
Pablo Aragon
|
122f45fcaa
|
Metasetup
|
2023-03-23 17:44:04 +01:00 |
Rafael Ameijeiras
|
766664470d
|
Merge branch 'ent-9893-nuevo-sistema-de-ha' into 'develop'
Ent 9893 nuevo sistema de ha
See merge request artica/pandorafms!5563
|
2023-03-23 12:58:53 +00:00 |
|
daniel
|
e82de5d6aa
|
fixed styles
|
2023-03-22 14:08:03 +01:00 |
|
daniel
|
732000f7bd
|
fixed styles
|
2023-03-21 18:42:31 +01:00 |
|
daniel
|
a22b5479d9
|
fixed styles
|
2023-03-16 16:48:03 +01:00 |
Daniel Maya
|
b446e89728
|
Merge branch 'develop' into ent-9893-nuevo-sistema-de-ha
|
2023-03-13 15:08:44 +01:00 |
|
Daniel Maya
|
695f3fb282
|
#9893 Added img disabled
|
2023-03-13 15:07:38 +01:00 |
|
daniel
|
503a1b2c22
|
Merge remote-tracking branch 'origin/develop' into ent-9680-widget-para-mostrar-modulos-por-estados
Conflicts:
pandora_console/include/lib/Dashboard/Widget.php
|
2023-03-13 10:43:38 +01:00 |
|
daniel
|
3be507ca7e
|
fixed styles
|
2023-03-10 12:40:21 +01:00 |
|
Pablo Aragon
|
4ebe7ee790
|
9680-Conflict
|
2023-03-10 09:38:55 +01:00 |
|
daniel
|
6d0b0039c5
|
fixed styles
|
2023-03-09 19:25:14 +01:00 |
|
Pablo Aragon
|
cbc05f7ea0
|
Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round
|
2023-03-09 15:15:06 +01:00 |
|
Pablo Aragon
|
2a97b26cfe
|
Admin tools
|
2023-03-09 15:14:47 +01:00 |
|
daniel
|
63d83b3f97
|
fixed styles
|
2023-03-09 11:25:43 +01:00 |
Jose Gonzalez
|
c855061d43
|
Netflow view
|
2023-03-09 00:45:41 +01:00 |
Jonathan
|
434aa1dbc3
|
z-index fix on buttons and mesage
|
2023-03-08 15:57:55 +01:00 |
|
Jose Gonzalez
|
1d3d2fc5fd
|
Minor fixes
|
2023-03-08 15:01:41 +01:00 |
|
Jose Gonzalez
|
eefb62e520
|
Input improve
|
2023-03-07 22:45:48 +01:00 |
|
Jonathan
|
8dbcffaa8b
|
Buttons and view report
|
2023-03-07 14:15:02 +01:00 |
|
daniel
|
5ba9e0e9aa
|
fixed styles
|
2023-03-06 16:21:10 +01:00 |
|
daniel
|
08dca1a83c
|
fixed styles
|
2023-03-05 13:46:27 +01:00 |
|
daniel
|
95df525cb2
|
fixed styles
|
2023-03-03 14:16:06 +01:00 |
|
Pablo Aragon
|
f3b9d73855
|
Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones
|
2023-03-03 12:43:35 +01:00 |
|
Pablo Aragon
|
b18a689225
|
About meta and observer input password
|
2023-03-03 12:40:58 +01:00 |
|
daniel
|
5d7738a05e
|
Merge remote-tracking branch 'origin/develop' into ent-9662-Restyling-fuentes-colores-botones
Conflicts:
pandora_console/extras/mr/62.sql
pandora_console/include/ajax/module.php
pandora_console/include/functions_ui.php
pandora_console/operation/agentes/estado_agente.php
pandora_console/operation/agentes/status_monitor.php
pandora_console/operation/events/events.php
|
2023-03-03 08:20:44 +01:00 |
|
daniel
|
310ad88707
|
fixed styles
|
2023-03-02 19:25:31 +01:00 |
|
Pablo Aragon
|
816f0f4770
|
Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones
|
2023-03-02 17:10:01 +01:00 |
|
Pablo Aragon
|
0e9f7331db
|
Ipam
|
2023-03-02 17:08:47 +01:00 |
|
Jose Gonzalez
|
4519bd3d72
|
Improve label input block function
|
2023-03-02 15:24:54 +01:00 |
|
daniel
|
7b1d8a535a
|
fixed styles
|
2023-03-01 13:19:12 +01:00 |
|
Jonathan
|
f72ec5eb9d
|
Fix html_print_label_input_block default id
|
2023-02-28 16:09:13 +01:00 |
|
Jose Gonzalez
|
973444014a
|
Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones
|
2023-02-27 16:37:17 +01:00 |
|
Jonathan
|
dcdf0a5188
|
SNMP and reporting visual changes
|
2023-02-27 16:33:54 +01:00 |
|
Jose Gonzalez
|
526bff976c
|
Improve functionality
|
2023-02-27 16:33:46 +01:00 |
|
Jose Gonzalez
|
f08fc6a8b7
|
Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones
|
2023-02-23 14:31:59 +01:00 |
|
Jose Gonzalez
|
d7c70bd8a8
|
Tree view fixes
|
2023-02-23 14:30:31 +01:00 |
|
daniel
|
598a1b1456
|
restyling
|
2023-02-23 12:34:41 +01:00 |
|
daniel
|
ff9ee7a4f0
|
restyling
|
2023-02-23 10:24:03 +01:00 |
|
Jose Gonzalez
|
ec58cb4593
|
Plugins view
|
2023-02-22 14:19:57 +01:00 |
|
Jose Gonzalez
|
370ee54d9f
|
Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones
|
2023-02-22 12:16:14 +01:00 |
|
Jose Gonzalez
|
fd0c181820
|
Margin reversed
|
2023-02-22 12:16:04 +01:00 |
|
Pablo Aragon
|
95fb797a7e
|
10488-Fix views reports
|
2023-02-22 10:33:45 +01:00 |
|
Jose Gonzalez
|
98bd383141
|
Minor html and ui improvements
|
2023-02-20 11:49:54 +01:00 |
|
Jose Gonzalez
|
d8230dba94
|
Minor change in buttons
|
2023-02-16 12:35:02 +01:00 |