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

865 Commits

Author SHA1 Message Date
Daniel Cebrian abf8792ec9 #9073 fixed error error for multiple io_safe_input 2023-03-08 09:13:04 +01:00
Daniel Cebrian a4634717d8 Merge branch 'develop' into ent-9073-nuevo-sistema-de-tips-de-bienvenida 2023-03-07 13:49:39 +01:00
Daniel Cebrian 135793454c #9073 added images 2023-03-06 12:20:08 +01:00
Daniel Maya 4b773671a9 #9893 changed mr 2 2023-03-03 11:49:25 +01:00
Daniel Maya 62673d8292 #9893 changed mr 2023-03-03 10:26:21 +01:00
Daniel Maya 297a21c11d Merge branch 'develop' into 'ent-9893-nuevo-sistema-de-ha' 
# Conflicts:
#   pandora_console/extras/mr/62.sql
 2023-03-03 09:18:56 +00:00
Daniel Maya b5ea1c5868 #9893 Added mr 2023-03-03 10:15:02 +01:00
Alejandro Campos 3ddb3c1034 Merge branch 'develop' into 'ent-4289-8282-RWORKS-Poder-escoger-el-servidor-que-ejecute-una-CronJob' 
# Conflicts:
#   pandora_console/extras/mr/62.sql
#   pandora_console/pandoradb.sql
 2023-03-03 08:12:57 +00: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
Alejandro Campos f297f6fff9 Merge branch 'develop' into 'ent-10008-Gestion-de-busquedas-en-la-vista-de-agentes-y-mejora-de-las-busquedas' 
# Conflicts:
#   pandora_console/extras/mr/62.sql
#   pandora_console/pandoradb.sql
 2023-03-02 16:53:42 +00:00
Diego Muñoz-Reja 5d756ee393 Merge branch 'ent-9819-crear-tip-en-consola-sonora-de-eventos' into 'develop' 
Ent 9819 crear tip en consola sonora de eventos

See merge request artica/pandorafms!5466
 2023-03-02 15:25:31 +00:00
Jonathan 590ddc827c #9819 Change MR and add pandoradb.sql create table teventsound 2023-03-02 08:29:06 +01:00
Jonathan fdab2cff8e Merge branch 'develop' into ent-9819-crear-tip-en-consola-sonora-de-eventos 2023-03-02 08:26:53 +01:00
Jonathan 2f4543a023 #9517 Change MR sql 2023-03-02 08:20:43 +01:00
daniel a758528968 Merge remote-tracking branch 'origin/develop' into ent-9662-Restyling-fuentes-colores-botones 
Conflicts:
	pandora_console/extras/mr/62.sql
	pandora_console/include/class/AuditLog.class.php
 2023-03-01 07:56:32 +01:00
Alejandro Campos f94c7e2a04 Merge branch 'develop' into 'ent-10008-Gestion-de-busquedas-en-la-vista-de-agentes-y-mejora-de-las-busquedas' 
# Conflicts:
#   pandora_console/extras/mr/62.sql
 2023-02-28 16:11:46 +00:00
Matias Didier 25413c7173 Merge branch 'ent-10235-anadir-mas-indices-al-modelo-de-datos-2' into 'develop' 
Added new indexes to mr and pandoradb

See merge request artica/pandorafms!5562
 2023-02-28 14:27:38 +00:00
Matias Didier cccae56b8a Merge branch 'ent-9517-buscar-por-campos-avanzados-de-agente' into 'develop' 
Ent 9517 buscar por campos avanzados de agente

See merge request artica/pandorafms!5446
 2023-02-28 11:59:01 +00:00
Daniel Cebrian 3dee690e42 #10324 added table tfavmenu_user in mr 2023-02-24 13:58:16 +01:00
Calvo d1a3795acb Added new indexes to mr and pandoradb 2023-02-23 12:58:33 +01:00
daniel 8230ae616b Merge remote-tracking branch 'origin/develop' into ent-9662-Restyling-fuentes-colores-botones 
Conflicts:
	pandora_console/godmode/users/user_list.php
	pandora_console/operation/events/events.php
 2023-02-22 12:35:34 +01:00
