tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
26,890 Commits 34 Branches 30 Tags 901 MiB
Commit Graph

26890 Commits

Author SHA1 Message Date
Daniel Barbero Martin a80b6664d4 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-04-09 08:04:03 +02:00
artica 70c6e7196f Auto-updated build strings. 2021-04-09 01:00:40 +02:00
Daniel Barbero Martin 2a6dffd0f8 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-04-08 17:32:32 +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
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
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
Daniel Barbero Martin fcf449439b WIP command center 2021-04-07 12:43:04 +02:00
Ramon Novoa 10a7420928 Revert "Revert "Test the post-receive hook."" 
This reverts commit 5c28b5aa00.
 2021-04-07 12:40:11 +02:00
Ramon Novoa 5c28b5aa00 Revert "Test the post-receive hook." 
This reverts commit 4a808ba387.
 2021-04-07 12:37:21 +02:00
Ramon Novoa 4a808ba387 Test the post-receive hook. 2021-04-07 11:09: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 Barbero Martin 216410946e Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-04-07 10:20:46 +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
Daniel Barbero Martin e5b2a27631 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 
Conflicts:
	pandora_console/extras/mr/46.sql
 2021-04-07 08:26:38 +02:00
artica 8734494b7f Auto-updated build strings. 2021-04-07 01:00:38 +02:00
Daniel Rodriguez 7593fe9f81 Merge branch 'ent-4536-Quitar-el-autocompletado-de-los-campos-personalizados' into 'develop' 
Ent 4536 quitar el autocompletado de los campos personalizados

See merge request artica/pandorafms!3811
 2021-04-06 17:48:14 +00:00
Daniel Rodriguez 0fc3cb8714 Merge branch 'ent-6271-mejoras-de-ui-en-setup' into 'develop' 
Multicolumn setup for performance and visual settings

See merge request artica/pandorafms!3921
 2021-04-06 17:47:39 +00:00
Daniel Rodriguez aaded121a4 Merge branch 'ent-6801-No-deberian-poder-añadirse-acciones-a-alertas-generadas-por-politicas' into 'develop' 
restricted action creation on alerts created from policy

See merge request artica/pandorafms!3891
 2021-04-06 17:46:47 +00:00
Daniel Rodriguez 43cfa383ac Merge branch 'ent-5370-Pestaña-de-comandos-de-alertas-sin-paginacion' into 'develop' 
Add pagination to commands view

See merge request artica/pandorafms!3919
 2021-04-06 17:44:54 +00:00
Daniel Rodriguez 8ebaddc233 Merge branch 'ent-6941-Problemas-de-rendimiento-en-la-vista-Manage-users' into 'develop' 
Ent 6941 problemas de rendimiento en la vista manage users

See merge request artica/pandorafms!3799
 2021-04-06 17:33:38 +00:00
Daniel Rodriguez e6ad284b80 Merge branch 'ent-6999-No-aparece-la-cabecera-en-la-vista-de-clusterssi-no-hay-cluster-creado' into 'develop' 
add deafult header

See merge request artica/pandorafms!3829
 2021-04-06 17:32:31 +00:00
Daniel Rodriguez 58d5c2bc69 Merge branch 'ent-7066-bug-filtro-alert-detail' into 'develop' 
Fixed alert detail filter and tactical view counter for disabled alers/agents/modules

See merge request artica/pandorafms!3881
 2021-04-06 17:30:27 +00:00
Daniel Rodriguez 0f5f41e97f Merge branch 'ent-7011-nexcon-se-sigue-generando-el-evento-de-alerta-cesada-aunque-esten-deshabilitados-los-eventos-de-la-alera' into 'develop' 
Avoid events while ceasing alerts

See merge request artica/pandorafms!3827
 2021-04-06 17:25:21 +00:00
Daniel Rodriguez bec22b5825 Merge branch 'ent-7238-salto-de-linea-perfil-grupo-manage-users' into 'develop' 
Fixed user/profile newline on users_list

See merge request artica/pandorafms!3982
 2021-04-06 17:24:20 +00:00
Daniel Rodriguez 32527863cb Merge branch 'ent-7095-Bug-en-Tree-group-metaconsola-con-usuario-no-ALL' into 'develop' 
fixed error tree groups agent edition metaconsole

See merge request artica/pandorafms!3904
 2021-04-06 17:23:18 +00:00
Daniel Rodriguez 8b817c63c7 Merge branch 'ent-6994-cambiar-el-orden-de-los-items-de-un-template-en-iformes-no-funciona' into 'develop' 
unsort template items

See merge request artica/pandorafms!3810
 2021-04-06 17:22:33 +00:00
Daniel Rodriguez 3ae93da065 Merge branch 'ent-4475-validar-alertas-api-cli' into 'develop' 
Ent 4475 validar alertas api cli

See merge request artica/pandorafms!3820
 2021-04-06 17:21:56 +00:00
Luis 6dac9039d4 Ent 4475 validar alertas api cli 2021-04-06 17:21:56 +00:00
Daniel Rodriguez 68a8c37545 Merge branch 'ent-6808-llamada-api-deja-logueado-usuario' into 'develop' 
Fixed session close on api

See merge request artica/pandorafms!3749
 2021-04-06 17:18:53 +00:00
Daniel Rodriguez 7a0139accd Merge branch 'ent-5544-9725-llamada-api-para-ver-el-numero-de-licencias-agentes-disponibles' into 'develop' 
API get license, get license_remaining

See merge request artica/pandorafms!3814
 2021-04-06 17:18:24 +00:00
Daniel Rodriguez a70a74fb47 Merge branch 'ent-7241-ventana-de-newsletter-con-errores-visuales' into 'develop' 
fixed lost icon

See merge request artica/pandorafms!3984
 2021-04-06 17:15:41 +00:00
Marcos Alconada f2efb6a39b fixed lost icon 2021-04-06 17:15:41 +00:00
Daniel Rodriguez dc692dbf2c Merge branch 'ent-6332-aadcm-anadir-buscador-de-modulos-en-vista-de-agente-consola-movil' into 'develop' 
Added a searchbox for module list in mobile/agent

See merge request artica/pandorafms!3962
 2021-04-06 17:14:49 +00:00