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

7740 Commits

Author SHA1 Message Date
daniel 1a1087e311 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 
Conflicts:
	pandora_console/extras/mr/66.sql
 2023-09-04 08:16:48 +02:00
Gorka Sanchez 2afd8d3ff3 Merge branch 'ent-11781-unauthenticated-admin-account-takeover-via-malicious-agent-and-xss' into 'develop' 
Ent 11781 unauthenticated admin account takeover via malicious agent and xss

See merge request artica/pandorafms!6362
 2023-08-31 10:34:30 +00:00
Gorka Sanchez 34ddf9e06c Merge branch 'ent-11734-paradas-planificadas-periodicas-y-de-cron-no-deshabilitan-los-modulos' into 'develop' 
Fix cron and periodically module planned downtimes

See merge request artica/pandorafms!6248
 2023-08-31 10:33:18 +00:00
Gorka Sanchez 0d4a097a48 Merge branch 'ent-10622-anadir-acciones-sobre-alertas-y-alertas-externas-en-politicas-de-manera-masiva' into 'develop' 
Ent 10622 anadir acciones sobre alertas y alertas externas en politicas de manera masiva

See merge request artica/pandorafms!6331
 2023-08-31 06:48:45 +00:00
Jonathan b83c8c6da6 #10622 fix bug 2023-08-29 14:08:06 +02:00
Pablo Aragon ba964dfb16 11817-Remove Network maps from autorefresh user list 2023-08-29 08:52:50 +02:00
Calvo 32d67361b4 Fix planned downtime string 2023-08-28 10:43:06 +02:00
daniel ecfa71b43c ITSM pandora_enterprise#11471 2023-08-25 14:15:32 +02:00
miguel angel rasteu 73773e6ff9 #11781 clean custom_id 2023-08-25 13:42:41 +02:00
Jonathan e986ac27d6 #10622 add action full name 2023-08-24 13:14:31 +02:00
daniel a7baab0aba Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-08-24 12:07:32 +02:00
Matias Didier 9e747e9952 Merge branch 'ent-11873-paradas-planificadas-de-modulos-ponen-en-modo-quiet-agente-en-vez-de-modulos' into 'develop' 
Ent 11873 paradas planificadas de modulos ponen en modo quiet agente en vez de modulos

See merge request artica/pandorafms!6345
 2023-08-24 08:43:28 +00:00
daniel dca15b5637 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-08-23 18:54:01 +02:00
daniel 512d5331d3 ITSM pandora_enterprise#11471 2023-08-23 18:52:06 +02:00
Rafael Ameijeiras 1fa70b3afc Merge branch 'ent-11852-advertencia-al-usar-intervalos-largos' into 'develop' 
Ent 11852 advertencia al usar intervalos largos

See merge request artica/pandorafms!6346
 2023-08-23 05:56:19 +00:00
Rafael Ameijeiras 1bca8b0006 Merge branch 'ent-11819-cambios-en-wizard-de-las-consolas-visuales' into 'develop' 
Ent 11819 cambios en wizard de las consolas visuales

See merge request artica/pandorafms!6338
 2023-08-23 05:54:46 +00:00
daniel 5a61f074d7 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-08-22 09:22:11 +02:00
Jonathan 631a247f19 #10622 fix style policy alerts external 2023-08-21 14:50:51 +02:00
miguel angel rasteu 19fb83cd92 #11051 Fix css conflict 2023-08-21 13:16:53 +02:00
Jonathan 563323d0be #11852 warning time lapse more than 30 days 2023-08-21 13:05:39 +02:00
Jorge Rincon 35a7c409bf #11873 Fixed Scheduled Downtime quiet mode for modules 2023-08-21 13:03:44 +02:00
Rafael Ameijeiras b91798947e Merge branch 'ent-10603-personalizacion-weekly-mail-report' into 'develop' 
Ent 10603 personalizacion weekly mail report

See merge request artica/pandorafms!6263
 2023-08-21 10:22:10 +00:00
miguel angel rasteu ebd98b479d #11051 Fix conflict css 2023-08-21 09:01:05 +02:00
miguel angel rasteu 970cc997cc #11051 Fix conflict 2023-08-21 08:25:53 +02:00
daniel a63824d802 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 
Conflicts:
	pandora_console/extras/mr/66.sql
	pandora_console/godmode/users/user_management.php
 2023-08-21 08:08:34 +02:00
