Commit Graph

702 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
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 d7a682d48c Merge branch 'develop' into ent-11093-reticula-en-consola-visual 2023-07-03 09:50:59 +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
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
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