tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
30,912 Commits 34 Branches 30 Tags 901 MiB
Commit Graph

669 Commits

Author SHA1 Message Date
Daniel Rodriguez b1ff477780 Merge branch 'ent-6367-report-server-gestion-de-informes-extensos-varios-cientos-de-agentes-val' into 'develop' 
new console report pandora_enterprise#6367

See merge request artica/pandorafms!5013
 2022-08-09 12:09:26 +00:00
Daniel Barbero d9227fae0e fix console report pandora_enterprise#6367 2022-08-08 13:51:07 +02:00
Daniel Barbero 38c7bcc061 fix errors ipam pandora_enterprise#9282 2022-08-04 10:10:20 +02:00
Daniel Barbero 2a51a448ac Merge remote-tracking branch 'origin/develop' into ent-6367-report-server-gestion-de-informes-extensos-varios-cientos-de-agentes-val 
Conflicts:
	pandora_console/godmode/menu.php
 2022-08-02 10:34:21 +02:00
Daniel Barbero Martin 1e9ca202f0 fix error services items pandora_enterprise#8522 2022-07-19 11:09:49 +02:00
Daniel Barbero Martin 628d9b5630 new console report pandora_enterprise#6367 2022-07-12 10:18:06 +02:00
Daniel Barbero Martin 8e2b074460 new console report pandora_enterprise#6367 2022-07-11 16:42:20 +02:00
Daniel Barbero Martin 01ba149280 new console report pandora_enterprise#6367 2022-07-08 13:40:20 +02:00
Diego Muñoz-Reja bdb1fda92e Merge branch 'ent-9019-13559-Bug-en-logueo-con-AD-con-el-nombre' into 'develop' 
Ent 9019 13559 bug en logueo con ad con el nombre

See merge request artica/pandorafms!4910
 2022-07-07 10:44:46 +00:00
Diego Muñoz-Reja 3fe66d9a9b Merge branch 'ent-9085-13692-Fallo-permisos-en-creacion-edicion-de-List-of-Special-Days' into 'develop' 
fixed permissions

See merge request artica/pandorafms!4934
 2022-06-28 14:32:31 +00:00
Daniel Barbero Martin f3e645146d Merge remote-tracking branch 'origin/develop' into ent-9086-eliminacion-de-la-replicacion-de-eventos-duplicado 2022-06-17 08:51:11 +02:00
Daniel Rodriguez bea57c8991 Merge branch 'ent-8861-wizard-snmp-convierte-valores-hex-string-en-string' into 'develop' 
Changed snmpwalk parameters for wizard

See merge request artica/pandorafms!4872
 2022-06-16 12:17:27 +00:00
Daniel Barbero Martin 951a1703bf Merge remote-tracking branch 'origin/develop' into ent-9086-eliminacion-de-la-replicacion-de-eventos-duplicado 
Conflicts:
	pandora_console/include/functions_reporting.php
 2022-06-08 08:15:49 +02:00
alejandro.campos@artica.es bf2ef75552 fixed permissions 2022-06-03 11:39:58 +02:00
Daniel Barbero Martin 0cda3d3613 refactor events meta pandora_enterprise#9086 2022-06-01 17:27:44 +02:00
Daniel Maya a78eb71995 #9019 Fixed id_user in active directory 2022-05-25 13:00:04 +02:00
Calvo dfc4786ef1 Changed snmpwalk parameters for wizard 2022-05-06 13:35:04 +02:00
fbsanchez 2ab1aa601c Service tree view with local scope parents 2022-04-20 14:10:23 +02:00
Daniel Barbero Martin 318ac668e9 add new report custom render pandora_enterprise#8540 2022-03-31 20:11:52 +02:00
Calvo b7923fe494 Added files repo error information for post_max_size and upload_max_filesize 2022-03-28 11:18:08 +02:00
fbsanchez 4d912fbd34 Merge remote-tracking branch 'origin/develop' into ent-6802-super-8 2022-02-11 09:55:34 +01:00
Jose Gonzalez 40efaa157d Merge remote-tracking branch 'origin' into ent-8422-Revision-completa-audit-logs 2022-02-01 13:42:30 +01:00
Jose Gonzalez d81e6571ec New audit logs 2022-02-01 13:39:18 +01:00
fbsanchez 1207463f16 Merge remote-tracking branch 'origin/develop' into ent-6802-super-8 
Conflicts:
	pandora_console/include/class/HTML.class.php
 2022-01-25 14:16:47 +01:00
