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

6086 Commits

Author SHA1 Message Date
Daniel Rodriguez 09202cebc4 Merge branch 'ent-8088-Alertas-SNMP-no-mantienen-el-valor-en-dropdowns' into 'develop' 
Ent 8088 alertas snmp no mantienen el valor en dropdowns

See merge request artica/pandorafms!4458
 2021-11-16 09:15:02 +00:00
Calvo c47799a4f1 Fix missing visual console profile tokens 2021-11-15 18:58:54 +01:00
Calvo 7e36a678e9 Fix file erorrs and warns 2021-11-15 18:54:28 +01:00
Calvo b6e34a2697 erge remote-tracking branch 'origin/develop' into ent-7839-revision-acl-enterprise-parte-2-introduccion-opciones 2021-11-15 18:14:18 +01:00
Daniel Maya efd8c8cab2 #8040 resolved conflict 2021-11-15 13:20:43 +01:00
Daniel Rodriguez eb9e73ecb0 Merge branch 'ent-7838-revision-acl-enterprise-parte-1-eliminacion-opciones' into 'develop' 
Deleted and reubicated acl options

See merge request artica/pandorafms!4340
 2021-11-15 11:24:50 +00:00
Daniel Rodriguez ff31a347c4 Merge branch 'ent-7947-Bug-en-integración-de-Integria-en-nodo-centralizado' into 'develop' 
Ent 7947 bug en integración de integria en nodo centralizado

See merge request artica/pandorafms!4492
 2021-11-15 11:22:25 +00:00
Daniel Rodriguez bec244e9b7 Merge branch 'ent-7593-fallo-en-boton-busqueda-libre-componente-remotos' into 'develop' 
Fix search component group passing invalid get params

See merge request artica/pandorafms!4293
 2021-11-15 10:18:20 +00:00
Daniel Rodriguez e573e79bcd Merge branch 'ent-7784-12114-en-las-templates-de-informes-en-metaconsola-no-busca-por-grupos-secundarios' into 'develop' 
Fix list agent with secondaty grouos on selec

See merge request artica/pandorafms!4303
 2021-11-15 10:16:24 +00:00
Daniel Rodriguez 09af86fbeb Merge branch 'ent-8105-Revision-de-lista-de-item-en-consolas-visuales' into 'develop' 
Ent 8105 revision de lista de item en consolas visuales

See merge request artica/pandorafms!4468
 2021-11-15 10:15:24 +00:00
Daniel Rodriguez 504411d7d2 Merge branch 'ent-8039-Bug-en-item-Network-link-CV' into 'develop' 
Ent 8039 bug en item network link cv

See merge request artica/pandorafms!4453
 2021-11-15 10:13:44 +00:00
Daniel Barbero Martin 0caeee185e WIP new report alert fired actions 2021-11-12 13:21:05 +01:00
Daniel Barbero Martin e70ecd461e WIP new report alert fired actions 2021-11-12 13:11:49 +01:00
Calvo 94d1964166 Fix server name item on reporting buider 2021-11-08 13:27:32 +01:00
Calvo 61bdc1f4e0 Fix ACL grous AW creation 2021-11-05 15:21:04 +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
Jose Gonzalez 932d42e8da Fixed colours 2021-11-04 15:44:40 +01:00
Daniel Barbero Martin 93aad130cb wip special days alerts 2021-11-04 10:20:03 +01:00
Daniel Barbero Martin bd75912a0d wip special days alerts 2021-11-04 09:55:37 +01:00
Daniel Barbero Martin fdca5e4a78 wip special days alerts 2021-11-03 17:30:54 +01:00
Daniel Barbero Martin 53361484fd Merge remote-tracking branch 'origin/develop' into ent-7503-Calendarios-para-dias-especiales 2021-11-03 11:16:46 +01:00
Daniel Barbero Martin 1e976a8605 alerts special days wip 2021-11-03 10:59:00 +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
Daniel Barbero Martin 25268ec9b4 color 2021-11-02 17:49:45 +01:00
Daniel Barbero Martin 3ed3a14443 Merge remote-tracking branch 'origin/develop' into ent-7503-Calendarios-para-dias-especiales 2021-11-02 08:08:19 +01:00
alejandro.campos@artica.es b4c21cfdca fixed several bugs in AD authentication in metaconsole 2021-10-29 16:12:23 +02:00
Daniel Barbero Martin 89680907fd wip special days 2021-10-29 13:45:18 +02:00
Daniel Rodriguez 3883c99804 Merge branch 'ent-7595-12357-prototipo-event-server-paralelizado-y-con-recuperacion-de-alertas-bingo-card' into 'develop' 
CorrelationServer

