Commit Graph

759 Commits

Author SHA1 Message Date
Matias Didier add65eca5d Merge branch 'ent-9162-10821-modificar-columnas-widget-eventos' into 'develop'
Ent 9162 10821 modificar columnas widget eventos

See merge request artica/pandorafms!5843
2023-07-06 08:35:35 +00:00
Daniel Cebrian bdcb16e6f8 #9162 fixed configure colums in meta 2023-07-06 09:20:21 +02:00
Jonathan d6df9ed38e #10639 new datepicker style and filters 2023-07-05 14:38:59 +02:00
Gorka Sanchez 7dea46c634 Merge branch 'ent-11093-reticula-en-consola-visual' into 'develop'
Ent 11093 reticula en consola visual

See merge request artica/pandorafms!6056
2023-07-05 09:54:35 +00:00
Matias Didier 94a0d4e460 Merge branch 'ent-11372-checkbox-decompress-pegada-al-nombre-del-fichero-se-ve-mal' into 'develop'
Ent 11372 checkbox decompress pegada al nombre del fichero se ve mal

See merge request artica/pandorafms!5995
2023-07-05 07:54:28 +00:00
Jonathan 389365ebd6 Merge branch 'develop' into ent-9756-anadir-escalado-de-estados-a-op-masivas 2023-07-03 11:20:59 +02:00
Jonathan d7a682d48c Merge branch 'develop' into ent-11093-reticula-en-consola-visual 2023-07-03 09:50:59 +02:00
miguel angel rasteu 5f864d53a8 #11051 Add action to mark all notification as read 2023-07-03 09:18:30 +02:00
miguel angel rasteu 2842a5d3cd #11372 fix consolelog 2023-06-27 11:51:45 +02:00
miguel angel rasteu 1df94901f6 #11372 trim long file names 2023-06-27 11:48:45 +02:00
daniel 6e3eddff08 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-06-27 08:23:46 +02:00
daniel e82c1e6881 wip integration integriaIMS pandora_enterprise#11471 2023-06-16 13:47:25 +02:00
Jonathan d2009b72df #9756 change styles modules bulks 2023-06-14 09:02:31 +02:00
miguel angel rasteu db62a91cb6 #11476 Fix https url 2023-06-08 13:19:01 +02:00
miguel angel rasteu 1f8752ee63 #11476 Fix pandora url 2023-06-08 13:10:16 +02:00
miguel angel rasteu 933f69f2ab #11476 Change copyright header 2023-06-08 11:53:13 +02:00
Jonathan dd375dc73e #11093 grid background VC 2023-06-07 12:46:39 +02:00
Jonathan ae526d5df0 #10598 New wizard welcome 2023-05-23 16:54:40 +02:00
miguel angel rasteu e1a10ef5c3 #11149 Delete hd 2023-05-23 13:41:32 +02:00
miguel angel rasteu bbd8679235 #11149 Fix conditional when selected is string and value is integer 2023-05-23 13:39:40 +02:00
miguel angel rasteu 33d95ef00e #11117 Add new field in tusuario for metaconsole event default and fix selectors 2023-05-22 12:08:27 +02:00
Rafael Ameijeiras 0bb69dda4d Merge branch 'ent-10328-14815-campos-ocultos-no-se-ocultan-en-comandos-segun-el-navegador' into 'develop'
Ent 10328 14815 campos ocultos no se ocultan en comandos segun el navegador

See merge request artica/pandorafms!5783
2023-05-17 14:47:08 +00:00
miguel angel rasteu cb63ee92f7 #10328 Fix JS code 2023-05-17 10:54:43 +02:00
miguel angel rasteu 52886b96b3 #10328 Fix security font and values 2023-05-16 17:03:10 +02:00
miguel angel rasteu 1d885f5e42 Fix functions_html 2023-05-16 16:15:18 +02:00
miguel angel rasteu 1fc0a43ca8 #11158 Fixed entities in agent name and icon size 2023-05-10 12:53:03 +02:00
Daniel Cebrian 042591c57b #9162 added new select for order columns in widgets 2023-05-08 10:35:59 +02:00
Jonathan 410a5efcd5 Merge branch 'develop' into ent-10185-filtros-personalizados-para-el-visor-de-datos-de-logs 2023-05-05 11:32:23 +02:00
Alejandro Campos 539ff07aec Merge branch 'develop' into 'ent-10179-wizard-deploy-agentes'
# Conflicts:
#   pandora_console/include/styles/pandora.css
2023-04-28 08:07:10 +00:00
miguel angel rasteu 8108a84ba7 Fix incompatibility with Firefox 2023-04-25 16:47:52 +02:00
Rafael Ameijeiras 58af8f8d46 Merge branch 'ent-10899-consola-mete-entities-en-los-custom-fields-del-inventario' into 'develop'
Ent 10899 consola mete entities en los custom fields del inventario

See merge request artica/pandorafms!5699
2023-04-25 13:27:07 +00:00
Rafael Ameijeiras 2dc910005f Merge branch 'ent-9555-revision-visual-ui-de-la-vista-movil' into 'develop'
Ent 9555 revision visual ui de la vista movil

See merge request artica/pandorafms!5684
2023-04-24 11:16:30 +00:00
alejandro.campos@artica.es 9553c42496 implemented agent deploy wizard 2023-04-19 19:21:38 +02:00
daniel 4a5f8be859 fix hd pandora_enterprise#11006 2023-04-19 13:34:04 +02:00
Diego Muñoz-Reja aa6c591a5e Merge branch 'ent-10646-15203-edicion-de-threshold-de-acciones' into 'develop'
Ent 10646 15203 edicion de threshold de acciones

See merge request artica/pandorafms!5648
2023-04-18 14:44:35 +00:00
Jonathan f6be23c353 #10899 json_ucescaped_unicode to inventory manage and visual fix 2023-04-14 12:24:39 +02:00
Pablo Aragon d144d77128 9555-Groups, agents counters 2023-04-13 09:38:52 +02:00
Pablo Aragon c21397476e 10898-Assign secondary groups in agent view 2023-04-12 08:21:26 +02:00
Pablo Aragon e64053eb22 10646-Threshold zero value 2023-04-03 10:00:08 +02:00
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
Jose Gonzalez 8673ea57b1 Fix issues with view button in setup view 2023-02-15 16:28:40 +01:00
Jose Gonzalez 2d52327285 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-15 12:51:54 +01:00
Jose Gonzalez e539fa9697 Minor HTML input checkbox fix 2023-02-15 12:48:41 +01:00
Jonathan 7e864a4db2 Select2 fix styles 2023-02-15 10:39:45 +01:00
Jose Gonzalez e499e13753 Minor fix with submit buttons 2023-02-14 12:16:09 +01:00
Jose Gonzalez d45a631ea5 Final merge with new menu 2023-02-13 10:37:37 +01:00
Daniel Maya 44bee67f36 #9663 menu redesing 6 2023-02-13 09:31:33 +01:00
Jose Gonzalez 6a46af495d Fix issue with dev environment starting and added button fixed id parameter 2023-02-10 13:38:47 +01:00
Pablo Aragon 971fc84a47 9680-Create widget ModulesByStatus 2023-02-09 10:12:59 +01:00
Jose Gonzalez 4b592b6610 Minor fixes 2023-02-08 17:20:52 +01:00
Jose Gonzalez f14d324490 Minor fixes and improves 2023-02-08 12:43:08 +01:00