aff94d0761
Merge branch 'ent-2543-6208-version-movil-metaconsola-no-muestra-graficas-ni-algunas-imagenes-metaconsola-no-redirige-a-vista-de-movil' into 'develop'
...
Ent 2543 6208 version movil metaconsola no muestra graficas ni algunas imagenes metaconsola no redirige a vista de movil
See merge request artica/pandorafms!1886
2018-10-25 10:40:56 +02:00
582db8d3b5
Merge branch '2618_Bug_Acceso_agentes_en_vista_de_grupo' into 'develop'
...
Fixed enterprise ACLs in Agents View
See merge request artica/pandorafms!1853
2018-10-25 10:40:12 +02:00
9cc08709dd
Merge branch 'ent-2709-i6079-Real-time-graphs-de-IfOperStatus-no-muestran-nada' into 'develop'
...
Fixed booleans realtime graphs
See merge request artica/pandorafms!1866
2018-10-25 10:35:04 +02:00
5a551da1f8
Merge branch '2759-crear-iso-precargada-enterprise-para-demos' into 'develop'
...
Minor fix in cde cluster api methods
See merge request artica/pandorafms!1864
2018-10-25 10:34:39 +02:00
6ab39aa728
Merge branch '2932-Bug-al-crear-un-evento-por-medio-de-la-API-no-te-inserta-el-campo-agent-name' into 'develop'
...
fixed bug: calling api method create event not inserting agent name
See merge request artica/pandorafms!1877
2018-10-25 10:33:06 +02:00
2b6e8473dc
Merge branch 'ent-2908-lentitud-vista-tactica-cuando-hay-millones-de-eventos' into 'develop'
...
Improve performance on tactical view with a lot of events
See merge request artica/pandorafms!1857
2018-10-25 10:32:11 +02:00
db802c5a2e
Auto-updated build strings.
2018-10-25 00:01:22 +02:00
50aa314191
WUX-UX integration
2018-10-24 19:31:39 +02:00
2e74cd53f1
Changed tlayout_template name table to varchar 600
2018-10-24 16:50:40 +02:00
87abf1dc02
added event time filter in tactical view
2018-10-24 16:36:44 +02:00
9d7f063ef2
Changed tlayout_template name table to varchar 600
2018-10-24 12:39:58 +02:00
f0dbff1885
Merge remote-tracking branch 'origin/develop' into 2759-crear-iso-precargada-enterprise-para-demos
2018-10-24 12:22:12 +02:00
f4add9a7f8
Changed tlayout_template name table to varchar 600
2018-10-24 11:49:18 +02:00
7a64bb4855
Auto-updated build strings.
2018-10-24 00:01:28 +02:00
4cb66c31f1
Fixed logo image on metaconsole login
2018-10-23 17:43:00 +02:00
8cb2ff1d1b
Fixed tactical view graph on mobile metaconsole
2018-10-23 17:41:14 +02:00
a1f28480ae
Fixed force_type check in delete/edit modules in bulk
2018-10-23 15:46:48 +02:00
9765a8c113
Merge remote-tracking branch 'origin/develop' into 2759-crear-iso-precargada-enterprise-para-demos
2018-10-23 14:43:39 +02:00
f10a661cd6
Fixed group and set_center
2018-10-23 12:36:20 +02:00
2af6108b66
Removed dashboard menu if it is displayed from main page
2018-10-23 12:29:23 +02:00
9a77256198
Auto-updated build strings.
2018-10-23 00:01:29 +02:00
aaa2c6aa10
fixed bug: calling api method create event not inserting agent name
2018-10-22 10:31:10 +02:00
f899910dd0
Updated version and build strings.
2018-10-22 09:45:06 +02:00
6bb478ea1a
Merge remote-tracking branch 'origin/develop' into 2221-Actualizacion_de_Pandora_a_version_7_de_PHP
2018-10-22 08:04:36 +02:00
1d0d656996
Auto-updated build strings.
2018-10-22 00:01:23 +02:00
b01362a873
Auto-updated build strings.
2018-10-21 00:01:26 +02:00
5ced50863c
Auto-updated build strings.
2018-10-20 00:01:25 +02:00
972f4b1e89
Added unit in label graphs
2018-10-19 14:03:15 +02:00
bd2a3a82ec
silence error php7(not solution)
2018-10-19 12:25:01 +02:00
81ebfc755e
fixed gdgraph
2018-10-19 12:01:22 +02:00
a7918a1816
delete field flash chart php7
2018-10-19 11:56:49 +02:00
8c49b26a91
php7 version
2018-10-19 11:37:11 +02:00
ffc7734ebc
delete flash_charts and library pchart
2018-10-19 11:31:06 +02:00
b7f9149c20
Merge branch '2920-No-funciona-el-wizard-para-crear-agentes-desde-la-metaconsola' into 'develop'
...
Changed function that creates a new agent from metaconsole to set field name…
See merge request artica/pandorafms!1873
2018-10-19 11:30:47 +02:00
0a1bee92a5
fixed slicebar to php7
2018-10-19 10:49:13 +02:00
3fd588353b
Changed function that creates a new agent from metaconsole to set field name with a hash and fixed bug when setting alias in database
2018-10-19 10:43:43 +02:00
b736746e1c
php version upgrade
2018-10-19 10:04:26 +02:00
f340a3dda0
Auto-updated build strings.
2018-10-19 00:01:26 +02:00
4d3c74ed37
Minor typo fix in events responses
2018-10-18 19:20:37 +02:00
40ceec6561
Fixed macro _agent_adress_ on events responses
2018-10-18 18:45:11 +02:00
e299209a92
fixed visual console custam graph in meta
2018-10-18 13:24:15 +02:00
9492d11cc8
Merge remote-tracking branch 'origin/develop' into 2221-Actualizacion_de_Pandora_a_version_7_de_PHP
2018-10-18 12:51:32 +02:00
d23e47dd9d
Merge branch '2737-Optimización-de-tags-dev-2' into 'develop'
...
Fixed tags filter on Tree tags
See merge request artica/pandorafms!1862
2018-10-18 09:53:03 +02:00
0c39e321e4
Auto-updated build strings.
2018-10-18 00:01:24 +02:00
e7663fc5f0
Fixed booleans realtime graphs
2018-10-17 19:20:22 +02:00
2d2c465ff6
Removed unwanted traces
2018-10-17 15:43:26 +02:00
aa0c4b41e7
Fixed bug in the data collection of network component when creating its corresponding module
2018-10-17 13:31:14 +02:00
7a44f9dcdd
Minor fix in cde cluster api methods
2018-10-17 13:26:41 +02:00
525caee909
Fixed a minor mistake in error message - #2900
2018-10-17 12:59:37 +02:00
0b22ab6bfd
Minor bug fixed - #2900
2018-10-17 12:57:02 +02:00
561bce71ce
Changed error and success messages - #2900
2018-10-17 12:49:11 +02:00
14afe2ff88
Added message 'Please, select an agent first'
2018-10-17 12:35:11 +02:00
060e46868d
Fixed tags filter on bulk operation (select module first)
2018-10-17 11:57:22 +02:00
9ee64b4894
Fixed report agent/module
2018-10-17 08:44:51 +02:00
fd53704dc0
Auto-updated build strings.
2018-10-17 00:01:34 +02:00
f824650642
Merge remote-tracking branch 'origin/develop' into 2221-Actualizacion_de_Pandora_a_version_7_de_PHP
2018-10-16 15:42:17 +02:00
3c62388f0e
fixed errors php and slicebars change version php7
2018-10-16 15:32:31 +02:00
0ca34c744d
Fixed tags filter on Tree tags
2018-10-16 13:29:00 +02:00
aff2879340
Merge remote-tracking branch 'origin/develop' into ent-2740-servicios-favoritos
...
Conflicts:
pandora_console/extras/mr/21.sql
pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
pandora_console/pandoradb_data.sql
2018-10-16 11:35:14 +02:00
14419759b0
Merge branch 'ent-2631-i6106-error-al-editar-modulos-con-tag-con-perfil-de-usuario-determinado' into 'develop'
...
Fixed modules tags acl with to tagged modules with an user without tags
See merge request artica/pandorafms!1860
2018-10-16 09:01:13 +02:00
3664099fca
Merge branch '2897-Fallo-al-hacer-update-en-Visual-Consoles-dev' into 'develop'
...
Fixed lost id_agent in visual console
See merge request artica/pandorafms!1858
2018-10-16 09:00:48 +02:00
9675c6ce52
Auto-updated build strings.
2018-10-16 00:01:27 +02:00
23fa30a514
Increased the character limit in Warning / Critical status string type when creating Network component
2018-10-15 16:59:39 +02:00
dd4e1c9994
Fixed modules tags acl with to tagged modules with an user without tags
2018-10-15 16:50:23 +02:00
392d4e7aad
Fixed lost id_agent in visual console
2018-10-15 15:05:47 +02:00
41d104ae2c
Improve performance on tactical view with a lot of events
2018-10-15 12:23:51 +02:00
d84427b014
fixed errors php
2018-10-15 10:32:24 +02:00
d28bc79b79
upgrade php
2018-10-15 09:05:04 +02:00
c3bcb84293
Merge remote-tracking branch 'origin/develop' into 2221-Actualizacion_de_Pandora_a_version_7_de_PHP
2018-10-15 08:58:55 +02:00
f3c8b14b32
Merge branch '2457-Formulario-de-creacion-repetido' into 'develop'
...
added check to prevent alert creation form from being printed in alert cluster for step 5
See merge request artica/pandorafms!1854
2018-10-15 00:06:41 +02:00
743c8a747e
Merge branch 'ent-2819-i6537-se-descuadran-etiquetas-en-link-publico-cons-visuales' into 'develop'
...
Fixed margin in public visual consoles
See merge request artica/pandorafms!1855
2018-10-15 00:04:34 +02:00
35e1234b3c
Auto-updated build strings.
2018-10-15 00:01:24 +02:00
44be4aea57
Auto-updated build strings.
2018-10-14 00:01:23 +02:00
b0e56cd506
Auto-updated build strings.
2018-10-13 00:01:24 +02:00
179f3f0526
Auto-updated build strings.
2018-10-12 00:01:28 +02:00
0747a5b263
Fixed secondary groups privileges in agent popup in tree view
2018-10-11 16:00:49 +02:00
c74e4a3d6a
Fixed agent filter on agents/module view to see secondary groups
2018-10-11 15:45:11 +02:00
aa33522670
added check to prevent alert creation form from being printed in alert cluster for step 5
2018-10-11 15:22:36 +02:00
e5a2284b8b
Fixed margin in public visual consoles
2018-10-11 14:51:52 +02:00
015dcdb032
Fixed enterprise ACLs in Agents View
2018-10-11 13:07:59 +02:00
16be9488c8
Merge remote-tracking branch 'origin/develop' into 2221-Actualizacion_de_Pandora_a_version_7_de_PHP
...
Conflicts:
pandora_console/include/functions_graph.php
2018-10-11 13:06:17 +02:00
1f56054f6c
fixed changes php7
2018-10-11 12:57:48 +02:00
c8121d7df3
Merge branch '2791-ACL-enterprise-view-dashboard-permite-al-usuario-hacer-busquedas-por-nombre-de-agente-exponiendo-datos-confidenciales-dev' into 'develop'
...
Added head search in acl enterprise
See merge request artica/pandorafms!1801
2018-10-11 12:16:25 +02:00
edadc60957
Merge branch '2737-Optimización-de-tags-dev' into 'develop'
...
2737 optimización de tags dev
See merge request artica/pandorafms!1815
2018-10-11 12:14:10 +02:00
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
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
d087665d1e
Auto-updated build strings.
2018-10-11 00:01:56 +02:00
2693bbe209
Merge remote-tracking branch 'origin/develop' into 2737-Optimización-de-tags-dev
...
Conflicts:
pandora_console/godmode/massive/massive_delete_modules.php
pandora_console/operation/agentes/ver_agente.php
2018-10-10 19:39:27 +02:00
18ad7a2ce9
[Tags performance] Fixed not init filter
2018-10-10 19:14:24 +02:00
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
4ac4f46daf
Fixed html_print_autocomplete_modules
2018-10-10 18:02:10 +02:00
496f99e42f
[Tags performance] Fixed tags counters in tags view
2018-10-10 17:43:02 +02:00
de10de03f7
[Tags performance] Fixed edit and delete massive delete and edit modules in bulk selecting modules first
2018-10-10 17:42:33 +02:00
8339eecacc
Merge branch '2737-Optimización-de-tags-dev' of https://192.168.50.5:8081/artica/pandorafms into 2737-Optimización-de-tags-dev
2018-10-10 16:57:15 +02:00
4558c909ef
Changed source filter in event list
2018-10-10 16:57:04 +02:00
299868cfd5
meta_db* added to tmetaconsole_setup
2018-10-10 14:35:09 +02:00
42caddeadd
Modified query to match MR requirements
2018-10-10 14:32:43 +02:00
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
1694fccd83
Auto-updated build strings.
2018-10-10 00:01:47 +02:00
3d6451d64b
Fix returnData - #2881
2018-10-09 20:03:49 +02:00
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
2083733329
Fix id for agent status - #2881
2018-10-09 16:33:07 +02:00
9b7ae31344
MR change
2018-10-09 16:09:44 +02:00
ec7c645d1b
[Tags performance] Fixed problems when there is not using secondary groups
2018-10-09 11:45:55 +02:00
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
28f9e152e7
[Tags performance] Fixed tags filter and removed unwanted code
2018-10-09 10:56:02 +02:00
fd13e33259
fixed minor error input max-length in plugin network component
2018-10-09 10:51:03 +02:00
eeba7b9350
Added two missing parameters in the url - #2884
2018-10-09 09:58:28 +02:00
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
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
51c4fbece2
Auto-updated build strings.
2018-10-09 00:01:25 +02:00
052d888ac4
Fixed a minor warning
2018-10-08 18:53:21 +02:00
61a82337c3
Fixed error in agents bulk operations
2018-10-08 17:57:05 +02:00
f952d5c70e
tags_get_acl_tags revision
2018-10-08 17:45:26 +02:00
441458843f
[Tags performance] Fixed check acl tags by module and removed unused code
2018-10-08 17:19:46 +02:00
f7700874a5
api function api_get_all_agents for meta - #2881
2018-10-08 16:45:44 +02:00
099f01a4ba
[Tags performance] Fixed select modules from Agent/Module dashboard widget
2018-10-08 13:45:30 +02:00
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
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
d2b8939804
[Tags performance] Fixed select_modules_for_agent_group function (failed with several secondary groups).
2018-10-08 12:33:40 +02:00
76da7384b6
Auto-updated build strings.
2018-10-08 00:01:23 +02:00
5171ef79b0
Auto-updated build strings.
2018-10-07 00:01:23 +02:00
a40057b3ff
Auto-updated build strings.
2018-10-06 00:01:29 +02:00
a72b9b0515
[Tags performance] Fixed agents_get_modules to ajax calls
2018-10-05 13:32:14 +02:00
c0dd2bcab6
Add status data to get_all_agents API response - #2881
2018-10-05 12:57:25 +02:00
c1af14b90e
Change tlayou name table to varchar 600 - #2823
2018-10-05 12:25:15 +02:00
a59ecc7ef3
fixed minor error counters alert fired in module_group view
2018-10-05 11:55:06 +02:00
1e4c570541
[Tags performance] check agents_get_modules in networkmap and removed unused code
2018-10-05 10:44:24 +02:00
198eb1bbc3
[Tags performance] Fixed parent module select
2018-10-05 10:12:40 +02:00
5fd76bf8cb
Merge branch '2737-Optimización-de-tags-dev' of https://192.168.50.5:8081/artica/pandorafms into 2737-Optimización-de-tags-dev
2018-10-05 09:42:09 +02:00
e8621e54e5
Updated tags optimization
2018-10-05 09:40:08 +02:00
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
ec8d36f8eb
Auto-updated build strings.
2018-10-05 00:01:30 +02:00
1278f03fd9
[Tags performance] agents_get_modules misc checks
2018-10-04 19:08:01 +02:00
0ce7d3a2ed
fixed errors php7
2018-10-04 17:17:39 +02:00
7766881da6
Added option charset to db_connect
...
Removed unused function db_get_table_count
2018-10-04 17:07:34 +02:00
530017a79d
Eliminadas entidades html de vista de auditoria
2018-10-04 17:02:38 +02:00
979e443824
Removed unused code
2018-10-04 16:31:24 +02:00
75768c9eaa
[Tags performance] Open reporting checks
2018-10-04 16:23:36 +02:00
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
e2f7157545
fixed php7
2018-10-04 11:43:08 +02:00
6a19c2faec
Añadida icono service map
2018-10-04 11:09:03 +02:00
7ac581ac1e
Auto-updated build strings.
2018-10-04 00:01:27 +02:00
f3eae5e111
[Tags performance] Some agents_get_modules checks
2018-10-03 17:00:57 +02:00
0855d09156
Fixed a minor mistake - #2858
2018-10-03 16:46:35 +02:00
61a3d147af
Added descriptive error messages - #2858
2018-10-03 16:41:58 +02:00
a33cae9e8f
[Tags performance] Check functions_agents agents_get_modules
2018-10-03 16:33:56 +02:00
0ca13b8e98
Removed unused code
2018-10-03 15:04:45 +02:00
36fade6b37
Removed unwanted traces
2018-10-03 13:55:06 +02:00
7bd0615681
[Tags performace] Check visual consoles
2018-10-03 13:53:59 +02:00
vgilc
artica
fbsanchez
manuel.montes
danielmaya
fermin831
alejandro-campos
artica
daniel
tatiana.llorente@artica.es
samucarc
Ramón Novoa
enriquecd