alejandro.campos@artica.es 2a9494b48d fix conflicts 2023-02-22 10:10:59 +01:00
alejandro.campos@artica.es 6c64ccd6d6 implemented consoles management 2023-02-21 15:32:45 +01:00
Jose Gonzalez da58e4b9e0 Ticket 10484 Fixed List Operating Systems 2023-02-20 13:02:24 +01:00
Jose Gonzalez 333a93fad2 Added MR 2023-02-20 11:45:59 +01:00
Daniel Maya 5b263981c4 #10118 Added group multiselector 2023-02-13 17:06:09 +01:00
alejandro.campos@artica.es 97ade7c461 deleted 2023-02-06 14:13:14 +01:00
alejandro.campos@artica.es bdb29231bc mr changes 2023-02-06 14:12:17 +01:00
alejandro.campos@artica.es 1998829b85 Merge remote-tracking branch 'origin/develop' into ent-9884-Carga-restauracion-de-filtros-en-la-vista-de-monitores 2023-02-06 14:02:39 +01:00
Daniel Rodriguez 67a4e2b04b Merge branch 'ent-9600-Estado-erroneo-de-servidor-cuando-hay-un-TZ-distinto-entre-servidor-consola' into 'develop' 
fix server status when distinct timezones

See merge request artica/pandorafms!5439
 2023-02-02 16:07:02 +00:00
Jonathan f80f1c9e70 Merge branch 'develop' into ent-9517-buscar-por-campos-avanzados-de-agente 2023-02-02 11:15:31 +01:00
alejandro.campos@artica.es e4f5a9a61a Merge remote-tracking branch 'origin/develop' into ent-9884-Carga-restauracion-de-filtros-en-la-vista-de-monitores 2023-02-01 09:36:42 +01:00
Jonathan 34fede2ce1 #9819 New section configuration sound event 2023-01-27 12:42:23 +01:00
Alejandro Campos 87d09d47ca Merge branch 'develop' into 'ent-9600-Estado-erroneo-de-servidor-cuando-hay-un-TZ-distinto-entre-servidor-consola' 
# Conflicts:
#   pandora_console/extras/mr/61.sql
 2023-01-26 09:53:51 +00:00
Daniel Cebrian 082d3b5532 #10166 added index in MR and pandoradb 2023-01-24 12:10:40 +01:00
Jonathan 1e7cbb5521 #9517 Custom sql - Agent safe mode not enable 2023-01-24 10:18:01 +01:00
Jonathan 01ed220e1f #9517 Custom sql - Agent safe mode not enable 2023-01-24 10:16:31 +01:00
Jonathan b64c1ee44c #9517 Custom sql - Agent safe mode not enable 2023-01-23 16:19:54 +01:00
Diego Muñoz-Reja c462f389a4 Merge branch 'ent-10014-filtros-personalizados-para-logviewer' into 'develop' 
Ent 10014 filtros personalizados para logviewer

See merge request artica/pandorafms!5414
 2023-01-23 13:27:11 +00:00
alejandro.campos@artica.es a2076ffd0c fix server status when distinct timezones 2023-01-20 13:11:49 +01:00
Jonathan 7461c0d03f #10014 Change SQL after change milestone 2023-01-20 08:03:03 +01:00
alejandro.campos@artica.es 67b7234e58 implement filter save and load feature in monitor view 2023-01-19 10:49:48 +01:00
daniel e0ee00aa7c fix name lts pandora_enterprise#10173 2023-01-18 09:28:57 +01:00
Jonathan f3cd19c315 #10014 New filters log viewer 2023-01-16 11:34:28 +01:00
Calvo af800fa886 Updated MR 2022-12-30 16:03:49 +01:00
Calvo 6d9149e11b Merge remote-tracking branch 'origin/develop' into ent-7386-Ocultar-credenciales-de-acceso-a-la-API 2022-12-29 17:39:12 +01:00
Alejandro Campos 93c1c040dd Merge branch 'develop' into 'ent-8297-Mejoras-en-gestion-de-acceso-a-pandora-MD5-SHA256-y-Salt-opcional' 
# Conflicts:
#   pandora_console/extras/mr/60.sql
 2022-12-20 12:05:31 +00:00
alejandro.campos@artica.es 22b63222c9 bcrypt implementation 2022-12-20 12:27:58 +01:00
Calvo f84f9733e3 Merge remote-tracking branch 'origin/develop' into ent-7386-Ocultar-credenciales-de-acceso-a-la-API 2022-12-20 12:15:10 +01:00
Rafael Ameijeiras e18277bc89 Merge branch 'ent-9847-cambiar-plugins-de-inventario-remoto-de-windows-para-que-usen-pandorawmic-2' into 'develop' 
added updates to mr with new code to update the scripts and changed the code...

See merge request artica/pandorafms!5337
 2022-12-19 14:33:52 +00:00
