5147 Commits

Author	SHA1	Message	Date
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