See merge request artica/pandorafms!4377
 2021-10-29 10:07:25 +00:00
Daniel Barbero Martin c2cce3990a special days template alerts 2021-10-28 17:30:03 +02:00
fbsanchez 77bee9f3ca UM replicated 2021-10-27 22:28:37 +02: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 05a2db88a3 menu fix 2021-10-25 17:01:26 +02:00
fbsanchez dabd7f53fe minor fixes 2021-10-25 14:05:11 +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 925fa8b819 Errata fix 2021-10-22 10:54:41 +02:00
alejandro.campos@artica.es 07c7c7a387 prevent from deleting global admin users when removing all of their profiles 2021-10-22 09:48:00 +02:00
fbsanchez bb8dbc9332 NCM 2021-10-21 02:17:17 +02:00
Daniel Maya 6520f95fcf #7947 Fixed integria IMS ticket in metaconsole 2021-10-20 17:06:24 +02:00
alejandro.campos@artica.es 3e1dcbb554 changed text 2021-10-20 13:30:24 +02:00
Jose Gonzalez 5b4043d9ea Fix delete files issue 2021-10-15 13:31:19 +02:00
Daniel Rodriguez 92740cd86b Merge branch 'ent-8096-arreglos-black-theme' into 'develop' 
fixed visual black theme error

See merge request artica/pandorafms!4457
 2021-10-14 09:59:16 +00:00
Daniel Maya 4579d2b8c6 #8105 Fixed list of elements 2021-10-13 15:20:20 +02:00
fbsanchez 8652648824 Merge remote-tracking branch 'origin/develop' into ent-7060-gestion-basica-de-configuracion-de-equipos-de-red 2021-10-08 15:51:05 +02:00
Jose Gonzalez 4331438765 Removed some cheerful words in the project 2021-10-08 11:13:28 +02:00
Daniel Rodriguez 16f2c776f2 Merge branch 'ent-8035-12446-fallos-filtros-personalizados-eventos' into 'develop' 
show only events filter in acl groups

See merge request artica/pandorafms!4451
 2021-10-08 08:09:19 +00:00
marcos 85037693b2 fixed visual black theme error 2021-10-07 16:45:56 +02:00
marcos d4108c4e8b show only events fetch with user groups 2021-10-07 16:11:23 +02:00
Daniel Maya c61c39f45f #8088 Fixed selected option with select2 2021-10-07 15:45:17 +02:00
marcos f55a6685bd show only events filter in acl groups 2021-10-07 14:09:02 +02:00
marcos 030b45af8e add new filter fot litghbulb_off 2021-10-07 12:50:10 +02:00
marcos afb9cea67f add new filter fot litghbulb_off 2021-10-07 12:42:58 +02:00
Daniel Maya 49ffdf822b #8040 Fixed module graph 2021-10-07 11:50:27 +02:00
Daniel Maya e9b6acc1a8 #8039 Fixed network link 2021-10-07 10:27:31 +02:00
marcos 795d5c055a merge conflict 2021-10-07 09:56:17 +02:00
fbsanchez dae8a9ba14 Merge remote-tracking branch 'origin/develop' into ent-7060-gestion-basica-de-configuracion-de-equipos-de-red 2021-10-06 14:50:13 +02:00
Daniel Rodriguez a674aeeb91 Merge branch 'ent-8054-12471-Conteo-erroneo-de-agentes-para-licenciamiento' into 'develop' 
fixed count

See merge request artica/pandorafms!4441
 2021-10-06 08:34:13 +00:00
alejandro.campos@artica.es ec693a88a0 fixed count 2021-10-05 11:26:29 +02:00
Daniel Rodriguez 6cbf83b2e2 Merge branch 'ent-7780-error-black-theme-en-transaccional-maps' into 'develop' 
fixed visual error

See merge request artica/pandorafms!4285
 2021-10-05 09:23:14 +00:00
