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

4707 Commits

Author SHA1 Message Date
Daniel Barbero Martin 0c59c89d8f Merge remote-tracking branch 'origin/develop' into new-vc-line-element 2019-09-19 09:35:52 +02:00
Alejandro Fraguas 4adf584827 Merge branch 'ent-4655-nomenclatura-licencia' into 'develop' 
Changed caption Expires

See merge request artica/pandorafms!2736
 2019-09-18 16:49:55 +02:00
Daniel Rodriguez c81cb1d222 Merge branch 'ent-3878-Report-type-summation-not-working-properly' into 'develop' 
Ent 3878 report type summation not working properly

See merge request artica/pandorafms!2599
 2019-09-18 14:41:35 +02:00
Jose Gonzalez 73a341912f Changed caption Expires 2019-09-18 13:35:11 +02:00
Daniel Rodriguez 66a97f2f66 Merge branch 'ent-4508-desajustes-y-en-bug-en-open' into 'develop' 
fixed visual error

See merge request artica/pandorafms!2669
 2019-09-17 11:36:07 +02:00
Luis Calvo 0b8ff69a36 Fixed modules first load on edit agent/module item report 2019-09-16 12:57:37 +02:00
Luis Calvo a04268b33c Merge remote-tracking branch 'origin/develop' into ent-3878-Report-type-summation-not-working-properly 2019-09-16 11:02:18 +02:00
Luis daa70f84db Merge branch 'develop' into 'ent-3314-Agents/Modules-item-error-on-report' 
# Conflicts:
#   pandora_console/godmode/reporting/reporting_builder.item_editor.php
 2019-09-16 10:09:52 +02:00
Alejandro Fraguas 3eadb07058 Merge branch 'ent-4166-No-se-añade-module_unit-personalizado' into 'develop' 
Fixed bug in custom unit #4166

See merge request artica/pandorafms!2675
 2019-09-11 16:47:40 +02:00
Daniel Rodriguez d02f3621f3 Merge branch 'ent-3813-Autocompletado-de-campo-Proxy-auth-server-al-crear-webserver-module' into 'develop' 
Removed autofill proxi in auth server

See merge request artica/pandorafms!2361
 2019-09-05 18:29:43 +02:00
marcos.alconada 9e4b5ca5c8 Merge remote-tracking branch 'origin/develop' into ent-4457-bug-visual-style-font 2019-09-05 12:03:37 +02:00
marcos.alconada c12d672109 Add visual condition for JA and CH Lenguage 2019-09-05 12:01:25 +02:00
Daniel Rodriguez 2f0a19ae6e Merge branch 'ent-4446-Bug-Creacion-filtro-SNMP' into 'develop' 
Fixed bug create snmp filter - #4446

See merge request artica/pandorafms!2638
 2019-09-03 17:07:27 +02:00
Daniel Rodriguez b3b0f082d7 Merge branch 'ent-4484-Acceso-update-manager-offline-en-open' into 'develop' 
Don't allow access to update manager offline in community edition - #4484

See merge request artica/pandorafms!2648
 2019-09-03 13:37:02 +02:00
Daniel Rodriguez 81511d1ac4 Merge branch 'ent-4422-campos-vacios-al-crear-modulos-wb' into 'develop' 
Fixed empty http_auth_user and pass

See merge request artica/pandorafms!2656
 2019-09-03 12:09:04 +02:00
Daniel Rodriguez 20cc562911 Merge branch 'ent-3895-Pete-permisos-al-intentar-borrar-un-report-sin-seleccionar-ninguno-en-los-checkboxs' into 'develop' 
Fixed bug in report deletions

See merge request artica/pandorafms!2362
 2019-09-02 13:18:20 +02:00
Daniel Rodriguez c47b24d84c Merge branch 'ent-4278-Bug-ACL-al-cargar-o-gestionar-filtros-de-eventos' into 'develop' 
Fixed bug permissions on filter events- 4278

See merge request artica/pandorafms!2671
 2019-08-30 16:07:45 +02:00
Daniel Rodriguez aa383e3f56 Merge branch 'ent-4513-bugs-en-password-policy' into 'develop' 
fixed visual error

See merge request artica/pandorafms!2678
 2019-08-30 14:35:57 +02:00
Daniel Rodriguez ab5ad9a459 Merge branch 'ent-4519-iconos-no-alineados-en-reporting-builder' into 'develop' 
fixed error

See merge request artica/pandorafms!2665
 2019-08-30 14:12:42 +02:00
Daniel Rodriguez 85b7ee034f Merge branch 'ent-4524-Campo-Command-en-respuestas-de-eventos' into 'develop' 
Changed input for textarea in command field - #4524

