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

18629 Commits

Author SHA1 Message Date
artica fc82a9d172 Auto-updated build strings. 2018-11-02 00:01:26 +01:00
artica f47918b4cc Auto-updated build strings. 2018-11-01 00:01:31 +01:00
vgilc 5694a16f74 Merge branch 'ent-2608-mas-problemas-de-vistas-de-grupos-secundarios' into 'develop' 
Fixed agent popup with secondary groups privileges in tree view

See merge request artica/pandorafms!1922
 2018-10-31 17:39:13 +01:00
Fermin 9f0e43623b Fixed agent popup with secondary groups privileges in tree view 2018-10-31 16:16:32 +01:00
vgilc e3f6a794a4 Merge branch '2716-ue-plugin-modifications' into 'develop' 
Improved LWP ssl ignore certificate added extra debug

See merge request artica/pandorafms!1723
 2018-10-31 16:00:46 +01:00
fbsanchez 7f093b29e3 Merge remote-tracking branch 'origin/develop' into 2716-ue-plugin-modifications 2018-10-31 15:48:57 +01:00
vgilc 49f1e79c22 Merge branch 'ent-2999-6711-estan-apareciendo-modulos-deshabilitados-en-v728-dentro-de-la-vista-de-modulos-de-un-agente' into 'develop' 
Fixed disabled modules on agent view

See merge request artica/pandorafms!1921
 2018-10-31 11:46:16 +01:00
Fermin 7f22e2b067 Fixed disabled modules on agent view 2018-10-31 08:57:34 +01:00
artica d9f8616b2c Auto-updated build strings. 2018-10-31 00:01:26 +01:00
vgilc 9d80681b06 Merge branch '2326-unificar-vistas-ux-y-wux-en-un-mismo-portal' into 'develop' 
snapshot viewer fix

See merge request artica/pandorafms!1920
 2018-10-30 18:36:06 +01:00
fbsanchez 39b6164526 snapshot viewer fix 2018-10-30 18:20:10 +01:00
vgilc 94c008bc21 Merge branch '2984-problemas-tras-actualizacion-php7' into 'develop' 
fixed warnings php7

See merge request artica/pandorafms!1918
 2018-10-30 17:47:42 +01:00
daniel 78a1c72eac fixed warnings php7 2018-10-30 17:38:46 +01:00
vgilc b1bf1d7b4b Merge branch '2326-unificar-vistas-ux-y-wux-en-un-mismo-portal' into 'develop' 
2326 unificar vistas ux y wux en un mismo portal

See merge request artica/pandorafms!1917
 2018-10-30 16:20:26 +01:00
fbsanchez a58bde2118 fixed UX historical snapshot viewer 2018-10-30 16:12:48 +01:00
vgilc e6a9ca7bfb Merge branch '2984-problemas-tras-actualizacion-php7' into 'develop' 
fixed errors php7

See merge request artica/pandorafms!1916
 2018-10-30 15:00:54 +01:00
daniel 0978be9b51 fixed errors php7 2018-10-30 14:43:27 +01:00
vgilc e1fdd5692b Merge branch 'fix/pandora_enterprise#2355-compatibilidad-windows' into 'develop' 
Quote the fping binary before calling it.

See merge request artica/pandorafms!1915
 2018-10-30 14:43:21 +01:00
vgilc cb848238e4 Merge branch '2221-actualizacion-de-pandora-a-version-7-de-php' into 'develop' 
xmlrpc php7 Dockerfile + debian specs

See merge request artica/pandorafms!1914
 2018-10-30 13:29:33 +01:00
Ramon Novoa a142a32349 Quote the fping binary before calling it. 2018-10-30 13:23:01 +01:00
fbsanchez 4f166555da xmlrpc php7 Dockerfile + debian specs 2018-10-30 12:54:20 +01:00
vgilc 70884f73d0 Merge branch '2984-problemas-tras-actualizacion-php7' into 'develop' 
fixed changes in pandora mobile

See merge request artica/pandorafms!1913
 2018-10-30 12:45:57 +01:00
daniel 743a41d29c fixed changes in pandora mobile 2018-10-30 12:30:10 +01:00
vgilc d4fa8e7b27 Merge branch '2983-6699-bug-no-se-pueden-anadir-acciones-nuevas-a-alertas-dev' into 'develop' 
Fixed add button on alerts

See merge request artica/pandorafms!1908
 2018-10-30 09:36:37 +01:00
vgilc 020f9579a2 Merge branch '2984-problemas-tras-actualizacion-php7' into 'develop' 
fixed errors php7

