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

7858 Commits

Author SHA1 Message Date
Jonathan b83c8c6da6 #10622 fix bug 2023-08-29 14:08:06 +02:00
Jonathan 4ca9b6d8d2 Merge branch 'develop' into ent-10639-unificacion-de-controles-de-fecha 2023-08-29 12:29:41 +02:00
Daniel Cebrian 77c7694082 Merge branch 'develop' into ent-11807-security-hardening-console-informes 2023-08-29 10:30:05 +02:00
Pablo Aragon ba964dfb16 11817-Remove Network maps from autorefresh user list 2023-08-29 08:52:50 +02:00
Daniel Cebrian aa39c4295e #11807 fixed bugs and added new report evolution hardening 2023-08-28 15:43:59 +02:00
Jorge Rincon 797b24af86 #10065 Added switch to filter create/edit modal. 2023-08-28 13:54:35 +02:00
Calvo 32d67361b4 Fix planned downtime string 2023-08-28 10:43:06 +02:00
daniel ecfa71b43c ITSM pandora_enterprise#11471 2023-08-25 14:15:32 +02:00
miguel angel rasteu 73773e6ff9 #11781 clean custom_id 2023-08-25 13:42:41 +02:00
Jonathan e986ac27d6 #10622 add action full name 2023-08-24 13:14:31 +02:00
daniel a7baab0aba Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-08-24 12:07:32 +02:00
Matias Didier 9e747e9952 Merge branch 'ent-11873-paradas-planificadas-de-modulos-ponen-en-modo-quiet-agente-en-vez-de-modulos' into 'develop' 
Ent 11873 paradas planificadas de modulos ponen en modo quiet agente en vez de modulos

See merge request artica/pandorafms!6345
 2023-08-24 08:43:28 +00:00
Jonathan d9e897568a Merge branch 'develop' into ent-10639-unificacion-de-controles-de-fecha 2023-08-24 10:06:19 +02:00
Jonathan ab50a519ea #10639 version 2 datepicker 2023-08-24 09:36:15 +02:00
Daniel Cebrian ae288e3dd4 #11807 added new report scoring 2023-08-24 09:24:31 +02:00
daniel dca15b5637 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-08-23 18:54:01 +02:00
daniel 512d5331d3 ITSM pandora_enterprise#11471 2023-08-23 18:52:06 +02:00
Rafael Ameijeiras 1fa70b3afc Merge branch 'ent-11852-advertencia-al-usar-intervalos-largos' into 'develop' 
Ent 11852 advertencia al usar intervalos largos

See merge request artica/pandorafms!6346
 2023-08-23 05:56:19 +00:00
Rafael Ameijeiras 1bca8b0006 Merge branch 'ent-11819-cambios-en-wizard-de-las-consolas-visuales' into 'develop' 
Ent 11819 cambios en wizard de las consolas visuales

See merge request artica/pandorafms!6338
 2023-08-23 05:54:46 +00:00
Daniel Cebrian 61839db7ff #11807 new report list of checks agent 2023-08-22 16:28:01 +02:00
Daniel Cebrian dd453507d2 #11807 new report top n failed by checks 2023-08-22 09:53:35 +02:00
daniel 5a61f074d7 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-08-22 09:22:11 +02:00
Jonathan 631a247f19 #10622 fix style policy alerts external 2023-08-21 14:50:51 +02:00
miguel angel rasteu 19fb83cd92 #11051 Fix css conflict 2023-08-21 13:16:53 +02:00
Jonathan 563323d0be #11852 warning time lapse more than 30 days 2023-08-21 13:05:39 +02:00
Jorge Rincon 35a7c409bf #11873 Fixed Scheduled Downtime quiet mode for modules 2023-08-21 13:03:44 +02:00
Rafael Ameijeiras b91798947e Merge branch 'ent-10603-personalizacion-weekly-mail-report' into 'develop' 
Ent 10603 personalizacion weekly mail report

See merge request artica/pandorafms!6263
 2023-08-21 10:22:10 +00:00
