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

18947 Commits

Author SHA1 Message Date
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
fermin831 c7a624000e Added API function set delete_user_profile_info 2018-10-29 13:34:30 +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
fermin831 bf7cdcc7ff Added API function set update_user_profile_info 2018-10-29 12:45:03 +01:00
fermin831 4f02d72630 Added API function set create_user_profile_info 2018-10-29 12:22:08 +01:00
Ramon Novoa 20d6c30416 Check that SNMP in/outoctet modules respond. 2018-10-29 12:09:35 +01:00
daniel 29fb922b70 Merge remote-tracking branch 'origin/develop' into 2784-Pantalla_por_dispositivos_filtrado_por_custom_fields 2018-10-29 11:06:57 +01:00
fermin831 c211433321 Added API function get user_profiles_info 2018-10-29 11:02:43 +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
daniel f78e86b925 view cusatom field 2018-10-25 17:08:56 +02:00
fbsanchez c06bd4207e estilos popup 2018-10-25 16:40:45 +02:00
fbsanchez 172ac187a2 estilos popup 2018-10-25 15:58:06 +02:00
fermin831 d70969e6e9 Merge branch 'develop' into ent-2520-api-listar-y-crear-repuestas-de-eventos-6165-eucomm 
Conflicts resolved:
	pandora_console/include/functions_api.php
 2018-10-25 15:45:16 +02:00
fermin831 f831e59ac3 Added documentation and minor fixes related with API event responses functions 2018-10-25 15:42:45 +02:00
fbsanchez 8619adbf4c estilos popup 2018-10-25 15:42:20 +02:00
fermin831 8cc68185d9 Added set delete_event_response to API 2018-10-25 15:34:02 +02:00
fermin831 1bd492307a Added set update_event_response to API 2018-10-25 15:25:27 +02:00
fermin831 6b93cba119 Added set create_event_response to API 2018-10-25 15:03:07 +02:00
fbsanchez 85051924b7 estilos popup 2018-10-25 14:01:12 +02:00
vgilc 3aff162616 Merge branch '2961-Longitud-del-nombre-de-las-plantillas-de-consolas-visuales' into 'develop' 
Changed tlayout_template name table to varchar 600

See merge request artica/pandorafms!1889
 2018-10-25 13:27:25 +02:00
vgilc 2bd6b0c688 Merge branch '1863-Error-en-tipo-de-evento-going-up-critical' into 'develop' 
1863 error en tipo de evento going up critical

See merge request artica/pandorafms!1736
 2018-10-25 13:25:22 +02:00
vgilc d218c586d9 Merge branch '2166-Hide-not-init-agents' into 'develop' 
fixed bug: hide not init agents not working in report item creation

See merge request artica/pandorafms!1742
 2018-10-25 13:23:22 +02:00
vgilc 9aed441246 Merge branch '2452-Fallo-recalculo-custom-graph' into 'develop' 
Changed custom graph item insertion and deletion to fix bug when sorting elements in list

See merge request artica/pandorafms!1782
 2018-10-25 13:20:30 +02:00
vgilc 3ed5b97e1d Merge branch '2455--6064-Error-Insert-data-nombre-de-XML-mal-construido' into 'develop' 
Fixed bug in the construction of the name of the xml file

See merge request artica/pandorafms!1737
 2018-10-25 13:20:05 +02:00
vgilc d1ff778102 Merge branch 'ent-2486-6107-bug-lista-dashbord-con-acl' into 'develop' 
Removed dashboard menu if it is displayed from main page

See merge request artica/pandorafms!1879
 2018-10-25 13:19:33 +02:00
vgilc fcb95a8d8d Merge branch '2510-Checkboxes-y-radio-buttons-en-Config.-visual' into 'develop' 
visuals fix in visual styles

See merge request artica/pandorafms!1731
 2018-10-25 13:16:57 +02:00
vgilc aabd5435d0 Merge branch '2535-Macro-para-unidad-informes' into 'develop' 
Added unit in label graphs

See merge request artica/pandorafms!1874
 2018-10-25 13:12:26 +02:00
vgilc d71257ea1c Merge branch 'ent-2540-Macro-de-IP-del-agente-no-funciona-event-responses-EUComm' into 'develop' 
Fixed macro _agent_adress_ on events responses

See merge request artica/pandorafms!1872
 2018-10-25 13:03:44 +02:00
vgilc 3c548f1c98 Merge branch '6219_Comprobacion_paradas_planificadas' into 'develop' 
Fixed problems in scheduled downtime CLI

See merge request artica/pandorafms!1806
 2018-10-25 13:03:17 +02:00
vgilc 66e662c53e Merge branch '2572-Fallo-visual' into 'develop' 
Database and application_osx icons added to select icon of group - #2572

See merge request artica/pandorafms!1749
 2018-10-25 13:02:08 +02:00