See merge request artica/pandorafms!1909
 2018-10-30 09:36:18 +01:00
artica 5a057490ad Auto-updated build strings. 2018-10-30 00:01:29 +01:00
daniel 8e206eeeef fixed errors php7 2018-10-29 18:20:56 +01:00
fermin831 294553941d Fixed add button on alerts 2018-10-29 16:41:55 +01:00
vgilc 7906920d30 Merge branch '2221-actualizacion-de-pandora-a-version-7-de-php' into 'develop' 
spec fix - php7

See merge request artica/pandorafms!1906
 2018-10-29 16:24:25 +01:00
fbsanchez cdc0efae82 spec fix - php7 2018-10-29 16:11:29 +01:00
Ramon Novoa 6353af0482 Merge remote-tracking branch 'github/develop' into develop 2018-10-29 13:20:48 +01:00
vgilc 4d689d3ce8 Merge branch 'fix/recon-notinit-inoutoctets' into 'develop' 
Check that SNMP in/outoctet modules respond.

See merge request artica/pandorafms!1904
 2018-10-29 13:08:40 +01:00
Ramon Novoa 20d6c30416 Check that SNMP in/outoctet modules respond. 2018-10-29 12:09:35 +01:00
vgilc 88da8d8d9a Merge branch 'fix/incremental-min-max' into 'develop' 
Process incremental modules before checking limits.

Closes pandora_enterprise#2213

See merge request artica/pandorafms!1903
 2018-10-29 09:18:16 +01:00
vgilc e03f56f0d7 Merge branch '2429-Resaltar-elementos-al-pasar-por-encima-o-marcar' into 'develop' 
2429 resaltar elementos al pasar por encima o marcar

See merge request artica/pandorafms!1762
 2018-10-29 09:17:54 +01:00
vgilc 17286414c7 Merge branch '2619_Group_View' into 'develop' 
Added warning and normal status agents in group view

See merge request artica/pandorafms!1799
 2018-10-29 09:16:33 +01:00
vgilc 08a8165b93 Merge branch '2827-Mensaje-de-alerta-disparada' into 'develop' 
Added number of times an alert is fired - #2827

See merge request artica/pandorafms!1823
 2018-10-29 09:15:32 +01:00
artica 696abbdead Auto-updated build strings. 2018-10-29 00:01:25 +01:00
artica 507bbcff56 Auto-updated build strings. 2018-10-28 00:01:22 +02:00
artica 01e9251a88 Auto-updated build strings. 2018-10-27 00:01:26 +02:00
Ramon Novoa c5aba438b4 Process incremental modules before checking limits. 
Fixes pandora_enterprise#2213.
 2018-10-26 15:44:16 +02:00
vgilc 1973a5fe54 Merge branch '2326-unificar-vistas-ux-y-wux-en-un-mismo-portal' into 'develop' 
WUX-UX integration

See merge request artica/pandorafms!1890
 2018-10-26 14:42:23 +02:00
vgilc 7a4b7d4289 Merge branch '2221-Actualizacion_de_Pandora_a_version_7_de_PHP' into 'develop' 
2221 actualizacion de pandora a version 7 de php

See merge request artica/pandorafms!1875
 2018-10-26 14:41:15 +02:00
daniel fee15492fa add php7 to Dockerfile 2018-10-26 14:36:18 +02:00
nramon 3d964364e8 Merge branch 'fix-language-selection-problem' into 'develop' 
Fixed language selection problem at initial setup.

See merge request artica/pandorafms!1902
 2018-10-26 10:51:01 +02:00
nramon 62cf584e44 Merge branch 'update-japanese-help-1025' into 'develop' 
Updated Japanese help files.

See merge request artica/pandorafms!1901
 2018-10-26 10:50:49 +02:00
Junichi Satoh 91ed413b0a Fixed language selection problem at initial setup. 2018-10-26 17:34:49 +09:00
Junichi Satoh ecf5ca3bb2 Updated Japanese help files. 2018-10-26 17:28:24 +09:00
artica dba51e07b3 Auto-updated build strings. 2018-10-26 00:01:33 +02:00
daniel 0b0bad8a73 Merge remote-tracking branch 'origin/develop' into 2221-Actualizacion_de_Pandora_a_version_7_de_PHP 
Conflicts:
	pandora_console/extras/mr/22.sql
	pandora_console/include/chart_generator.php
	pandora_console/include/functions_graph.php
	pandora_console/include/functions_reporting.php
	pandora_console/include/functions_reporting_html.php
	pandora_console/include/graphs/fgraph.php
 2018-10-25 17:43:28 +02:00