miguel angel rasteu ebd98b479d #11051 Fix conflict css 2023-08-21 09:01:05 +02:00
miguel angel rasteu 970cc997cc #11051 Fix conflict 2023-08-21 08:25:53 +02:00
daniel a63824d802 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 
Conflicts:
	pandora_console/extras/mr/66.sql
	pandora_console/godmode/users/user_management.php
 2023-08-21 08:08:34 +02:00
Daniel Cebrian 0696ca60da Merge branch 'develop' into ent-11807-security-hardening-console-informes 2023-08-18 14:48:47 +02:00
Daniel Cebrian abb173c1a7 #11807 new report top checks more frequent 2023-08-18 10:27:55 +02:00
Jorge Rincon 3b50481c28 Merge branch develop into ent-11543-pantalla-de-login-en-modo-blanco 2023-08-18 09:49:27 +02:00
Jorge Rincon 3e4178c490 Merge branch develop into ent-10065-post-filtros-de-eventos-privados 2023-08-18 09:19:57 +02:00
Rafael Ameijeiras 43b9972aef Merge branch 'ent-11871-error-sql-en-discovery-task-list-con-usuario-estandar-y-perfil-operator-read' into 'develop' 
Ent 11871 error sql en discovery task list con usuario estandar y perfil operator read

See merge request artica/pandorafms!6340
 2023-08-18 06:49:48 +00:00
Rafael Ameijeiras e28c7db126 Merge branch 'ent-11805-error-en-custom-reports-report-tasks-1-sin-reports' into 'develop' 
Ent 11805 error en custom reports report tasks 1 sin reports

See merge request artica/pandorafms!6310
 2023-08-18 06:42:26 +00:00
Rafael Ameijeiras 640c417a35 Merge branch 'ent-11375-user-bulk-operations-al-intentar-anadir-un-perfil-que-el-usuario-ya-tiene-el-aviso-de-error' into 'develop' 
Ent 11375 user bulk operations al intentar anadir un perfil que el usuario ya tiene el aviso de error

See merge request artica/pandorafms!6160
 2023-08-18 06:37:31 +00:00
Rafael Ameijeiras 46e5d4edcd Merge branch 'ent-11022-mejora-en-visualizacion-de-licencia' into 'develop' 
Ent 11022 mejora en visualizacion de licencia

See merge request artica/pandorafms!6204
 2023-08-18 06:35:41 +00:00
Daniel Rodriguez 2e4c542f28 Merge branch 'ent-11636-SNMP-v2-hace-que-wizard-no-funcione' into 'develop' 
Ent 11636 snmp v2 hace que wizard no funcione

See merge request artica/pandorafms!6303
 2023-08-18 06:29:45 +00:00
daniel 1fecd7d289 ITSM pandora_enterprise#11471 2023-08-17 14:56:55 +02:00
Daniel Cebrian 9327d50306 Merge branch 'develop' into ent-11807-security-hardening-console-informes 2023-08-17 08:26:58 +02:00
daniel 8bc65474f0 ITSM pandora_enterprise#11471 2023-08-16 16:52:57 +02:00
Jorge Rincon c7809b429f #11871 Fixed SQL query 2023-08-16 13:46:19 +02:00
Jonathan 53bf10acc0 #11819 wizard visual console update 2023-08-14 14:54:15 +02:00
daniel 98a5355c94 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-08-14 13:33:35 +02:00
Jorge Rincon f275cde745 #11843 Warning added message in cloud view 2023-08-14 11:50:06 +02:00
Jorge Rincon 3f0f6f8c44 Merge branch develop into ent-11843-advertencia-de-deprecado-de-discovery-y-marcar-las-tarea-antiguas-como-legacy. conflict is resolved 2023-08-14 11:25:11 +02:00
daniel 64c7f56235 ITSM pandora_enterprise#11471 2023-08-14 10:59:56 +02:00
daniel 133eef456a Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-08-14 08:14:34 +02:00
Jonathan de0fdd58af #10622 fix string policie to policies 2023-08-14 08:00:24 +02:00
daniel f0d78a44d1 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 
Conflicts:
	pandora_console/extras/delete_files/delete_files.txt
 2023-08-11 14:32:54 +02:00
