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

26778 Commits

Author SHA1 Message Date
Daniel Rodriguez 39d0e66983 Merge branch 'ent-6378-descarga-custom-field-view' into 'develop' 
Added ACL check to custom view CSV donwload

See merge request artica/pandorafms!3714
 2021-03-01 10:47:50 +00:00
Daniel Rodriguez 0ff981e279 Merge branch 'ent-6364-bug-set-stop-downtime-api' into 'develop' 
Fixed api call set stop_downtime

See merge request artica/pandorafms!3704
 2021-03-01 10:46:33 +00:00
Daniel Rodriguez da15dfc69c Merge branch 'ent-5347-Mensaje-de-aviso-de-información-actualizada-erróneo-al-cambiar-el-idioma' into 'develop' 
Ent 5347 mensaje de aviso de información actualizada erróneo al cambiar el idioma

See merge request artica/pandorafms!3698
 2021-03-01 10:41:39 +00:00
Daniel Rodriguez 8ff36ef66f Merge branch 'ent-5269-añadir-elemento-al-filtro-de-la-vista-de-administracion-general-de-alertas' into 'develop' 
Ent 5269 añadir elemento al filtro de la vista de administracion general de alertas

See merge request artica/pandorafms!3796
 2021-03-01 10:38:51 +00:00
Daniel Rodriguez aedecd5c67 Merge branch 'ent-6879-separar-en-alertas-de-inventario-el-selector-de-grupos-de-acl-del-selector-de-grupos-sobre-el-que-se-aplican-las-alertas' into 'develop' 
Ent 6879 separar en alertas de inventario el selector de grupos de acl del selector de grupos sobre el que se aplican las alertas

See merge request artica/pandorafms!3771
 2021-03-01 10:35:28 +00:00
Daniel Maya 208c0d10e8 Ent 6879 separar en alertas de inventario el selector de grupos de acl del selector de grupos sobre el que se aplican las alertas 2021-03-01 10:35:28 +00:00
Daniel Rodriguez 5661f9fbdd Merge branch 'ent-5163-error-texto-pestaña-Network-tools-agente' into 'develop' 
Fixed

Closes pandora_enterprise#5163

See merge request artica/pandorafms!3713
 2021-03-01 10:32:55 +00:00
Daniel Rodriguez 55f9ab6d57 Merge branch 'ent-5113-Metaconsola-vista-tactica-alertas-disparadas' into 'develop' 
fixed triggered alerts count

See merge request artica/pandorafms!3716
 2021-03-01 10:29:31 +00:00
Daniel Rodriguez c37d883efe Merge branch 'ent-6874-macros-no-se-sustituyen-listado-informes' into 'develop' 
Added macros to reports items list

See merge request artica/pandorafms!3740
 2021-03-01 10:20:54 +00:00
Daniel Rodriguez 54fa645d00 Merge branch 'ent-6840-Errores-en-la-vista-de-Omnishell' into 'develop' 
Ent 6840 errores en la vista de omnishell

See merge request artica/pandorafms!3732
 2021-03-01 10:19:21 +00:00
Daniel Rodriguez b2ed2f5511 Merge branch 'ent-6833-planned-downtimes-any-no-funciona' into 'develop' 
Fix issue with adding agents and modules

Closes pandora_enterprise#6833

See merge request artica/pandorafms!3723
 2021-03-01 10:05:59 +00:00
Daniel Rodriguez 07a29fae04 Merge branch 'ent-6608-OPEN-Servidores-SMTP-externos-no-mandan-e-mail-test' into 'develop' 
fixed string

See merge request artica/pandorafms!3870
 2021-03-01 10:05:04 +00:00
Daniel Rodriguez 86bd145dce Merge branch 'ent-6414-mobile-console-events-modal-open-twice' into 'develop' 
Fixed mobile events modal opening twice

See merge request artica/pandorafms!3720
 2021-03-01 10:03:51 +00:00
Daniel Rodriguez 0243740ab1 Merge branch 'ent-6136-fallos-visuales-en-la-correlacion-de-alertas' into 'develop' 
add new style

See merge request artica/pandorafms!3789
 2021-03-01 10:02:19 +00:00
Marcos Alconada 0d4761b63d add new style 2021-03-01 10:02:18 +00:00
Daniel Rodriguez 1128b366d5 Merge branch 'ent-5537-cambio-en-botones-de-select-all-de-ventanas-de-seleccion-de-agentes' into 'develop' 
Ent 5537 cambio en botones de select all de ventanas de seleccion de agentes

See merge request artica/pandorafms!3696
 2021-03-01 10:00:22 +00:00