See merge request artica/pandorafms!2676
 2019-08-30 14:12:21 +02:00
Daniel Rodriguez f292780aa2 Merge branch 'ent-4377-Fallo-al-listar-los-items-de-tipo-text-en-los-reports-de-metaconsola' into 'develop' 
Added item type text to list of items- #4377

See merge request artica/pandorafms!2652
 2019-08-30 14:11:18 +02:00
Daniel Rodriguez cbfb8b1e89 Merge branch 'ent-4389-Error-al-mostrar-el-nombre-de-un-agente-en-la-edicion-de-un-item-de-un-report' into 'develop' 
Show alias instead of name - #4389

See merge request artica/pandorafms!2651
 2019-08-30 14:10:52 +02:00
marcos.alconada d650ff6959 fixed error 2019-08-30 11:28:24 +02:00
manuel 94e377c3c3 Merge branch 'develop' into ent-3813-Autocompletado-de-campo-Proxy-auth-server-al-crear-webserver-module 
Conflicts:
	pandora_console/godmode/agentes/configurar_agente.php
 2019-08-30 09:46:27 +02:00
manuel ce4f4f003d Merge branch 'develop' into ent-3895-Pete-permisos-al-intentar-borrar-un-report-sin-seleccionar-ninguno-en-los-checkboxs 
Conflicts:
	pandora_console/godmode/reporting/reporting_builder.php
 2019-08-30 09:30:11 +02:00
Tatiana Llorente d38f1f8aec Fixed bug in unit in massive operations - #4166 2019-08-27 12:21:00 +02:00
Luis Calvo 2dc084da8a Merge remote-tracking branch 'origin/develop' into ent-4132-custom-fields-url 2019-08-27 09:11:45 +02:00
marcos.alconada efd6a72bb8 Merge remote-tracking branch 'origin/develop' into ent-4513-bugs-en-password-policy 2019-08-26 08:09:14 +02:00
marcos.alconada 8d8e08d37b fixed visual error 2019-08-22 15:25:35 +02:00
Tatiana Llorente e8a873de7c Changed input for textarea in command field - #4524 2019-08-22 11:22:40 +02:00
Alejandro Fraguas 1e5b6a8416 Merge branch 'ent-4507-bug-visual-en-version-open' into 'develop' 
fixed visual error in Open

See merge request artica/pandorafms!2670
 2019-08-22 08:43:44 +02:00
Tatiana Llorente b444be87b4 Fixed bug in custom unit #4166 2019-08-21 14:46:58 +02:00
Tatiana Llorente d515e510f3 Fixed bug in custom unit #4166 2019-08-21 13:38:53 +02:00
Luis Calvo a8c351d177 Custom fields type hint BBCode updated 2019-08-21 09:55:53 +02:00
marcos.alconada ff44666e41 fixed visual error2 2019-08-21 09:49:17 +02:00
Daniel Barbero Martin ee1eed93b4 Merge remote-tracking branch 'origin/develop' into new-vc-line-element 2019-08-21 07:58:08 +02:00
Tatiana Llorente 32a3776260 Fixed bug permissions on filter events- 4278 2019-08-20 13:46:13 +02:00
Tatiana Llorente 38547052fb Fixed bug permissions on filter events- 4278 2019-08-20 13:42:04 +02:00
marcos.alconada a77a72cea5 fixed visual error on Open 2019-08-20 13:07:47 +02:00
marcos.alconada d46e013567 fixed visual error! 
ç2
 2019-08-19 14:29:04 +02:00
marcos.alconada 44eb8dd3d1 fixed visual error 2019-08-19 12:31:47 +02:00
marcos.alconada e83f001948 fixed error 2019-08-16 13:47:06 +02:00
Tatiana Llorente 747e06c8b0 Added margin - #4300 2019-08-12 12:54:06 +02:00
Luis Calvo db349a4783 Fixed empty http_auth_user and pass 2019-08-12 12:26:00 +02:00
Tatiana Llorente b893d55a49 Added item type text to list of items- #4377 2019-08-09 12:09:49 +02:00
Tatiana Llorente 8bfde74a06 Show alias instead of name - #4389 2019-08-09 11:06:17 +02:00
Tatiana Llorente 77f57ae87f Don't allow access to update manager offline in community edition - #4484 2019-08-08 09:23:23 +02:00
Tatiana Llorente c32c15ed94 Fixed bug create snmp filter - #4446 2019-08-07 09:35:08 +02:00
marcos.alconada 9cfa8be1e9 font size for jap and chinese adjusted agents 2019-08-06 14:35:15 +02:00
fbsanchez 6ac21acd39 wip agent deployment scan 2019-07-25 18:35:51 +02:00