Daniel Rodriguez 3743fa6ca8 Merge branch 'ent-7922-selector-demasiado-grande-en-creacion-de-modulos' into 'develop' 
less module selector width

See merge request artica/pandorafms!4384
 2021-10-05 09:21:22 +00:00
Daniel Rodriguez ce53453e32 Merge branch 'ent-8002-bug-visual-vista-informes-open' into 'develop' 
Fiex open report list view

See merge request artica/pandorafms!4408
 2021-10-05 09:20:01 +00:00
Daniel Rodriguez d0e738e8fb Merge branch 'ent-7937-mensaje-this-node-is-configured-with-centralized-mode-de-nodo-sale-en-metaconsola' into 'develop' 
Ent 7937 mensaje this node is configured with centralized mode de nodo sale en metaconsola

See merge request artica/pandorafms!4409
 2021-10-05 09:18:41 +00:00
fbsanchez 31f329a833 Merge remote-tracking branch 'origin/develop' into ent-7060-gestion-basica-de-configuracion-de-equipos-de-red 
Conflicts:
	pandora_console/vendor/composer/autoload_classmap.php
	pandora_console/vendor/composer/autoload_static.php
 2021-10-05 10:57:00 +02:00
marcos aa43caee23 resolved mrege conflicts 2021-10-04 14:22:11 +02:00
Jose Gonzalez 6deaee84ac Merge 2021-10-04 10:00:15 +02:00
fbsanchez e237d7dd07 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/mr/50.sql
 2021-09-30 12:24:19 +02:00
fbsanchez 696c59b258 WIP NCM 2021-09-29 20:56:39 +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
alejandro.campos@artica.es fc6fb36293 Merge remote-tracking branch 'origin/develop' into ent-7168-Integrar-vista-de-warnings-en-Availability-reports 2021-09-29 13:29:20 +02:00
Daniel Rodriguez 894cd0974f Merge branch 'ent-3407-Informes-en-IPAM' into 'develop' 
Ent 3407 informes en ipam

See merge request artica/pandorafms!4424
 2021-09-27 12:06:00 +00:00
Daniel Rodriguez c57c901e55 Merge branch 'ent-7068-funcionamiento-de-alertas-en-politicas' into 'develop' 
Added unlinked icon to alerts in unlinked module

See merge request artica/pandorafms!4426
 2021-09-27 10:09:30 +00:00
Daniel Rodriguez a754b875c9 Merge branch 'ent-7976-GISS-Limite-de-licencia-en-metaconsola-para-UM' into 'develop' 
Ent 7976 giss limite de licencia en metaconsola para um

See merge request artica/pandorafms!4403
 2021-09-24 12:37:03 +00:00
alejandro.campos@artica.es 9e0729574e Merge remote-tracking branch 'origin/develop' into ent-7168-Integrar-vista-de-warnings-en-Availability-reports 2021-09-24 11:40:25 +02:00
Daniel Rodriguez 4420ecec2c Merge branch 'ent-7514-pasar-networkmaps-a-open' into 'develop' 
Ent 7514 pasar networkmaps a open

Closes pandora_enterprise#7514

See merge request artica/pandorafms!4416
 2021-09-24 07:14:14 +00:00
Daniel Rodriguez 7bdb730abd Merge branch 'ent-8018-estilos-campos-seleccion-metaconsola' into 'develop' 
Fix select fields size

Closes pandora_enterprise#8018

See merge request artica/pandorafms!4418
 2021-09-24 07:12:52 +00:00
Calvo 4a9f523468 Added unlinked icon to alerts in unlinked module 2021-09-23 19:02:31 +02:00
fbsanchez 12ddb4d792 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/pandoradb.sql
 2021-09-23 16:23:38 +02:00
Alejandro Campos ca46285a0e Merge branch 'develop' into 'ent-3407-Informes-en-IPAM' 
# Conflicts:
#   pandora_console/extras/mr/50.sql
 2021-09-23 13:33:02 +00:00
fbsanchez fe42a8782b Updated messages in centralised environment status check 2021-09-23 11:16:48 +02:00
Jose Gonzalez 5b40a4f700 Merge remote-tracking branch 'origin' into ent-7514-pasar-networkmaps-a-open 2021-09-23 08:50:50 +02:00
Daniel Rodriguez 42700e9033 Merge branch 'ent-7785-input-email-con-fondo-blanco-y-texto-negro' into 'develop' 
fixed visual error