alejandro c6637d59e4 added also the updates in the mr and updated the inserts in pandoradb_data.sql for the motherboards, monitors, printers, product_key, product_id inventory plugins. 2022-12-16 12:19:30 +01:00
alejandro.campos@artica.es 7e507d454b change password field length 2022-12-16 12:12:11 +01:00
alejandro 5c41b88ed2 added updates to mr with new code to update the scripts and changed the code of the windows tmodule_inventory inserts in pandoradb_data.sql 2022-12-16 09:00:01 +01:00
alejandro.campos@artica.es 4ca220a3a7 Merge remote-tracking branch 'origin/develop' into ent-9323-14021-Modificar-el-display-de-valores-de-informe 2022-12-15 15:28:58 +01:00
alejandro.campos@artica.es 4ea10b5a5b changed user password hashing 2022-12-15 13:24:51 +01:00
Alejandro Campos 867e1cc2b3 Merge branch 'develop' into 'ent-9002-Eliminar-monitorizacion-transaccional-Servidor-transaccional' 
# Conflicts:
#   pandora_console/extras/mr/60.sql
 2022-12-13 11:42:41 +00:00
Daniel Barbero a0ddad63b8 Merge remote-tracking branch 'origin/develop' into ent-9135-buscar-por-nombre-de-usuario-en-eventos 
Conflicts:
	pandora_console/extras/mr/59.sql
 2022-12-13 09:17:39 +01:00
Rafael Ameijeiras f9bb893aae Merge branch 'ent-8849-13468-Anadir-links-web-en-los-custom-fileds-de-agente' into 'develop' 
implemented custom field

See merge request artica/pandorafms!5271
 2022-12-12 08:20:08 +00:00
alejandro.campos@artica.es 0f8b7ad834 removed linebreak 2022-12-09 12:50:13 +01:00
alejandro.campos@artica.es 39920692ef Merge remote-tracking branch 'origin/develop' into ent-9002-Eliminar-monitorizacion-transaccional-Servidor-transaccional 2022-12-09 12:49:04 +01:00
alejandro.campos@artica.es 2c020bcd46 fixed vc template creation 2022-11-30 18:50:57 +01:00
Daniel Maya 306d0f0cf2 #9927 changed lts_name 2022-11-28 09:24:50 +01:00
alejandro.campos@artica.es cdddc07b86 changed mr 2022-11-23 12:22:19 +01:00
alejandro.campos@artica.es 767624b0c3 implemented link type custom field 2022-11-22 11:50:07 +01:00
Daniel Barbero 19f587b73a fixed filters pandora_enterprise#9864 2022-11-22 11:37:33 +01:00
Daniel Barbero 4118a46b9f add new filter search events pandora_enterprise#9135 2022-11-18 14:04:54 +01:00
Daniel Barbero a31733ffef Merge remote-tracking branch 'origin/develop' into ent-9135-buscar-por-nombre-de-usuario-en-eventos 2022-11-18 07:51:26 +01:00
alejandro.campos@artica.es 5e510e7e12 implemented custom field 2022-11-16 10:28:50 +01:00
alejandro.campos@artica.es 780e6ac514 Removed transactional server 2022-11-11 12:53:41 +01:00
Daniel Rodriguez 7646f0629b Merge branch 'ent-8733-giss-anadir-alertas-externas-desde-varias-politicas-sin-pisar-las-anteriores' into 'develop' 
multiple external alert policies pandora_enterprise#8733

See merge request artica/pandorafms!5205
 2022-11-07 12:44:23 +00:00
Daniel Barbero 33b1c0ab8f add new filter pandora_enterprise#9135 2022-11-03 12:00:58 +01:00
edu.corral ba70e8dd0d ent 7914 status scaling time based 2022-11-02 12:58:45 +01:00
edu.corral 6a9e30ae6d ent 7914 status scaling 2022-11-02 12:53:14 +01:00
Daniel Barbero 331219ba16 Merge remote-tracking branch 'origin/develop' into ent-8733-giss-anadir-alertas-externas-desde-varias-politicas-sin-pisar-las-anteriores 
Conflicts:
	pandora_console/extras/mr/58.sql
 2022-10-31 14:13:45 +01:00
Alejandro Campos 0889bcf142 Merge branch 'develop' into 'ent-9376-Discovery-SNMP-Host-Filtro-por-interfaces-no-operativas' 
# Conflicts:
#   pandora_console/extras/mr/58.sql
 2022-10-31 10:46:44 +00:00
Daniel Rodriguez 41946bfda7 Merge branch 'ent-4822-estado-de-consola-visual-mantenimiento' into 'develop' 
add mode maintenance VC pandora_enterprise#4822

