11994 Commits

Author	SHA1	Message	Date
fbsanchez	0d3817d64d	dynamic toggle in wizard input printForm	2019-11-14 17:45:45 +01:00
fbsanchez	192fd10dd8	Merge remote-tracking branch 'origin/ent-EDF' into ent-4772-omnishell	2019-11-14 17:14:34 +01:00
fbsanchez	3c87efe113	Merge remote-tracking branch 'origin/develop' into ent-EDF ... Conflicts: pandora_console/extras/mr/33.sql	2019-11-14 17:13:38 +01:00
fbsanchez	7efb1367ef	Merge branch 'ent-EDF' into ent-4772-omnishell	2019-11-14 17:12:21 +01:00
fbsanchez	14128590d6	Minor corrections&fixes	2019-11-14 17:05:01 +01:00
Alejandro Fraguas	27bdf04735	Merge branch 'ent-4774-welcome-to-pandorafms' into 'develop' ... first changed to welcome window See merge request artica/pandorafms!2822	2019-11-14 16:05:22 +01:00
alejandro-campos	994b3a9bff	changes in service map widget: always show legend and fix visual problem	2019-11-14 15:21:24 +01:00
Daniel Barbero Martin	c17acefc49	Merge remote-tracking branch 'origin/ent-EDF' into ent-4610-Alertas-de-logs ... Conflicts: pandora_console/extras/mr/33.sql	2019-11-14 12:22:11 +01:00
Alejandro Fraguas	0199c6312a	Merge branch 'ent-4752-Herramientas-de-diagnostico' into 'develop' ... refactoriced diagnostics pandoraFMS See merge request artica/pandorafms!2809	2019-11-14 11:49:23 +01:00
Daniel Barbero Martin	750e6e789c	fixed minor error	2019-11-14 09:58:10 +01:00
Daniel Barbero Martin	879884e6c3	fixed errors	2019-11-14 09:52:56 +01:00
manuel	607c26529d	Fixed bug in visual console line item	2019-11-14 09:51:49 +01:00
Daniel Barbero Martin	86162b4c66	fixed errors	2019-11-14 08:53:45 +01:00
artica	cfdb5330ae	Auto-updated build strings.	2019-11-14 00:01:12 +01:00
fbsanchez	b0920d93af	Merge branch 'ent-4772-omnishell' into ent-EDF ... Conflicts: pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql	2019-11-13 18:15:19 +01:00
fbsanchez	78443a029d	Omnishell rc1	2019-11-13 18:10:16 +01:00
Daniel Barbero Martin	42fc81a408	fixed errors	2019-11-13 17:50:22 +01:00
fbsanchez	0e2a3d0f47	minor style fix after feedback cleanup	2019-11-13 17:42:14 +01:00
fbsanchez	65d02d4529	Merge remote-tracking branch 'origin/ent-EDF' into ent-4774-welcome-to-pandorafms	2019-11-13 17:40:45 +01:00
fbsanchez	345eb48fd7	save the green lines	2019-11-13 17:38:48 +01:00
fbsanchez	83590146b1	Merge remote-tracking branch 'origin/develop' into ent-4774-welcome-to-pandorafms	2019-11-13 17:38:24 +01:00
Daniel Barbero Martin	8645b01828	fixed errors	2019-11-13 16:43:32 +01:00
fbsanchez	670df456f5	wip results omnishell	2019-11-13 16:39:24 +01:00
Daniel Barbero Martin	a0db941b1e	fixed errors	2019-11-13 15:52:09 +01:00
Jose Gonzalez	62fbdd36a0	Solution for lost comments in the events section modal window	2019-11-13 15:36:52 +01:00
fbsanchez	672ce6db22	first task omnishell and minor style checks	2019-11-13 15:24:44 +01:00
fbsanchez	6677b6a5ab	hide report in welcomewindow if not enterprise customer	2019-11-13 14:32:34 +01:00
Daniel Rodriguez	f844c660af	Merge branch 'ent-4766-feedback-de-ayudas' into 'develop' ... add feedback See merge request artica/pandorafms!2813	2019-11-13 13:43:08 +01:00
Daniel Barbero Martin	5f8ec8f89c	fixed errors	2019-11-13 13:29:09 +01:00
fbsanchez	875d4430a7	Merge remote-tracking branch 'origin/ent-EDF' into ent-4772-omnishell	2019-11-13 12:21:42 +01:00
fbsanchez	b11dbc639f	Merge remote-tracking branch 'origin/ent-4752-Herramientas-de-diagnostico' into ent-EDF ... Conflicts: pandora_console/general/header.php	2019-11-13 12:20:29 +01:00
Daniel Barbero Martin	7103317bc2	Merge remote-tracking branch 'origin/develop' into ent-4752-Herramientas-de-diagnostico ... Conflicts: pandora_console/general/header.php pandora_console/include/styles/pandora.css	2019-11-13 12:12:17 +01:00
Daniel Barbero Martin	28c9718c26	WIP alerts-log	2019-11-13 12:07:23 +01:00
marcos	fe45afa662	Merge remote-tracking branch 'origin/develop' into ent-4226-mejoras-plugin-sap	2019-11-13 12:01:36 +01:00
artica	c19d760bdb	Auto-updated build strings.	2019-11-13 00:01:12 +01:00
fbsanchez	d1fbd36a97	WIP omnishell	2019-11-12 19:31:38 +01:00
Daniel Barbero Martin	25f879df00	add step 3	2019-11-12 18:45:20 +01:00
Tatiana Llorente	484ec9ea60	Ent 4845 revision de skins	2019-11-12 18:10:58 +01:00
Daniel Rodriguez	073ca73b2a	Merge branch 'ent-4670-Cambiar-tamaño-fuente-en-informes' into 'develop' ... Added token in visual styles to change the font size in items of reports - #4670 See merge request artica/pandorafms!2798	2019-11-12 18:09:39 +01:00
Tatiana Llorente	a11b18292c	Fixed width in the select to load filters in events view	2019-11-12 17:12:44 +01:00
Daniel Barbero Martin	fa6bc254a1	Fixed errors	2019-11-12 16:22:58 +01:00
fbsanchez	b9633933e1	Merge remote-tracking branch 'origin/develop' into ent-4774-welcome-to-pandorafms ... Conflicts: pandora_console/extras/mr/33.sql pandora_console/general/header.php	2019-11-12 14:17:45 +01:00
Daniel Barbero Martin	02677849ce	add new css	2019-11-12 13:17:00 +01:00
Daniel Barbero Martin	9d3c9febad	Add alert correlation wizard	2019-11-12 13:16:25 +01:00
fbsanchez	19d06dc061	Merge remote-tracking branch 'origin/ent-EDF' into ent-4226-mejoras-plugin-sap	2019-11-12 10:19:34 +01:00
marcos	ec05b52fb4	update omnishell.css	2019-11-12 10:08:35 +01:00
artica	2ee4f9d88f	Auto-updated build strings.	2019-11-12 00:01:09 +01:00
Tatiana Llorente	1b3c7f8ed6	Fixed bug in some items of reports in metaconsole	2019-11-11 17:58:00 +01:00
fbsanchez	1637b09b1e	Merge branch 'ent-4774-welcome-to-pandorafms' into ent-EDF	2019-11-11 15:23:35 +01:00
fbsanchez	946ef2fae4	icon review tick badge	2019-11-11 15:23:23 +01:00
fbsanchez	53954ec853	Merge branch 'ent-4774-welcome-to-pandorafms' into ent-EDF	2019-11-11 14:26:23 +01:00
fbsanchez	65f5223698	validation alerts	2019-11-11 14:26:04 +01:00
fbsanchez	0c5af7ea24	minor fixes	2019-11-11 13:46:42 +01:00
fbsanchez	0b610cd8ba	Merge branch 'ent-4774-welcome-to-pandorafms' into ent-EDF	2019-11-11 13:39:08 +01:00
fbsanchez	430af38fa6	minor fixes in flow control	2019-11-11 13:38:27 +01:00
Luis	f57f87b50b	Ent 4834 pandora custom logo text on conf	2019-11-11 13:33:37 +01:00
artica	c390befc2a	Auto-updated build strings.	2019-11-11 00:01:07 +01:00
artica	7e275febcd	Auto-updated build strings.	2019-11-10 00:01:07 +01:00
artica	cba38680bd	Auto-updated build strings.	2019-11-09 00:01:09 +01:00
Daniel Barbero Martin	deb2657353	Merge remote-tracking branch 'origin/ent-EDF' into ent-4610-Alertas-de-logs	2019-11-08 11:14:51 +01:00
artica	c8b39740a9	Auto-updated build strings.	2019-11-08 11:05:59 +01:00
Daniel Barbero Martin	c78e3f4184	fixed minor error	2019-11-08 08:55:58 +01:00
fbsanchez	d9d8cbfd35	Merge remote-tracking branch 'origin/ent-EDF' into ent-4772-omnishell	2019-11-07 19:43:18 +01:00
fbsanchez	cf0a06f216	Merge branch 'ent-4766-feedback-de-ayudas' into ent-EDF	2019-11-07 19:41:36 +01:00
fbsanchez	36ae77a33c	minor fix	2019-11-07 19:41:23 +01:00
fbsanchez	a8bdb68cac	Merge branch 'ent-4766-feedback-de-ayudas' into ent-EDF	2019-11-07 19:40:23 +01:00
fbsanchez	4905b18888	Fulfill help path and mail check	2019-11-07 19:39:50 +01:00
fbsanchez	9387f59979	Merge branch 'ent-4766-feedback-de-ayudas' into ent-EDF	2019-11-07 18:39:06 +01:00
fbsanchez	424aa10555	style minor changes	2019-11-07 18:38:52 +01:00
fbsanchez	c4779f6f91	Merge branch 'ent-4766-feedback-de-ayudas' into ent-EDF	2019-11-07 18:33:51 +01:00
fbsanchez	307eabc7b9	Merge remote-tracking branch 'origin/develop' into ent-EDF	2019-11-07 18:33:37 +01:00
fbsanchez	cb131c7895	Some CDE and styling in help feedback	2019-11-07 18:33:03 +01:00
fbsanchez	763ec6772c	Help feedback style improved	2019-11-07 17:26:32 +01:00
Alejandro Fraguas	adc0f24f8e	Merge branch 'ent-3178-integrar-terminal-web-en-la-consola-de-pandora-y-explorar-otras-utilidades-anyterm-replace' into 'develop' ... Ent 3178 integrar terminal web en la consola de pandora y explorar otras utilidades anyterm replace See merge request artica/pandorafms!2825	2019-11-07 15:48:12 +01:00
Tatiana Llorente	54c6f3965d	Fixed bug with doubles quotes in comments of events	2019-11-07 15:25:19 +01:00
fbsanchez	ef14de075e	Merge branch 'ent-4774-welcome-to-pandorafms' into ent-EDF	2019-11-07 14:06:07 +01:00
fbsanchez	5fe515a3ed	Fixed welcome flow	2019-11-07 14:05:42 +01:00
Daniel Rodriguez	a550f2d9d3	Merge branch 'ent-4403-8401-acanovas-ipam-creacion-de-superredes' into 'develop' ... added function to convert cidr prefixes to mask See merge request artica/pandorafms!2832	2019-11-07 11:47:24 +01:00
fbsanchez	7c68595241	Merge remote-tracking branch 'origin/ent-4774-welcome-to-pandorafms' into ent-EDF	2019-11-07 10:43:24 +01:00
fbsanchez	6e637954b8	Merge remote-tracking branch 'origin/develop' into ent-EDF	2019-11-07 10:43:15 +01:00
fbsanchez	d080f1d6a7	Welcome pack	2019-11-07 10:42:46 +01:00
Daniel Rodriguez	1006c54687	Merge branch 'ent-4928-Bug-generacion-PDF-con-set-initial-date' into 'develop' ... Ent 4928 bug generacion pdf con set initial date See merge request artica/pandorafms!2866	2019-11-07 09:48:42 +01:00
Daniel Barbero Martin	b18878148c	change load modal	2019-11-07 09:38:52 +01:00
fbsanchez	79d165b164	Merge remote-tracking branch 'origin/develop' into ent-EDF	2019-11-06 20:01:28 +01:00
Daniel Rodriguez	76d9ca9db5	Merge branch 'ent-4853-set-module-data-no-funciona-API' into 'develop' ... Ent 4853 set module data no funciona api See merge request artica/pandorafms!2841	2019-11-06 17:19:51 +01:00
Daniel Rodriguez	e81932cf0d	Merge branch 'ent-4809-Seleccion-de-tamaño-de-fuente-en-Agent-detail' into 'develop' ... Fixed visual styles ticket 4809 See merge request artica/pandorafms!2867	2019-11-06 16:23:51 +01:00
fbsanchez	98237a8d34	Merge remote-tracking branch 'origin/develop' into ent-EDF ... Conflicts: pandora_console/general/header.php	2019-11-06 15:36:53 +01:00
Daniel Rodriguez	34bfb762fd	Merge branch 'ent-4857-Bug-color-pagina-eventos' into 'develop' ... Ent 4857 bug color pagina eventos See merge request artica/pandorafms!2834	2019-11-06 15:27:48 +01:00
Alejandro Fraguas	37ffff12eb	Merge branch '4727-macros-grupos-secundarios' into 'develop' ... 4727 macros grupos secundarios See merge request artica/pandorafms!2811	2019-11-06 12:20:39 +01:00
Daniel Rodriguez	5a34ec51d2	Merge branch 'ent-4687-api-get-all-agents-recursion' into 'develop' ... Added recursion to api_get_all_agents See merge request artica/pandorafms!2753	2019-11-06 10:38:17 +01:00
Tatiana Llorente	1a34e488b6	Fixed bug in report date in pdf reports	2019-11-06 10:34:08 +01:00
manuel	a486738920	Fixed visual styles ticket 4809	2019-11-06 10:31:26 +01:00
Tatiana Llorente	05e424a24e	Merge remote-tracking branch 'origin/develop' into ent-4623-Exportar-a-CSV-los-eventos-separador-erroneo ... Conflicts: pandora_console/include/functions_ui.php	2019-11-05 17:25:56 +01:00
Tatiana Llorente	87c5d0025b	Merge remote-tracking branch 'origin/develop' into ent-4623-Exportar-a-CSV-los-eventos-separador-erroneo	2019-11-05 17:24:10 +01:00
Daniel Rodriguez	35d87400fd	Merge branch 'ent-4892-HTML-custom-report-date-vacio' into 'develop' ... Ent 4892 html custom report date vacio See merge request artica/pandorafms!2847	2019-11-05 17:19:40 +01:00
Luis	b707ebd4a4	Added docs and support urls in console. Fixed bugs	2019-11-05 17:09:29 +01:00
Daniel Rodriguez	b7d8323583	Merge branch 'ent-3687-get-agents-id-name-by-alias-api-cli' into 'develop' ... Added API and cli function get_agents_id_by_alias See merge request artica/pandorafms!2802	2019-11-05 17:08:32 +01:00
Daniel Rodriguez	0e628a365d	Merge branch 'ent-4625-Cambiar-titulo-a-archivo-CSV-de-la-vista-de-eventos' into 'develop' ... Ent 4625 cambiar titulo a archivo csv de la vista de eventos See merge request artica/pandorafms!2783	2019-11-05 16:57:23 +01:00
Daniel Rodriguez	dd86598298	Merge branch 'ent-4902-Querys-predefinidas-en-plantillas-de-informes-no-funcionan' into 'develop' ... Fixed visual bug in general report item See merge request artica/pandorafms!2854	2019-11-05 16:43:52 +01:00
marcos	b80cb976f9	review fms	2019-11-05 16:08:51 +01:00
fbsanchez	276fc82556	Merge branch 'ent-EDF' into ent-4226-mejoras-plugin-sap ... Conflicts: pandora_console/extras/mr/33.sql	2019-11-05 15:39:18 +01:00
Daniel Barbero Martin	e5f24ca884	Merge develop	2019-11-05 15:27:06 +01:00
fbsanchez	ed6dd2983f	Merge remote-tracking branch 'origin/ent-4752-Herramientas-de-diagnostico' into ent-EDF ... Conflicts: pandora_console/include/javascript/pandora.js	2019-11-05 15:21:21 +01:00
fbsanchez	58cbc3c738	Merge remote-tracking branch 'origin/develop' into ent-EDF ... Conflicts: pandora_console/extras/mr/33.sql pandora_console/pandoradb_data.sql	2019-11-05 15:17:09 +01:00
Daniel Barbero Martin	ebb7cbfe6c	Fix styles css	2019-11-05 15:12:24 +01:00
Luis Calvo	dab4676a33	Resolved merge conflict and fixed bugs	2019-11-05 13:57:13 +01:00
Daniel Rodriguez	98d36cfc6d	Merge branch 'ent-4896-General-Report-en-Plantillas-no-tiene-bien-la-hora' into 'develop' ... Ent 4896 general report en plantillas no tiene bien la hora See merge request artica/pandorafms!2855	2019-11-05 13:33:27 +01:00
fbsanchez	b1d4bfe149	Merge remote-tracking branch 'origin/develop' into ent-3178-integrar-terminal-web-en-la-consola-de-pandora-y-explorar-otras-utilidades-anyterm-replace ... Conflicts: pandora_console/pandoradb_data.sql	2019-11-05 11:16:26 +01:00
Daniel Rodriguez	a1b879d065	Merge branch 'ent-4728-Desactivar-Restart-Map-para-usuarios-sin-permisos' into 'develop' ... Ent 4728 desactivar restart map para usuarios sin permisos See merge request artica/pandorafms!2805	2019-11-04 18:45:57 +01:00
Tatiana Llorente	c83b85c225	Ent 4801 error informes pdf csv	2019-11-04 18:41:03 +01:00
Jose Gonzalez	f584ac7835	Solved issue with query	2019-11-04 17:45:56 +01:00
marcos	84bdc8fc17	add progress extend	2019-11-04 17:39:21 +01:00
Tatiana Llorente	28e2702a48	Changed condition for general reports with last value checked	2019-11-04 12:00:12 +01:00
manuel	d0c2c0d1eb	Fixed visual bug in general report item	2019-11-04 10:39:16 +01:00
fbsanchez	a249132fb5	sap discovery - config	2019-10-31 21:32:34 +01:00
fbsanchez	115c884cd4	Discovery SAP	2019-10-31 21:13:18 +01:00
fbsanchez	5a42e76650	SAP discovery task	2019-10-31 18:19:00 +01:00
fbsanchez	c72f792d43	SAP discovery task	2019-10-31 18:18:38 +01:00
Tatiana Llorente	867ab6d0bf	Fixed bug in report date	2019-10-31 09:51:38 +01:00
fbsanchez	3eb0a6bb95	minor fixes after internal meeting	2019-10-30 18:33:33 +01:00
fbsanchez	72b1fb2b16	Merge remote-tracking branch 'origin/ent-4774-welcome-to-pandorafms' into ent-EDF ... Conflicts: pandora_console/include/javascript/pandora.js modified: pandora_console/general/register.php modified: pandora_console/godmode/agentes/configurar_agente.php modified: pandora_console/godmode/agentes/module_manager_editor.php new file: pandora_console/include/ajax/welcome_window.php new file: pandora_console/include/class/WelcomeWindow.class.php modified: pandora_console/include/constants.php modified: pandora_console/include/functions_config.php modified: pandora_console/include/javascript/pandora.js new file: pandora_console/include/styles/new_installation_welcome_window.css	2019-10-30 16:56:44 +01:00
marcos	334cea472e	add method ui_progress_extend(work in progress)	2019-10-30 14:47:28 +01:00
marcos	bb7ba67dab	changes in omnishell.css	2019-10-29 17:49:04 +01:00
Daniel Barbero Martin	2bb81a839a	Merge remote-tracking branch 'origin/ent-EDF' into ent-4772-omnishell ... Conflicts: pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql pandora_console/godmode/menu.php pandora_console/pandoradb_data.sql	2019-10-29 17:15:19 +01:00
fbsanchez	c07baa614f	Merge remote-tracking branch 'origin/ent-4766-feedback-de-ayudas' into ent-EDF	2019-10-29 17:00:57 +01:00
Marcos Alconada	613e5741fb	Merge branch 'develop' into 'ent-4766-feedback-de-ayudas' ... # Conflicts: # pandora_console/include/functions_ui.php	2019-10-29 17:00:39 +01:00
marcos	487da50d31	add omnishell.css	2019-10-29 16:56:11 +01:00
fbsanchez	383967f68a	Merge branch 'ent-4769-modulos-ssh-php-perl' into ent-EDF	2019-10-29 16:56:01 +01:00
fbsanchez	0a53c0b915	Merge remote-tracking branch 'origin/ent-4752-Herramientas-de-diagnostico' into ent-EDF	2019-10-29 16:50:46 +01:00
fbsanchez	7224131126	Merge branch 'ent-3178-integrar-terminal-web-en-la-consola-de-pandora-y-explorar-otras-utilidades-anyterm-replace' into ent-EDF	2019-10-29 16:50:02 +01:00
alejandro-campos	cf0321846f	fix bug in dynamic report filter group functionality: not applying recursion correctly	2019-10-29 12:31:23 +01:00
marcos	8174b4f2eb	add help option in welcome window	2019-10-29 10:38:22 +01:00
Luis Calvo	64e80e6fee	Fixed error message	2019-10-29 10:32:59 +01:00
Luis Calvo	7f01f3d014	Merge remote-tracking branch 'origin/develop' into ent-3687-get-agents-id-name-by-alias-api-cli	2019-10-29 10:23:46 +01:00
alejandro-campos	758804e5de	fix minor bug in function groups_get_id_recursive	2019-10-29 09:18:21 +01:00
Daniel Barbero Martin	6f52095419	Merge remote-tracking branch 'origin/develop' into ent-4752-Herramientas-de-diagnostico	2019-10-29 09:14:06 +01:00
Daniel Barbero Martin	f6fd5cc21f	Add image feedback	2019-10-29 09:13:48 +01:00
artica	6f3e42e732	Auto-updated build strings.	2019-10-29 00:01:13 +01:00
marcos	57bfc364ae	add modal confirmation window	2019-10-28 18:57:10 +01:00
fbsanchez	7d5b845e1f	minor fixes	2019-10-28 18:37:01 +01:00
Tatiana Llorente	32da1d287b	Fixed API function set_module_data	2019-10-28 15:19:39 +01:00
fbsanchez	e12bcb2ac4	Merge remote-tracking branch 'origin/develop' into ent-3178-integrar-terminal-web-en-la-consola-de-pandora-y-explorar-otras-utilidades-anyterm-replace	2019-10-28 12:59:02 +01:00
fbsanchez	7accbc97c4	Merge remote-tracking branch 'origin/develop' into ent-4769-modulos-ssh-php-perl	2019-10-28 12:36:19 +01:00
artica	3094d5af05	Updated version and build strings.	2019-10-28 12:35:59 +01:00
fbsanchez	ccf971c2eb	Merge remote-tracking branch 'origin/develop' into ent-4769-modulos-ssh-php-perl	2019-10-28 12:18:19 +01:00
Alejandro Fraguas	ffb9b9052c	Merge branch 'ent-4848-phantomjs-se-queda-congelado' into 'develop' ... Ent 4848 phantomjs se queda congelado See merge request artica/pandorafms!2837	2019-10-28 11:53:47 +01:00
Daniel Rodriguez	08247c1952	Merge branch 'ent-3779-7612-Revision-de-llamadas-a-api-y-cli-agent-name-alias-name' into 'develop' ... changed pandora api functions to include possibility of using agent alias when... See merge request artica/pandorafms!2819	2019-10-28 11:25:38 +01:00
alejandro-campos	b16ef248d6	minor fixes in cli and api functions	2019-10-28 09:48:52 +01:00
Daniel Barbero Martin	89b030c484	Merge remote-tracking branch 'origin/develop' into ent-4752-Herramientas-de-diagnostico	2019-10-28 08:50:02 +01:00
artica	88a56a1f22	Auto-updated build strings.	2019-10-28 00:01:08 +01:00
artica	874ac0c630	Auto-updated build strings.	2019-10-27 00:01:07 +02:00
artica	8a03486dfc	Auto-updated build strings.	2019-10-26 00:01:09 +02:00
Daniel Barbero	f8c9b83a9c	Merge remote-tracking branch 'origin/develop' into ent-4752-Herramientas-de-diagnostico	2019-10-25 13:46:08 +02:00
Daniel Barbero	c4aea1ac59	add styles validation form of modal	2019-10-25 13:28:01 +02:00
fbsanchez	21dd69706d	web2image	2019-10-25 13:16:06 +02:00
fbsanchez	440874d436	More controls for phantom web2image	2019-10-25 12:51:33 +02:00
fbsanchez	a2e96270a7	Avoid close cron sessions while gc	2019-10-25 12:24:02 +02:00
fbsanchez	2a24e22335	Avoid close cron sessions while gc	2019-10-25 12:23:00 +02:00
Daniel Barbero	22a2b7cd0b	Add feedback phpInfo	2019-10-25 10:43:03 +02:00
artica	86fd1275be	Auto-updated build strings.	2019-10-25 00:01:11 +02:00
Daniel Barbero Martin	3dee6888d6	fix	2019-10-24 17:42:37 +02:00
Tatiana Llorente	38b3490e4e	Changed color of constant to severity minor in events	2019-10-24 17:42:27 +02:00
marcos	e725a0185b	cambios semi finales	2019-10-24 16:56:13 +02:00
alejandro-campos	ee587a3117	Merge remote-tracking branch 'origin/develop' into ent-3779-7612-Revision-de-llamadas-a-api-y-cli-agent-name-alias-name	2019-10-24 13:21:08 +02:00
alejandro-campos	a4988fe9af	modified get_events functions in functions_api	2019-10-24 13:18:26 +02:00
fbsanchez	a0c610d988	WS fixed audit origin address	2019-10-24 12:18:49 +02:00
fbsanchez	d34aa0917b	WS tick interval, WS manager able to limit connections per session	2019-10-24 10:35:16 +02:00
artica	38dfa5cf35	Auto-updated build strings.	2019-10-24 00:01:09 +02:00
fbsanchez	709f4cac81	WebSocket configuration, quickShell settings, quickShell proxied url compatibility	2019-10-23 19:56:48 +02:00
Daniel Barbero Martin	de22fb70e3	Merge remote-tracking branch 'origin/develop' into ent-4752-Herramientas-de-diagnostico	2019-10-23 19:51:49 +02:00
Daniel Barbero Martin	f06a55c6bb	continue feedback mail	2019-10-23 19:50:57 +02:00
alejandro-campos	a06f56a413	added function to convert cidr prefixes to mask	2019-10-23 17:22:18 +02:00
Alejandro Fraguas	5364ef0fa1	Merge branch 'ent-4745-8826-cofares-han-dejado-de-llegar-las-graficas-que-nos-llegaban-en-los-correos-de-alerta-por-mail' into 'develop' ... Fix and control API sessions See merge request artica/pandorafms!2830	2019-10-23 16:12:19 +02:00
Tatiana Llorente	31c36dc015	Ent 4819 no funciona llamada api get events	2019-10-23 15:53:30 +02:00
Alejandro Fraguas	8fd6f28070	Merge branch 'ent-4851-Cambio-de-color-en-la-union-de-agentes-del-GIS-map' into 'develop' ... Changed color See merge request artica/pandorafms!2831	2019-10-23 12:28:04 +02:00
Daniel Rodriguez	39b3a00276	Merge branch 'ent-4690-revision-completa-de-informes-templates-en-meta' into 'develop' ... Fixed bugs in reports See merge request artica/pandorafms!2796	2019-10-23 11:41:07 +02:00
Daniel Maya	c01a856826	Changed color	2019-10-23 11:17:16 +02:00
artica	1470241783	Auto-updated build strings.	2019-10-23 00:01:11 +02:00
fbsanchez	9edb77d288	proper logout (api)	2019-10-22 20:48:45 +02:00
fbsanchez	5b3fd5dd79	Merge remote-tracking branch 'origin/develop' into ent-3178-integrar-terminal-web-en-la-consola-de-pandora-y-explorar-otras-utilidades-anyterm-replace	2019-10-22 17:34:41 +02:00
fbsanchez	eb98f695f9	Merge branch 'ent-4745-8826-cofares-han-dejado-de-llegar-las-graficas-que-nos-llegaban-en-los-correos-de-alerta-por-mail' into ent-3178-integrar-terminal-web-en-la-consola-de-pandora-y-explorar-otras-utilidades-anyterm-replace	2019-10-22 17:34:34 +02:00
fbsanchez	ccfd944ad7	Fix and control API sessions ... Conflicts: pandora_console/include/lib/User.php modified: pandora_console/include/api.php modified: pandora_console/include/chart_generator.php new file: pandora_console/include/lib/User.php modified: pandora_console/include/load_session.php modified: pandora_console/include/web2image.js	2019-10-22 17:33:50 +02:00
marcos	b35c9dd96d	ajust changes	2019-10-22 16:42:13 +02:00
manuel	bbeb750e46	Merge branch 'develop' into ent-4690-revision-completa-de-informes-templates-en-meta ... Conflicts: pandora_console/include/functions_graph.php	2019-10-22 15:51:38 +02:00
manuel	deb217906c	Fixed bug in templates	2019-10-22 15:41:13 +02:00
Daniel Rodriguez	552d8758e8	Merge branch 'ent-4815-html-en-los-csv' into 'develop' ... Fixed bug in CSV export See merge request artica/pandorafms!2824	2019-10-22 14:22:42 +02:00
marcos	f14c4966e3	changes	2019-10-22 13:10:15 +02:00
Daniel Rodriguez	0cf3e01f74	Merge branch 'ent-1880-Umbrales-inversos-en-negativo' into 'develop' ... Ent 1880 umbrales inversos en negativo See merge request artica/pandorafms!2818	2019-10-22 12:56:21 +02:00
Alejandro Fraguas	ee0eee06f6	Merge branch 'ent-4724-estilo-vista-pandora-wux' into 'develop' ... fixed visual error See merge request artica/pandorafms!2779	2019-10-22 12:54:28 +02:00
marcos	ca49cefb0d	fixed	2019-10-22 12:19:25 +02:00
marcos	79a1a1b2a3	add wux.css	2019-10-22 10:23:53 +02:00
artica	f99616723b	Auto-updated build strings.	2019-10-22 00:01:09 +02:00
fbsanchez	47e6f4adb5	Fix and control API sessions	2019-10-21 21:09:03 +02:00
marcos	ee97ed8a5e	segunda ronda	2019-10-21 18:36:02 +02:00
Daniel Barbero	e37af1598a	continue feedback diagnostics	2019-10-21 18:11:04 +02:00
fbsanchez	6c52462c8c	Modular WebSocket engine, added ssh and telnet to quickshell extension	2019-10-21 17:36:26 +02:00
fbsanchez	bb2faca479	ma	2019-10-21 12:18:42 +02:00
manuel	312b1c7c40	Fixed bug in CSV export	2019-10-21 11:48:13 +02:00
alejandro-campos	f2dbcea183	fix indentation	2019-10-21 09:55:39 +02:00
alejandro-campos	6cf08dde1e	Merge branch 'develop' into ent-3779-7612-Revision-de-llamadas-a-api-y-cli-agent-name-alias-name	2019-10-21 09:43:43 +02:00