3281 Commits

Author	SHA1	Message	Date
daniel	d116e4742a	add new tocken max events responses ... Former-commit-id: f65e6a478812a913d25fa7b87e9ac2b26b9a5ff4	2019-02-19 12:14:42 +01:00
fbsanchez	27602d8e49	Recovered notification editor for user ... Former-commit-id: a4fbf05912c974ab388cde9e9237022f2bcc3277	2019-02-18 15:14:24 +01:00
fbsanchez	7b2e0342c1	Fix. notification did not reach ALL target ... Former-commit-id: 237e5dac34bcbe50453e0b56f0964a9d74aa7c04	2019-02-18 14:18:58 +01:00
alejandro-campos	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
alejandro-campos	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
fbsanchez	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
fbsanchez	ed63ef47fa	Moved ReconServer to DiscoveryServer ... Former-commit-id: 5e18aa75d669f6b45d3b4e2648f31473fd206091	2019-02-13 14:56:10 +01:00
fbsanchez	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
fbsanchez	42dc0c60be	supervisor ... Former-commit-id: cf99e746a02ab3e921a39b19f6b4822580299b7e	2019-02-12 11:41:21 +01:00
fbsanchez	72a57bfbec	minor changes in message edit ... Former-commit-id: a36fe911f191c3a187c8c70032f3b1aaa0977fea	2019-02-11 19:27:21 +01:00
fbsanchez	0dbabd3ba3	Improved conversation view (messages) some filters and fixes in functions_messages ... Former-commit-id: 13597c6556939bbe772d5ed749930e30e5377c47	2019-02-11 18:28:00 +01:00
Daniel Maya	ba7540c9ee	improvement of optimization for list event ... Former-commit-id: a7788b01160c661139e6a3a6aac70c69441265a1	2019-02-08 09:51:08 +01:00
Daniel Maya	c2a44e073f	Update events.build_query.php ... Former-commit-id: 4622b27b1ce9e81ce81d89d7bc9d2eeb1b30fb93	2019-02-07 18:03:28 +01:00
Samuel Carcases	23a8d0640f	Update events.build_query.php ... Former-commit-id: 189244aa57d58eb33dd43f707eb6ac929f58e537	2019-02-07 17:05:05 +01:00
samucarc	92af9f84bc	Fixed conflict ... Former-commit-id: c0e0826c5a70772c049d9e0ce168f3d0b35118c0	2019-02-07 17:00:52 +01:00
fermin831	d5fb9f1051	Added AJAX to user notification config window ... Former-commit-id: 9ca09ae777d699588a76dfb619156d800a95895b	2019-02-07 12:22:50 +01:00
Tatiana Llorente	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
fermin831	986dfcb74d	Added basic and dummy user edit notifications ... Former-commit-id: d0395c5b2cbc870812e54e15db523eeaac94557f	2019-02-06 18:20:26 +01:00
fermin831	6ddcfcbb19	Fixed code style lintern ... Former-commit-id: d7757a56f8368761776f80f826600d601b56b6d9	2019-02-06 12:51:02 +01:00
fermin831	ac6b74dcdf	Added new window to display user notifications config ... Former-commit-id: 57ba8fcd01365cedc92535d7cf71f70432a55a94	2019-02-06 11:36:28 +01:00
Tatiana Llorente	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
samucarc	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
Alejandro Gallardo Escobar	d38236091b	Format fixes ... Former-commit-id: 58823652a8bda566d0b0e340a1249abb4f7f219e	2019-02-01 09:55:29 +01:00
fbsanchez	3f81e60df2	wip messages ... Former-commit-id: 7852ce90b3f2681a0134a651812341f7fac00c53	2019-01-30 17:33:31 +01:00
artica	b3da2803a4	Changed the format of the .php files ... Former-commit-id: 4dc926a81de14e27df8be7982406b09d8e808399	2019-01-30 16:18:44 +01:00
fbsanchez	406c062a3c	WIP messages, usable ... Former-commit-id: 79e0b38fe7499642480505aac088ef8b45b04714	2019-01-30 13:29:46 +01:00
fbsanchez	fa6c4d5bc9	notifications, WIP: new lib defined ... Former-commit-id: 430ac2e090f91403fc074d2a9b37ab36de10d5a9	2019-01-30 11:56:47 +01:00
tatiana.llorente@artica.es	f5c96b7e5d	New organization of CSS files - #3358 ... Former-commit-id: 8512adc7742eecb64db2b0ee539acfddd33406c2	2019-01-24 11:10:49 +01:00
alejandro-campos	2155420d71	implement custom fields for node monitor view ... Former-commit-id: d9dd515a726d1fa7cc5855b016270b9ef083cb6f	2019-01-18 11:13:29 +01:00
Alejandro Fraguas	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
Daniel Rodriguez	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
alejandro-campos	9048a13840	fix bug: in progress events deleting on event view massive deletion ... Former-commit-id: 4c4f0a387ad3abd7cfea913b45c885ab3af4ecc6	2019-01-15 13:27:14 +01:00
alejandro-campos	5235b62c0d	fix disable actions in event list when centralized mode is enabled ... Former-commit-id: d5f16b4453b1e291ba051cd381fc6c09ce0bd027	2019-01-15 11:29:12 +01:00
alejandro-campos	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
alejandro-campos	efa2e5332f	fix massive custom event responses ... Former-commit-id: 24db40167b05bfd7fe4de88060f03a7a0ec38e73	2019-01-14 13:40:49 +01:00
alejandro-campos	5a8e46d608	modify the way event responses are executed in event list ... Former-commit-id: 14ef545eef10427d95f96484e8d6b8d9656bd53c	2019-01-14 12:10:43 +01:00
danielmaya	07dc9a0b84	first load it does not show the data ... Former-commit-id: 417e37dfb7acd78f3fb9e379a62534ca611aa9b1	2019-01-09 12:27:22 +01:00
alejandro-campos	752186cfba	conflict solved ... Former-commit-id: 1f523d736b97c48ecfb9b39598c529e601702775	2019-01-08 11:59:50 +01:00
Samuel Carcases	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
fbsanchez	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
vgilc	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
alejandro-campos	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
danielmaya	b155b06ae9	Fixed issue with secondary group ... Former-commit-id: 879f30eec17cc27446c86dcc34bb4d774f0632dc	2018-12-07 11:20:15 +01:00
vgilc	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
vgilc	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
vgilc	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
alejandro-campos	8371e75757	modified event list visualization	2018-11-26 16:40:20 +01:00
daniel	557002d7fd	fixed error events graphs	2018-11-23 10:32:58 +01:00
danielmaya	62ad6b9a35	Added check of tags in report wizard	2018-11-22 10:39:48 +01:00
samucarc	099e0e6ed2	Fixed calendar in combined graphs	2018-11-21 16:28:43 +01:00
daniel	494b858a20	fixed errors session_start	2018-11-21 13:08:58 +01:00
vgilc	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
fbsanchez	35870d13fd	allow snapshot_view check historical db	2018-11-16 12:42:08 +01:00
daniel	0a097d185d	fixed errors in custom fields view	2018-11-16 11:58:49 +01:00
vgilc	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
Ramon Novoa	574e537ff1	Decode entities in the eHorus password. ... Ref pandora_enterprise#3073.	2018-11-14 12:16:59 +01:00
samucarc	43629d5c2a	Fixed minor visual error in GIS Map	2018-11-14 12:10:38 +01:00
daniel	22a26aa072	fixed error upgrade jquery	2018-11-14 11:40:01 +01:00
daniel	ac671d041c	Merge remote-tracking branch 'origin/develop' into 2784-Pantalla_por_dispositivos_filtrado_por_custom_fields	2018-11-13 15:47:07 +01:00
fermin831	a201262737	Fixed php errors on radial networkmap	2018-11-12 16:29:31 +01:00
daniel	afaa6ad2ba	Merge remote-tracking branch 'origin/develop' into 2784-Pantalla_por_dispositivos_filtrado_por_custom_fields	2018-11-12 09:07:56 +01:00
vgilc	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
tatiana.llorente@artica.es	85adf7cf8d	Display an error message when no changes have been made - #2900	2018-11-08 12:04:08 +01:00
alejandro-campos	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
daniel	1c1df4b5f7	fixed errors css jqueryui	2018-11-07 17:09:42 +01:00
daniel	218bf81fa1	Merge remote-tracking branch 'origin/develop' into 2784-Pantalla_por_dispositivos_filtrado_por_custom_fields	2018-11-07 13:30:19 +01:00
daniel	3f78f15499	WIP View custom fields data	2018-11-07 13:28:00 +01:00
danielmaya	3ffd976365	resolved conflicts in ver_agente	2018-11-07 12:31:54 +01:00
vgilc	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
vgilc	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
samucarc	3d99ef48aa	Fixed ACLs in monitoring View and agent detail	2018-11-05 13:05:34 +01:00
tatiana.llorente@artica.es	233b9c2c70	Well centered message modal window - #2768	2018-11-02 13:07:38 +01:00
danielmaya	3c78e387df	Fixed nodes count in pandora_networkmap	2018-11-02 11:32:07 +01:00
fbsanchez	39b6164526	snapshot viewer fix	2018-10-30 18:20:10 +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	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	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
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
fbsanchez	85051924b7	estilos popup	2018-10-25 14:01:12 +02:00
vgilc	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
vgilc	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
vgilc	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
vgilc	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
vgilc	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
vgilc	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
vgilc	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
danielmaya	bbde9c70b6	conflict resolved	2018-10-25 11:13:57 +02:00
vgilc	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
vgilc	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
fbsanchez	50aa314191	WUX-UX integration	2018-10-24 19:31:39 +02:00
danielmaya	87abf1dc02	added event time filter in tactical view	2018-10-24 16:36:44 +02:00
tatiana.llorente@artica.es	b9112541fb	Tip added - #2906	2018-10-23 13:56:27 +02:00
danielmaya	f10a661cd6	Fixed group and set_center	2018-10-23 12:36:20 +02:00
daniel	ffc7734ebc	delete flash_charts and library pchart	2018-10-19 11:31:06 +02:00
tatiana.llorente@artica.es	f96c626823	Changed url - #2917	2018-10-18 16:34:03 +02:00
daniel	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
tatiana.llorente@artica.es	525caee909	Fixed a minor mistake in error message - #2900	2018-10-17 12:59:37 +02:00
tatiana.llorente@artica.es	0b22ab6bfd	Minor bug fixed - #2900	2018-10-17 12:57:02 +02:00