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

18351 Commits

Author SHA1 Message Date
Ramón Novoa 3e584747b3
Merge pull request #104 from sofwerx/https-proxy 
Adding a check for HTTP_X_FORWARDED_PROTO in https_is_running()
 2018-10-11 09:34:26 +02:00
vgilc ae5858c428 Merge branch '2457-Formulario-de-creacion-repetido' into 'develop' 
added check whto skip alert creation table printing in cluster alert  only when step is 5

See merge request artica/pandorafms!1851
 2018-10-11 08:06:44 +02:00
artica d087665d1e Auto-updated build strings. 2018-10-11 00:01:56 +02:00
alejandro-campos 7fcbc6ece9 added check whto skip alert creation table printing in cluster alert only when step is 5 2018-10-10 18:54:46 +02:00
vgilc 363fc920d7 Merge branch '2760-sincronizacion-automatica-meta-a-nodos' into 'develop' 
Modified query to match MR requirements

See merge request artica/pandorafms!1850
 2018-10-10 15:04:15 +02:00
fbsanchez 299868cfd5 meta_db* added to tmetaconsole_setup 2018-10-10 14:35:09 +02:00
fbsanchez 42caddeadd Modified query to match MR requirements 2018-10-10 14:32:43 +02:00
vgilc ba419ad246 Merge branch '2881-Añadir-campo-de-estado-de-agente-en-la-llamada-API-get_all_agents-fix' into 'develop' 
Fix returnData - #2881

See merge request artica/pandorafms!1849
 2018-10-10 09:10:27 +02:00
artica 1694fccd83 Auto-updated build strings. 2018-10-10 00:01:47 +02:00
enriquecd 3d6451d64b Fix returnData - #2881 2018-10-09 20:03:49 +02:00
vgilc 5197c64f67 Merge branch 'Añadir-campo-estado-de-agente-en-la-llamada-API-get-all-agent-3' into 'develop' 
Fix id for agent status - #2881

See merge request artica/pandorafms!1846
 2018-10-09 17:27:52 +02:00
vgilc 20da7a35c5 Merge branch '2760-sincronizacion-automatica-meta-a-nodos' into 'develop' 
MR change

See merge request artica/pandorafms!1845
 2018-10-09 17:20:34 +02:00
enriquecd 2083733329 Fix id for agent status - #2881 2018-10-09 16:33:07 +02:00
fbsanchez 9b7ae31344 MR change 2018-10-09 16:09:44 +02:00
Ramon Novoa d8dc73f5b7 Add perl-Crypt-Blowfish to the docker image for the Satellite Server. 2018-10-09 15:38:44 +02:00
vgilc 2d5d092e15 Merge branch '2884-Se-pierde-el-filtrado-en-vista-de-eventos' into 'develop' 
Added two missing parameters in the url - #2884

See merge request artica/pandorafms!1842
 2018-10-09 11:27:25 +02:00
vgilc 7fb7a582e0 Merge branch '2891-Limitacion_de_caracteres_en_edicion_de_componentes' into 'develop' 
fixed minor error input max-length in plugin network component

See merge request artica/pandorafms!1843
 2018-10-09 10:58:25 +02:00
daniel fd13e33259 fixed minor error input max-length in plugin network component 2018-10-09 10:51:03 +02:00
tatiana.llorente@artica.es eeba7b9350 Added two missing parameters in the url - #2884 2018-10-09 09:58:28 +02:00
vgilc bc90e77a3d Merge branch '2881-Añadir-campo-de-estado-de-agente-en-la-llamada-API-get_all_agents-2' into 'develop' 
api function api_get_all_agents for meta - #2881

See merge request artica/pandorafms!1840
 2018-10-09 08:53:16 +02:00
vgilc 6ea8bee8ca Merge branch '2613_Error_en_filtrar_agentes_por_estado_en_bulk_operations_2' into 'develop' 
Fixed error in agents bulk operations

See merge request artica/pandorafms!1841
 2018-10-09 08:52:26 +02:00
artica 51c4fbece2 Auto-updated build strings. 2018-10-09 00:01:25 +02:00
samucarc 61a82337c3 Fixed error in agents bulk operations 2018-10-08 17:57:05 +02:00
enriquecd f7700874a5 api function api_get_all_agents for meta - #2881 2018-10-08 16:45:44 +02:00
vgilc 11679461cd Merge branch '2881-Añadir-campo-de-estado-de-agente-en-la-llamada-API-get_all_agents' into 'develop' 
Add status data to get_all_agents API response - #2881

See merge request artica/pandorafms!1835
 2018-10-08 13:24:35 +02:00