Jorge Rincon 3b50481c28 Merge branch develop into ent-11543-pantalla-de-login-en-modo-blanco 2023-08-18 09:49:27 +02:00
Rafael Ameijeiras 43b9972aef Merge branch 'ent-11871-error-sql-en-discovery-task-list-con-usuario-estandar-y-perfil-operator-read' into 'develop' 
Ent 11871 error sql en discovery task list con usuario estandar y perfil operator read

See merge request artica/pandorafms!6340
 2023-08-18 06:49:48 +00:00
Rafael Ameijeiras e28c7db126 Merge branch 'ent-11805-error-en-custom-reports-report-tasks-1-sin-reports' into 'develop' 
Ent 11805 error en custom reports report tasks 1 sin reports

See merge request artica/pandorafms!6310
 2023-08-18 06:42:26 +00:00
Rafael Ameijeiras 640c417a35 Merge branch 'ent-11375-user-bulk-operations-al-intentar-anadir-un-perfil-que-el-usuario-ya-tiene-el-aviso-de-error' into 'develop' 
Ent 11375 user bulk operations al intentar anadir un perfil que el usuario ya tiene el aviso de error

See merge request artica/pandorafms!6160
 2023-08-18 06:37:31 +00:00
Rafael Ameijeiras 46e5d4edcd Merge branch 'ent-11022-mejora-en-visualizacion-de-licencia' into 'develop' 
Ent 11022 mejora en visualizacion de licencia

See merge request artica/pandorafms!6204
 2023-08-18 06:35:41 +00:00
Daniel Rodriguez 2e4c542f28 Merge branch 'ent-11636-SNMP-v2-hace-que-wizard-no-funcione' into 'develop' 
Ent 11636 snmp v2 hace que wizard no funcione

See merge request artica/pandorafms!6303
 2023-08-18 06:29:45 +00:00
daniel 1fecd7d289 ITSM pandora_enterprise#11471 2023-08-17 14:56:55 +02:00
daniel 8bc65474f0 ITSM pandora_enterprise#11471 2023-08-16 16:52:57 +02:00
Jorge Rincon c7809b429f #11871 Fixed SQL query 2023-08-16 13:46:19 +02:00
Jonathan 53bf10acc0 #11819 wizard visual console update 2023-08-14 14:54:15 +02:00
daniel 98a5355c94 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-08-14 13:33:35 +02:00
Jorge Rincon f275cde745 #11843 Warning added message in cloud view 2023-08-14 11:50:06 +02:00
Jorge Rincon 3f0f6f8c44 Merge branch develop into ent-11843-advertencia-de-deprecado-de-discovery-y-marcar-las-tarea-antiguas-como-legacy. conflict is resolved 2023-08-14 11:25:11 +02:00
daniel 64c7f56235 ITSM pandora_enterprise#11471 2023-08-14 10:59:56 +02:00
daniel 133eef456a Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-08-14 08:14:34 +02:00
Jonathan de0fdd58af #10622 fix string policie to policies 2023-08-14 08:00:24 +02:00
daniel f0d78a44d1 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 
Conflicts:
	pandora_console/extras/delete_files/delete_files.txt
 2023-08-11 14:32:54 +02:00
daniel dbf98689c2 ITSM pandora_enterprise#11471 2023-08-11 14:30:18 +02:00
Rafael Ameijeiras 320c407637 Merge branch 'ent-10424-fix-http-auth-login-password-problem-2' into 'develop' 
Ent 10424 fix http auth login password problem 2

See merge request artica/pandorafms!6329
 2023-08-11 08:22:22 +00:00
Jonathan df91ea25b5 #10622 massive policies alerts and external 2023-08-11 09:18:50 +02:00
Rafael Ameijeiras 0e317edf70 Merge branch 'ent-11851-fallo-en-el-editor-de-intervalos-del-setup' into 'develop' 
Ent 11851 fallo en el editor de intervalos del setup

See merge request artica/pandorafms!6324
 2023-08-11 06:32:24 +00:00
Daniel Maya f90cbd87a0 #10424 Fixed auth login and password 2023-08-10 13:06:00 +02:00
Jorge Rincon 6cd5fc491b #11843 adjusted type for extensions 2023-08-09 15:26:30 +02:00
Jorge Rincon ed9b70725d #11843 Added word legacy in the discovery. It is added only for version 1.0 of discovery. 2023-08-09 14:40:56 +02:00
Jorge Rincon 5a440f1078 #11851 fixed setup interval editor 2023-08-09 09:47:09 +02:00