See merge request artica/pandorafms!5191
 2022-10-31 10:02:44 +00:00
Alejandro Campos 9322e5b720 Merge branch 'develop' into 'ent-9376-Discovery-SNMP-Host-Filtro-por-interfaces-no-operativas' 
# Conflicts:
#   pandora_console/extras/mr/58.sql
 2022-10-27 09:50:24 +00:00
Daniel Maya 382e74ae36 resolved conflict 2022-10-27 09:42:40 +02:00
alejandro.campos@artica.es 8d611a8e7f implemented float formatting and option in reports to change visualization format 2022-10-26 18:25:16 +02:00
Daniel Barbero 3273fc23ed Merge remote-tracking branch 'origin/develop' into ent-4822-estado-de-consola-visual-mantenimiento 
Conflicts:
	pandora_console/extras/mr/58.sql
 2022-10-26 09:42:02 +02:00
edu.corral 90f8122232 ent 7914 table change for status scaling based on time 2022-10-26 08:51:51 +02:00
edu.corral 0f6f7b6563 ent 7914 status scaling based on time 2022-10-21 13:22:14 +02:00
edu.corral 0fd29caffe ent 7914 status scaling based on time 2022-10-21 13:10:12 +02:00
Daniel Barbero 688597a006 multiple external alert policies pandora_enterprise#8733 2022-10-20 16:42:26 +02:00
Jimmy Olano a276eb4dba Merge branch 'ent-9592-Problema-de-seguridad-con-la-gestion-de-sesiones-Limited-Authentication-bypass-in-ajax-php' into 'develop' 
fixed vulnerability

Ref pandora_enterprise#9592

See merge request artica/pandorafms!5176
 2022-10-20 12:10:59 +00:00
Alejandro Campos c995a5eafb Merge branch 'develop' into 'ent-9592-Problema-de-seguridad-con-la-gestion-de-sesiones-Limited-Authentication-bypass-in-ajax-php' 
# Conflicts:
#   pandora_console/extras/mr/58.sql
 2022-10-18 07:23:29 +00:00
Daniel Barbero 47a2e01a33 Merge remote-tracking branch 'origin/develop' into ent-2133-14061-recursividad-en-la-vista-de-eventos-accelya 
Conflicts:
	pandora_console/extras/mr/58.sql
 2022-10-18 07:59:26 +02:00
Daniel Barbero 3099ffa7cb add mode maintenance VC pandora_enterprise#4822 2022-10-13 13:44:39 +02:00
Daniel Barbero 9c93a99fb2 add mode maintenance VC pandora_enterprise#4822 2022-10-13 11:03:49 +02:00
Diego Muñoz-Reja 8154ef5533 Merge branch 'ent-9391-Cambios-en-el-inventario-remoto' into 'develop' 
added change to allow inventory modules to load script from a path

See merge request artica/pandorafms!5151
 2022-10-11 15:14:45 +00:00
alejandro.campos@artica.es 05cbc2fb0e fixed vulnerability 2022-10-04 18:00:47 +02:00
Daniel Maya 2d747caede #4043 mr 58 2022-10-04 09:58:07 +02:00
Daniel Maya c1b4501da5 resolved conflict 2022-10-03 14:41:14 +02:00
Daniel Rodriguez 637fae3e8d Merge branch 'ent-8898-anida-mapas-de-red-no-actualizan-bien' into 'develop' 
Ent 8898 anida mapas de red no actualizan bien

See merge request artica/pandorafms!5143
 2022-09-29 12:36:37 +00:00
Daniel Barbero 8438045cf6 filter recursive groups in events pandora_enterprise#2133 2022-09-29 12:54:46 +02:00
Diego Muñoz-Reja 9aa1d4d82f Merge branch 'ent-9395-14081-Politicas-no-aplican-a-grupos-secundarios' into 'develop' 
removed mr

See merge request artica/pandorafms!5150
 2022-09-28 14:02:06 +00:00
alejandro.campos@artica.es 4dd0075b72 removed mr 2022-09-28 15:53:44 +02:00
alejandro.campos@artica.es 042362991d implemented option to skip inoperative interfaces on demand 2022-09-28 15:34:45 +02:00
Alejandro Campos b11839dde5 Merge branch 'develop' into 'ent-9395-14081-Politicas-no-aplican-a-grupos-secundarios' 
# Conflicts:
#   pandora_console/extras/mr/57.sql
 2022-09-27 15:24:28 +00:00
alejandro.campos@artica.es 9c7e70c7de changes to mr 2022-09-27 17:19:10 +02:00