vgilc b5540d3cb1 Merge branch '2823-Longitud-del-nombre-de-las-consolas-visuales-Carrefour' into 'develop' 
Change tlayou name table to varchar 600 - #2823

See merge request artica/pandorafms!1834
 2018-10-08 13:24:10 +02:00
artica 76da7384b6 Auto-updated build strings. 2018-10-08 00:01:23 +02:00
artica 5171ef79b0 Auto-updated build strings. 2018-10-07 00:01:23 +02:00
artica a40057b3ff Auto-updated build strings. 2018-10-06 00:01:29 +02:00
enriquecd c0dd2bcab6 Add status data to get_all_agents API response - #2881 2018-10-05 12:57:25 +02:00
enriquecd c1af14b90e Change tlayou name table to varchar 600 - #2823 2018-10-05 12:25:15 +02:00
vgilc 740a7f0327 Merge branch '2741-Refactorizar_vista_module_groups_2' into 'develop' 
fixed minor error counters alert fired in module_group view

See merge request artica/pandorafms!1833
 2018-10-05 12:02:15 +02:00
daniel a59ecc7ef3 fixed minor error counters alert fired in module_group view 2018-10-05 11:55:06 +02:00
vgilc f9d4c8e51c Merge branch '2303_Aparecen_entidades_html_en_las_vistas_de_auditoria_2' into 'develop' 
Eliminadas entidades html de vista de auditoria

See merge request artica/pandorafms!1830
 2018-10-05 09:17:36 +02:00
artica ec8d36f8eb Auto-updated build strings. 2018-10-05 00:01:30 +02:00
vgilc 5abee8a5a9 Merge branch '2749-6381-plugin-para-monitorizacion-de-servicios-y-watchdog-bajo-demanda' into 'develop' 
PluginTools Added global alerts to parse_arguments

See merge request artica/pandorafms!1832
 2018-10-04 17:35:43 +02:00
fbsanchez b67eb9ae16 PluginTools Added global alerts to parse_arguments 2018-10-04 17:30:48 +02:00
samucarc 530017a79d Eliminadas entidades html de vista de auditoria 2018-10-04 17:02:38 +02:00
vgilc 21c9a7ee4a Merge branch '2127-Paginacion-en-busqueda-de-modulos' into 'develop' 
added hidden input to policy modules filters form

See merge request artica/pandorafms!1597
 2018-10-04 14:16:22 +02:00
vgilc be87cc41f1 Merge branch 'New_image__service_map' into 'develop' 
Añadida icono service map

See merge request artica/pandorafms!1827
 2018-10-04 14:15:38 +02:00
samucarc 6a19c2faec Añadida icono service map 2018-10-04 11:09:03 +02:00
artica 7ac581ac1e Auto-updated build strings. 2018-10-04 00:01:27 +02:00
vgilc ef7ca68d4a Merge branch '1970_La_lista_de_campos_no_se_esta_aplicando_correctamente' into 'develop' 
Fixed fields list in manage events-custom fields

See merge request artica/pandorafms!1633
 2018-10-03 13:21:07 +02:00
samucarc 3c54710d1b Fixed conflicts 2018-10-03 13:09:39 +02:00
vgilc 46830a4cbe Merge branch '2778-Mostrar-valor-numerico-en-el-tooltip-dev' into 'develop' 
fixed issue with string data in visual map

See merge request artica/pandorafms!1811
 2018-10-03 09:31:02 +02:00
artica f39788d8ef Auto-updated build strings. 2018-10-03 00:01:28 +02:00
vgilc ca67f52fb4 Merge branch '2670-Nuevo-widget-dashboard-system-group-status' into 'develop' 
2670 nuevo widget dashboard system group status

See merge request artica/pandorafms!1795
 2018-10-02 17:25:19 +02:00
alejandro-campos 62548c7f94 Merge branch 'develop' into 2670-Nuevo-widget-dashboard-system-group-status 
Conflicts:
	pandora_console/include/styles/pandora.css
 2018-10-02 17:11:02 +02:00
vgilc 7db6ae54ff Merge branch '2857-Falta-imagen-de-fondo-para-preview-de-logo-en-visual-setup-de-meta' into 'develop' 
edited css class ui-widget-content

See merge request artica/pandorafms!1822
 2018-10-02 15:39:18 +02:00
vgilc 5668857914 Merge branch '2479-Errores-en-vista-de-alertas-de-meta' into 'develop' 
2479 errores en vista de alertas de meta

See merge request artica/pandorafms!1821
 2018-10-02 15:37:08 +02:00