Daniel Maya 6175d91298 Ent 5537 cambio en botones de select all de ventanas de seleccion de agentes 2021-03-01 10:00:22 +00:00
Daniel Rodriguez a0335b5fe6 Merge branch 'ent-4336-8257-separar-alertas-de-system-status-para-elegir-cuales-deseamos-recibir' into 'develop' 
Ent 4336 8257 separar alertas de system status para elegir cuales deseamos recibir

See merge request artica/pandorafms!3846
 2021-03-01 09:57:51 +00:00
Daniel Rodriguez 43c842ec75 Merge branch 'ent-6931-Cabecera-duplicada-en-Remote-component-management' into 'develop' 
Ent 6931 cabecera duplicada en remote component management

See merge request artica/pandorafms!3782
 2021-03-01 09:54:35 +00:00
Daniel Rodriguez 1767712c72 Merge branch 'ent-2530-bug-tokens-webserver-module' into 'develop' 
Fixed tokens htpp_auth user,avoid repetiton

See merge request artica/pandorafms!3734
 2021-03-01 09:53:55 +00:00
artica 0587500074 Auto-updated build strings. 2021-03-01 01:00:09 +01:00
artica 0cf47e4b00 Auto-updated build strings. 2021-02-28 01:00:06 +01:00
artica 814a39235e Auto-updated build strings. 2021-02-27 01:00:19 +01:00
Jose Gonzalez 08cc259f07 Fixed issue 2021-02-26 14:24:44 +01:00
fbsanchez ad347dc953 errata fix 2021-02-26 12:48:23 +01:00
alejandro.campos@artica.es 86cd01418f fixed string 2021-02-26 09:41:53 +01:00
Daniel Barbero Martin 58ca60c857 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-02-26 08:37:06 +01:00
Daniel Barbero Martin 85ec17f3e1 WIP Command center 2021-02-26 08:36:48 +01:00
artica dc04a2b2b5 Auto-updated build strings. 2021-02-26 01:00:19 +01:00
Daniel Rodriguez 1b2fcb67fb Merge branch 'ent-7080-error-servicios-elementos-modulo' into 'develop' 
Ent 7080 error servicios elementos modulo

See merge request artica/pandorafms!3868
 2021-02-25 17:56:22 +00:00
Luis eb5e295286 Ent 7080 error servicios elementos modulo 2021-02-25 17:56:21 +00:00
Jose Gonzalez 7cfc1d2f9a Fixed issue with all modules 2021-02-25 16:08:02 +01:00
fbsanchez d41b189612 Extra lines after mr file 2021-02-25 13:27:00 +01:00
alejandro.campos@artica.es 901d12fec0 Integration with Integria 2021-02-25 13:18:04 +01:00
fbsanchez 8fcac749f5 POST/GET reloaded if empty in ajax 2021-02-25 12:09:41 +01:00
fbsanchez f84d7a413e POST/GET reloaded if empty in ajax 2021-02-25 12:08:58 +01:00
Daniel Barbero Martin 36d4b7b7c3 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-02-25 09:46:59 +01:00
artica 078ab1657f Auto-updated build strings. 2021-02-25 01:00:25 +01:00
fbsanchez 9f694e32f7 Merge remote-tracking branch 'origin/develop' into ent-2561-llamadas-api-para-modulos-de-politicas 
Conflicts:
	pandora_console/godmode/wizards/Wizard.main.php
 2021-02-24 09:41:53 +01:00
artica 508b953496 Auto-updated build strings. 2021-02-24 01:00:21 +01:00
rafael.ameijeiras 793ca4ace7 change agent docker image to centos7 2021-02-23 15:05:08 +01:00
marcos b13d5dc8d4 fixed error not show messages 2021-02-23 14:35:57 +01:00
artica a5b1128014 Auto-updated build strings. 2021-02-23 01:00:16 +01:00
fbsanchez 4b0f96126b minor fix 2021-02-22 12:25:24 +01:00
fbsanchez 34a19b969c missed mr file 2021-02-22 12:04:12 +01:00
fbsanchez d1c0d1b9f4 Merge remote-tracking branch 'origin/develop' into ent-4336-8257-separar-alertas-de-system-status-para-elegir-cuales-deseamos-recibir 2021-02-22 12:03:52 +01:00
fbsanchez 85f37a91de Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision 
Conflicts:
	pandora_console/include/functions_ui.php
 2021-02-22 12:01:29 +01:00
artica cd9694f034 Auto-updated build strings. 2021-02-22 01:00:09 +01:00
artica c70643203f Auto-updated build strings. 2021-02-21 01:00:14 +01:00
artica 396f67d57b Auto-updated build strings. 2021-02-20 01:00:21 +01:00