daniel dbf98689c2 ITSM pandora_enterprise#11471 2023-08-11 14:30:18 +02:00
Daniel Cebrian 4c3432cf40 Merge branch 'develop' into ent-11807-security-hardening-console-informes 2023-08-11 11:09:49 +02:00
Rafael Ameijeiras 320c407637 Merge branch 'ent-10424-fix-http-auth-login-password-problem-2' into 'develop' 
Ent 10424 fix http auth login password problem 2

See merge request artica/pandorafms!6329
 2023-08-11 08:22:22 +00:00
Jonathan df91ea25b5 #10622 massive policies alerts and external 2023-08-11 09:18:50 +02:00
Rafael Ameijeiras 0e317edf70 Merge branch 'ent-11851-fallo-en-el-editor-de-intervalos-del-setup' into 'develop' 
Ent 11851 fallo en el editor de intervalos del setup

See merge request artica/pandorafms!6324
 2023-08-11 06:32:24 +00:00
Daniel Maya f90cbd87a0 #10424 Fixed auth login and password 2023-08-10 13:06:00 +02:00
Daniel Cebrian 85de06fbec #11807 new report vulnerability by category 2023-08-10 11:36:50 +02:00
Daniel Cebrian f871f4e4d0 Merge branch 'ent-11326-security-hardening-console' into ent-11807-security-hardening-console-informes 2023-08-10 08:19:03 +02:00
Jorge Rincon 6cd5fc491b #11843 adjusted type for extensions 2023-08-09 15:26:30 +02:00
Jorge Rincon ed9b70725d #11843 Added word legacy in the discovery. It is added only for version 1.0 of discovery. 2023-08-09 14:40:56 +02:00
Jorge Rincon 5a440f1078 #11851 fixed setup interval editor 2023-08-09 09:47:09 +02:00
Daniel Cebrian 0a23448259 Merge branch 'develop' into ent-11807-security-hardening-console-informes 2023-08-09 09:29:19 +02:00
daniel 7f82273dc4 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 
Conflicts:
	pandora_console/extras/mr/65.sql
 2023-08-09 08:59:01 +02:00
Daniel Cebrian a72309ffa9 Merge branch 'develop' into ent-11682-no-se-configuran-las-listas-de-dias-especiales 2023-08-08 17:35:34 +02:00
Daniel Cebrian c45b9fb541 Merge branch 'develop' into ent-11682-no-se-configuran-las-listas-de-dias-especiales 2023-08-08 17:30:16 +02:00
Jorge Rincon f4b555162b #11843 First part of discovery deprecate warning change 2023-08-08 15:02:31 +02:00
Jorge Rincon 3429e0d190 #10065 Added the option to create-edit a private event filter. 2023-08-07 14:43:50 +02:00
Jonathan 70460ac77b #11835 fix temporary 503 error on update items 2023-08-07 13:12:12 +02:00
Daniel Cebrian bc66f71e14 #11807 added report vul_by_cat 2023-08-07 12:42:05 +02:00
Rafael Ameijeiras d84f69d922 Merge branch 'ent-11651-menu-lateral-se-despista-al-solicitar-detalle-de-alertas' into 'develop' 
Ent 11651 menu lateral se despista al solicitar detalle de alertas

See merge request artica/pandorafms!6268
 2023-08-07 07:28:55 +00:00
Jonathan 49f2dc35f8 #fix agent manager 2023-08-04 12:23:09 +02:00
Jonathan 47155513cc #11710 fix error redirect url and pagination 2023-08-04 10:17:59 +02:00
Jonathan 10dd156b16 #11710 redirect meta message 2023-08-04 09:29:47 +02:00
Jonathan 9dabecffce Merge branch 'develop' into ent-11710-fallo-en-la-paginacion-de-el-apartado-de-alert-commands-en-nodos-con-metaconsola 2023-08-04 09:27:24 +02:00
Rafael Ameijeiras 019efcb124 Merge branch 'ent-11668-noticias-en-consola-tienen-fondo-blanco-en-tema-oscuro' into 'develop' 
Ent 11668 noticias en consola tienen fondo blanco en tema oscuro

