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 |
|
Kike
|
8b53dbc444
|
Corrected typing error
|
2018-10-29 17:44:09 +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 |
|
Kike
|
da91b4d25f
|
Solved errors in mobile events view
|
2018-10-29 16:16:03 +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 |
|
enriquecd
|
7634a41e04
|
Api meta functions new,update,delete,get users - #2523
|
2018-10-25 20:01:04 +02:00 |
|
enriquecd
|
2849d62faa
|
Add generic API functions set access control and traps functions - #2978
|
2018-10-25 19:48:23 +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 |
|
samucarc
|
74b80f68a5
|
Fixed minor bug in pandora flot js
|
2018-10-25 16:52:39 +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 |
|
alejandro-campos
|
ad652c82fa
|
fixed english and spanish version of plugin-in macros help dialog
|
2018-10-25 13:56:17 +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 |
|
samucarc
|
e3b7f33287
|
Added improvements in the creation of agents in the meta console
|
2018-10-25 13:26:35 +02:00 |
|