957 Commits

Author	SHA1	Message	Date
fbsanchez	4031ae9bf7	minor update in notification viewer ... Former-commit-id: 990993ee0c2df7d9fb39a358b94c27b7df968426	2019-03-25 20:23:07 +01:00
fbsanchez	436e60c736	Merge remote-tracking branch 'origin/develop' into ent-3595-discovery-fase-2 ... Former-commit-id: 49dc95bbeca973fe13b0c82dc205778294c6066f	2019-03-25 20:14:24 +01:00
Daniel Rodriguez	dcf40fed3d	Merge branch 'ent-3610-Vista-Edicion-de-Usuario' into 'develop' ... Ent 3610 vista edicion de usuario See merge request artica/pandorafms!2278 Former-commit-id: bf55b5206e79b5747b4215a05569b58ae70a35b0	2019-03-25 18:16:07 +01:00
Tatiana Llorente	c682e5f326	Remove new font in edit user ... Former-commit-id: dc7da7f1fe9df0abacfb267fb7b5c6773f35df2c	2019-03-25 16:27:25 +01:00
Tatiana Llorente	a841472bff	Changes in header ... Former-commit-id: 6ef8f7fc6513562e782e7d89dc5a13a4369480c4	2019-03-25 12:50:43 +01:00
Tatiana Llorente	fe7103ba9c	Changes in header ... Former-commit-id: 3c69b91277f0078a65764c297126d3ebb0dfc11c	2019-03-25 12:41:39 +01:00
fermin831	2711eb59ea	Merge remote-tracking branch 'origin/ent-3595-discovery-fase-2' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1 ... Conflicts: pandora_console/extras/mr/26.sql pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql pandora_console/pandoradb.sql Former-commit-id: 29c3e96f3022c59a9252849c2adeb29182476395	2019-03-25 09:20:06 +01:00
fermin831	af9936c78f	Merge remote-tracking branch 'origin/develop' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1 ... Conflicts: pandora_console/install.php Former-commit-id: 13c6146ea07be2c0d1bb571e70c644f1f68ae2bc	2019-03-21 13:26:55 +01:00
fbsanchez	6fb6963501	Merge remote-tracking branch 'origin/develop' into ent-3595-discovery-fase-2 ... Former-commit-id: 9df9a4c3a4a50e191af5167129df1352e712171e	2019-03-20 17:40:08 +01:00
Tatiana Llorente	5d409cd778	New view user edit ... Former-commit-id: 551c2036cd69e34c66e12a8cbcef3345fbf3919a	2019-03-20 16:45:24 +01:00
Tatiana Llorente	d27c509817	Merge remote-tracking branch 'origin/develop' into ent-3610-Vista-Edicion-de-Usuario ... Former-commit-id: fb1fffdf576bd46ba733717abf2425ee0e0d607c	2019-03-20 13:28:07 +01:00
Tatiana Llorente	a99c8b1a7b	New view user edit ... Former-commit-id: 46b0d396f2121901b19417ebdfe91963c3ea0e54	2019-03-20 13:26:15 +01:00
Daniel Maya	c2033715a9	Merge branch 'ent-3595-discovery-fase-2' of https://brutus.artica.lan:8081/artica/pandorafms into ent-3595-discovery-fase-2 ... Former-commit-id: 4e097a7169f1ecb05c843076b67f98f0ea1370af	2019-03-18 09:06:20 +01:00
Daniel Maya	d13e7bbf44	new generic functions ... Former-commit-id: 09352ca97ea73505acdb44d14cde79b0d916d286	2019-03-18 09:05:47 +01:00
Daniel Barbero	d5108efb0d	fixed error update manager delete files ... Former-commit-id: 88b915f9278eba5949c867ae514a104ce796aec1	2019-03-15 12:19:02 +01:00
Daniel Barbero Martin	a1aa480421	add delete files in update manager ... Former-commit-id: 880dfc8079e7e85fa1fcba4746927caf1a2d2c06	2019-03-14 18:04:28 +01:00
fermin831	b660da6e84	Merge remote-tracking branch 'origin/develop' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1 ... Conflicts: pandora_console/extras/mr/26.sql pandora_console/install.php Former-commit-id: dda11929acf5f741e0a4d290b4607ae72683284b	2019-03-14 10:49:16 +01:00
fbsanchez	f4290e52fe	Minor fix notif. ball margins ... Former-commit-id: 36705558ac7b2ef94115068acb0bce01662b8ecc	2019-03-13 15:55:24 +01:00
fbsanchez	750c64fbd7	Merge remote-tracking branch 'origin/develop' into ent-3595-discovery-fase-2 ... Former-commit-id: 8dd2601c41392e8b252b2a719d16deef5b6398c7	2019-03-13 09:52:00 +01:00
Tatiana Llorente	aaf5d7bf89	New view user edit ... Former-commit-id: 3901480a6b4ca2d412a67f6adfe7adefd2558e6f	2019-03-12 12:24:33 +01:00
Tatiana Llorente	29f00dd1da	New login page ... Former-commit-id: ae1cc9368536c6a9fbcea12ec2aa1d6b7584268a	2019-03-12 11:09:12 +01:00
Tatiana Llorente	c5722d2e10	New view user edit ... Former-commit-id: 584df7ff9cca2b5898cdbcaec1d27ce8264a71cd	2019-03-12 10:59:44 +01:00
Tatiana Llorente	9a702a90a1	New view user edit ... Former-commit-id: 8f7f0fd62174d4e3dfcbd7774aff8c409057680b	2019-03-12 08:56:45 +01:00
fermin831	a321a7465d	Merge branch 'ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1' of https://brutus.artica.lan:8081/artica/pandorafms into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1 ... Conflicts: pandora_console/include/functions_netflow.php pandora_console/operation/network/network_report.php Former-commit-id: 4aa57202e051f4d9e8df95b000c54ac162021668	2019-03-11 13:19:17 +01:00
Tatiana Llorente	71afb7a741	New login page ... Former-commit-id: 69408bda61a30561372a5ebaecc08fd04b434611	2019-03-11 10:07:22 +01:00
Fermin	dd8265f65e	Merge branch 'develop' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1 ... Former-commit-id: 65d43e483dc23616c44da3b26b73c94cbf10d3fe	2019-03-08 09:02:22 +01:00
fermin831	471770ec85	Reduced icon size on netflow explorer ... Former-commit-id: 6d16a2583dcdbf62386b29662a914a538bae9275	2019-03-07 19:16:24 +01:00
fbsanchez	3e39e727b6	WIP: Unified class NetworkMapClass ... Former-commit-id: 6e6f4afb70be008602f51dfbd383bb855613e084	2019-03-07 18:57:48 +01:00
fermin831	1f89cccbbe	Change item link filter by image filter in network/flow explorer ... Former-commit-id: 521cca18646273361711e75ad85f64a9b9988046	2019-03-07 15:10:38 +01:00
daniel	00283a5c6a	progress task list ... Former-commit-id: 5b8a10cdc792e74538784ae27367bc1ca2c7bed0	2019-03-07 14:45:26 +01:00
fbsanchez	aef10cf649	Fixed grown in notifications ... Former-commit-id: c563f2388d27d4fffbcfaf34fbd1c4d83ad4ef84	2019-03-06 19:39:07 +01:00
fbsanchez	40bc938000	notifications font color and some minor changes ... Former-commit-id: d56c7ed04a10ef693867df7709002169f865bbc3	2019-03-06 16:38:06 +01:00
fbsanchez	825128e31e	WIP: minor updates in notification wrapper ... Former-commit-id: 1dd6fcf1ca43cc9d3b0c633c7bd6487240c2b5bf	2019-03-05 19:10:44 +01:00
fbsanchez	63ee3b0329	wip: style checks ... Former-commit-id: 527c939420f9790b7b0850a207dd5221721986fd	2019-03-05 19:02:23 +01:00
fbsanchez	70e4e86cdf	Merge remote-tracking branch 'origin/ent-3432-Nueva-cabecera-y-menu-lateral' into ent-3595-discovery-fase-2 ... Former-commit-id: ba98fda78052b11f7bb579cf84d5e29e557e68ac	2019-03-05 18:58:26 +01:00
Daniel Maya	e26c81aa6c	Fixed images and reset map in networkmap ... Former-commit-id: d56dc68d542aa1e4d30a3014acc53b44dc07191e	2019-03-05 15:33:27 +01:00
Tatiana Llorente	7be5d3e9e0	new header and menu ... Former-commit-id: 7a36ca23fc302cf3b86dca26971ce591107b66e8	2019-03-05 12:54:11 +01:00
Fermin	a01319464e	Added link with params html component and modify the network report ... Former-commit-id: d95cfe164d67e70d5135feb68169bb825ee2d83a	2019-03-05 10:08:07 +01:00
Tatiana Llorente	36fa0fc41f	new header and menu ... Former-commit-id: d1e8fbd044711f87b75177c32225be7847b60018	2019-03-04 08:39:56 +01:00
Tatiana Llorente	34eedc5330	new header and menu ... Former-commit-id: aac70c14548c725b68fa031202e0b8449b725f45	2019-02-26 11:20:17 +01:00
Tatiana Llorente	3e87c8e931	new header and menu ... Former-commit-id: 975b72219cb07e0d4f9b332607e554bd65ea7cc3	2019-02-26 10:43:59 +01:00
Tatiana Llorente	6ec148c59c	new header and menu ... Former-commit-id: 4375597f0b77ccc577fa486c409e214a7ba00362	2019-02-25 12:28:41 +01:00
Tatiana Llorente	4c92375a58	new header and menu ... Former-commit-id: 3509107664a968fc358a8bb3e662f27b26b10c73	2019-02-25 12:23:15 +01:00
Tatiana Llorente	526311d1c6	new header and menu ... Former-commit-id: 0748bc89d30e8ae4723026848d493d15d82af9cd	2019-02-25 11:54:46 +01:00
fbsanchez	8b5f50f883	Discovery minor fixes ... Former-commit-id: 3914d7a99fb70d88c1a1f95d3c2aeb100f277266	2019-02-22 19:18:07 +01:00
fbsanchez	b1aa0fe2f2	Merge from develop ... Former-commit-id: 043b38c0e4ea96e0e39cc2480420164dd0f5d3b7	2019-02-22 12:30:27 +01:00
fbsanchez	4148387c50	Updates discovery ... Former-commit-id: e99072a2b7a1ddd528698e12bdfe75b0b56ba25b	2019-02-21 13:05:48 +01:00
manuel	ad3e2b88bf	Minor fixes Wiz.Discovery ... Former-commit-id: 750cd3ab1902ed3eda9806aa9b505d5e4a1175be	2019-02-21 11:19:38 +01:00
fbsanchez	08c6d782a4	Add menuentry discovery ... Former-commit-id: bc40f0bda89947a88a912484642aa3c89ded64f8	2019-02-20 18:24:32 +01:00
fbsanchez	4834561e87	Wiz. minor fixes ... Former-commit-id: b3963bf5994a8f9829922e0a1b0be3a20fc54fba	2019-02-20 14:38:00 +01:00
fbsanchez	a63e497497	Wiz. Added textarea input ... Former-commit-id: 319ab37377e6649c1cd6c6adea1e956e934f2e23	2019-02-20 11:11:26 +01:00
manuel	ea70c0846c	Added href in wizard ... Former-commit-id: 9b6b9e66d14257163f14bc904d5b13c6de9f9912	2019-02-19 16:34:11 +01:00
fbsanchez	85371424ee	Minor fixes and status check ... Former-commit-id: 47a7e75579927c0ac109f303b77ebcc273334581	2019-02-19 11:13:07 +01:00
manuel	938408ada9	Added wizard ... Former-commit-id: d47389f000b9295c21d9a56ed0138913d0045b76	2019-02-19 08:58:30 +01:00
fbsanchez	c49c8bc0b5	discovery minor style changes ... Former-commit-id: ea572c9d797214cbfc6f1b9ff2025f0c4819b4ed	2019-02-15 18:44:59 +01:00
fbsanchez	5093094d7d	H&D tasklist and some visual changes ... Former-commit-id: d9130ec520b0c23a9cf42ce62aae6c3d2432649b	2019-02-15 18:05:59 +01:00
manuel	32d34cd09b	Changed styles in host and devices ... Former-commit-id: 743f203466e8e3745a33837054e5bc4faa69337c	2019-02-15 14:02:32 +01:00
fbsanchez	f777c59a83	WIP: H&D skel files css wiz&discov ... Former-commit-id: e57758a9e77b19868262557d9e11a0ff7b38f02c	2019-02-15 10:00:23 +01:00
fbsanchez	7df9d4f78b	WIP: H&D merge ... Former-commit-id: d53f7d5abed5cfc8d45e6a42bfd52089ff463ff3	2019-02-14 17:14:01 +01:00
fbsanchez	8acb658266	WIP: H&D ... Former-commit-id: 7e74f1330b7e5cfdab3757ec62523942a1b4fe9f	2019-02-14 13:27:49 +01:00
Daniel Barbero	444b5c4bfd	Merge remote-tracking branch 'origin/develop' into 339-No_cortar_elementos_en_PDF ... Conflicts: pandora_console/install.php Former-commit-id: f26bcce527ebe225454700e8feca21610f91b20f	2019-02-14 07:51:53 +01:00
fbsanchez	5b4cadf138	minor style fix ... Former-commit-id: ca2dcf89672832b7796c9b9cc555d36d9db503ec	2019-02-13 17:16:12 +01:00
fbsanchez	f75a292b34	minor fixes/updates in notifications UI ... Former-commit-id: d4f5b7db1b5a6f0a023e33c4b8cd55db7765b11a	2019-02-13 16:40:37 +01:00
fermin831	855822f61e	Fixed arrow on notifications area ... Former-commit-id: 6771d282bf7a6b5b9ddd0baec8a0a887f741d931	2019-02-13 12:44:30 +01:00
fermin831	fe50d6caff	Open toasts and messages into new window ... Former-commit-id: ff3d565247225032219d4bbb5fa903bdae7730e8	2019-02-13 11:09:15 +01:00
fermin831	48724fe033	Added onclick to notification-item's ... Former-commit-id: 2e4833686b08b104b11ba9023f6eca38e0ed6bd9	2019-02-12 16:46:21 +01:00
fermin831	cc2b2709f9	Show the notifications with AJAX ... Former-commit-id: 73f407d13d3805dce879c1431311a4aaec00c152	2019-02-12 16:25:59 +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	851050f04e	message_edit.css added ... Former-commit-id: f4e88b813dc1b39e50b0f997ace3768a10f406f1	2019-02-11 19:48:20 +01:00
fermin831	c355a581ff	Added toasts to notifications ... Former-commit-id: 7429bf8d9c4f4e8bb16549172a59c33d22185821	2019-02-11 17:53:37 +01:00
daniel	4aae62ba36	Fixed error in reports ... Former-commit-id: d3ad6cd8e1dd052fedc3dfe65bd5938537033f34	2019-02-11 17:05:05 +01:00
Fermin	d5d58e5b2b	Added outter shadow to notifications messages box ... Former-commit-id: 1eed4b4f2ef7d58dbab73ccb2628bb0ef9ffc7ca	2019-02-08 18:53:28 +01:00
Fermin	0124bd0a17	Added real notifications (not AJAX jet) ... Former-commit-id: 5d0dee32c4fb96ad8dcb4f3f70049e1d1c4936fc	2019-02-08 14:23:05 +01:00
daniel	16c742bd83	fixed report pdf ... Former-commit-id: 442a90512fbb244154749ddefe0007cef65655c5	2019-02-08 14:10:19 +01:00
daniel	4d4b8bbc0d	Merge remote-tracking branch 'origin/develop' into 339-No_cortar_elementos_en_PDF ... Conflicts: pandora_console/include/styles/pandora.css Former-commit-id: 792472b0cc9b3f1ae56894c53407419c7fbd573e	2019-02-07 10:30:23 +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
Daniel Rodriguez	f098b72fe4	Merge branch 'ent-3274-Retoque-visual-vista-SNMP-interfaces' into 'develop' ... Fixed height in slicesbar graph of table interface snmp - #3274 See merge request artica/pandorafms!2144 Former-commit-id: c4e83cd7a6525aae2a567a90b3fb7d4d1ebb70bf	2019-02-06 18:56:47 +01:00
fermin831	37d02ddf59	Added disabled status to switches ... Former-commit-id: 7fee49f58e4be84bfb8bad08303b203d71dafe16	2019-02-06 18:18:48 +01:00
manuel.montes	d113bfbeb8	Merge branch 'develop' into ent-3120-Cambio-de-radio-buttons-yes-no-por-checkbox-2-parte ... Conflicts: pandora_console/include/styles/pandora.css Former-commit-id: 57658aa74a36e6ca9bc53af58e3732e895cf977c	2019-02-06 17:02:58 +01:00
manuel.montes	dee7c769f2	Merge branch 'develop' into ent-3120-Cambio-de-radio-buttons-yes-no-por-checkbox-2-parte ... Conflicts: pandora_console/godmode/setup/performance.php pandora_console/godmode/setup/setup_auth.php pandora_console/godmode/setup/setup_ehorus.php pandora_console/godmode/setup/setup_general.php pandora_console/godmode/setup/setup_visuals.php pandora_console/include/styles/pandora.css modificado: pandora_console/include/functions_html.php Former-commit-id: feaf2f5d3defda182f9cdaf151854257aeba1b22	2019-02-06 16:11:46 +01:00
daniel	19c5a1c844	fixed error pdf ... Former-commit-id: 2a81a654df0c216951c61f36ff31a05ce5f7e29a	2019-02-06 15:58:36 +01:00
Tatiana Llorente	b805fe594e	Merge remote-tracking branch 'origin/develop' into ent-3274-Retoque-visual-vista-SNMP-interfaces ... Conflicts: pandora_console/include/functions_reporting_html.php Former-commit-id: d096025f7a166160598f9fb26fe17c60809c9c3e	2019-02-06 15:34:06 +01:00
Tatiana Llorente	b8aab972c9	Merge remote-tracking branch 'origin/develop' into 3446-Imagen-grupos-no-se-muestra-None ... Conflicts: pandora_console/godmode/groups/group_list.php Former-commit-id: 6f928cc0a3ce2d4822affc7444254393d1d47b69	2019-02-06 15:14:22 +01:00
fermin831	7df3fe2dac	Added functionallity to Add element on notification global config ... Former-commit-id: b51cf2d5079019a69fd7c4344dfcff2bf38147db	2019-02-05 17:40:44 +01:00
fermin831	8811257762	Popup to add groups and sources to global notification configuration ... Former-commit-id: 481812290ea1d1446aa7378ab6a935139483c8a0	2019-02-05 13:36:16 +01:00
daniel	418d497291	fixed errors pdf ... Former-commit-id: f7ad69f6b5e0910e5f31464ddfe94593529ef6a7	2019-02-05 10:40:24 +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
daniel	20e0508e01	fixed pdf report ... Former-commit-id: 515b8f06f3584c6aaa1a32ea29a2f555e7afccad	2019-02-04 12:10:52 +01:00
fermin831	50030b6933	Added notify all users and disable on first load ... Former-commit-id: d193a8375ce00f3f2cf2c1fc181d4eef47c92eb2	2019-02-01 14:48:52 +01:00
fermin831	315a51c5e7	Added only read selector global notification setup ... Former-commit-id: bd6262cda30c0bb5a63b106e6c3832efbcfc63b9	2019-02-01 13:46:58 +01:00
fermin831	01bc0775bc	Added notification global configuration (only enable and disable) ... Former-commit-id: 850d4dd1d8e30fc66623308b8ab148eaeadb5015	2019-01-31 19:13:51 +01:00
fermin831	b589826c86	Added HTML switch element ... Former-commit-id: 426557a47577fd9b5b2002ed02d70f1effb92162	2019-01-31 19:11:59 +01:00
fermin831	397f2964da	Added messages notification ball ... Former-commit-id: c44a99cf63bc7451890389e4d234fd8aa7b62cbc	2019-01-31 15:16:56 +01:00
artica	7a9684f23c	Changed the format of the .css files ... Former-commit-id: a0dce3fe780031105396a8439c83d520197670af	2019-01-30 12:42:16 +01:00
daniel	335abb9abc	fixed error css ... Former-commit-id: d2be8c4cf4306cb51c9b3854cbe06d4c80119d8b	2019-01-25 09:54:53 +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
daniel	fb46197c1f	fixed minor error button ... Former-commit-id: 4b57425285d33d181390090fbdd3c36882ab4fcf	2019-01-23 15:30:46 +01:00
manuel.montes	fd2dcb3281	Changed radio buttons by toogle switch checkbox ... Former-commit-id: d4b46db05fa38e268e0c6f82979bca52fec36e78	2019-01-17 17:28:23 +01:00
vgilc	1b4cd37d5f	Merge branch 'ent-2997-color-cloud-vc-items' into 'develop' ... Add the Color Cloud item to the Visual Console See merge request artica/pandorafms!2075 Former-commit-id: e40e442631628db94c8f21c52cd8c04a0adbb6d6	2018-12-12 17:43:39 +01:00
tatiana.llorente@artica.es	f98b3e2ea5	Fixed error in submit - #3153 ... Former-commit-id: a1c21457db7a4d4d6297fd0935b8beada7cde63c	2018-12-10 15:18:53 +01:00
Alejandro Gallardo Escobar	b0998003a3	Added a new icon ... Former-commit-id: b4eb7f9aaf16d9ea3b0bb0339c1a70ee162aa259	2018-12-10 09:19:26 +01:00
tatiana.llorente@artica.es	2cb494bfe7	Show popup before drop database - #3153	2018-12-04 15:41:36 +01:00
vgilc	d2c048b2dc	Merge branch '2890-Texto-en-Active-incident-on-this-agent' into 'develop' ... Added css rule for links in the th tables with databox class- #2890 See merge request artica/pandorafms!1844	2018-11-30 13:11:45 +01:00
daniel	a5346a7ae3	fixed error login double	2018-11-21 17:38:11 +01:00
daniel	34ea7cfbcb	fixed position select autocomplete agent jqui	2018-11-15 15:19:43 +01:00
tatiana.llorente@artica.es	a6b8929a37	Added jquery-ui styles to css - #2784	2018-11-13 16:48:06 +01:00
tatiana.llorente@artica.es	719e502a27	Revert "Added jquery-ui styles to css - #2784" ... This reverts commit fdda5793d2.	2018-11-13 16:34:27 +01:00
tatiana.llorente@artica.es	fdda5793d2	Added jquery-ui styles to css - #2784	2018-11-13 16:27:57 +01:00
daniel	1c1df4b5f7	fixed errors css jqueryui	2018-11-07 17:09:42 +01:00
daniel	267f83cc4c	add datatabes	2018-11-07 13:25:02 +01:00
daniel	7d54858b45	delete files dont use	2018-11-07 13:24:07 +01:00
tatiana.llorente@artica.es	233b9c2c70	Well centered message modal window - #2768	2018-11-02 13:07:38 +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
fbsanchez	172ac187a2	estilos popup	2018-10-25 15:58:06 +02:00
fbsanchez	85051924b7	estilos popup	2018-10-25 14:01:12 +02:00
vgilc	4dd2cd434c	Merge branch '2726-Botones-background-en-Visual-consoles' into 'develop' ... Changed colors for buttons - #2726 See merge request artica/pandorafms!1797	2018-10-25 12:05:56 +02:00
vgilc	cf9bf2b4e2	Merge branch '2768-Mensajería-interna' into 'develop' ... Fixed borders of tables with classes databox and data - #2768 See merge request artica/pandorafms!1786	2018-10-25 11:54:50 +02:00
tatiana.llorente@artica.es	8f2472dcf8	Added css rule for links in the th tables with databox class- #2890	2018-10-09 12:38:59 +02:00
vgilc	ca67f52fb4	Merge branch '2670-Nuevo-widget-dashboard-system-group-status' into 'develop' ... 2670 nuevo widget dashboard system group status See merge request artica/pandorafms!1795	2018-10-02 17:25:19 +02:00
alejandro-campos	62548c7f94	Merge branch 'develop' into 2670-Nuevo-widget-dashboard-system-group-status ... Conflicts: pandora_console/include/styles/pandora.css	2018-10-02 17:11:02 +02:00
alejandro-campos	e5e81e55d7	edited css class ui-widget-content	2018-10-01 17:58:29 +02:00
vgilc	f73b4a55e6	Merge branch '2741-Refactorizar_vista_module_groups' into 'develop' ... refactoriced view module_groups See merge request artica/pandorafms!1788	2018-10-01 10:59:09 +02:00
vgilc	d933a966eb	Merge branch '2478-Logo-meta' into 'develop' ... changed background of meta visual setup logo previews See merge request artica/pandorafms!1641	2018-09-28 10:50:13 +02:00
samucarc	638c4f8bc7	Added warning and normal status agents in group view	2018-09-21 15:10:30 +02:00
tatiana.llorente@artica.es	028cca0d66	Changed colors for buttons - #2726	2018-09-21 12:59:15 +02:00
daniel	26c08d9309	refactoriced view module_groups	2018-09-20 15:51:36 +02:00
tatiana.llorente@artica.es	e49c0e3ae7	Fixed a minor mistake in thead - #2768	2018-09-20 12:18:31 +02:00
tatiana.llorente@artica.es	bc38468e6c	Fixed borders of tables with classes databox and data - #2768	2018-09-20 11:50:47 +02:00
alejandro-campos	6d28b386d1	changed styles for system group status widget	2018-09-17 18:56:38 +02:00
alejandro-campos	89a4e3667f	Added styles for new widget system group status	2018-09-13 19:08:45 +02:00
danielmaya	39673ed93a	Added class modaldeletebutton in pandora.css	2018-09-07 14:15:21 +02:00
Alejandro Gallardo Escobar	dd6b9aed81	Refactored the layer configuration of the GIS maps to fix some bugs	2018-08-13 12:42:30 +02:00
danielmaya	cd26042fa9	Fixed event graph in cluster view	2018-07-31 15:41:15 +02:00
alejandro-campos	cca29b2f85	changed background of meta visual setup logo previews	2018-07-26 18:14:43 +02:00
slerena	082e9c6185	Merge branch '1781-Animación-visual-para-ventanas-modales-de-ayuda-2' into 'develop' ... Add visual animation to popup modal windows - #1781 See merge request artica/pandorafms!1284	2018-06-25 18:59:34 +02:00
daniel	05d8d0ccf5	fixed errors graph	2018-06-13 19:13:42 +02:00
daniel	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
fermin831	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
manuel.montes	b68948307b	Fixed white-space / pre-wrap	2018-05-23 17:55:07 +02:00
Fermin	8f2302630c	[Rebranding] Docs and Support login icons are configurables	2018-05-21 14:29:11 +02:00
daniel	123d49d604	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/styles/pandora.css	2018-05-10 08:52:45 +02:00
fermin831	33abfa7f9d	[Rebranding] Other general source files. Removed unreached code oon general/logon_ok.php	2018-05-09 18:50:45 +02:00
vgilc	d746af9c28	Merge branch 'ent-1888-anadir-nueva-feature-para-poder-cambiar-los-eventos-a-estado-en-proceso' into 'develop' ... Ent 1888 anadir nueva feature para poder cambiar los eventos a estado en proceso See merge request artica/pandorafms!1442	2018-05-09 10:24:19 +02:00
fbsanchez	3dd4dd51cb	Specified more accurate class for label styling	2018-05-04 12:26:18 +02:00
fermin831	675e8deb47	Added function display_confirm_dialog with custom dialog	2018-04-25 12:32:58 +02:00
daniel	3fbd9adc38	fixed graph	2018-04-24 13:19:24 +02:00
fbsanchez	dcaae924fc	Decreased limit to reduceText call in some graphs	2018-04-03 16:41:21 +02:00
fbsanchez	526bd5f8c5	Merge remote-tracking branch 'origin/develop' into 2096-shorten_labels_in_hbars	2018-03-23 11:08:48 +01:00
fbsanchez	835e791ef1	Fixed label shortener in hbar	2018-03-21 13:40:15 +01:00
fermin831	1001240cf4	[SNMP] Fixed translation of custom mibs, added custom description data and change style of OID details	2018-03-15 16:03:46 +01:00
enriquecd	b51dc73cd6	Change cluster view design - #1877	2018-02-14 18:37:27 +01:00
enriquecd	c889776f44	Add visual animation to popup modal windows - #1781	2018-02-08 16:51:58 +01:00
enriquecd	a04f941a55	Merge branch 'develop' into 1403-Añadir-relojes-a-consolas-visuales-com1 ... Conflicts: pandora_console/include/styles/pandora.css	2018-02-07 17:02:15 +01:00
enriquecd	ae471bb9f2	Merge remote-tracking branch 'origin/clusters' into 1748-Sistema-de-gestión-de-Clusters	2018-02-07 13:52:44 +01:00
enriquecd	ab24c3bf80	Merge branch 'develop' into 1571-Auditoría-del-sistema-información-de-los-cambios-4850-com1 ... Conflicts: pandora_console/include/functions.php pandora_console/include/styles/pandora.css	2018-02-06 10:46:59 +01:00
danielmaya	aea9d6ae36	resolved conflicts with containers and added mr12	2018-02-06 09:21:07 +01:00
enriquecd	d59289db62	Change builder style - #1748	2018-02-02 14:56:33 +01:00
enriquecd	768e6e605f	Fix bugs - #1748	2018-02-02 13:05:36 +01:00
enriquecd	2b446a681d	Popup when click modules in cluster view, new images, filter modules - #1748	2018-01-30 17:38:29 +01:00
enriquecd	74b4f2a5f3	Add optional token animation and vissual effects in visual styles configuration view - #1724	2018-01-08 13:01:29 +01:00
vgilc	78899cc1c7	Merge branch '1708-CARREFOUR_Cambio_de_comportamiento_en_Consolas_Visuales_favoritas' into 'develop' ... add new funtionality view favourite console visual See merge request artica/pandorafms!1211	2018-01-02 10:31:31 +01:00
daniel	0b5678fba6	add new funtionality view favourite console visual	2017-12-28 15:13:06 +01:00
enriquecd	5747299d8e	Add visual effect to login page - #1724	2017-12-21 13:45:57 +01:00
enriquecd	521eb8f4cb	Add clocks to visual console - #1403	2017-12-01 12:14:56 +01:00
vgilc	df5722e499	Merge branch '1500-Fuente-erronea-en-el-boton-del-wizar-de-instalación-de-Pandora' into 'develop' ... Change font family to install wizard button - #1500 See merge request artica/pandorafms!964	2017-11-29 16:57:03 +01:00
enriquecd	afd84ce74d	Change system audit log extended info to table format with change info - #1571	2017-11-24 10:59:44 +01:00
danielmaya	897d7bf258	Added type graph selection in container graph	2017-11-23 18:01:32 +01:00
enriquecd	1e138f240f	Change pandora black styles - #1394	2017-11-03 10:27:01 +01:00
Arturo Gonzalez	5a59f9e2a5	Merge branch 'develop' into 1378-donut-graph-in-visual-console-dev	2017-10-26 14:20:35 +02:00
vgilc	86b4fc433c	Merge branch '1388-Meter-un-par-de-saltos-de-tamaño-de-fuente-mas-elementos-consola-visual' into 'develop' ... Add new font sizes for visual console - #1388 See merge request artica/pandorafms!874	2017-10-26 13:39:59 +02:00
vgilc	e8a14b6981	Merge branch '1416-new-h-and-v-bar-charts-in-visual-console-dev' into 'develop' ... 1416 new h and v bar charts in visual console dev See merge request artica/pandorafms!956	2017-10-26 13:30:52 +02:00
enriquecd	4f62a02ca1	Change font family to install wizard button - #1500	2017-10-24 18:16:32 +02:00
Arturo Gonzalez	5fa51ceb6b	Fixed element in meta	2017-10-24 09:24:07 +02:00
Arturo Gonzalez	1d3a082e5c	Added item to editor	2017-10-19 12:22:01 +02:00
Arturo Gonzalez	20cccbc87f	Added item to editor palette	2017-10-19 10:03:53 +02:00
Arturo Gonzalez	f6fca4e46d	Added donut to node visual consoles	2017-10-18 11:40:40 +02:00
enriquecd	bb4ddc38dd	Change styles for pandora black theme - #1394	2017-10-10 12:16:19 +02:00
vgilc	83488e517e	Merge branch '1349-Boton-muy-feo-en-el-wizard-de-instalacion-de-pandora' into 'develop' ... Change installer next button style - #1349 See merge request !833	2017-10-04 14:01:54 +02:00
Arturo Gonzalez	09f73929aa	Changed route analyzer styles	2017-10-03 16:40:01 +02:00
Arturo Gonzalez	7cd5d9c3a9	Added new styles to route analyzer	2017-10-03 15:20:35 +02:00
enriquecd	76ae95ead4	Add new font sizes for visual console - #1388	2017-10-03 11:52:26 +02:00
enriquecd	be0655334d	Change installer next button style - #1349	2017-09-20 13:04:36 +02:00
vgilc	4096a0f5ff	Merge branch '1122-Revision-del-estilo-CSS-de-las-paginas-de-ayuda' into 'develop' ... Change pandora help window style - #1122 See merge request !741	2017-09-11 09:43:39 +02:00
vgilc	b4f0cf12ae	Merge branch '1060-Letras-blancas-en-fondo-blanco-con-Black-theme-7' into 'develop' ... Change pandorin dialog font color with black theme - #1060 See merge request !635	2017-09-08 10:02:45 +02:00
daniel	fe2a2a36e8	fixed minor errors in WUX	2017-08-30 16:09:11 +02:00
daniel	c29d8a4fdb	Revert "merge develop" ... This reverts commit 8232911713, reversing changes made to f5da86ac0a.	2017-08-23 09:35:17 +02:00
daniel	8232911713	merge develop	2017-08-22 18:39:34 +02:00
enriquecd	2f5127d517	Change pandora help window style - #1122	2017-08-21 15:58:19 +02:00
daniel	86125a3c40	changes visual console wux	2017-08-18 13:29:07 +02:00
vgilc	7fdfbde6ff	Merge branch '133-Bug-en-pop-up-de-activacion-de-licencia-theme-black' into 'develop' ... Change license activation popup color text - #133 See merge request !393	2017-08-18 13:17:02 +02:00
daniel	f0efe69ad4	fixed error in wux	2017-08-18 12:02:47 +02:00
daniel	ab3cd7dcc0	wux console view	2017-08-17 18:38:12 +02:00
daniel	7e649b78b3	wux new form	2017-08-09 11:29:16 +02:00
artu30	14a439faab	Merge branch 'develop' into '618-new-item-auto-sla-graph-in-visual-console-dev' ... # Conflicts: # pandora_console/godmode/reporting/visual_console_builder.editor.js # pandora_console/include/functions_visual_map_editor.php # pandora_console/include/graphs/flot/pandora.flot.js	2017-07-28 10:30:17 +02:00
daniel	741cc05268	fixed errors in graph container	2017-07-24 10:53:04 +02:00
Arturo Gonzalez	e9e10d3a79	Merge branch 'develop' into 618-new-item-auto-sla-graph-in-visual-console-dev ... pandora_console/include/functions_visual_map.php pandora_console/include/functions_visual_map_editor.php	2017-07-18 11:57:13 +02:00
vgilc	38b42a26a2	Merge branch '845-Mejoras-en-SNMP-Browser-dev' into 'develop' ... 845 mejoras en snmp browser dev See merge request !602	2017-07-13 12:07:46 +02:00
Arturo Gonzalez	9db5669f16	Added item in button palette with default fields	2017-07-12 11:51:00 +02:00
enriquecd	95184cab21	Change pandorin dialog font color with black theme - #1060	2017-06-29 18:19:58 +02:00
Daniel Maya	b7f4ecbe69	update css and added gif	2017-06-20 15:46:35 +02:00
Daniel Maya	b38b41b942	updated files	2017-06-20 15:32:24 +02:00
Daniel Maya	4398b47d92	updated	2017-06-20 10:31:14 +02:00
daniel	80a38cbd9f	add checkbox for show all events in view agent detail	2017-06-14 12:45:40 +02:00
Arturo Gonzalez	2e71af2568	Added new visual styles to event sound console	2017-05-25 17:11:35 +02:00
vgilc	56fd0f85ba	Merge branch 'ent-565-pintado-del-menu-lateral-con-acl-enterprise-activado' into 'develop' ... Modified menu position to fit it with ACL enterprise See merge request !304	2017-05-17 17:10:11 +02:00
enriquecd	01a50a76af	Change license activation popup color text - #133	2017-04-20 19:04:22 +02:00
Arturo Gonzalez	629439f271	Added some modifications to adapt um and rr in meta	2017-04-05 10:26:12 +02:00
fermin831	2b74fbe57e	Modified menu position to fit it with ACL enterprise	2017-03-27 15:32:05 +02:00
daniel	07e5274d0d	fixed error in login page errors and change icon pdf report	2017-03-22 15:26:54 +01:00
daniel	8365afbe76	fixed errors in helps pandora and visual styles	2017-03-21 11:44:46 +01:00
daniel	aec7df9137	fixed minor error	2017-03-17 13:40:17 +01:00
daniel	4277661cc4	fixed minor errors in login page	2017-03-17 13:29:26 +01:00
daniel	8d4b730b6c	fixed minor errors	2017-03-17 11:37:43 +01:00
daniel	3b54116147	fixed errors in css	2017-03-17 09:20:38 +01:00
daniel	1325601082	fixed errors	2017-03-16 18:41:53 +01:00
daniel	e252135979	merge develop	2017-03-15 17:09:40 +01:00
daniel	aec0d91109	login page new	2017-03-15 15:23:28 +01:00
daniel	a87839bd07	login page	2017-03-15 10:12:18 +01:00
Daniel Maya	f4350aed6b	Ticket 477. Fixed some bug in the visual console	2017-03-14 15:54:46 +01:00
Arturo Gonzalez	73c31012d9	Added new visual styles to um and rr systems. Ticket #486	2017-03-14 10:36:10 +01:00
artu30	2c8af1d54a	Merge branch 'new_jquery_dialog_view' into 'develop' ... New styles to jquery dialog. (Header done) See merge request !250	2017-03-13 17:06:00 +01:00
enriquecd	0094cfa9bf	Center alert modal window when is opened - #93	2017-03-13 13:25:16 +01:00
Arturo Gonzalez	dfa7552fcd	New styles to jquery dialog. (Header done)	2017-03-10 09:41:07 +01:00
daniel	07a58aa944	changes css for widget	2017-03-08 10:56:25 +01:00
daniel	a7a7a27225	fixed widgets groups status	2017-03-07 15:31:24 +01:00
Arturo Gonzalez	15bcd0add8	Changed visual styls of install page. Ticket #448	2017-03-07 10:59:22 +01:00
fermin831	4ae8963e2e	Added events active filter view (open side)	2017-02-28 15:41:03 +01:00
enriquecd	983d00535a	Change background color when mouse over rows in agent and module managers - #81	2017-02-27 14:28:09 +01:00
m-lopez-f	45316cdd0f	Fixed visual in welcome view. Gitlab: #359	2017-02-23 12:26:48 +01:00
daniel	7609e85d3e	fixed errors in tab menu	2017-02-23 09:23:27 +01:00
daniel	f351a95993	fixed errors in tabs reports	2017-02-22 09:21:35 +01:00
enriquecd	36aa73bdd8	Make alert messages window draggable, zindex 3, change disable logo in graph - #52	2017-02-10 10:18:53 +01:00
daniel	543fd0c7ea	delete shortcut bar	2017-02-03 12:23:58 +01:00
enriquecd	f14f0d923f	Add transition to hover change color in alert windows and left menu bar buttons - #30	2017-01-26 12:10:28 +01:00
enriquecd	e6dd14fcb6	Improve_visual_console_fix_pandoracss - #15	2017-01-20 16:02:34 +01:00
daniel	1b26423867	Merge branch 'develop' into 135-informe-de-eventos-sale-agrupado-int-4330-open	2017-01-18 17:39:04 +01:00
enriquecd	6447189606	Improve visual console - #110	2017-01-16 13:31:56 +01:00
daniel	99aa41b32a	fixed reports events	2017-01-13 14:09:56 +01:00
enriquecd	356944f8f2	Create and update buttons in CONFIGURE EVENT RULE positioned wrong #130	2017-01-05 16:27:45 +01:00
daniel	b28fe4cef4	Merge branch 'develop' into feature/report_SLA_new	2016-12-14 15:42:18 +01:00
daniel	fb942ab6cf	fixed error and visual erros pdf, xml, csv, json	2016-12-14 14:02:00 +01:00
daniel	2b0820d70e	add new reports sla_hourly , weekly and availability graph	2016-12-12 16:48:25 +01:00
Arturo Gonzalez	e9eb60a718	Changed events sound styles and added new filters. Ticket #109 Gitlab	2016-12-05 15:23:17 +01:00
daniel	9fc797ae9e	reports availability and SLA change new function ... (cherry picked from commit 7faa1eff1e)	2016-11-30 08:57:17 +01:00
enriquecd	d768da3964	Top position control for sections left bar when is fixed - #3788	2016-11-21 16:25:11 +01:00
m-lopez-f	5fef13b97b	Fixed problems with values in simple value in visual maps ... (cherry picked from commit f16628b8c1)	2016-11-21 08:54:49 +01:00
enriquecd	76c1f7cd82	Visual console improvements - Add: font style/size setting - map size setting - back color map - graph function a type graph line/area - Improve wizard - Back graph color... #110	2016-11-16 18:58:27 +01:00
enriquecd	559902275f	OUM online loses format #4117, vertical center Agent/Module Group cells #59 ... (cherry picked from commit 37091a0c31)	2016-10-27 16:26:25 +02:00