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

19226 Commits

Author SHA1 Message Date
Alejandro Fraguas aaf64e591c Merge branch 'ent-5708-review-discovery-h-d' into 'develop' 
Ent 5708 review discovery h d

See merge request artica/pandorafms!3195
 2020-05-14 10:32:43 +02:00
artica 44b5f2671e Auto-updated build strings. 2020-05-14 01:00:51 +02:00
Alejandro Fraguas 3db0f557c9 Merge branch 'ent-4852-api-get-the-mc-event-id-from-console-event-id' into 'develop' 
Ent 4852 api get the mc event id from console event

See merge request artica/pandorafms!3151
 2020-05-13 11:24:43 +02:00
artica 9fc993519b Auto-updated build strings. 2020-05-13 01:00:20 +02:00
Daniel Rodriguez 5cab51c99d Merge branch 'ent-5554-Creador-de-mapas-de-red-se-vuelve-inoperable-despues-de-borrar-un-nodo' into 'develop' 
fix accessing wrong index after deletion of node

See merge request artica/pandorafms!3122
 2020-05-12 12:59:12 +02:00
Daniel Rodriguez bd5b320725 Merge branch 'ent-5559-bug-al-anadir-nuevos-permisos-en-active-directory-advanced-permissions' into 'develop' 
Ent 5559 bug al anadir nuevos permisos en active directory advanced permissions

See merge request artica/pandorafms!3174
 2020-05-12 12:57:55 +02:00
Daniel Rodriguez bc794918d4 Merge branch 'ent-5538-redireccion-incorrecta-en-pantalla-sin-permisos' into 'develop' 
fixed error

See merge request artica/pandorafms!3143
 2020-05-12 12:56:27 +02:00
Tatiana Llorente fabace239d Ent 5675 textos del sistema de licencias 2020-05-12 12:54:20 +02:00
Daniel Rodriguez 46f1f44883 Merge branch 'ent-5574-field-description-not-in-general-search-nor-agent-detailed' into 'develop' 
Added agent description to search and agent detail

See merge request artica/pandorafms!3130
 2020-05-12 12:53:32 +02:00
Alejandro Fraguas e8461e19f3 Merge branch 'ent-5503-pop-up-imagenes-detras-de-un-server-proxy' into 'develop' 
change url for pop up reverse proxy

See merge request artica/pandorafms!3168
 2020-05-12 12:50:02 +02:00
Alejandro Fraguas 464699cbaa Merge branch 'ent-5481-agregar-nombre-a-llamada-api-get-agent-id-name-by-alias' into 'develop' 
add nombre in api_get_i_name_by_alias API method

See merge request artica/pandorafms!3150
 2020-05-12 09:51:09 +02:00
artica 3dfef47b24 Auto-updated build strings. 2020-05-12 01:00:20 +02:00
Alejandro Fraguas 5f1066a342 Merge branch 'ent-5412-mensaje-de-allowoverride-en-apache' into 'develop' 
notify for allowoverride

See merge request artica/pandorafms!3149
 2020-05-11 12:53:12 +02:00
marcos 86f52fd8e6 changed message allow override 2020-05-11 12:24:18 +02:00
Alejandro Fraguas 46b5f13350 Merge branch 'ent-5482-php-warning-visual-console-group-item' into 'develop' 
Metaconsole const replaced by function on visual map

See merge request artica/pandorafms!3145
 2020-05-11 10:11:28 +02:00
artica 8514cdc378 Auto-updated build strings. 2020-05-11 01:00:15 +02:00
artica 87445c28ef Auto-updated build strings. 2020-05-10 01:00:15 +02:00
artica 3c01526ea9 Auto-updated build strings. 2020-05-09 01:00:24 +02:00
Tatiana Llorente 1f16abd4bd Ent 5701 quitar feature de chat 2020-05-08 15:39:24 +02:00
Daniel Rodriguez b655094f3a Merge branch 'ent-5619-se-muestran-2-veces-el-mensaje-de-realizado' into 'develop' 
duplicated enable/disable message

See merge request artica/pandorafms!3128
 2020-05-08 15:38:24 +02:00