See merge request artica/pandorafms!4284
 2021-09-22 09:10:09 +00:00
alejandro.campos@artica.es d9dd7f211e created report for ipam networks 2021-09-21 16:02:17 +02:00
alejandro.campos@artica.es fc959f0bc6 created report for ipam networks 2021-09-21 15:59:14 +02:00
Jose Gonzalez cd1b7daa00 Fix select fields size 2021-09-20 12:16:08 +02:00
Jose Gonzalez 3af47c0e5f Open network maps 2021-09-17 10:45:01 +02:00
Calvo 5027e8c9a5 Fiex open report list view 2021-09-14 13:33:18 +02:00
Daniel Maya 3dc9165209 #7976 Fixed agent limit 2021-09-13 13:30:14 +02:00
Daniel Rodriguez 93b4d81264 Merge branch 'ent-7730-visualizacion-update-manager-en-tema-oscuro' into 'develop' 
add update manager black background update manager

See merge request artica/pandorafms!4270
 2021-09-10 11:11:24 +00:00
Marcos Alconada 2ed5be71d6 Resolve conflict 2021-09-10 08:04:23 +00:00
fbsanchez 34adf6e9e2 Merge remote-tracking branch 'origin/develop' into ent-7595-12357-prototipo-event-server-paralelizado-y-con-recuperacion-de-alertas-bingo-card 2021-09-08 21:21:45 +02:00
Daniel Rodriguez 6fff287b70 Merge branch 'ent-7314-comillas-comandos-remotos' into 'develop' 
Added tip for notice to users for use single quotation

Closes pandora_enterprise#7314

See merge request artica/pandorafms!4376
 2021-09-08 13:14:54 +00:00
José González 740a82253a Fixed quot string 2021-09-08 12:20:38 +02:00
Daniel Rodriguez 6599f80dff Merge branch 'ent-7444-Metaconsole-Triggered-alerts-report' into 'develop' 
Fixed forget metaconsole alerts

Closes pandora_enterprise#7444

See merge request artica/pandorafms!4388
 2021-09-08 10:14:22 +00:00
Jose Gonzalez e8eb77058b Fix 2021-09-06 15:19:23 +02:00
Jose Gonzalez fa101db3b6 Fix vulnerability 2021-09-03 13:30:15 +02:00
marcos 9c425f60e8 less module selector width 2021-09-02 16:56:01 +02:00
fbsanchez 6756c16c35 Added correlation server to server list 2021-09-02 12:21:31 +02:00
José González 6b90b33a26 Merge branch 'develop' into 'ent-7804-modificar-comportamiento-file-manager' 
# Conflicts:
#   pandora_console/include/functions_filemanager.php
 2021-09-01 15:33:44 +00:00
marcos 1bec5014c7 resoled conflcits 2021-09-01 16:58:36 +02:00
Daniel Rodriguez b8e1391ffd Merge branch 'ent-7911-errores-file-manager' into 'develop' 
Fixed issues with files upload

Closes pandora_enterprise#7911

See merge request artica/pandorafms!4370
 2021-09-01 13:18:10 +00:00
Jose Gonzalez 73cd0fd17e Changed content of advice 2021-09-01 10:29:25 +02:00
Daniel Rodriguez f12f3d6cf4 Merge branch 'ent-7915-Error-SQL-en-filtro-de-custom-field-en-informe-de-inventario-de-agentes' into 'develop' 
Ent 7915 error sql en filtro de custom field en informe de inventario de agentes

See merge request artica/pandorafms!4375
 2021-08-31 10:05:31 +00:00
Daniel Rodriguez fae4b284e4 Merge branch 'ent-7945-500-al-crear-informe' into 'develop' 
Ent 7945 500 al crear informe

See merge request artica/pandorafms!4373
 2021-08-27 12:07:24 +00:00
José González 84b8973027 Added tip for notice to users for use single quotation 2021-08-27 12:49:27 +02:00
Daniel Rodriguez 16fff8b2f5 Merge branch 'ent-7619-cambiar-parametros-lanzar-snmpwalk-configuracion-modulo' into 'develop' 
Change snmpwalk behaviour in module configuration

Closes pandora_enterprise#7619

