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

530 Commits

Author SHA1 Message Date
Daniel Rodriguez 7a614fcf48 Merge branch 'ent-6354-Bug-de-creacion-de-dashboard-con-permisos-no-ALL' into 'develop' 
Ent 6354 bug de creacion de dashboard con permisos no all

See merge request artica/pandorafms!3780
 2021-01-25 10:02:41 +01:00
alejandro-campos 731d486455 changed behavior of All group and fixed acl vulnerability 2021-01-20 18:22:43 +01:00
Daniel Maya adf4c988ec Added warning 2021-01-19 16:03:34 +01:00
alejandro-campos 366d02f203 Merge remote-tracking branch 'origin/ent-6354-Bug-de-creacion-de-dashboard-con-permisos-no-ALL-2' into ent-6354-Bug-de-creacion-de-dashboard-con-permisos-no-ALL-3 2021-01-14 09:22:06 +01:00
Daniel Rodriguez b9a2998c49 Merge branch 'ent-6490-Errores-en-edicion-de-acciones-de-alertas' into 'develop' 
Ent 6490 errores en edicion de acciones de alertas

See merge request artica/pandorafms!3657
 2021-01-04 11:11:16 +01:00
José González 02475d25b6 Merge branch 'develop' into 'ent-1175-copyright-actualizados' 
# Conflicts:
#   pandora_console/general/header.php
#   pandora_console/general/sap_view.php
 2020-12-23 06:48:22 +01:00
Jose Gonzalez 3fd983fb72 Fix 2020-12-03 15:51:40 +01:00
Jose Gonzalez 649442f794 Updated copyrights 2020-11-27 13:52:35 +01:00
Daniel Maya 1cf3381797 Fixed update alert actions 2020-11-26 10:33:32 +01:00
Marcos Alconada 94cfd51501 Ent 6512 error en acls de alertas 2020-10-28 11:41:30 +01:00
alejandro-campos def59508ae changed behavior of all group acl check and fixed acl vulnerabilities 2020-10-22 12:00:44 +02:00
fbsanchez 5f4893ef1a Merge remote-tracking branch 'origin/develop' into ent-5822-prueba-concepto-modal-selector-de-grupos 2020-09-29 12:47:11 +02:00
fbsanchez f69166bd53 Updates style width group selector 2020-09-28 18:04:46 +02:00
Daniel Rodriguez 12bc9e2b4e Merge branch 'ent-6195-10482-entities-en-tabla-de-auditoria' into 'develop' 
Ent 6195 10482 entities en tabla de auditoria

See merge request artica/pandorafms!3411
 2020-09-23 09:38:29 +02:00
Daniel Rodriguez 0d19f500b1 Merge branch 'ent-6153-AADCM-Reset-counter-for-non-sustained-alerts' into 'develop' 
checkd option by default on creation

See merge request artica/pandorafms!3454
 2020-09-18 09:27:22 +02:00
Daniel Rodriguez 4c8414cda5 Merge branch 'ent-4292-TinyMCE-status-bar' into 'develop' 
Solved issue with TinyMCE status bar. Now can view it properly

See merge request artica/pandorafms!2910
 2020-09-17 15:14:33 +02:00
Jose Gonzalez 0e3c10a698 Merge 2020-09-17 10:35:18 +02:00
alejandro-campos 5bd208a95c checkd option by default on creation 2020-09-14 13:43:18 +02:00
Jose Gonzalez 8f477b1833 Avoid XSS in List of special days. Added control for only show help tip if description has data 2020-09-09 12:49:43 +02:00
daniel fe8e7b7d0c Add new filter search actions 2020-08-31 12:48:00 +02:00
manuel.montes f477919433 Fixed entities in query 2020-08-28 13:56:15 +02:00
Jose Gonzalez 5565d839c3 Merge remote-tracking branch 'origin/develop' into ent-6093-error-fields-en-alertas-snmp 2020-08-26 09:00:35 +02:00
Jose Gonzalez 516de686cf Fixed issue 2020-08-25 15:03:19 +02:00
Jose Gonzalez 1b14d83fd4 Added None value 2020-08-25 10:58:26 +02:00
José González 85d8e1f796 Merge branch 'develop' into 'ent-6102-edicion-nombre-sincronizacion-alertas-metaconsola' 
# Conflicts:
#   pandora_console/extras/mr/40.sql
#   pandora_console/godmode/alerts/configure_alert_template.php
 2020-08-07 13:17:41 +02:00