See merge request artica/pandorafms!6182
 2023-08-04 06:45:42 +00:00
Rafael Ameijeiras 2cfa209147 Merge branch 'ent-10177-consola-web-no-muestra-cual-servidor-pfms-se-esta-editando' into 'develop' 
Ent 10177 consola web no muestra cual servidor pfms se esta editando

See merge request artica/pandorafms!6304
 2023-08-04 06:43:07 +00:00
Jonathan 6c4143db10 #11710 change message "go to metaconsole" 2023-08-04 08:40:46 +02:00
Rafael Ameijeiras b2821c0db3 Merge branch 'ent-11713-bugs-de-visualizacion-de-los-botones-de-accion-en-metaconsola-y-consola' into 'develop' 
Ent 11713 bugs de visualizacion de los botones de accion en metaconsola y consola

See merge request artica/pandorafms!6249
 2023-08-04 06:34:35 +00:00
Rafael Ameijeiras 0b680568b5 Merge branch 'ent-11739-compatibilidad-php-8-2-second' into 'develop' 
Ent 11739 compatibilidad php 8 2 second

See merge request artica/pandorafms!6300
 2023-08-04 06:32:37 +00:00
miguel angel rasteu 1009404bfd Merge branch 'develop' into ent-11668-noticias-en-consola-tienen-fondo-blanco-en-tema-oscuro 2023-08-03 13:42:49 +02:00
Jonathan 1807c1f84c #11805 hide "-1" on message 2023-08-03 13:00:33 +02:00
Jonathan 52038585f2 #11805 fix error for open 2023-08-03 12:57:31 +02:00
Daniel Maya ddcfa02e6f #11739 Fixed date_format 2 2023-08-03 12:51:50 +02:00
miguel angel rasteu 135c6835bd #11713 fix title buttons 2023-08-03 12:51:09 +02:00
miguel angel rasteu 1dc24cdfb4 #11668 Fix black theme 2023-08-03 12:22:20 +02:00
Rafael Ameijeiras 8f04fbec4d Merge branch 'ent-11645-mensaje-de-error-en-sla-items-erroneo' into 'develop' 
Ent 11645 mensaje de error en sla items erroneo

See merge request artica/pandorafms!6179
 2023-08-03 07:04:39 +00:00
Rafael Ameijeiras fec85ce8e7 Merge branch 'ent-11749-15964-conteo-de-agentes-no-aparece-en-v772' into 'develop' 
Ent 11749 15964 conteo de agentes no aparece en v772

See merge request artica/pandorafms!6266
 2023-08-03 07:04:11 +00:00
miguel angel rasteu ef07bea496 #10177 Fix underscore 2023-08-03 07:59:13 +02:00
miguel angel rasteu 3f85562f21 #10177 Fix server name 2023-08-02 13:42:11 +02:00
Rafael Ameijeiras f692dd4c7d Merge branch 'ent-11693-15876-inverse-interval-no-se-activa-para-modulos-web-server-de-tipo-string' into 'develop' 
Ent 11693 15876 inverse interval no se activa para modulos web server de tipo string

See merge request artica/pandorafms!6218
 2023-08-02 10:43:12 +00:00
Rafael Ameijeiras e6eee88a63 Merge branch 'ent-11377-users-bulk-operations-usuarios-con-perfil-x-anadido-no-aparecen-al-intentar-borrar-perfil' into 'develop' 
Ent 11377 users bulk operations usuarios con perfil x anadido no aparecen al intentar borrar perfil

See merge request artica/pandorafms!6010
 2023-08-02 10:42:36 +00:00
