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

24086 Commits

Author SHA1 Message Date
Daniel Barbero Martin 90013603a7 refactor events meta pandora_enterprise#9086 2022-06-13 17:06:09 +02:00
Daniel Barbero Martin 5680b82563 Merge remote-tracking branch 'origin/develop' into ent-9086-eliminacion-de-la-replicacion-de-eventos-duplicado 2022-06-13 08:16:40 +02:00
artica 85f31c5ab4 Auto-updated build strings. 2022-06-13 01:00:16 +02:00
artica 62bcc9e267 Auto-updated build strings. 2022-06-12 01:00:15 +02:00
artica 46897aff83 Auto-updated build strings. 2022-06-11 01:00:50 +02:00
artica 32c62e9f93 Auto-updated build strings. 2022-06-10 01:00:21 +02:00
Daniel Rodriguez 50442faf26 Merge branch 'ent-9108-No-funciona-widget-Odometro-en-version-Open' into 'develop' 
Ent 9108 no funciona widget odometro en version open

See merge request artica/pandorafms!4938
 2022-06-09 12:50:39 +00:00
Daniel Rodriguez 6a8abc035f Merge branch 'ent-9076-Texto-Update-Manager' into 'develop' 
fixed wrong encoding

See merge request artica/pandorafms!4950
 2022-06-09 07:39:31 +00:00
Daniel Rodriguez 60dad90807 Merge branch 'ent-9060-Bulk-operations-modifican-todos-modulos-incluso-con-acceso-restringido' into 'develop' 
Fix issue with bulk operations over modules with not allowed groups

See merge request artica/pandorafms!4922
 2022-06-09 07:36:20 +00:00
Daniel Rodriguez 336bc74d49 Merge branch 'ent-9021-proteccion-en-cascada-bucle-padre-hijo' into 'develop' 
Ent 9021 proteccion en cascada bucle padre hijo

See merge request artica/pandorafms!4921
 2022-06-09 07:34:40 +00:00
Daniel Rodriguez ad9a864b1c Merge branch 'ent-9116-13158-Nuevos-fallos-componentes-locales-con-politicas-con-macro' into 'develop' 
fixed macro default value not loading

See merge request artica/pandorafms!4941
 2022-06-09 07:32:18 +00:00
artica 9d28c67a1c Auto-updated build strings. 2022-06-09 01:00:21 +02:00
alejandro.campos@artica.es c48eae6da0 fixed wrong encoding 2022-06-08 18:25:32 +02:00
Daniel Barbero Martin 8dbc860f4a refactor events meta pandora_enterprise#9086 2022-06-08 17:01:15 +02:00
José González bad2438867 Update massive_edit_modules.php 2022-06-08 12:38:03 +00:00
Daniel Rodriguez a40efcfee5 Merge branch 'ent-9037-controles-pegados-en-agente-detail-view' into 'develop' 
Ent 9037 controles pegados en agente detail view

See merge request artica/pandorafms!4936
 2022-06-08 09:11:54 +00:00
Daniel Rodriguez 1eea27e1f3 Merge branch 'ent-9040-Mejoras-en-la-vista-de-agents-alerts' into 'develop' 
Ent 9040 mejoras en la vista de agents alerts

See merge request artica/pandorafms!4933
 2022-06-08 09:11:19 +00:00
Daniel Rodriguez a2c1b38a3f Merge branch 'ent-9011-Fallo-permisos-en-paradas-planificadas' into 'develop' 
fixed permissions in selectors

See merge request artica/pandorafms!4931
 2022-06-08 09:10:51 +00:00
Daniel Barbero Martin 951a1703bf Merge remote-tracking branch 'origin/develop' into ent-9086-eliminacion-de-la-replicacion-de-eventos-duplicado 
Conflicts:
	pandora_console/include/functions_reporting.php
 2022-06-08 08:15:49 +02:00
artica 8a5847a225 Auto-updated build strings. 2022-06-08 01:00:24 +02:00
Daniel Barbero Martin ee2810e680 refactor events meta pandora_enterprise#9086 2022-06-07 17:25:51 +02:00
Daniel Rodriguez fc18c1a168 Merge branch 'ent-9035-Si-no-hay-inventario,-no-deberia-mostrar-la-solapa-de-inventario' into 'develop' 
Hide inventory view if agent dont have inventory modules

See merge request artica/pandorafms!4916
 2022-06-07 11:52:37 +00:00
Daniel Rodriguez 6f5e1c3f94 Merge branch 'ent-8708-Version-mobile-visualiza-alertas-de-agentes-deshabilitados' into 'develop' 
Ent 8708 version mobile visualiza alertas de agentes deshabilitados

See merge request artica/pandorafms!4859
 2022-06-07 11:41:40 +00:00
Daniel Rodriguez bf7941ddd2 Merge branch 'ent-7757-12115-anadir-ruta-completa-en-nombre-de-servicio-en-consola-visual-dashboard' into 'develop' 
Service tree view with local scope parents

See merge request artica/pandorafms!4826
 2022-06-07 10:47:26 +00:00
Daniel Rodriguez b962afe56d Merge branch 'ent-9078-Gráfica-de-estados-de-módulos' into 'develop' 
Ent 9078 gráfica de estados de módulos

See merge request artica/pandorafms!4924
 2022-06-07 10:46:18 +00:00