See merge request artica/pandorafms!4221
 2021-08-27 10:45:42 +00:00
Daniel Maya c4e6c52fe2 #7915 fixed custom field filter 2021-08-27 11:24:23 +02:00
Daniel Rodriguez c172afe1ce Merge branch 'ent-7940-Bug-items-de-informes-en-open' into 'develop' 
Ent 7940 bug items de informes en open

See merge request artica/pandorafms!4372
 2021-08-26 10:13:13 +00:00
Daniel Maya 0a79014480 #7495 fixed report name 2 2021-08-26 12:03:14 +02:00
Jose Gonzalez 945c29d1bc Fix issues 2021-08-26 11:15:02 +02:00
Daniel Rodriguez 22587a0dde Merge branch 'ent-7036-11346-Introducir-el-campo-de-IP-del-agente-en-la-vista-de-eventos' into 'develop' 
Ent 7036 11346 introducir el campo de ip del agente en la vista de eventos

See merge request artica/pandorafms!4275
 2021-08-25 13:00:42 +00:00
Daniel Rodriguez 61baf63a6a Merge branch 'ent-7819-500-al-ordernar-items-de-informes' into 'develop' 
fixed error 500 when sort report items

See merge request artica/pandorafms!4314
 2021-08-25 12:52:33 +00:00
Daniel Rodriguez 3be8971360 Merge branch 'ent-7887-Vulnerabilidad-xss-en-operaciones-masivas-de-módulos' into 'develop' 
Ent 7887 vulnerabilidad xss en operaciones masivas de módulos

See merge request artica/pandorafms!4365
 2021-08-25 12:52:06 +00:00
Daniel Maya c8fb8a441f #7940 Fixed server filter in open 2021-08-25 13:43:13 +02:00
Jose Gonzalez 1bbcc47344 Merge remote-tracking branch 'origin' into ent-7911-errores-file-manager 2021-08-24 16:17:33 +02:00
Daniel Rodriguez 8a574a2f93 Merge branch 'ent-7920-metacosola-gestion-de-usuarios-locales' into 'develop' 
Re-enabled user management in MC while not in centralised environment

See merge request artica/pandorafms!4369
 2021-08-24 12:28:03 +00:00
Daniel Rodriguez 4d5926e427 Merge branch 'ent-7612-implementar-sistema-de-mensajeria-en-la-meta' into 'develop' 
Ent 7612 implementar sistema de mensajeria en la meta

See merge request artica/pandorafms!4353
 2021-08-24 08:13:02 +00:00
José González 6358f3fc9b Fixed issues with files upload 2021-08-23 15:35:47 +02:00
Daniel Rodriguez 3dc6db320e Merge branch 'ent-7725-bug-en-creacion-de-itmes-sla' into 'develop' 
Fixed SLA report items creating empty extra item

See merge request artica/pandorafms!4253
 2021-08-23 10:50:10 +00:00
fbsanchez 4ff6b8a1bb Re-enabled user management in MC while not in centralised environment 2021-08-23 12:29:17 +02:00
marcos 244d7f6c8b solved conflicts 2021-08-23 08:25:12 +02:00
alejandro.campos@artica.es c07a112f4b migrate histrogram report items 2021-08-19 16:23:52 +02:00
Daniel Maya 9488ce873b #7887 Fixed xss in massive modules 2021-08-19 12:57:16 +02:00
Daniel Rodriguez 44dcdb03bc Merge branch 'ent-7542-11882-Buscador-de-acciones-no-funciona' into 'develop' 
Ent 7542 11882 buscador de acciones no funciona

See merge request artica/pandorafms!4343
 2021-08-17 07:09:26 +00:00
alejandro.campos@artica.es 21e15752cf fixed select2 search in action update 2021-08-16 11:04:52 +02:00
alejandro.campos@artica.es 54ae7e5783 modified availability report 2021-08-16 09:43:11 +02:00
fbsanchez 93636aef96 Avoid warning phpcs 2021-08-12 12:00:53 +02:00
fbsanchez 034e921e35 Upgraded jquery to 3.6.0, without npm 2021-08-12 09:30:43 +02:00
Daniel Rodriguez 03306454e0 Merge branch 'ent-7883-aplicacion-de-parches-offline-en-la-open' into 'develop' 
Allowed UMC offline for opensource installations, fixed issue while accessing settings