Daniel Rodriguez 1ab4e89a14 Merge branch 'ent-6036-Error-en-edicion-de-acciones-de-alerta' into 'develop' 
fix empty check condition

See merge request artica/pandorafms!3359
 2020-08-07 09:46:09 +02:00
Luis 35f231ac8c Restored alert actions help (needed for macros) 2020-08-07 09:36:43 +02:00
Daniel Rodriguez 51f2db16cb Merge branch 'ent-5587-no-tiene-en-cuenta-las-acciones-default-filtrar-alertas' into 'develop' 
Changed query for get default actions in templates

Closes pandora_enterprise#5587

See merge request artica/pandorafms!3320
 2020-07-20 07:54:08 +02:00
daniel f3ad52e0fa Ent 5532 edicion creacion de templates acciones comandos modo centralizado 2020-07-13 12:23:46 +02:00
Daniel Rodriguez 492c7f90cf Merge branch 'ent-5670-no-aparecen-los-valores-introducidos-al-crear-una-platilla-de-alerta' into 'develop' 
fixed error

See merge request artica/pandorafms!3321
 2020-07-13 11:13:24 +02:00
Jose Gonzalez 5e039adb26 Solve the issue for alerts, os names and tags 2020-07-07 11:05:19 +02:00
alejandro-campos 0ef7ff1198 fix empty check condition 2020-07-06 14:35:22 +02:00
marcos 1f4de3ee4d ignore keys xss special days 2020-06-19 10:53:14 +02:00
marcos 40c0d4ea09 fixed error 2020-06-18 17:09:22 +02:00
Jose Gonzalez 1805a0910e Changed query for get default actions in templates 2020-06-18 16:53:32 +02:00
marcos 9ddfde1774 fixed error with update event comments 2020-06-09 12:02:31 +02:00
marcos cfe30d5b7d fixed vulnerability on special days 2020-06-09 10:37:11 +02:00
fbsanchez b3cf532c16 Merge remote-tracking branch 'origin/develop' into ent-5756-pantallas-de-configuracion-del-cluster 2020-05-29 12:30:49 +02:00
Manuel Montes 611291c217 Ent 5428 revision total de ayudas hint wiki 2020-05-29 11:37:06 +02:00
fbsanchez f3d9f2d75e Cluster view RC1 2020-05-22 13:13:19 +02:00
marcos f229dada52 fixed minnnor error 2020-04-02 19:02:14 +02:00
Daniel Maya c7e6f9fd34 Added disable event in alert template 2020-03-23 11:34:37 +01:00
Tatiana Llorente 8c86019037 Ent 5583 bug comando de alerta 2020-03-18 12:25:29 +01:00
Daniel Rodriguez e1e76595a5 Merge branch 'ent-5365-Pestana-de-acciones-de-alertas-sin-paginacion' into 'develop' 
Ent 5365 pestana de acciones de alertas sin paginacion

See merge request artica/pandorafms!3087
 2020-03-16 17:19:32 +01:00
Daniel Maya fc88d265d4 Added group filter in alert list 2020-03-16 15:42:10 +01:00
Tatiana Llorente d799ac0739 Added pagination and filter box in alert actions - #5365 2020-03-02 16:17:45 +01:00
Tatiana Llorente 0980c9a74a Ent 5261 cambio de control de intervalo en alertas 2020-01-16 13:50:39 +01:00
Tatiana Llorente 95600412e1 Minor visual changes in alert list 2020-01-14 13:14:09 +01:00
Alejandro Fraguas 7f61caaa15 Merge branch 'ent-5034-Bug-al-copiar-acción-de-alerta' into 'develop' 
Ent 5034 bug al copiar acción de alerta

See merge request artica/pandorafms!2921
 2019-12-23 10:51:10 +01:00
manuel 85f4301e4c Fixed bugs in alert actions 2019-12-05 16:43:26 +01:00