alejandro.campos@artica.es 8074448bfd remove snmp version 2 2023-08-02 11:07:08 +02:00
Rafael Ameijeiras d96977b883 Merge branch 'ent-10562-Nueva-vista-de-detalle-de-alertas-encoladas' into 'develop' 
Ent 10562 nueva vista de detalle de alertas encoladas

See merge request artica/pandorafms!6273
 2023-08-02 08:26:50 +00:00
Jonathan 7e8b26b73a Merge branch 'develop' into ent-11693-15876-inverse-interval-no-se-activa-para-modulos-web-server-de-tipo-string 2023-08-02 09:29:42 +02:00
Jonathan f063c5182e #11693 fix warning/critical inverse for serverdata 2023-08-02 09:26:14 +02:00
miguel angel rasteu 57df761622 #11377 Fix sql query 2023-08-02 09:11:55 +02:00
Daniel Maya ae22b99835 Merge branch 'develop' into ent-11739-compatibilidad-php-8-2-second 2023-08-02 09:10:04 +02:00
alejandro.campos@artica.es 700bb53df4 implemented pending alerts list for event server 2023-08-01 14:37:16 +02:00
Rafael Ameijeiras 965184c688 Merge branch 'ent-11629-neflow-filter-no-admite-grupo-all' into 'develop' 
Ent 11629 neflow filter no admite grupo all

See merge request artica/pandorafms!6151
 2023-08-01 12:33:07 +00:00
Daniel Maya 0d321f5311 #11739 Fixed deprecated functions 3 2023-08-01 11:19:04 +02:00
Jonathan 84df4e1195 #11571 fix for firefox margin api token span 2023-08-01 11:11:24 +02:00
Jonathan 629f43c8f5 Merge branch 'develop' into ent-11571-contact-details 2023-08-01 10:27:40 +02:00
Rafael Ameijeiras 9f36729d30 Merge branch 'ent-11771-15990-configuracion-de-modulos-de-plugin-en-politicas-en-metaconsola-se-muestran-vacias' into 'develop' 
Ent 11771 15990 configuracion de modulos de plugin en politicas en metaconsola se muestran vacias

See merge request artica/pandorafms!6291
 2023-08-01 07:28:27 +00:00
Jorge Rincon e7c2340e72 #11771 Fixed plugin field operation in module creation/edition 2023-07-31 15:30:39 +02:00
Rafael Ameijeiras 0c4331f9d4 Merge branch 'ent-11351-15668-snmp-alerts-crea-alerta-sin-tener-ningun-dato-puesto-en-formulario' into 'develop' 
Ent 11351 15668 snmp alerts crea alerta sin tener ningun dato puesto en formulario

See merge request artica/pandorafms!5988
 2023-07-31 11:08:29 +00:00
Daniel Maya 8bbaa11ce3 resolved conflict 2023-07-31 09:44:46 +02:00
miguel angel rasteu 9781809b22 #11713 Fix title 2023-07-31 09:27:50 +02:00
miguel angel rasteu 95e17b46bf Merge branch 'develop' into ent-11713-bugs-de-visualizacion-de-los-botones-de-accion-en-metaconsola-y-consola 2023-07-31 09:03:03 +02:00
Rafael Ameijeiras 3a9404ad12 Merge branch 'ent-11653-cascade-protection-modules-solamente-se-debe-permitir-habilitar-si-se-tiene-un-agente-padre' into 'develop' 
Ent 11653 cascade protection modules solamente se debe permitir habilitar si se tiene un agente padre

See merge request artica/pandorafms!6262
 2023-07-31 06:57:32 +00:00
Jorge Rincon 89f604a602 #11771 Fixed plugin type fields 2023-07-28 14:03:24 +02:00
Daniel Cebrian 022ccc6ace https://brutus.artica.es:8081/artica/pandora_enterprise/-/issues/11807 2023-07-28 13:54:51 +02:00
Daniel Cebrian a0fdb2a791 #11326 new report vulnerabilities 2023-07-28 12:11:36 +02:00
Daniel Rodriguez 42a5fc0716 Merge branch 'ent-9301-anadir-token-de-mantenimiento-para-que-el-pandora_db-elimine-agentes-deshabilitados-manualmente' into 'develop' 
Ent-9301-anadir-token-de-mantenimiento-para-que-el-pandora_db-elimine-agentes-deshabilitados