alejandro.campos@artica.es 7aa40617f8 fixed macro default value not loading 2022-06-07 11:20:51 +02:00
Daniel Rodriguez c433fcf3f0 Merge branch 'ent-9038-ocultar-opciones-en-la-busqueda-de-vista-de-modulos' into 'develop' 
Ent 9038 ocultar opciones en la busqueda de vista de modulos

See merge request artica/pandorafms!4930
 2022-06-07 09:12:51 +00:00
Daniel Rodriguez 08d8da9c83 Merge branch 'ent-8999-Cambiar-comportamiento-bulk-operations-meta' into 'develop' 
Ent 8999 cambiar comportamiento bulk operations meta

See merge request artica/pandorafms!4904
 2022-06-07 09:06:47 +00:00
artica 851f1a19ce Auto-updated build strings. 2022-06-07 01:00:21 +02:00
Daniel Maya 44748a0f8b #9108 fixed modules_get_table_data 2022-06-06 16:34:16 +02:00
Daniel Rodriguez 5138756525 Merge branch 'ent-8958-13577-Error-al-quitar-un-comando-de-una-acción' into 'develop' 
Ent 8958 13577 error al quitar un comando de una acción

See merge request artica/pandorafms!4878
 2022-06-06 12:16:15 +00:00
Daniel Rodriguez 618ff10fa2 Merge branch 'ent-8153-POST-Campos-extendidos-en-informe-de-eventos' into 'develop' 
Ent 8153 post campos extendidos en informe de eventos

See merge request artica/pandorafms!4830
 2022-06-06 10:52:51 +00:00
Daniel Maya ea16aac7af #8897 conflict resolved 2022-06-06 11:18:14 +02:00
Daniel Rodriguez 416021bca6 Merge branch 'ent-8822-enlace-web-en-metaconsola-para-nuevas-sugerencias' into 'develop' 
Changed link to Suggest new feature on new installation

See merge request artica/pandorafms!4874
 2022-06-06 08:45:20 +00:00
Daniel Barbero Martin 459df79c8b Merge remote-tracking branch 'origin/develop' into ent-9086-eliminacion-de-la-replicacion-de-eventos-duplicado 2022-06-06 08:16:25 +02:00
artica 9712cf6c0f Auto-updated build strings. 2022-06-06 01:00:16 +02:00
artica 05b97a3dbc Auto-updated build strings. 2022-06-05 01:00:16 +02:00
artica 44925ef341 Auto-updated build strings. 2022-06-04 01:00:22 +02:00
edu.corral 9d7b047e72 9037 fixed agent view controls 2022-06-03 14:15:51 +02:00
Daniel Rodriguez b2acb41c10 Merge branch 'ent-8632-colocar-recursion-bien-modificar-agente' into 'develop' 
Fix recursion checkbox position

See merge request artica/pandorafms!4840
 2022-06-03 11:45:15 +00:00
Daniel Rodriguez 81e7f202c6 Merge branch 'ent-8890-Lista-de-tareas-RECON-con-muchos-targets-sale-horrible' into 'develop' 
Ent 8890 lista de tareas recon con muchos targets sale horrible

See merge request artica/pandorafms!4864
 2022-06-03 09:32:50 +00:00
Daniel Rodriguez 7f34ec585e Merge branch 'ent-8641-Estilos-rotos-vista-inicial-Manage-Database-HA' into 'develop' 
Fix styles

See merge request artica/pandorafms!4801
 2022-06-03 09:00:57 +00:00
Daniel Rodriguez 1f54d030c7 Merge branch 'ent-8928-Nuevo-widget-OS-Quick-Report' into 'develop' 
Ent 8928 nuevo widget os quick report

See merge request artica/pandorafms!4877
 2022-06-03 08:12:50 +00:00
Daniel Barbero Martin 1cd680a971 Merge remote-tracking branch 'origin/develop' into ent-9086-eliminacion-de-la-replicacion-de-eventos-duplicado 
Conflicts:
	pandora_console/operation/events/events.php
 2022-06-03 09:28:18 +02:00
Daniel Barbero Martin 8dd9523b40 refactor events meta pandora_enterprise#9086 2022-06-03 09:20:51 +02:00
artica 21399593dd Auto-updated build strings. 2022-06-03 01:00:22 +02:00
Daniel Maya 3fb0392d80 #9040 changed table styles 2022-06-02 16:47:48 +02:00
Daniel Rodriguez 7ef4f00aea Merge branch 'ent-8970-bug-en-leyenda-al-generar-grafica-sql-en-plantillas-de-informe' into 'develop' 
fixed visual error sql graph pandora_enterprise#8970

See merge request artica/pandorafms!4888
 2022-06-02 14:16:29 +00:00
Daniel Rodriguez 616c2b776a Merge branch 'ent-8710-Cuadro-eliminar-alertas-masivas-pequeño' into 'develop' 
Fix visual issue

See merge request artica/pandorafms!4844
 2022-06-02 14:00:24 +00:00
Daniel Rodriguez a7791c06fc Merge branch 'ent-8751_espacios_no_mostrados_creando_agentes_en_API' into 'develop' 
Fix x20; chars in alias when create agents with alias with spaces in API

See merge request artica/pandorafms!4804
 2022-06-02 13:55:45 +00:00