59159ec473
change last status change info
...
Former-commit-id: e40f4ce7f042219584f0224822ca8a112f453194
2019-02-21 17:22:00 +01:00
a9eb3cf37b
Merge branch 'ent-3458-Metaconsola_filtro_eventos_por_nombre_agente_no_machea_nombres_con_espacios' into 'develop'
...
Fixed filter by name of agents in events when they contain spaces
See merge request artica/pandorafms!2160
Former-commit-id: 725ca1b5279d8074454ae8ed4b3af27f084e9594
2019-02-21 17:07:36 +01:00
6ef1c3951a
Ticket Changed
...
Former-commit-id: e258f0932398d9fc58a8d097098c83b7bed084c5
2019-02-21 14:04:00 +01:00
d9e0f2ea42
Merge remote-tracking branch 'origin/develop' into 3088-Se_carga_filtro_en_vista_de_eventos_cuando_no_hay_filtro_activo
...
Former-commit-id: f0ab3426fdf23bbceed7c2cd991b37c33ec3ae2e
2019-02-21 13:26:12 +01:00
dc4d5b1bd7
fixed error in widget
...
Former-commit-id: 3b0d2e8641d35f7c339aa4229f0a7108216704e0
2019-02-21 13:21:05 +01:00
acf3c94642
fix bad solved conflict and added changes in bd to migrate and mr
...
Former-commit-id: d52e91d0f2b886620aa9fc07dda48bfeb27ffe0c
2019-02-21 13:16:32 +01:00
bb7be444f4
Merge branch '3088-Se_carga_filtro_en_vista_de_eventos_cuando_no_hay_filtro_activo' into 'develop'
...
Fixed error user edit tocken filter events not set.
See merge request artica/pandorafms!2188
Former-commit-id: d293fbdebaf2a1300b4a2082c75d9b92c37cf87b
2019-02-21 09:49:47 +01:00
300626e551
Merge remote-tracking branch 'origin/develop' into ent-3499-Numero_de_respuestas_de_eventos_masivas
...
Former-commit-id: 4a8482ccef3661c83553dff8f5533c29321f95f2
2019-02-20 15:38:15 +01:00
55486e7b93
Merge branch 'ent-2836-Operaciones-masivas-filtrado-de-modulos-por-tag' into 'develop'
...
Fixed bug in filtered modules by tag
See merge request artica/pandorafms!2181
Former-commit-id: f313f0cab032ccc8329933a641db8c541b682474
2019-02-20 10:33:28 +01:00
d4e7cbcdc8
Fixed error user edit tocken filter events not set.
...
Former-commit-id: 6c57c05f82fc0be260428474408384527d66a838
2019-02-19 14:55:44 +01:00
00cba4cbc9
Fixed bug in filtered modules by tag
...
Former-commit-id: 098d3c88a9a30fb1c38074e741f093ff40fd5d02
2019-02-19 13:05:31 +01:00
d116e4742a
add new tocken max events responses
...
Former-commit-id: f65e6a478812a913d25fa7b87e9ac2b26b9a5ff4
2019-02-19 12:14:42 +01:00
27602d8e49
Recovered notification editor for user
...
Former-commit-id: a4fbf05912c974ab388cde9e9237022f2bcc3277
2019-02-18 15:14:24 +01:00
7b2e0342c1
Fix. notification did not reach ALL target
...
Former-commit-id: 237e5dac34bcbe50453e0b56f0964a9d74aa7c04
2019-02-18 14:18:58 +01:00
c16fb1696d
Merge branch 'develop' into 3222-Deshabilitar-doble-autenticacion-si-no-esta-activada
...
Former-commit-id: 6024bd09f1bb77c7610a8adbb72a92631ad6e59d
2019-02-15 15:03:42 +01:00
e4ca9b7fc8
Merge branch 'develop' into 3281-Vista-monitor-detail-personalizar-campos-a-mostrar
...
Former-commit-id: 1683307f273ba5676ec61709403249b24113c47f
2019-02-15 14:22:55 +01:00
3e9e668e00
Merge remote-tracking branch 'origin/ent-3430-discovery' into ent-3431-discovery-host-devices
...
Former-commit-id: e20038920481419abfaeddc665b3369f90b49fef
2019-02-14 10:59:27 +01:00
ed63ef47fa
Moved ReconServer to DiscoveryServer
...
Former-commit-id: 5e18aa75d669f6b45d3b4e2648f31473fd206091
2019-02-13 14:56:10 +01:00
166c3bbe88
Merge remote-tracking branch 'origin/ent-3430-discovery' into ent-3371-sistema-de-notificaciones-pandora
...
Former-commit-id: d630994f964e43b28197f4d26469fa1484d08ac2
2019-02-12 12:41:11 +01:00
42dc0c60be
supervisor
...
Former-commit-id: cf99e746a02ab3e921a39b19f6b4822580299b7e
2019-02-12 11:41:21 +01:00
72a57bfbec
minor changes in message edit
...
Former-commit-id: a36fe911f191c3a187c8c70032f3b1aaa0977fea
2019-02-11 19:27:21 +01:00
0dbabd3ba3
Improved conversation view (messages) some filters and fixes in functions_messages
...
Former-commit-id: 13597c6556939bbe772d5ed749930e30e5377c47
2019-02-11 18:28:00 +01:00
ba7540c9ee
improvement of optimization for list event
...
Former-commit-id: a7788b01160c661139e6a3a6aac70c69441265a1
2019-02-08 09:51:08 +01:00
c2a44e073f
Update events.build_query.php
...
Former-commit-id: 4622b27b1ce9e81ce81d89d7bc9d2eeb1b30fb93
2019-02-07 18:03:28 +01:00
23a8d0640f
Update events.build_query.php
...
Former-commit-id: 189244aa57d58eb33dd43f707eb6ac929f58e537
2019-02-07 17:05:05 +01:00
92af9f84bc
Fixed conflict
...
Former-commit-id: c0e0826c5a70772c049d9e0ce168f3d0b35118c0
2019-02-07 17:00:52 +01:00
d5fb9f1051
Added AJAX to user notification config window
...
Former-commit-id: 9ca09ae777d699588a76dfb619156d800a95895b
2019-02-07 12:22:50 +01:00
4c2215a3db
Merge remote-tracking branch 'origin/develop' into 3446-Imagen-grupos-no-se-muestra-None
...
Conflicts:
pandora_console/install.php
Former-commit-id: bc20f50737c115ade0034b4ca9e6d4cab26d35e6
2019-02-07 08:59:45 +01:00
986dfcb74d
Added basic and dummy user edit notifications
...
Former-commit-id: d0395c5b2cbc870812e54e15db523eeaac94557f
2019-02-06 18:20:26 +01:00
6ddcfcbb19
Fixed code style lintern
...
Former-commit-id: d7757a56f8368761776f80f826600d601b56b6d9
2019-02-06 12:51:02 +01:00
ac6b74dcdf
Added new window to display user notifications config
...
Former-commit-id: 57ba8fcd01365cedc92535d7cf71f70432a55a94
2019-02-06 11:36:28 +01:00
9baa3dcfa2
Merge remote-tracking branch 'origin/develop' into 3358-Mejora-en-la-aplicación-de-estilos
...
Conflicts:
pandora_console/extensions/agents_modules.php
pandora_console/extensions/module_groups.php
pandora_console/general/login_page.php
pandora_console/godmode/alerts/alert_list.builder.php
pandora_console/godmode/alerts/alert_list.list.php
pandora_console/godmode/gis_maps/configure_gis_map.php
pandora_console/godmode/groups/group_list.php
pandora_console/godmode/reporting/visual_console_builder.data.php
pandora_console/godmode/reporting/visual_console_builder.editor.php
pandora_console/godmode/reporting/visual_console_builder.elements.php
pandora_console/godmode/setup/setup_visuals.php
pandora_console/include/chart_generator.php
pandora_console/include/functions_networkmap.php
pandora_console/include/functions_pandora_networkmap.php
pandora_console/include/functions_ui.php
pandora_console/include/functions_visual_map_editor.php
pandora_console/include/styles/common.css
pandora_console/include/styles/countdown.css
pandora_console/include/styles/datepicker.css
pandora_console/include/styles/dialog.css
pandora_console/include/styles/help.css
pandora_console/include/styles/menu.css
pandora_console/include/styles/pandora.css
pandora_console/include/styles/pandora_forms.css
pandora_console/operation/agentes/estado_monitores.php
pandora_console/operation/agentes/interface_traffic_graph_win.php
pandora_console/operation/agentes/realtime_win.php
pandora_console/operation/agentes/stat_win.php
pandora_console/operation/events/events.php
pandora_console/operation/snmpconsole/snmp_view.php
pandora_console/operation/tree.php
pandora_console/operation/visual_console/render_view.php
Former-commit-id: 87793fc5a319121753f591da7949ad0ff3bd72b1
2019-02-05 09:23:53 +01:00
c5805e439e
Fixed filter by name of agents in events when they contain spaces
...
Former-commit-id: 93557e0ef296d1683acd86cb70ce2da6677e3e6c
2019-02-01 12:38:31 +01:00
d38236091b
Format fixes
...
Former-commit-id: 58823652a8bda566d0b0e340a1249abb4f7f219e
2019-02-01 09:55:29 +01:00
3f81e60df2
wip messages
...
Former-commit-id: 7852ce90b3f2681a0134a651812341f7fac00c53
2019-01-30 17:33:31 +01:00
b3da2803a4
Changed the format of the .php files
...
Former-commit-id: 4dc926a81de14e27df8be7982406b09d8e808399
2019-01-30 16:18:44 +01:00
406c062a3c
WIP messages, usable
...
Former-commit-id: 79e0b38fe7499642480505aac088ef8b45b04714
2019-01-30 13:29:46 +01:00
fa6c4d5bc9
notifications, WIP: new lib defined
...
Former-commit-id: 430ac2e090f91403fc074d2a9b37ab36de10d5a9
2019-01-30 11:56:47 +01:00
f5c96b7e5d
New organization of CSS files - #3358
...
Former-commit-id: 8512adc7742eecb64db2b0ee539acfddd33406c2
2019-01-24 11:10:49 +01:00
2155420d71
implement custom fields for node monitor view
...
Former-commit-id: d9dd515a726d1fa7cc5855b016270b9ef083cb6f
2019-01-18 11:13:29 +01:00
45becfe9ad
Merge branch '3046-Fallos-en-edicion-de-usuario' into 'develop'
...
3046-Fallos-en-edicion-de-usuario
See merge request artica/pandorafms!1947
Former-commit-id: bff6a1068784bb6ded8adec78f7458285f742368
2019-01-16 12:26:27 +01:00
797b49c03d
Merge branch '313-Respuestas-de-evento-masivas' into 'develop'
...
ent-313-Respuestas-de-evento-masivas
See merge request artica/pandorafms!2121
Former-commit-id: c4cf56f0b2526158d8f7f67ab3417e46b6e0f003
2019-01-15 16:17:53 +01:00
9048a13840
fix bug: in progress events deleting on event view massive deletion
...
Former-commit-id: 4c4f0a387ad3abd7cfea913b45c885ab3af4ecc6
2019-01-15 13:27:14 +01:00
5235b62c0d
fix disable actions in event list when centralized mode is enabled
...
Former-commit-id: d5f16b4453b1e291ba051cd381fc6c09ce0bd027
2019-01-15 11:29:12 +01:00
1ed90180c9
disable actions in event list when centralized mode is enabled and improve behavior of checkboxes when a massive action is applied
...
Former-commit-id: 11f4606d2e7dd9b91c918323dc8a3dada0c8f765
2019-01-15 11:27:05 +01:00
efa2e5332f
fix massive custom event responses
...
Former-commit-id: 24db40167b05bfd7fe4de88060f03a7a0ec38e73
2019-01-14 13:40:49 +01:00
5a8e46d608
modify the way event responses are executed in event list
...
Former-commit-id: 14ef545eef10427d95f96484e8d6b8d9656bd53c
2019-01-14 12:10:43 +01:00
07dc9a0b84
first load it does not show the data
...
Former-commit-id: 417e37dfb7acd78f3fb9e379a62534ca611aa9b1
2019-01-09 12:27:22 +01:00
752186cfba
conflict solved
...
Former-commit-id: 1f523d736b97c48ecfb9b39598c529e601702775
2019-01-08 11:59:50 +01:00
05cc3d0538
Merge branch '3125_Fallo_en_calendario_Begin_Date_en_el_filtro_de_las_combined_graph' into 'develop'
...
Fixed calendar in combined graphs
See merge request artica/pandorafms!2005
Former-commit-id: a7df2231f2c3b6e94b9d3273c99112f07c258441
2019-01-03 16:41:21 +01:00
0686982055
Fixed agents_get_group_agents while trying to get agent list from target group
...
Former-commit-id: 8a005e1574760688f5823cc854a287774c8c828b
2018-12-28 13:09:37 +01:00
74f4c58693
Merge branch '2584_Visual_en_Mapas_GIS' into 'develop'
...
Fixed minor visual error in GIS Map
See merge request artica/pandorafms!1971
Former-commit-id: 6cdaa62ad743a06e6e7f2d0e4026a04f953fcb16
2018-12-21 10:33:17 +01:00
0670eb0d29
disable double authentication option on user edit when disabled in authentication setup
...
Former-commit-id: 3718da22ded115ae7de492ffbd200d972704865f
2018-12-10 11:04:21 +01:00
b155b06ae9
Fixed issue with secondary group
...
Former-commit-id: 879f30eec17cc27446c86dcc34bb4d774f0632dc
2018-12-07 11:20:15 +01:00
5754674212
Merge branch '2906-TIP-para-Time-autorefresh-de-Edit-my-user' into 'develop'
...
Tip added - #2906
See merge request artica/pandorafms!1882
2018-11-30 13:09:34 +01:00
14d683b003
Merge branch '2917-Error-al-cambiar-de-página-en-eventos-agrupados-por-agente' into 'develop'
...
Changed url - #2917
See merge request artica/pandorafms!1869
2018-11-30 13:08:53 +01:00
b88e584e85
Merge branch '2938-Problema-con-tags-en-el-wizard-y-la-vista-de-informes-dev' into 'develop'
...
Added check of tags in report wizard
See merge request artica/pandorafms!2007
2018-11-30 13:07:22 +01:00
8371e75757
modified event list visualization
2018-11-26 16:40:20 +01:00
557002d7fd
fixed error events graphs
2018-11-23 10:32:58 +01:00
62ad6b9a35
Added check of tags in report wizard
2018-11-22 10:39:48 +01:00
099e0e6ed2
Fixed calendar in combined graphs
2018-11-21 16:28:43 +01:00
494b858a20
fixed errors session_start
2018-11-21 13:08:58 +01:00
f99dadca39
Merge branch 'fix/ux-panel-historical-images' into 'develop'
...
Fix/ux panel historical images
See merge request artica/pandorafms!1984
2018-11-16 12:51:31 +01:00
35870d13fd
allow snapshot_view check historical db
2018-11-16 12:42:08 +01:00
0a097d185d
fixed errors in custom fields view
2018-11-16 11:58:49 +01:00
d7db1e95e4
Merge branch 'fix/ehorus-password' into 'develop'
...
Decode entities in the eHorus password.
See merge request artica/pandorafms!1972
2018-11-14 12:41:52 +01:00
574e537ff1
Decode entities in the eHorus password.
...
Ref pandora_enterprise#3073.
2018-11-14 12:16:59 +01:00
43629d5c2a
Fixed minor visual error in GIS Map
2018-11-14 12:10:38 +01:00
22a26aa072
fixed error upgrade jquery
2018-11-14 11:40:01 +01:00
ac671d041c
Merge remote-tracking branch 'origin/develop' into 2784-Pantalla_por_dispositivos_filtrado_por_custom_fields
2018-11-13 15:47:07 +01:00
a201262737
Fixed php errors on radial networkmap
2018-11-12 16:29:31 +01:00
afaa6ad2ba
Merge remote-tracking branch 'origin/develop' into 2784-Pantalla_por_dispositivos_filtrado_por_custom_fields
2018-11-12 09:07:56 +01:00
7afc328e50
Merge branch '2900-Mensajes-de-Error-y-Success-al-mismo-tiempo-en-la-edición-de-usuarios_2' into 'develop'
...
Display an error message when no changes have been made - #2900
See merge request artica/pandorafms!1948
2018-11-08 12:27:45 +01:00
85adf7cf8d
Display an error message when no changes have been made - #2900
2018-11-08 12:04:08 +01:00
4179c0d341
fixed user edit update bug: not able to empty email and phone number fields and console errors. Also added validation to email and phone number inputs
2018-11-08 10:20:22 +01:00
1c1df4b5f7
fixed errors css jqueryui
2018-11-07 17:09:42 +01:00
218bf81fa1
Merge remote-tracking branch 'origin/develop' into 2784-Pantalla_por_dispositivos_filtrado_por_custom_fields
2018-11-07 13:30:19 +01:00
3f78f15499
WIP View custom fields data
2018-11-07 13:28:00 +01:00
3ffd976365
resolved conflicts in ver_agente
2018-11-07 12:31:54 +01:00
eec3b1843d
Merge branch '2900-Mensajes-de-Error-y-Success-al-mismo-tiempo-en-la-edición-de-usuarios' into 'develop'
...
2900 mensajes de error y success al mismo tiempo en la edición de usuarios
See merge request artica/pandorafms!1863
2018-11-06 17:08:54 +01:00
4102f11f6b
Merge branch '2618_Bug_Acceso_agentes_en_vista_de_grupo_2' into 'develop'
...
2618 bug acceso agentes en vista de grupo 2
See merge request artica/pandorafms!1928
2018-11-05 13:11:44 +01:00
3d99ef48aa
Fixed ACLs in monitoring View and agent detail
2018-11-05 13:05:34 +01:00
233b9c2c70
Well centered message modal window - #2768
2018-11-02 13:07:38 +01:00
3c78e387df
Fixed nodes count in pandora_networkmap
2018-11-02 11:32:07 +01:00
39b6164526
snapshot viewer fix
2018-10-30 18:20:10 +01:00
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
a58bde2118
fixed UX historical snapshot viewer
2018-10-30 16:12:48 +01:00
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
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
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
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
85051924b7
estilos popup
2018-10-25 14:01:12 +02:00
f2356a3a9b
Merge branch 'ent-2608-mas-problemas-de-vistas-de-grupos-secundarios' into 'develop'
...
Ent 2608 mas problemas de vistas de grupos secundarios
See merge request artica/pandorafms!1856
2018-10-25 12:59:51 +02:00
4c4c874553
Merge branch '2630-Exportación-Gráficas-relacionado-con-CSV' into 'develop'
...
Fixed bug in csv export graph
See merge request artica/pandorafms!1814
2018-10-25 12:57:24 +02:00
9b4eeb5c84
Merge branch '2723-Fallo-hint-en-eventos' into 'develop'
...
new function that adds a border to the image if the status is warning - #2723
See merge request artica/pandorafms!1743
2018-10-25 12:07:58 +02:00
8e1a946836
Merge branch '2738-Autorefresh-falla-en-la-meta' into 'develop'
...
Countdown in group view for autorefresh
See merge request artica/pandorafms!1768
2018-10-25 11:57:53 +02:00
82f6e3cb95
Merge branch '2786-Errores-en-mapas-de-red-dev' into 'develop'
...
Fixed group and set_center
See merge request artica/pandorafms!1880
2018-10-25 11:43:38 +02:00
67fc03ab6d
Merge branch '2814-Create-network-components-desde-SNMP-Walk' into 'develop'
...
Changed styles for the button create_network_component - #2814
See merge request artica/pandorafms!1817
2018-10-25 11:41:35 +02:00
89f0d547b0
Merge branch '2848-Descuadre-en-SNMP-console' into 'develop'
...
Added align center for the head of the table - #2848
See merge request artica/pandorafms!1820
2018-10-25 11:20:37 +02:00
bbde9c70b6
conflict resolved
2018-10-25 11:13:57 +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
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
50aa314191
WUX-UX integration
2018-10-24 19:31:39 +02:00
87abf1dc02
added event time filter in tactical view
2018-10-24 16:36:44 +02:00
b9112541fb
Tip added - #2906
2018-10-23 13:56:27 +02:00
f10a661cd6
Fixed group and set_center
2018-10-23 12:36:20 +02:00
ffc7734ebc
delete flash_charts and library pchart
2018-10-19 11:31:06 +02:00
f96c626823
Changed url - #2917
2018-10-18 16:34:03 +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
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
41d104ae2c
Improve performance on tactical view with a lot of events
2018-10-15 12:23:51 +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
c74e4a3d6a
Fixed agent filter on agents/module view to see secondary groups
2018-10-11 15:45:11 +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
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
4ac4f46daf
Fixed html_print_autocomplete_modules
2018-10-10 18:02:10 +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
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
eeba7b9350
Added two missing parameters in the url - #2884
2018-10-09 09:58:28 +02:00
61a82337c3
Fixed error in agents bulk operations
2018-10-08 17:57:05 +02:00
099f01a4ba
[Tags performance] Fixed select modules from Agent/Module dashboard widget
2018-10-08 13:45:30 +02:00
1e4c570541
[Tags performance] check agents_get_modules in networkmap and removed unused code
2018-10-05 10:44:24 +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
1278f03fd9
[Tags performance] agents_get_modules misc checks
2018-10-04 19:08:01 +02:00
3c54710d1b
Fixed conflicts
2018-10-03 13:09:39 +02:00
7ffeaaf50b
[Tags performance] fermin revision 1
2018-10-03 11:13:52 +02:00
958930931e
Fixed filter group in agents/modules view
2018-10-03 10:42:59 +02:00
14caf7bc07
Added new search input for the module name
2018-10-02 11:12:10 +02:00
28b879f058
[Tags performance] Added TODOS to revise agents_get_modules
2018-10-02 09:48:29 +02:00
9a47d5325e
[Tags performance] Events improvements
2018-10-01 17:03:37 +02:00
ae4472d5c8
Added align center for the head of the table - #2848
2018-10-01 16:59:17 +02:00
04226c7940
Changed styles for the button create_network_component - #2814
2018-10-01 12:26:06 +02:00
debf8db577
[Tags performance] Added some TODOs
2018-09-28 12:39:23 +02:00
2dac09435a
Merge branch '2040-Tags-en-operaciones-masivas' into 'develop'
...
fixed bug on bulk delete and bulk update module operation
See merge request artica/pandorafms!1613
2018-09-28 11:05:34 +02:00
01d5c2fce9
Merge branch '2435-Botones-superpuestos-mensajeria-interna-pandora' into 'develop'
...
fixed visual bug: buttons in message edit bad positioned
See merge request artica/pandorafms!1601
2018-09-28 10:51:58 +02:00
ed30ed1f84
Merge branch '2503_Descuadre_Visual_Recon_Task_Windows' into 'develop'
...
Fixed Windows visual mismatch of the Recon task
See merge request artica/pandorafms!1619
2018-09-28 10:38:57 +02:00
ffb511c140
Merge branch '2558-No-aparece-nombre-de-agente-al-crear-incidente-desde-event-response' into 'develop'
...
fixed bug: agent field not retrieving value on incident creation from event response
See merge request artica/pandorafms!1648
2018-09-28 10:25:12 +02:00
712103c308
Fixed bug in csv export graph
2018-09-27 17:35:52 +02:00
453fb3f67b
TODO List
2018-09-27 13:30:32 +02:00
631c38ca84
[Tags performance] Improve monitor detail (aka status_monitor)
2018-09-27 12:46:45 +02:00
638c4f8bc7
Added warning and normal status agents in group view
2018-09-21 15:10:30 +02:00
7e4ca193cf
Countdown in group view for autorefresh
2018-09-14 14:19:49 +02:00
ddfb527668
Merge branch 'ent-2668-gis-visual-improvements' into 'develop'
...
Minor visual improvements for the GIS views
See merge request artica/pandorafms!1764
2018-09-14 08:24:32 +02:00
8601e38eed
Minor visual improvements for the GIS views
2018-09-13 16:38:17 +02:00
5d6f414d68
fixed view manage groups
2018-09-13 16:28:08 +02:00
22bb52759c
Resolved conflict - #2429
2018-09-13 16:25:53 +02:00
d652a9c942
Created function that adds class checkselected and added inputs to select all in several tables - #2429
2018-09-13 16:07:40 +02:00
764b1125bd
Generate session csrf code to avoid attacks in user edition
2018-09-13 15:19:08 +02:00
5c54afe673
Fixed secondary groups in alerts details
2018-09-11 09:15:48 +02:00
d36c10fa08
new function that adds a border to the image if the status is warning - #2723
2018-09-10 13:22:02 +02:00
ac0f0536c7
performance improve view groups
2018-09-07 14:19:01 +02:00
6072cd3dc9
improve performance on group view
2018-09-06 15:28:22 +02:00
66c8404fcf
Fixed agent view in public Visual Console
2018-09-04 11:08:10 +02:00
5b30aa5560
Added source, comment and id_extra in event filter
2018-08-31 16:25:12 +02:00
09a80abdd2
[Secondary groups] Fixed monitor permission checking in metaconsole
2018-08-17 14:57:50 +02:00
8a5495a283
Merge branch 'develop' into ent-2335-gis-group-items
2018-08-17 11:17:29 +02:00
7da4557abc
Added the feature of the new map items (groups) and fixed more bugs
2018-08-17 11:07:42 +02:00
a4d1cfc9e6
Merge branch '2641-no-se-filtran-eventos-por-grupo-secundario-en-meta' into 'develop'
...
2641 no se filtran eventos por grupo secundario en meta
See merge request artica/pandorafms!1688
2018-08-16 11:03:02 +02:00
dc8020dbdc
Merge branch 'ent-2626-pantalla-de-edicion-de-modulos-en-grupos-secundarios' into 'develop'
...
[Secondary groups] Fixed modules permissions in some views
See merge request artica/pandorafms!1669
2018-08-16 09:46:28 +02:00
05a0eb0db6
Fixed events secondary groups filter in metaconsole
2018-08-14 17:06:15 +02:00
024a1cc1ee
Fixed snapshot view in metaconsole
2018-08-14 13:21:32 +02:00
d3c3304976
Fixed pagination and added filter to All events
2018-08-14 10:40:56 +02:00
62617e609c
[Secondary groups] Fixed group agents and group events in events filter
2018-08-08 13:17:03 +02:00
4315cef4c9
[Secondary groups] Fixed modules permissions in some views
2018-08-08 11:49:54 +02:00
1d607834dc
Merge branch '2389-Ordenar-eventos-por-campo' into 'develop'
...
implemented sort filter to event view custom fields
See merge request artica/pandorafms!1660
2018-08-03 10:50:56 +02:00
097661d82b
implemented sort filter to event view custom fields
2018-08-03 10:38:53 +02:00
06c436e5bf
add new tocken zoom graph visual styles
2018-08-03 10:01:04 +02:00
5e6eca8e51
Added ACL to snapshot view
2018-08-02 14:32:12 +02:00
c1269ca23f
Refactorized snapshot link on meta
2018-08-02 13:42:39 +02:00
18800feaae
Refactorized snapshot link on node
2018-08-02 13:02:33 +02:00
22ffd8d1e5
Merge branch '2389-Ordenar-eventos-por-campo' into 'develop'
...
added order filters to events table
See merge request artica/pandorafms!1608
2018-08-02 10:55:33 +02:00
01656f2e76
conflict resolution on branch 2389-Ordenar-eventos-por-campo
2018-08-02 10:27:31 +02:00
1baf56159e
Merge branch 'ent-2567-no-se-muestran-las-graficas-con-permisos-para-secundary-group' into 'develop'
...
Fixed acl in module graph view
See merge request artica/pandorafms!1653
2018-08-01 15:12:41 +02:00
04cfbe4ef9
Fixed acl in module graph view
2018-08-01 13:16:21 +02:00
f42c705125
fixed bug: agent field not retrieving value on incident creation from event response
2018-07-31 10:59:19 +02:00
d740240a51
fixed error data string show
2018-07-27 14:07:02 +02:00
a476d008ac
fix bug in metaconsole view events
2018-07-26 15:30:49 +02:00
3985316a9b
fixed errors in policies metaconsole
2018-07-26 12:41:09 +02:00
202f72d1c3
Fixed fields list in manage events-custom fields
2018-07-25 17:23:13 +02:00
b922066a72
Add items to the view events
2018-07-19 18:04:50 +02:00
99773177dd
Merge branch 'ent-2076-ue-mejoras-en-gestion-de-politicas-desde-metaconsola' into 'develop'
...
Resolve "[UE] Mejoras en gestion de politicas desde Metaconsola"
See merge request artica/pandorafms!1604
2018-07-19 14:22:40 +02:00
88a9d6db4d
Fixed Windows visual mismatch of the Recon task
2018-07-18 17:49:12 +02:00
0621b5a3ac
Fixed in Custom graphs
2018-07-18 13:33:53 +02:00
213a59d26e
fixed bug on bulk delete and bulk update module operation
2018-07-16 18:14:18 +02:00
d0b6c9775f
Addapted modules edition to metaconsole
2018-07-13 11:56:37 +02:00
6ec4787c38
added order filters to events table
2018-07-10 15:11:18 +02:00
a573f69593
Merge branch '2173-REDIRIS-Desplegable-de-grupo-All-en-grupos-pandorafms2' into 'develop'
...
Reverse changes for non-administrators users
See merge request artica/pandorafms!1600
2018-07-09 08:53:51 +02:00
c26a50e838
fixed errors in graphs
2018-07-06 11:56:38 +02:00
d3b39fe1dd
fixed visual bug: buttons in message edit bad positioned
2018-07-06 11:03:52 +02:00
9f9728fd03
Reverse changes for non-administrators users
2018-07-06 10:22:57 +02:00
5436c64800
Merge branch '2396-fallo-acl-en-vista-de-cluster' of https://brutus.artica.lan:8081/artica/pandorafms into 2396-fallo-acl-en-vista-de-cluster
2018-06-29 08:52:46 +02:00
4f23407ea8
Fixed for group All
2018-06-28 17:03:02 +02:00
65eb4744a1
fixed boolean graph no zoom
2018-06-27 16:17:17 +02:00
415f23ea14
Merge branch 'ent-2334-intracom-snmp-trap-forwarding-improvement' into 'develop'
...
Recover critical status the SNMPTrap on SNMP console actions
See merge request artica/pandorafms!1567
2018-06-26 22:40:02 +02:00
b40770b944
Merge branch '2036-Cambiar-color-de-la-marca-de-Quiet' into 'develop'
...
Image for mode Quiet changed to blue - #2036
See merge request artica/pandorafms!1573
2018-06-26 22:37:50 +02:00
998eacc630
fixed minor errors in graph remove avgOnly
2018-06-26 13:26:37 +02:00
965c6c839b
Image for mode Quiet changed to blue - #2036
2018-06-26 12:31:23 +02:00
c0cd577fb4
Merge branch '2173-REDIRIS-Desplegable-de-grupo-All-en-grupos' into 'develop'
...
Fixed bug in pandorafms
See merge request artica/pandorafms!1523
2018-06-25 19:05:26 +02:00
99271a4822
Merge branch '1797-Menú-desplegable-de-gráficas-miniaturizado' into 'develop'
...
fixed resize in stat_win.php
See merge request artica/pandorafms!1503
2018-06-25 18:59:09 +02:00
8320e5cc53
Merge branch '2128-Botón-de-"Crear-complementos-de-red"-en-SNMP-browser' into 'develop'
...
Fixed the online-style of submit
See merge request artica/pandorafms!1496
2018-06-25 18:58:17 +02:00
c0e63bd1a0
Merge branch '2346-Pequeño-fallo-Consola-VIsual' into 'develop'
...
Fixed visual bug
See merge request artica/pandorafms!1566
2018-06-25 18:57:13 +02:00
aa540614dd
Merge branch 'ent-2409-Agregar-agentes-en-concreto-en-Mapas-Gis' into 'develop'
...
Fixed add particular agents to GIS layers
See merge request artica/pandorafms!1568
2018-06-25 18:55:17 +02:00
dcb73f844e
Revert "Revert "Recover critical status the SNMPTrap on SNMP console actions""
...
This reverts commit 16cff75242
2018-06-22 13:37:36 +02:00
2719cadc61
Revert "Fixed agents display on GIS maps"
...
This reverts commit 6a53e924bb
2018-06-22 13:37:17 +02:00
e19f116637
Fixed add particular agents to GIS layers
2018-06-22 13:33:04 +02:00
16cff75242
Revert "Recover critical status the SNMPTrap on SNMP console actions"
...
This reverts commit 8ef8f31f67
2018-06-22 13:30:10 +02:00
6a53e924bb
Fixed agents display on GIS maps
2018-06-22 13:28:39 +02:00
8ef8f31f67
Recover critical status the SNMPTrap on SNMP console actions
2018-06-21 19:27:33 +02:00
09ed3fa7c3
Fixed visual bug
2018-06-21 14:21:22 +02:00
288d2bafb6
Added in progres selected button to events view
2018-06-20 18:56:44 +02:00
46c23f9deb
fixed minor errors in graphs: tree, labels, tocken meta
2018-06-14 12:17:16 +02:00
05d8d0ccf5
fixed errors graph
2018-06-13 19:13:42 +02:00
9ecc770519
remove only average for all graphs and add zoom for sparse graph in stat-win and stat-win-interfaces
2018-06-13 11:02:58 +02:00
632fc26be2
Thermometer graph only for intracom - #2214
2018-06-12 12:39:05 +02:00
24ec62b807
Merge branch '1827-Graficas_TIP_eje_x_no_mantiene_ratio' into 'develop'
...
fixed errors agent access and other fix
See merge request artica/pandorafms!1525
2018-06-12 12:13:46 +02:00
6eba3250da
fixed errors agent access and other fix
2018-06-12 12:08:04 +02:00
fdbe03ef83
Merge branch 'ent-639-add-user-defined-timezones' into 'develop'
...
Add user defined timezones
See merge request artica/pandorafms!1462
2018-06-12 10:20:31 +02:00
bcd937b1ba
Fixed bug in pandorafms
2018-06-11 17:42:12 +02:00
f6184b52da
Merge branch 'develop' into ent-639-add-user-defined-timezones
2018-06-11 17:42:02 +02:00
fac3e21829
Added a lot of fixes to the dates stored as strings without timezone information to made them use the user timezone
2018-06-11 16:40:10 +02:00
c949ab3dc7
Merge branch 'develop' into 2290-seguridad-en-la-api
...
Conflicts:
pandora_console/include/functions_api.php
2018-06-11 15:55:48 +02:00
f85a8b513a
fixed errors
2018-06-08 14:30:15 +02:00
eb7cdc7c90
fixed errors in graph delete to image pdf
2018-06-08 08:58:18 +02:00
2e1bb2ac9c
Merge branch 'develop' into 2290-seguridad-en-la-api
...
Conflicts:
pandora_console/include/functions_api.php
2018-06-07 11:38:37 +02:00
0afd436cea
[ACL API] Added ACL to some get api calls and refactorized agent count
2018-06-06 15:04:30 +02:00
badfd83b0d
Merge remote-tracking branch 'origin/develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio
...
Conflicts:
pandora_console/include/functions_graph.php
pandora_console/include/graphs/fgraph.php
2018-06-06 11:57:02 +02:00
89a481c452
fixed errors in graphs
2018-06-06 11:18:39 +02:00
a69550f79e
Merge branch 'fix-warnings-with-php72' into 'develop'
...
Fixed warnings and some icons are not shown correctly with php7.2.
See merge request artica/pandorafms!1490
2018-06-05 10:26:40 +02:00
dbb802fb31
Merge branch '2214-Crear-nuevo-tipo-de-custom-graph-thermometer' into 'develop'
...
New graph thermometer - #2214
See merge request artica/pandorafms!1465
2018-06-04 10:19:21 +02:00
4abf3f3b2e
Merge branch '1976-Informe-de-log-dev' into 'develop'
...
Fixed sources in log report
See merge request artica/pandorafms!1508
2018-06-04 10:17:17 +02:00
47a287b6f6
fixed errors in graph
2018-06-01 13:58:29 +02:00
6bd672fd38
Fixed free search in events view
2018-05-31 20:32:04 +02:00
04f117523b
Fixed sources in log report
2018-05-31 17:33:51 +02:00
a8b8f309e6
fixed graphs
2018-05-30 17:45:17 +02:00
5021144405
fixed resize in stat_win.php
2018-05-29 13:19:20 +02:00
dd57ddbd3c
Merge remote-tracking branch 'origin/develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio
...
Conflicts:
pandora_console/include/functions.php
pandora_console/include/styles/pandora.css
2018-05-28 17:54:53 +02:00
02a442a8db
fixed errors in graph add phantom js
2018-05-28 17:47:40 +02:00
88e060893a
Merge branch 'develop' into 2106-intracom-rebranding
...
Conflicts resolved:
pandora_console/operation/events/events_rss.php
2018-05-28 12:12:16 +02:00
alejandro-campos
Alejandro Fraguas
marcos.alconada
daniel
Daniel Rodriguez
manuel
fbsanchez
Daniel Maya
Samuel Carcases
samucarc
fermin831
Tatiana Llorente
Alejandro Gallardo Escobar
artica
vgilc
Ramon Novoa
manuel.montes
slerena
enriquecd