Jose Gonzalez 3252832cc7 WIP: Check audit logs 2022-01-20 10:55:23 +01:00
Jose Gonzalez 0f549ce813 Fix issues with grid and background color 2022-01-14 13:56:08 +01:00
Jose Gonzalez b34b89f514 Clean magic number and define dynamic width 2022-01-13 17:45:16 +01:00
fbsanchez 32c0229966 php8 review 2022-01-13 12:43:55 +01:00
fbsanchez fee3f4ab96 php8 review + mdpf update 2022-01-12 14:22:16 +01:00
fbsanchez 92186aa15f vc php8 2022-01-11 14:46:57 +01:00
Jose Gonzalez 37675e0fce Added php8 function and solve issue with agent id sorting in events 2021-12-16 16:35:31 +01:00
fbsanchez 9ff3c8eee1 wip ncm2 2021-11-15 18:58:57 +01:00
José González bdc4d0a8b1 Revert "Merge branch 'ent-7662-rebranding-meta' into 'develop'" 
This reverts merge request !4302
 2021-11-04 16:28:15 +01:00
Jose Gonzalez c0abe5edb9 Fix merge 2021-11-04 16:00:05 +01:00
Daniel Rodriguez 56ae68a034 Merge branch 'ent-7951-Bloqueo-auto-creacion-usuarios-desde-nodo-en-entornos-centralizado' into 'develop' 
Ent 7951 bloqueo auto creacion usuarios desde nodo en entornos centralizado

See merge request artica/pandorafms!4487
 2021-11-03 09:34:49 +00:00
fbsanchez a5bf72cca0 Merge remote-tracking branch 'origin/develop' into ent-7595-12357-prototipo-event-server-paralelizado-y-con-recuperacion-de-alertas-bingo-card 
Conflicts:
	pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
	pandora_console/include/constants.php
	pandora_server/lib/PandoraFMS/Tools.pm
 2021-10-26 14:21:40 +02:00
fbsanchez 5ae3bbc4fe Merge remote-tracking branch 'origin/develop' into ent-7060-gestion-basica-de-configuracion-de-equipos-de-red 2021-10-25 10:28:31 +02:00
fbsanchez bb8dbc9332 NCM 2021-10-21 02:17:17 +02:00
alejandro.campos@artica.es e7d730ba0d fix bug with ldap login in metaconsole 2021-10-19 19:19:55 +02:00
Daniel Rodriguez aa2eb08edb Merge branch 'ent-fix-snmp-interfaces-wizard' into 'develop' 
Fixed SNMP interfaces wizard against 32bit counter devices.

See merge request artica/pandorafms!4348
 2021-10-18 08:33:17 +00:00
Daniel Rodriguez 69216e1bcf Merge branch 'ent-8056-12473-Funcion-get-magic-quotes-gpc-hace-fallar-snmp-browser-para-PHP-7-4-o-superior' into 'develop' 
removed deprecated get_magic_quotes_gpc function and dependent code

See merge request artica/pandorafms!4439
 2021-10-06 10:30:58 +00:00
alejandro.campos@artica.es c08806374e removed deprecated get_magic_quotes_gpc function and dependent code 2021-10-04 17:37:06 +02:00
Jose Gonzalez 8696d21a42 Fixed any minor bugs 2021-09-29 17:03:13 +02:00
fbsanchez 8c1838abb7 Merge remote-tracking branch 'origin/develop' into ent-7937-mensaje-this-node-is-configured-with-centralized-mode-de-nodo-sale-en-metaconsola 
Conflicts:
	pandora_console/install.php
 2021-09-29 13:47:10 +02:00
Jose Gonzalez 1a884a9df6 Merge remote-tracking branch 'origin' into ent-7662-rebranding-meta 2021-09-28 11:33:48 +02:00
fbsanchez fe42a8782b Updated messages in centralised environment status check 2021-09-23 11:16:48 +02:00
Daniel Rodriguez b02ecc7cae Merge branch 'ent-7473-11796-mala-representacion-de-percentil-en-graficas-personalizadas' into 'develop' 
fixed error with percentiles in graphs

See merge request artica/pandorafms!4312
 2021-09-21 13:18:18 +00:00
Jose Gonzalez 423bd106d5 Fix issues 2021-09-01 16:57:48 +02:00
José González 215c0e3cc1 Branding 2021-08-30 16:24:51 +02:00
José González f31d156a46 Merge remote-tracking branch 'origin' into ent-7662-rebranding-meta 2021-08-27 13:00:37 +02:00