See merge request artica/pandorafms!6051
 2023-07-27 13:08:05 +00:00
alejandro.campos@artica.es 6114787764 Merge remote-tracking branch 'origin/develop' into ent-11387-post-mantener-conteo-y-comentarios-de-in-process-extra-id 2023-07-27 13:32:26 +02:00
Daniel Cebrian d44df2ea6b #11326 added top n agents with worst score 2023-07-27 13:21:57 +02:00
Daniel Rodriguez 84f61c9022 Merge branch 'ent-10265-eliminar-gestion-de-mapas-via-ntop-antigua-funcionalidad-deprecada' into 'develop' 
Ent-10265-eliminar-gestion-de-mapas-via-ntop-antigua-funcionalidad-deprecada

See merge request artica/pandorafms!6028
 2023-07-27 10:27:55 +00:00
Rafael Ameijeiras 9ce383d2ec Merge branch 'ent-11739-compatibilidad-php-8-2' into 'develop' 
Ent 11739 compatibilidad php 8 2

See merge request artica/pandorafms!6286
 2023-07-27 09:17:24 +00:00
Daniel Cebrian 2c9f7e026e Merge branch 'develop' into ent-9771-discovery-2-0-sistema-de-extensiones-disco-para-el-discovery 2023-07-26 15:58:26 +02:00
Daniel Maya bee65bc575 #11739 Fixed deprecated functions 2023-07-26 14:18:20 +02:00
Daniel Rodriguez c2d7c10442 Merge branch 'ent-11606-Quitar-consolas-visuales-legacy' into 'develop' 
remove legacy visual console

See merge request artica/pandorafms!6140
 2023-07-26 11:09:44 +00:00
Rafael Ameijeiras d046e82208 Merge branch 'ent-11644-desaparece-selector-en-bulk-operations-en-nodo-centralizado' into 'develop' 
Ent 11644 desaparece selector en bulk operations en nodo centralizado

See merge request artica/pandorafms!6168
 2023-07-25 11:04:38 +00:00
Rafael Ameijeiras b4742f9e46 Merge branch 'ent-11698-proteccion-en-cascada-de-modulos-no-se-puede-configurar' into 'develop' 
Ent 11698 proteccion en cascada de modulos no se puede configurar

See merge request artica/pandorafms!6216
 2023-07-25 10:34:53 +00:00
Daniel Rodriguez 4b6be6596e Merge branch 'ent-10640-meter-programador-de-informes-en-la-vista-de-edicion-de-un-informe-en-una-nueva-solapa' into 'develop' 
Ent 10640 meter programador de informes en la vista de edicion de un informe en una nueva solapa

See merge request artica/pandorafms!5858
 2023-07-25 10:02:12 +00:00
Rafael Ameijeiras 391447c307 Merge branch 'ent-11708-error-al-visualizar-el-boton-de-delete-en-metaconsola-en-category-management' into 'develop' 
Ent 11708 error al visualizar el boton de delete en metaconsola en category management

See merge request artica/pandorafms!6231
 2023-07-25 09:05:16 +00:00
Rafael Ameijeiras 85a3e32c27 Merge branch 'ent-11421-Config-remota-del-servidor-no-accesible-si-no-hay-dataserver' into 'develop' 
show server conf remote edition in at least one server element

See merge request artica/pandorafms!6197
 2023-07-25 09:03:51 +00:00
Rafael Ameijeiras 7f2918990c Merge branch 'ent-11360-intervalo-en-1-hora-por-defecto-en-item-de-informe-module-histogram-graph' into 'develop' 
Ent 11360 intervalo en 1 hora por defecto en item de informe module histogram graph

See merge request artica/pandorafms!6166
 2023-07-25 07:53:48 +00:00