Daniel Rodriguez fbd9902dc7 Merge branch 'ent-5746-problema-libreria-de-modulos' into 'develop' 
add cache false on functions_module_library

See merge request artica/pandorafms!3197
 2020-05-08 15:36:44 +02:00
Daniel Rodriguez 3db9247ec0 Merge branch 'ent-5757-mejoras-visuales-en-el-treeview' into 'develop' 
Ent 5757 mejoras visuales en el treeview

See merge request artica/pandorafms!3200
 2020-05-08 15:34:43 +02:00
Alejandro Fraguas 73ce23bfd8 Merge branch 'ent-5702-problema-de-seguridad-en-quicksell-escalado-de-privilegios-remoto' into 'develop' 
1st approach avoid quick_shell vulnerability (telnet)

See merge request artica/pandorafms!3170
 2020-05-08 14:16:06 +02:00
artica 36d15f3de5 Auto-updated build strings. 2020-05-08 01:00:18 +02:00
fbsanchez 3684bf8ea2 Minor changes tree style 2020-05-07 09:36:14 +02:00
artica bc3e21af6d Auto-updated build strings. 2020-05-07 01:00:17 +02:00
fbsanchez bd3ffc0c8d Tree view style review 2020-05-06 17:35:05 +02:00
artica 5ad9e5dbd7 Auto-updated build strings. 2020-05-06 01:00:18 +02:00
fbsanchez 92ff713651 1st approach 2020-05-05 18:58:45 +02:00
vgilc d17299e290 Merge branch 'update-japanese-console-translation' into 'develop' 
Japanese console translation

See merge request artica/pandorafms!3182
 2020-05-05 15:25:39 +02:00
tatiana 490213dfed Changed path in a required file 2020-05-05 12:50:15 +02:00
artica b894f63f1f Auto-updated build strings. 2020-05-05 01:00:14 +02:00
fbsanchez 4815dce8aa H&D port filtering + control tasks cancellation while restarting server 2020-05-04 11:13:15 +02:00
fbsanchez 54a9ebd4ed Merge remote-tracking branch 'origin/develop' into ent-5708-review-discovery-h-d 
Conflicts:
	pandora_server/lib/PandoraFMS/Recon/Base.pm
 2020-05-04 09:52:15 +02:00
artica 12128ea2f1 Auto-updated build strings. 2020-05-04 01:00:15 +02:00
artica 7006e3febd Auto-updated build strings. 2020-05-03 01:00:14 +02:00
artica f95fed2d79 Auto-updated build strings. 2020-05-02 01:00:15 +02:00
artica 848503babe Auto-updated build strings. 2020-05-01 01:00:14 +02:00
marcos e215cdc194 add cache false on functions_module_library 2020-04-30 18:20:09 +02:00
fbsanchez 7ad06596ff Merge remote-tracking branch 'origin/develop' into ent-5708-review-discovery-h-d 2020-04-30 16:26:47 +02:00
fbsanchez 900e25eef1 WIP rcmd in H&D 2020-04-30 15:00:25 +02:00
fbsanchez 026562e7ee MR changes 2020-04-30 15:00:04 +02:00
daniel c308d49c25 Fix retrocompatibility 2020-04-30 14:08:56 +02:00
artica 8a019bd8f4 Auto-updated build strings. 2020-04-30 01:00:16 +02:00
artica 456848485e Auto-updated build strings. 2020-04-29 01:00:16 +02:00
Daniel Rodriguez a28ffda2eb Merge branch 'ent-5762-notificacion-de-chat' into 'develop' 
add modal on Webchat

See merge request artica/pandorafms!3189
 2020-04-28 16:38:56 +02:00
marcos 2d48c67377 add modal on Webchat 2020-04-28 13:56:43 +02:00
marcos bcc68c0034 add modal on Webchat 2020-04-28 13:42:27 +02:00
Daniel Rodriguez 19713f5040 Merge branch 'ent-5750-dashboards-boton-de-borrado' into 'develop' 
add delete confirmation dialog

See merge request artica/pandorafms!3185
 2020-04-28 11:36:17 +02:00
marcos 72f9c051eb changed message confirmation dialog 2020-04-28 10:44:13 +02:00