See merge request artica/pandorafms!4349
 2021-08-11 12:20:32 +00:00
fbsanchez 3662d8b8a0 Added offline entry to menu in community ed 2021-08-11 14:12:49 +02:00
fbsanchez c69c326bc5 Warning to be careful with offline patches 2021-08-11 11:34:29 +02:00
fbsanchez 97afb02ba6 Allowed UMC offline for opensource installations, fixed issue while accessing settings 2021-08-11 11:28:33 +02:00
fbsanchez cf976f9622 Merge remote-tracking branch 'origin/develop' into ent-7861-fallo-umc-cuando-hay-db-historico 
Conflicts:
	pandora_console/godmode/um_client/index.php
 2021-08-11 09:56:02 +02:00
Daniel Rodriguez f8e9bd38ec Merge branch 'ent-7633-selector-de-grupos-en-el-graph-builder-de-las-custom-graphs-ocupa-todo-el-ancho-de-la-pantalla' into 'develop' 
colspan 1 to group selector custom graph

See merge request artica/pandorafms!4223
 2021-08-11 07:10:50 +00:00
Daniel Rodriguez 00ed8233d0 Merge branch 'ent-7755-graficas-adjuntas-tienen-fuentes-muy-pequeñas' into 'develop' 
set default font size on graph modules when is send in mails

See merge request artica/pandorafms!4264
 2021-08-10 12:19:54 +00:00
Daniel Rodriguez b3336cdc4f Merge branch 'ent-7563-bug-carga-dinamica-icono-grupos-creacion-agente' into 'develop' 
Fixed group icon on agent creation

See merge request artica/pandorafms!4145
 2021-08-10 07:00:56 +00:00
Daniel Rodriguez 46b17e5156 Merge branch 'ent-7657-Vulnerabilidad-xss-en-nombre-de-modulos' into 'develop' 
fixed xss vulnerability

See merge request artica/pandorafms!4196
 2021-08-09 08:59:44 +00:00
Calvo 9d04933ca2 Added missing sec related to GET params to ACL enterprise 2021-08-06 10:29:38 +02:00
Daniel Maya a5f9e74b50 #7881 Fixed snmp alert 2021-08-05 15:53:44 +02:00
Daniel Rodriguez e623fa1822 Merge branch 'ent-7854-warning-por-memoria-php-umc-cuando-vale-1' into 'develop' 
Minor fix in memory detection UMC

See merge request artica/pandorafms!4327
 2021-08-05 11:51:39 +00:00
alejandro.campos@artica.es 5acd64bbf7 fixed text inputs in add action modals 2021-08-05 13:05:53 +02:00
Daniel Rodriguez 39d4466658 Merge branch 'ent-fix-alert-action-creation' into 'develop' 
Fixed alert action creation problem.

See merge request artica/pandorafms!4313
 2021-08-05 07:56:22 +00:00
Daniel Rodriguez e2a1a42006 Merge branch 'ent-7592-componentes-remotos-de-red-campo-tcp-send' into 'develop' 
Unset field tcp send when snmp remote component selected

See merge request artica/pandorafms!4160
 2021-08-04 12:03:52 +00:00
Daniel Rodriguez 801f8fc3c4 Merge branch 'ent-7615-hide-en-los-comandos-de-alertas' into 'develop' 
Fixed alert command hide on update

See merge request artica/pandorafms!4164
 2021-08-03 06:47:41 +00:00
Daniel Rodriguez 2963d67225 Merge branch 'ent-7767-secondary-groups-no-se-anaden-agente' into 'develop' 
Improve code for get secondary groups

Closes pandora_enterprise#7767

See merge request artica/pandorafms!4259
 2021-08-02 07:18:02 +00:00
Calvo 9b736d0c48 Deleted and reubicated acl options 2021-07-30 13:49:22 +02:00
fbsanchez b88b019528 errata fix0 2021-07-29 13:15:01 +02:00
fbsanchez 41f2842e41 Proxy fix and some traceability for DBH upgrade 2021-07-29 13:11:45 +02:00
fbsanchez cea9d2ae3d Fix searchpath for MR while updating 2021-07-28 19:16:27 +02:00
fbsanchez 9206dc491e avoid notice but accept any other alert from PHP 2021-07-27 11:24:23 +02:00