Rafael Ameijeiras 458226e24d Merge branch 'ent-11754-15970-error-de-paginacion-de-custom_graphs' into 'develop' 
Ent 11754 15970 error de paginacion de custom graphs

See merge request artica/pandorafms!6267
 2023-07-25 07:52:11 +00:00
alejandro.campos@artica.es 31ec1b8209 Merge remote-tracking branch 'origin/develop' into ent-11421-Config-remota-del-servidor-no-accesible-si-no-hay-dataserver 2023-07-24 13:49:28 +02:00
Rafael Ameijeiras db62d257df Merge branch 'ent-11716-text-area-plugin-parameters-se-rompe-si-no-anadimos-espacios' into 'develop' 
Ent 11716 text area plugin parameters se rompe si no anadimos espacios

See merge request artica/pandorafms!6244
 2023-07-24 10:52:56 +00:00
Pablo Aragon ccf124103d 11135-Move js code from ui_print_datatable. Resolve conflict 2023-07-24 10:46:19 +02:00
Pablo Aragon 2a89a494cc 10640-Report task. Resolve conflict 2023-07-24 10:06:43 +02:00
Pablo Aragon 8389169e16 Merge branch 'develop' into ent-10640-meter-programador-de-informes-en-la-vista-de-edicion-de-un-informe-en-una-nueva-solapa 2023-07-24 08:40:33 +02:00
daniel 1bf7f1e36e ITSM pandora_enterprise#11471 2023-07-21 14:23:42 +02:00
alejandro.campos@artica.es 7b9170312c implemented pending alerts list for event server 2023-07-21 11:50:53 +02:00
Daniel Rodriguez 4148074996 Merge branch 'ent-11012-Flag-Experimental-para-la-consola' into 'develop' 
added setup token

See merge request artica/pandorafms!6133
 2023-07-21 07:23:33 +00:00
miguel angel rasteu 88ba679875 #11651 Fix console.log 2023-07-20 12:52:36 +02:00
miguel angel rasteu a4442ce31b #11651 Fix menu 2023-07-20 10:42:22 +02:00
miguel angel rasteu 9978bbe645 #11754 Add pagination 2023-07-20 09:42:09 +02:00
miguel angel rasteu 80b60eb86f #11749 Fix agent count 2023-07-20 08:43:51 +02:00
daniel 3e2c2990df Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-07-20 08:28:36 +02:00
Jorge Rincon ac23a4c375 #11653 Fixed operation for Agent parent field 2023-07-19 15:48:33 +02:00
miguel angel rasteu 1759dfe4b5 #10603 Custom weekly schedule 2023-07-19 12:07:47 +02:00
daniel 1f1b85561c Merge remote-tracking branch 'origin/develop' into ent-11387-post-mantener-conteo-y-comentarios-de-in-process-extra-id 2023-07-19 11:39:06 +02:00
daniel 5cf31fc77e ITSM fixed pandora_enterprise#11471 2023-07-19 11:36:03 +02:00
daniel 5707ec9e4b Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-07-18 15:13:29 +02:00
daniel 9a72d0740c ITSM fixed pandora_enterprise#11471 2023-07-18 15:13:08 +02:00
Rafael Ameijeiras 06d3664b2f Merge branch 'ent-10254-15114-anadir-timeout-y-secondary-server-a-ad' into 'develop' 
Ent 10254 [#15114]Añadir timeout y secondary server a AD

See merge request artica/pandorafms!6091
 2023-07-18 10:14:29 +00:00
Daniel Cebrian 41a03a7a49 Merge branch 'develop' into ent-9771-discovery-2-0-sistema-de-extensiones-disco-para-el-discovery 2023-07-18 09:27:14 +02:00
Rafael Ameijeiras 9ad7ea0d6f Merge branch 'ent-11420-botones-incorrectos-en-config-remota-del-servidor' into 'develop' 
Ent 11420 botones incorrectos en config remota del servidor

See merge request artica/pandorafms!6035
 2023-07-17 11:12:17 +00:00