27237 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
artica	3627be1f85	Auto-updated build strings.	2021-04-11 01:00:32 +02:00
artica	ea81d04e5f	Auto-updated build strings.	2021-04-10 01:00:37 +02:00
Jose Gonzalez	62264c9d07	Added boolean casting for check acl	2021-04-09 14:05:33 +02:00
Daniel Rodriguez	bcb0832309	Merge branch 'ent-7070-archivo-raro-0-en-pandoa_console' into 'develop' ... Avoid file 0 with log in pandora_console See merge request artica/pandorafms!3863	2021-04-09 11:53:26 +00:00
Daniel Rodriguez	b1f174e687	Merge branch 'ent-7266-black-theme-mala-implementacion-de-vista-de-ticket-integracion-integria' into 'develop' ... Ent 7266 black theme mala implementacion de vista de ticket integracion integria See merge request artica/pandorafms!4009	2021-04-09 10:00:12 +00:00
Marcos Alconada	dafa88c27d	Ent 7266 black theme mala implementacion de vista de ticket integracion integria	2021-04-09 10:00:11 +00:00
Daniel Rodriguez	19a1945385	Merge branch 'ent-7264-custom-graphs-en-black-theme' into 'develop' ... set black theme custom graph colors See merge request artica/pandorafms!3999	2021-04-09 09:52:28 +00:00
Marcos Alconada	225f183e75	set black theme custom graph colors	2021-04-09 09:52:28 +00:00
Daniel Rodriguez	a203a6e80d	Merge branch 'ent-7269-black-theme.vista-ppal-agente-la-caja-de-vista-de-logs-sale-encogida' into 'develop' ... fixed size box log sources status See merge request artica/pandorafms!4006	2021-04-09 09:35:50 +00:00
Daniel Rodriguez	ae655da711	Merge branch 'ent-7270-black-theme-vista-servicios' into 'develop' ... add black theme style on visual map See merge request artica/pandorafms!4008	2021-04-09 09:34:59 +00:00
Daniel Rodriguez	040fdbae01	Merge branch 'ent-7262-fondo-de-la-grafica-de-acceso-no-es-transparente-casca-en-blactheme' into 'develop' ... set black theme on agent access rate flot See merge request artica/pandorafms!3997	2021-04-09 09:29:26 +00:00
Marcos Alconada	a1fceb2e81	set black theme on agent access rate flot	2021-04-09 09:29:26 +00:00
Daniel Rodriguez	bda9cbe3e8	Merge branch 'ent-7256-modal-de-aviso-de-perdida-de-soporte-ha-perdido-los-estilos' into 'develop' ... fixed visual error See merge request artica/pandorafms!3994	2021-04-09 09:28:25 +00:00
Daniel Rodriguez	1b9916c6e9	Merge branch 'ent-6818-bug-en-label-de-informes-y-plantillas' into 'develop' ... fixed error with label reporting views See merge request artica/pandorafms!3938	2021-04-09 09:24:44 +00:00
Daniel Rodriguez	1fb259c35f	Merge branch 'ent-7260-no-esta-funcionando-operaciones-masivas-agentes-edicion' into 'develop' ... fixed error on bulk operations edit agents See merge request artica/pandorafms!3995	2021-04-09 09:21:36 +00:00
Jose Gonzalez	f8d4039314	Fixed merges	2021-04-09 10:34:25 +02:00
artica	70c6e7196f	Auto-updated build strings.	2021-04-09 01:00:40 +02:00
Jose Gonzalez	2ef57919a1	Avoiding clickjacking	2021-04-08 11:28:01 +02:00
Daniel Rodriguez	4adb9827cb	Merge branch 'ent-7278-no-se-despliegan-agentes-en-templates-wizard-ni-en-generacion-dinamica-de-reports-desde' into 'develop' ... minor fix while empty search condition See merge request artica/pandorafms!4012	2021-04-08 07:49:16 +00:00
artica	2e27cebad2	Auto-updated build strings.	2021-04-08 01:00:37 +02:00
fbsanchez	c64f05dc17	minor fix while empty search condition	2021-04-07 20:31:24 +02:00
fbsanchez	201d3194de	Some inclusions in mobile view (MC) and minor fixes	2021-04-07 18:17:08 +02:00
fbsanchez	cf6ad584d4	Merge remote-tracking branch 'origin/develop' into ent-6782-revision-general-de-la-consola-movil	2021-04-07 17:46:43 +02:00
Daniel Rodriguez	b62dc5c0c2	Merge branch 'ent-6982-Bug-al-crear-Agent-event-report-a-traves-de-wizard' into 'develop' ... fixed visual error report wizard See merge request artica/pandorafms!3896	2021-04-07 15:10:32 +00:00
daniel	d78c276721	fixed visual error report wizard	2021-04-07 15:10:32 +00:00
Daniel Rodriguez	1f61161e6f	Merge branch 'ent-6997-bug-unidades-item-general-summation' into 'develop' ... General report exponent prefix shows with blankspace See merge request artica/pandorafms!3924	2021-04-07 13:15:38 +00:00
Daniel Rodriguez	078901924c	Merge branch 'ent-6967-mensaje-error-constante-YAML-Tiny' into 'develop' ... Changed message disposition Closes pandora_enterprise#6967 See merge request artica/pandorafms!3852	2021-04-07 13:14:38 +00:00
marcos	4395f21e4e	add black theme style on visual map	2021-04-07 13:27:24 +02:00
Jose Gonzalez	34b01fdf51	Merge	2021-04-07 13:10:52 +02:00
Jose Gonzalez	d4d3350c8c	Reverted failed change	2021-04-07 13:03:18 +02:00
Daniel Rodriguez	b89a860ba7	Merge branch 'ent-6969-bug-refresco-eventos' into 'develop' ... Fixed mixed response from event datatables See merge request artica/pandorafms!3952	2021-04-07 10:55:25 +00:00
Daniel Rodriguez	517d7378d4	Merge branch 'ent-7079-escapar-caracters-url-api' into 'develop' ... Addded param to escape API url call raw_decode See merge request artica/pandorafms!3914	2021-04-07 10:54:47 +00:00
Daniel Rodriguez	9813586f0d	Merge branch 'ent-6935-OPEN-mouse-over-confuso-items' into 'develop' ... Added more clear message Closes pandora_enterprise#6935 See merge request artica/pandorafms!3853	2021-04-07 10:54:20 +00:00
Daniel Rodriguez	ed6fa1a803	Merge branch 'ent-2685-7938-aadcm-dashboards-en-metaconsola' into 'develop' ... dashboards meta See merge request artica/pandorafms!3840	2021-04-07 10:53:31 +00:00
Daniel Rodriguez	b244cd28b2	Merge branch 'ent-6962-tags-largos-no-caben-en-configuracion-modulos' into 'develop' ... Added tips to large tags in module config See merge request artica/pandorafms!3851	2021-04-07 10:52:39 +00:00
Luis	36287188b4	Added tips to large tags in module config	2021-04-07 10:52:39 +00:00
Daniel Rodriguez	f0870e6e08	Merge branch 'ent-7028-giss-implementar-dropdown-buscador-para-custom-fields' into 'develop' ... select2 on select items See merge request artica/pandorafms!3836	2021-04-07 10:52:07 +00:00
Daniel Rodriguez	08fa353682	Merge branch 'ent-7034-button-go-back-remote-components-do-not-work' into 'develop' ... Fixed reomte components search bugs and button go back See merge request artica/pandorafms!3998	2021-04-07 10:51:35 +00:00
Luis	97879d1c71	Fixed reomte components search bugs and button go back	2021-04-07 10:51:35 +00:00
Daniel Rodriguez	2e46379014	Merge branch 'ent-6924-cambiar-label-event-text-por-event-name' into 'develop' ... Event text to Event name in alert_actions Monitoring event See merge request artica/pandorafms!3769	2021-04-07 10:50:37 +00:00
Ramon Novoa	10a7420928	Revert "Revert "Test the post-receive hook."" ... This reverts commit 5c28b5aa00d95ce4aba9ea45279edbe708a09b82.	2021-04-07 12:40:11 +02:00
Ramon Novoa	5c28b5aa00	Revert "Test the post-receive hook." ... This reverts commit 4a808ba387130362c91ca2aae80bb6e4c52f0374.	2021-04-07 12:37:21 +02:00
marcos	7a5125ea8c	fixed size box log sources status	2021-04-07 11:52:57 +02:00
Ramon Novoa	4a808ba387	Test the post-receive hook.	2021-04-07 11:09:44 +02:00
fbsanchez	6e4212129b	Merge remote-tracking branch 'origin/develop' into ent-6782-revision-general-de-la-consola-movil ... Conflicts: pandora_console/include/styles/dashboards.css pandora_console/mobile/operation/visualmap.php pandora_console/mobile/operation/visualmaps.php	2021-04-07 10:28:44 +02:00
fbsanchez	1ac6ed35cf	Merge remote-tracking branch 'origin/develop' into ent-6924-cambiar-label-event-text-por-event-name ... Conflicts: pandora_console/extras/mr/46.sql	2021-04-07 10:23:33 +02:00
Daniel Rodriguez	f083858987	Merge branch 'revert-29bf07d9' into 'develop' ... Revert "Merge branch 'ent-7040-forzar-URL-publica-meta' into 'develop'" See merge request artica/pandorafms!4005	2021-04-07 08:19:49 +00:00
fbsanchez	4920dc9621	Revert "Merge branch 'ent-7040-forzar-URL-publica-meta' into 'develop'" ... This reverts merge request !3860	2021-04-07 10:17:32 +02:00
Daniel Rodriguez	decea8ab95	Merge branch 'ent-6952-bug-group-creation-user-admin-no-all' into 'develop' ... Ent 6952 bug group creation user admin no all See merge request artica/pandorafms!3844	2021-04-07 08:11:35 +00:00
Luis	4ab7b1a135	Ent 6952 bug group creation user admin no all	2021-04-07 08:11:35 +00:00