Commit Graph

378 Commits

Author SHA1 Message Date
Daniel Rodriguez 4473762393 Merge branch '3227-No-se-guarda-muestra-correctamente-certificado-ssl-en-setup-general' into 'develop'
fix bug when updating path of ssl certificate in general setup

See merge request artica/pandorafms!2052

Former-commit-id: 453119a3a14e50ce6834eb1ee46da2f1289d6082
2019-02-18 17:18:46 +01:00
Alejandro Fraguas 01b8649812 Merge branch '1744-Opción-para-validar-que-la-ip-de-un-agente-sea-unica' into 'develop'
Added option in setup for unique main IP in agents - #1744

Closes pandora_enterprise#1744

See merge request artica/pandorafms!2114

Former-commit-id: 77e1bbae9a1a60bc51739d98948ca8af5d183f78
2019-02-18 12:16:20 +01:00
alejandro-campos 2c97708373 Merge branch 'develop' into 3227-No-se-guarda-muestra-correctamente-certificado-ssl-en-setup-general
Former-commit-id: d6becbfc3aba9d5197b748647db5e93e3b58c348
2019-02-15 14:56:20 +01:00
Tatiana Llorente 9568cc9aba Merge remote-tracking branch 'origin/develop' into 1744-Opción-para-validar-que-la-ip-de-un-agente-sea-unica
Conflicts:
	pandora_console/godmode/agentes/agent_manager.php
	pandora_console/godmode/agentes/configurar_agente.php
	pandora_console/include/functions_config.php


Former-commit-id: 19f087050477dcc099bd31d7de62ac893de5d686
2019-02-06 18:06:49 +01:00
Tatiana Llorente cc17cbf60f Merge remote-tracking branch 'origin/develop' into ent-3426-No-desaparece-la-alerta-de-PhantomJS-en-windows
Conflicts:
	pandora_console/include/functions_config.php


Former-commit-id: 3456fcc7a45639055010e67440601ac4fba547ec
2019-02-06 15:22:05 +01:00
artica b3da2803a4 Changed the format of the .php files
Former-commit-id: 4dc926a81de14e27df8be7982406b09d8e808399
2019-01-30 16:18:44 +01:00
tatiana.llorente@artica.es 4d4569cadb Fixed error with slashes - #3426
Former-commit-id: 8dbead7acd73faa66e406cccf1fe81ed775eb933
2019-01-25 13:52:49 +01:00
daniel 687358d70c add new token treshold IPAM
Former-commit-id: cc7858af6a83b0773fec3249e13cfbfb274f2fba
2019-01-23 17:33:06 +01:00
tatiana.llorente@artica.es 6f65c9876f Added option in setup for unique main IP in agents - #1744
Former-commit-id: f8f9668a14818a01b811a73052e2e7e82e9a8c7a
2019-01-09 16:20:24 +01:00
fermin831 0445e212fe Added default_no_hierarchy to config global variable
Former-commit-id: 0daba928d7adc7a848bca04b04168d05a82ea609
2019-01-08 12:54:32 +01:00
danielmaya b530447474 Added token metaconsole_deploy_inventory_plugin in functions_config
Former-commit-id: 9d819bb43ba4ce7869480411ae6f6cb9f1edbcce
2018-12-17 12:09:05 +01:00
alejandro-campos c05b4c53e8 fix bug when updating path of ssl certificate in general setup
Former-commit-id: dfe466e64e18c7e3ea949f7786e0ef6343334260
2018-12-07 15:12:09 +01:00
daniel a089a93477 fixed session bugs 2018-11-20 18:07:43 +01:00
vgilc 522a098d24 Merge branch '2615-bug-session-timeout' into 'develop'
time used for session cookie expiration set to gmt time

See merge request artica/pandorafms!1995
2018-11-19 17:30:11 +01:00
alejandro-campos 2c5cd6627b time used for session cookie expiration set to gmt time 2018-11-19 16:33:27 +01:00
vgilc c499a21cc2 Merge branch '2615-bug-session-timeout' into 'develop'
time used for session cookie set to timezone current time instead of gmt time

