611 Commits

Author	SHA1	Message	Date
Tatiana Llorente	31b19ab970	Fix pagination blank page - #4306	2019-07-05 09:31:23 +02:00
fbsanchez	879e61b9aa	minor fix in public_url_exclusions	2019-07-02 16:47:19 +02:00
fbsanchez	eb01e9baaf	public_url with force option	2019-07-02 14:17:53 +02:00
Tatiana Llorente	1aa0131a81	Merge branch 'develop' into 'ent-4195-Status-sets-Visual' ... Conflicts: pandora_console/include/styles/pandora.css	2019-07-02 11:42:19 +02:00
Tatiana Llorente	9163f725ed	Created black theme - #4194	2019-07-01 16:57:33 +02:00
fbsanchez	4754e20784	Merge remote-tracking branch 'origin/develop' into ent-3980-7966-aws-multicuenta-y-mejora-monitorizacion	2019-06-26 09:52:22 +02:00
Daniel Rodriguez	61e07abf3a	Merge branch 'ent-4238-eventos-csv-e-historico' into 'develop' ... Ent 4238 eventos csv e historico See merge request artica/pandorafms!2515	2019-06-25 18:33:49 +02:00
Daniel Rodriguez	6af895b9c1	Merge branch 'ent-3999-No-se-ve-icono-SO-en-eventos-en-metaconsola' into 'develop' ... Added meta option in function ui_print_os_icon - #3999 See merge request artica/pandorafms!2502	2019-06-25 16:04:51 +02:00
Tatiana Llorente	43b83af2c6	Changed default images status set for css - #4195	2019-06-24 11:59:17 +02:00
fbsanchez	e9ef9b64a3	credential_store	2019-06-21 19:34:47 +02:00
Luis Calvo	f7f81f5344	Custom fields url improved	2019-06-21 16:26:13 +02:00
fbsanchez	6682bad19f	first steps credential store	2019-06-21 12:03:25 +02:00
fbsanchez	524575171a	event history viewer	2019-06-19 12:56:16 +02:00
fbsanchez	37e98d108b	fit mc	2019-06-18 19:17:21 +02:00
fbsanchez	823581f398	export current page to csv fixed icon	2019-06-18 12:58:46 +02:00
fbsanchez	d8a331bf77	event filters tags, date, module name	2019-06-18 12:48:28 +02:00
fbsanchez	f7cf6e1e8b	wip events	2019-06-18 10:32:04 +02:00
fbsanchez	457c1c9edf	wip event view	2019-06-17 18:33:39 +02:00
fbsanchez	ebfdce1073	Improved ui_progress documentation	2019-06-14 10:40:30 +02:00
fbsanchez	7226a45df5	improved ui_progress now accepts ajax updates	2019-06-14 10:35:10 +02:00
fbsanchez	b08e8b595d	multiple fixes	2019-06-13 19:41:21 +02:00
Tatiana Llorente	018c942ecb	Added meta option in function ui_print_os_icon - #3999	2019-06-13 15:04:39 +02:00
fbsanchez	f3a0f37a1c	Events agent grouped	2019-06-12 18:19:39 +02:00
fbsanchez	4bb300889d	Merge remote-tracking branch 'origin/develop' into ent-4136-button-styles	2019-06-12 13:17:36 +02:00
fbsanchez	48e6fef0b7	Event filters	2019-06-11 12:58:18 +02:00
fbsanchez	ef3d299d58	wip event view	2019-06-10 15:18:35 +02:00
fbsanchez	f67bf8c2b7	wip event list filters	2019-06-07 22:44:02 +02:00
fbsanchez	419a90d69c	wip event list	2019-06-07 17:35:13 +02:00
fbsanchez	23e6711f09	WIP Events	2019-06-06 17:50:47 +02:00
Alejandro Fraguas	9791b174b2	Merge branch 'ent-4030-bug-en-busqueda-de-inventario' into 'develop' ... Ent 4030 bug en busqueda de inventario See merge request artica/pandorafms!2431	2019-06-05 10:23:43 +02:00
fbsanchez	2f5265fcbb	color updates	2019-06-04 14:08:07 +02:00
fbsanchez	c741020538	styles review	2019-06-04 13:57:55 +02:00
fbsanchez	b4dcf4a6f1	style review	2019-06-03 11:55:56 +02:00
fbsanchez	88b0802472	style review	2019-06-03 10:46:52 +02:00
fbsanchez	40cca5e1e3	BIG style change, erased all important flags	2019-05-30 18:21:13 +02:00
fbsanchez	c2346842c9	ui_toggle revierw	2019-05-29 18:13:21 +02:00
fbsanchez	f16f35ad10	Changes styles	2019-05-29 17:49:09 +02:00
fbsanchez	121ae89b1d	dyn style ui_print_help_tip	2019-05-29 17:34:11 +02:00
fbsanchez	3c730fbedf	BC updated	2019-05-29 17:10:21 +02:00
fbsanchez	47c9220cbb	clippy positions and control overflow	2019-05-29 17:02:01 +02:00
fbsanchez	505229abe4	minor style change - box	2019-05-29 13:03:58 +02:00
fbsanchez	49dee1e2bc	Next contact to seconds	2019-05-29 12:42:55 +02:00
fbsanchez	5ec162e058	Data title events	2019-05-29 11:24:17 +02:00
fbsanchez	c8649a8dc4	Styles	2019-05-29 11:21:57 +02:00
fbsanchez	70469c4909	Event list agent view	2019-05-28 18:03:01 +02:00
fbsanchez	99e485e96e	toggle updated	2019-05-28 16:24:28 +02:00
fbsanchez	445db7c43b	module list agent view	2019-05-28 16:20:24 +02:00
fbsanchez	348f0c2a65	agent view styling	2019-05-28 13:27:17 +02:00
fbsanchez	9a12b34847	Updates styling	2019-05-28 12:13:29 +02:00
fbsanchez	92ca217800	minor fixes in style view tasklist	2019-05-28 10:57:36 +02:00
fbsanchez	2cd19aa0cb	updates styles	2019-05-28 10:47:31 +02:00
fbsanchez	bdd7cc1317	Flex agent view	2019-05-28 09:48:09 +02:00
fbsanchez	f57915285f	review styles agent view	2019-05-27 22:36:55 +02:00
fbsanchez	f1499082fa	agent view rebuilt	2019-05-27 21:30:46 +02:00
fbsanchez	954dd0b43a	UI_toggle updated	2019-05-27 19:08:41 +02:00
fbsanchez	5be124f315	Styles review	2019-05-27 19:00:48 +02:00
fbsanchez	f0fb6d7fd9	wip styles	2019-05-27 18:03:56 +02:00
Luis Calvo	fdd61e4f27	Fixed agent searh box	2019-05-17 16:36:21 +02:00
manuel	20dace7de8	Merge branch 'develop' into ent-3468-Ayudas_online ... Conflicts: pandora_console/godmode/agentes/agent_manager.php Former-commit-id: c53d6c5819284e92caae040c52c6da477c27a2f3	2019-05-13 16:20:12 +02:00
manuel	143def5d87	Added helps	2019-05-09 13:43:53 +02:00
manuel	f5759abcad	Merge branch 'develop' into ent-3468-Ayudas_online	2019-05-08 09:35:32 +02:00
Tatiana Llorente	9f3c586b55	Merge remote-tracking branch 'origin/develop' into ent-3611-Vista-Creación-Edición-de-Agente ... Former-commit-id: b60c4d8c438d79f20cc9dcdfac856bbaf0a4ada5	2019-05-03 13:11:26 +02:00
Tatiana Llorente	ab6658a450	Fixed pagination in modal windows - #3707 ... Former-commit-id: 090149ce7add4d30c8747e570a819c1b8025a0a6	2019-04-24 16:26:50 +02:00
Tatiana Llorente	313ff93c8c	Fixed pagination in modal window to create dashboard - #3707 ... Former-commit-id: 6fbfff55e76cb88db890864ec36d6bc766f6e2c6	2019-04-24 15:38:46 +02:00
Daniel Barbero Martin	ac41e9255f	helpers ... Former-commit-id: 56c67397cb17ca0ebc28e2903c378fcda10a6536	2019-04-24 13:53:18 +02:00
Tatiana Llorente	274c78f647	Merge remote-tracking branch 'origin/develop' into ent-3611-Vista-Creación-Edición-de-Agente ... Conflicts: pandora_console/include/styles/pandora.css Former-commit-id: 8beb92aea96f37340434f4a2e5e8012058d52b0a	2019-04-17 10:49:02 +02:00
Tatiana Llorente	ed3155c053	New View Create/Update Agent - #3611 ... Former-commit-id: e8c3576ca06561f5979c0151670115b697533843	2019-04-17 10:35:32 +02:00
Tatiana Llorente	cfff9c065d	New View Create/Update Agent - #3611 ... Former-commit-id: 5a36e41a05341d5afa19917a99f34ac16cfc99e9	2019-04-17 09:27:15 +02:00
Tatiana Llorente	3da2f267a2	New design for the tables - #3707 ... Former-commit-id: 6b2550344a7748e210fdb81a26751e9e94cbbfa4	2019-04-05 13:51:35 +02:00
Tatiana Llorente	aa640efc44	Merge remote-tracking branch 'origin/develop' into ent-3707-Nuevo-diseño-para-las-tablas ... Former-commit-id: 43e5f9f044a351f1c6cf1c192b9f92cba6d1b0b3	2019-04-05 13:19:42 +02:00
Tatiana Llorente	d91631e0e1	New design for the tables - #3707 ... Former-commit-id: 08bb5008c402afa0d5e75d7f8ade167843a22499	2019-04-05 13:18:38 +02:00
Daniel Maya	faecabb1cc	Fixed problem with openlayer ... Former-commit-id: 91eb396d550cd6a90c9c3ba4cbb0ec12c2c51c6e	2019-04-03 12:54:36 +02:00
Tatiana Llorente	f497d3bd2e	Added class to action buttons and moved checkbox to the left side ... Former-commit-id: 1d7ba8fa06e734a3e45f7bc1ca2f78d0d8978122	2019-04-02 13:42:30 +02:00
Tatiana Llorente	34598f391b	Merge remote-tracking branch 'origin/develop' into ent-3707-Nuevo-diseño-para-las-tablas ... Former-commit-id: 8b576f68f26c1fe2b0d6c1f9029eac599f7a377f	2019-03-27 17:05:50 +01:00
Tatiana Llorente	845cb85c55	New design for tables - #3707 ... Former-commit-id: 923414d8bf98d6264e6cebc27706118e16710b70	2019-03-27 17:03:55 +01:00
fermin831	b2f046e4d6	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/include/class/ConsoleSupervisor.php pandora_console/include/class/NetworkMap.class.php pandora_console/include/styles/pandora.css pandora_console/operation/menu.php Former-commit-id: 2a0661a65772d4a91f95587d77b0d1287fb66b18	2019-03-27 12:11:23 +01:00
alejandro-campos	ec999341ba	change discovery headers and add breadcrumbs to them ... Former-commit-id: 93183474aabaeccfd3893cacd78c4d6ddf764502	2019-03-26 15:42:33 +01:00
Tatiana Llorente	a99c8b1a7b	New view user edit ... Former-commit-id: 46b0d396f2121901b19417ebdfe91963c3ea0e54	2019-03-20 13:26:15 +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
artica	b3da2803a4	Changed the format of the .php files ... Former-commit-id: 4dc926a81de14e27df8be7982406b09d8e808399	2019-01-30 16:18:44 +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	b963395d01	fixed errors ... Former-commit-id: 813a875e0f3d0dc3c1097ced987a5a45e8051046	2019-01-11 08:45:12 +01:00
vgilc	33f014695d	Merge branch '3057-Agregar-token-barras-desplazamiento-en-vista-datos-de-modulo' into 'develop' ... Fixed overflow in module data view See merge request artica/pandorafms!1967 Former-commit-id: bfcf0c9c08953e1fa49e8731db808bc78ecc826b	2018-12-21 10:23:29 +01:00
fbsanchez	1b7f3b7251	Merge remote-tracking branch 'origin/develop' into fix/reverse-proxy ... Former-commit-id: e621a700020a9da04f1a9ae50a1961638fd5ece3	2018-12-05 08:45:18 +01:00
vgilc	01cf7d8081	Merge branch '2888-Error-links-en-Show-link-to-public-dashboard' into 'develop' ... Changed url for widgets in public dashboard - #2888 See merge request artica/pandorafms!1859	2018-11-30 13:12:30 +01:00
fbsanchez	08ea1b2283	minor fix ui_get_full_url	2018-11-19 14:15:34 +01:00
fbsanchez	b90da54c86	fixed public_url mandatory in MC environments	2018-11-19 13:16:53 +01:00
fbsanchez	60f9483e79	mandatory public_url if is set	2018-11-19 11:54:35 +01:00
daniel	2eb47c1251	fixed errors in custom fields view	2018-11-16 15:00:09 +01:00
manuel.montes	dd7e623782	Fixed overflow in module data view	2018-11-13 17:04:14 +01:00
daniel	1c1df4b5f7	fixed errors css jqueryui	2018-11-07 17:09:42 +01:00
daniel	3f78f15499	WIP View custom fields data	2018-11-07 13:28:00 +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
Ramon Novoa	6353af0482	Merge remote-tracking branch 'github/develop' into develop	2018-10-29 13:20:48 +01:00
vgilc	08a8165b93	Merge branch '2827-Mensaje-de-alerta-disparada' into 'develop' ... Added number of times an alert is fired - #2827 See merge request artica/pandorafms!1823	2018-10-29 09:15:32 +01: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
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
daniel	ffc7734ebc	delete flash_charts and library pchart	2018-10-19 11:31:06 +02:00
tatiana.llorente@artica.es	6adcba4b39	Changed url for widgets in public dashboard - #2888	2018-10-15 16:12:16 +02:00
Ramón Novoa	3e584747b3	Merge pull request #104 from sofwerx/https-proxy ... Adding a check for HTTP_X_FORWARDED_PROTO in https_is_running()	2018-10-11 09:34:26 +02:00
daniel	e2f7157545	fixed php7	2018-10-04 11:43:08 +02:00
vgilc	5668857914	Merge branch '2479-Errores-en-vista-de-alertas-de-meta' into 'develop' ... 2479 errores en vista de alertas de meta See merge request artica/pandorafms!1821	2018-10-02 15:37:08 +02:00
tatiana.llorente@artica.es	2dd10a4328	Added number of times an alert is fired - #2827	2018-10-02 12:35:20 +02:00
alejandro-campos	1c2743797e	Revert "fixed conflict" ... This reverts commit 1d726d59f3.	2018-10-01 18:16:55 +02:00
alejandro-campos	1d726d59f3	fixed conflict	2018-10-01 15:34:36 +02:00
alejandro-campos	6b14754137	fixed conflict	2018-10-01 15:30:43 +02:00
vgilc	706a3ca4c0	Merge branch '2479-Errores-en-vista-de-alertas-de-meta' into 'develop' ... fixed bug in meta alert view: action field (other than default) not showing See merge request artica/pandorafms!1621	2018-10-01 14:45:16 +02:00
alejandro-campos	0c899f5078	Merge branch 'develop' into 2479-Errores-en-vista-de-alertas-de-meta ... Conflicts: pandora_console/include/functions_ui.php	2018-10-01 14:03:30 +02:00
vgilc	62dcf0f342	Merge branch '2459_No_se_ve_el_icono_por_defecto_del_widget_de_bienvenida' into 'develop' ... Fixed welcome icone See merge request artica/pandorafms!1640	2018-10-01 12:38:49 +02:00
vgilc	ad5581f0c2	Merge branch '2491-Alert-view-meta' into 'develop' ... fixed bug in meta alert view: agent names not showing in table See merge request artica/pandorafms!1618	2018-09-28 10:39:52 +02:00
tatiana.llorente@artica.es	d36c10fa08	new function that adds a border to the image if the status is warning - #2723	2018-09-10 13:22:02 +02:00
Alejandro Gallardo Escobar	1de746ab69	Fixed a problem with the autocomplete agent cache	2018-08-17 15:03:24 +02:00
fermin831	18800feaae	Refactorized snapshot link on node	2018-08-02 13:02:33 +02:00
vgilc	fcda8f56f9	Merge branch '2460-tu-zona-horaria-es-distinta-pero-igual' into 'develop' ... fixed bug: when system timezone is equal to your timezone, dont show the… See merge request artica/pandorafms!1645	2018-08-01 15:20:08 +02:00
alejandro-campos	443b70c39d	fixed bug: when system timezone is equal to your timezone, dont show the different timezones warning	2018-07-30 16:25:38 +02:00
daniel	d740240a51	fixed error data string show	2018-07-27 14:07:02 +02:00
samucarc	21db360ab8	Fixed welcome icone	2018-07-26 17:44:31 +02:00
daniel	3985316a9b	fixed errors in policies metaconsole	2018-07-26 12:41:09 +02:00
fermin831	cb0351de99	Fixed question mark hel header meta	2018-07-20 12:29:34 +02:00
alejandro-campos	b5c378d589	fixed bug in meta alert view: action field (other than default) not showing	2018-07-19 13:55:16 +02:00
alejandro-campos	5258d69e7e	fixed bug in meta alert view: agent names not showing in table	2018-07-18 17:44:18 +02:00
daniel	2c9a613f1b	fixed visual erros in metapolicies	2018-07-13 12:30:18 +02:00
Alejandro Gallardo Escobar	a258dc7e43	Fixed a message	2018-06-12 10:04:33 +02:00
Alejandro Gallardo Escobar	f6184b52da	Merge branch 'develop' into ent-639-add-user-defined-timezones	2018-06-11 17:42:02 +02:00
Alejandro Gallardo Escobar	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
fermin831	1391f8cc11	[Rebranding] Fixed get header logo on metaconsole	2018-05-29 12:45:08 +02:00
fermin831	a54c074b11	[Rebranding] Added hide help on node	2018-05-25 10:29:40 +02:00
fermin831	750ed29ac9	[Rebranding] Added a header to white backgrounds and make the favicon and the mobile console configurable	2018-05-24 16:59:50 +02:00
fermin831	43447bbee4	[Rebranding] Minor ended fixed	2018-05-23 18:19:24 +02:00
fermin831	e71fd399fb	Merge branch 'develop' into 2106-intracom-rebranding ... Conflicts: pandora_console/godmode/admin_access_logs.php pandora_console/include/javascript/functions_pandora_networkmap.js	2018-05-22 19:29:46 +02:00
fermin831	946e897db6	[Rebranding] Get the correct header logo in the metaconsole	2018-05-22 15:26:11 +02:00
fermin831	2e8e3c27b6	[Rebranding] Modified tinylogo by custom_logo in node	2018-05-22 13:40:23 +02:00
Fermin	8f2302630c	[Rebranding] Docs and Support login icons are configurables	2018-05-21 14:29:11 +02:00
Fermin	0d6115726a	[Rebranding] Open include root files (except networkmaps related sources)	2018-05-11 12:49:16 +02:00
fermin831	57fb63bd91	Fixed snapshots view in string data	2018-05-07 19:40:38 +02:00
Ian Blenke	ecf21f1f45	Adding a check for HTTP_X_FORWARDED_PROTO in ui_get_full_url()	2018-03-29 10:57:23 -04:00
fermin831	a8cb366508	[Alerts view] Fixed validation in alerts view	2018-03-14 17:24:34 +01:00
fermin831	74f899736f	[Snapshots] Fixed snapshots in metaconsole. Changed functionallity but preserve all way to work	2018-03-12 15:17:59 +01:00
fermin831	e37768097f	[Visual] Refixed help images on node	2018-02-28 12:16:43 +01:00
fermin831	6093f6a0d8	[Metaconsole] Fixed img broken links on metaconsole	2018-02-28 12:08:15 +01:00
danielmaya	c54090a614	Fixed messages in warning popup	2018-01-05 11:32:16 +01:00
enriquecd	516c3b8d47	Fix pagination - #1728	2017-12-21 17:01:19 +01:00
enriquecd	e902baaf9d	Apply safe input to ui_get_url_refresh return - fix text form inputs js error - #1574	2017-11-16 12:46:19 +01:00
Arturo Gonzalez	eb39d25c4b	Added field to get string modules	2017-11-10 15:03:52 +01:00
vgilc	2d87172558	Merge branch 'vulnerabilidad-en-consola' into 'develop' ... Resolve: Vulnerabilidad en consola See merge request artica/pandorafms!1020	2017-11-06 17:41:45 +01:00
Alejandro Gallardo Escobar	83becb3e80	[Console] Fixed an error into the 'ui_print_truncate_text' function	2017-11-06 15:18:55 +01:00
Arturo Gonzalez	50e7e5fc17	Added changes to sort json in ajax return	2017-10-31 16:39:58 +01:00
Alejandro Gallardo Escobar	c687e6a97b	[Console] Fixed an XSS vulnerability into the 'ui_print_truncate_text' function	2017-10-27 13:25:27 +02:00