See merge request artica/pandorafms!1991
2018-11-19 13:29:01 +01:00
alejandro-campos 3ffab647cb time used for session cookie set to timezone current time instead of gmt time 2018-11-19 13:21:25 +01:00
danielmaya 24fe48d5c5 Added token metaconsole_deploy_collection in the config 2018-11-19 12:12:10 +01:00
fbsanchez 5c3b3a0e66 adjusted replication_interval default 2018-11-16 12:46:10 +01:00
fbsanchez 50c3453415 change default values for event synch 2018-11-16 11:27:32 +01:00
daniel d12a25866d fixed translate php7 warning 2018-11-15 15:33:46 +01:00
daniel b78c52caa4 fixed error Acess for Access 2018-11-15 13:22:54 +01:00
daniel 6174e622c8 create alert php7 2018-11-14 18:15:48 +01:00
daniel bd2a3a82ec silence error php7(not solution) 2018-10-19 12:25:01 +02:00
daniel 8c49b26a91 php7 version 2018-10-19 11:37:11 +02:00
daniel ffc7734ebc delete flash_charts and library pchart 2018-10-19 11:31:06 +02:00
daniel f824650642 Merge remote-tracking branch 'origin/develop' into 2221-Actualizacion_de_Pandora_a_version_7_de_PHP 2018-10-16 15:42:17 +02:00
daniel d84427b014 fixed errors php 2018-10-15 10:32:24 +02:00
fermin831 e318d9539c Added favourite services configuration tokens 2018-09-19 16:56:58 +02:00
daniel f117d1af43 fixed heigth charts for reports 2018-09-11 09:33:24 +02:00
fermin831 e54e91cdf1 Revert "Improved metaconsole sync (added centralized management)"
This reverts commit 3c99242508.
2018-08-17 13:27:55 +02:00
daniel 06c436e5bf add new tocken zoom graph visual styles 2018-08-03 10:01:04 +02:00
fermin831 3c99242508 Improved metaconsole sync (added centralized management) 2018-07-20 14:10:31 +02:00
daniel 0dd39f1f00 fixed errors in graph slice for uncompresed 2018-07-05 11:52:52 +02:00
daniel 2ae0dc6c52 fixed minor error default graph for pdf or email 320 2018-06-20 11:54:03 +02:00
danielmaya 4214577eea Added new token for static graph height 2018-06-19 18:27:04 +02:00
danielmaya 14f4070558 Changed link to phantomjs configuration 2018-06-18 13:22:20 +02:00
daniel 651347897c fixed minor error add link phantomjs 2018-06-14 20:15:04 +02:00
daniel 05d8d0ccf5 fixed errors graph 2018-06-13 19:13:42 +02:00
daniel 92204c4ec2 fixed minor error alert phantomjs 2018-06-13 11:55:05 +02:00
daniel 7fe88d761e remove setup resolution graph 2018-06-13 11:32:03 +02:00
daniel 9ecc770519 remove only average for all graphs and add zoom for sparse graph in stat-win and stat-win-interfaces 2018-06-13 11:02:58 +02:00
daniel 2d6fa8d0e0 fixed errors graphs 2018-06-12 15:46:05 +02:00
fermin831 a54c074b11 [Rebranding] Added hide help on node 2018-05-25 10:29:40 +02:00
fermin831 8eb44762b2 [Rebranding] Added custom favicon and white background to meta 2018-05-24 18:33:45 +02:00
fermin831 750ed29ac9 [Rebranding] Added a header to white backgrounds and make the favicon and the mobile console configurable 2018-05-24 16:59:50 +02:00
fermin831 0e3db1eb80 [Rebranding] Added custom logo to network maps central node 2018-05-21 18:26:28 +02:00
Fermin 8f2302630c [Rebranding] Docs and Support login icons are configurables 2018-05-21 14:29:11 +02:00
Fermin 3497132517 [Rebranding] Moved rebranding to visual styles section 2018-05-21 11:56:16 +02:00
Fermin ef07eff769 [Rebranding] Added enable update manager option 2018-05-21 11:07:39 +02:00