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

1143 Commits

Author SHA1 Message Date
Daniel Cebrian 5e497db840 #11126 moved token vulnerabilities to enterprise 2023-10-25 11:48:49 +02:00
Daniel Cebrian a862a8018c #11126 added token in config agent and setup 2023-10-24 18:02:14 +02:00
miguel angel rasteu 35efc20fc7 #12177 Fix message 2023-10-13 12:58:21 +02:00
miguel angel rasteu 2062169f2f #12177 Fix upload os icon 2023-10-13 12:55:58 +02:00
miguel angel rasteu 5060398661 #11206 Fix conflict 2023-10-13 09:00:03 +02:00
Rafael Ameijeiras dda7c2a0c0 Merge branch 'ent-12205-interfaz-configuracion-ehorus-pandora-rc-a-nivel-de-usuario-ha-desaparecido' into 'develop' 
Ent 12205 interfaz configuracion ehorus pandora rc a nivel de usuario ha desaparecido

See merge request artica/pandorafms!6544
 2023-10-11 07:18:34 +00:00
miguel angel rasteu f22fd10659 #12205 Fix url 2023-10-10 13:44:57 +02:00
miguel angel rasteu 23c5836ddc #12205 Change ehorus images 2023-10-10 11:34:11 +02:00
miguel angel rasteu 133826b498 #12205 Fix ehorus conf interfaz 2023-10-10 09:57:09 +02:00
alejandro.campos@artica.es 0e0b5bba43 Merge remote-tracking branch 'origin/develop' into ent-11830-reemplazar-sistema-de-websocket-gotty-actual 2023-10-09 14:17:25 +02:00
Alejandro Campos 0f381b0db7 Merge branch 'develop' into 'ent-11114-Gestion-de-versiones-Obsolescencia-planeada' 
# Conflicts:
#   pandora_console/extras/mr/66.sql
 2023-10-03 13:11:09 +00:00
Matias Didier 9e4903e545 Merge branch 'ent-12145-16086-gis-no-carga-en-mapas' into 'develop' 
Ent 12145 16086 gis no carga en mapas

See merge request artica/pandorafms!6514
 2023-10-03 08:52:21 +00:00
alejandro.campos@artica.es 0771094e85 minor changes 2023-10-02 16:42:32 +02:00
miguel angel rasteu 3f41e4f32b #12138 delete agent access graph 2023-10-02 16:24:23 +02:00
alejandro.campos@artica.es 85598d5012 Merge remote-tracking branch 'origin/develop' into ent-11830-reemplazar-sistema-de-websocket-gotty-actual 2023-09-28 16:36:59 +02:00
Jonathan 6db13cc55a merge conflict solution 2023-09-28 13:14:49 +02:00
Jonathan a1d170cf0f #12145 remove maxlength 2023-09-28 11:47:58 +02:00
Jonathan c577fedff4 #12145 remove maxlength 2023-09-28 11:46:15 +02:00
alejandro.campos@artica.es 3f2caf9404 some gotty changes 2023-09-27 18:28:12 +02:00
miguel angel rasteu d6faec76d7 #12121 Clear html tag characters to prevent XSS attacks 2023-09-26 09:57:39 +02:00
alejandro.campos@artica.es 19a9f82fe1 gotty changes 2023-09-25 19:08:24 +02:00
Jonathan 70e3707b64 #11705 group extra id heredity event custom id 2023-09-25 12:22:10 +02:00
Jorge Rincon 01bf91f213 #11127 Added token Number of modules in queue 2023-09-22 13:13:06 +02:00
alejandro.campos@artica.es 6f8212ed40 Merge remote-tracking branch 'origin/develop' into ent-11114-Gestion-de-versiones-Obsolescencia-planeada 2023-09-20 15:46:47 +02:00
daniel 802f0bf83b Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-09-12 12:37:31 +02:00
daniel 5093d54137 ITSM pandora_enterprise#11471 2023-09-11 18:14:32 +02:00
Jorge Rincon 2c430929cb #11831 Fixed menu option literals 2023-09-11 16:53:52 +02:00
miguel angel rasteu 99f92b9bec #10676 Fix truncate text 2023-09-11 10:09:34 +02:00
daniel 3d5a5c856b ITSM pandora_enterprise#11471 2023-09-08 13:09:03 +02:00
miguel angel rasteu 4b5dcff3cc #10529 Fix token session timeout 2023-09-08 09:26:08 +02:00
alejandro.campos@artica.es 318fa38721 Merge remote-tracking branch 'origin/develop' into ent-11114-Gestion-de-versiones-Obsolescencia-planeada 2023-09-07 17:44:51 +02:00
alejandro.campos@artica.es 753851410e implemented os version management 2023-09-06 17:02:15 +02:00
alejandro.campos@artica.es f8911bcf9c implemented os version management 2023-09-06 17:00:16 +02:00
Jorge Rincon 0cd43b8315 fixed web console erratas 2023-09-06 15:45:35 +02:00
daniel fce86cb2ac Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-09-06 07:50:27 +02:00
daniel a059f18b4b ITSM pandora_enterprise#11471 2023-09-04 16:36:58 +02:00
Jorge Rincon aead8d006e #11894 Fixed links does not update the page when creating or deleting links 2023-08-29 14:11:32 +02: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 512d5331d3 ITSM pandora_enterprise#11471 2023-08-23 18:52:06 +02:00
daniel 5a61f074d7 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-08-22 09:22:11 +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
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 8bc65474f0 ITSM pandora_enterprise#11471 2023-08-16 16:52:57 +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
Jorge Rincon 5a440f1078 #11851 fixed setup interval editor 2023-08-09 09:47:09 +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
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 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
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
Daniel Maya ddcfa02e6f #11739 Fixed date_format 2 2023-08-03 12:51:50 +02:00
miguel angel rasteu 1dc24cdfb4 #11668 Fix black theme 2023-08-03 12:22:20 +02:00
Daniel Maya 8bbaa11ce3 resolved conflict 2023-07-31 09:44:46 +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
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 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
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
daniel 1bf7f1e36e ITSM pandora_enterprise#11471 2023-07-21 14:23:42 +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
daniel 3e2c2990df Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-07-20 08:28:36 +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 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
miguel angel rasteu fd56631ae4 #11713 Fix action button title 2023-07-14 13:07:04 +02:00
Diego Muñoz-Reja 57058c4f9c Merge branch 'ent-11266-no-se-habilita-el-log-de-consola-en-770-ni-771' into 'develop' 
Ent 11266 no se habilita el log de consola en 770 ni 771

See merge request artica/pandorafms!6001
 2023-07-13 07:55:47 +00:00
daniel d3412a7ad1 add filter events comments pandora_enterprise#11387 2023-07-10 16:26:33 +02:00
Matias Didier a575c3028f Merge branch 'ent-11037-modificar-etiqueta' into 'develop' 
Ent 11037 modificar etiqueta

See merge request artica/pandorafms!5795
 2023-07-07 11:57:33 +00:00
Daniel Cebrian 496058e144 Merge branch 'develop' into ent-11437-automatic-logout-mechanism-has-been-disabled 2023-07-06 12:12:23 +02:00
miguel angel rasteu 4ff400f54c #11022 Add agent usage details 2023-07-03 13:18:50 +02:00
miguel angel rasteu 8ad4e8261e #10563 Fix config enable feedback 2023-07-03 10:22:22 +02:00
miguel angel rasteu 5f864d53a8 #11051 Add action to mark all notification as read 2023-07-03 09:18:30 +02:00
Gorka Sanchez 28f99d2c27 Merge branch 'ent-10741-15263-cuadro-de-busqueda-de-modulos-en-agente-limitado-a-5-caracteres' into 'develop' 
Ent 10741 15263 cuadro de busqueda de modulos en agente limitado a 5 caracteres

See merge request artica/pandorafms!5713
 2023-06-30 11:39:50 +00:00
miguel angel rasteu ac92b5979c #10563 Move menu item Links from Management to Operation. Add button in setup to global disable the Feedback functionality 2023-06-30 08:35:37 +02:00
alejandro.campos@artica.es 087c0c18cc Merge remote-tracking branch 'origin/develop' into ent-9781-14477-Control-reportes-SQL-Query-en-PDF 2023-06-29 12:00:44 +02:00
Rafael Ameijeiras 520f0c77d1 Merge branch 'ent-10266-tip-sobre-opcion-de-setup-en-version-opensource-setup-visual-precision-de-datos' into 'develop' 
Ent 10266 tip sobre opcion de setup en version opensource setup visual precision de datos

See merge request artica/pandorafms!5703
 2023-06-27 11:26:02 +00:00
Matias Didier fde3857674 Merge branch 'ent-11476-cambiar-headers-de-copyright' into 'develop' 
Ent 11476 cambiar headers de copyright

See merge request artica/pandorafms!6069
 2023-06-22 13:24:47 +00:00
Pablo Aragon cbbf675d82 11620-Login background 772 2023-06-20 11:40:40 +02:00
alejandro.campos@artica.es 77ff766f84 remove legacy visual console 2023-06-19 15:25:37 +02:00
alejandro.campos@artica.es 1499af3a2d added setup token 2023-06-19 11:04:08 +02:00
Daniel Cebrian 052852f2d1 #10254 added timeout in active directory 2023-06-13 13:20:28 +02:00
Daniel Cebrian 8678df6982 #10254 added secondary server in ad 2023-06-13 12:37:28 +02:00
Daniel Cebrian 1980458572 #11437 added new control session 2023-06-08 14:06:15 +02:00
miguel angel rasteu db62a91cb6 #11476 Fix https url 2023-06-08 13:19:01 +02:00
miguel angel rasteu 1f8752ee63 #11476 Fix pandora url 2023-06-08 13:10:16 +02:00
miguel angel rasteu 64204b6ff7 #11476 Fix ascci art 2023-06-08 12:42:10 +02:00
miguel angel rasteu 933f69f2ab #11476 Change copyright header 2023-06-08 11:53:13 +02:00
Félix Suárez 17262c45e0 FrontEnd display and Token DB update 2023-06-06 16:02:04 -06:00
Félix Suárez 6aa082d54c Remove aditional reference and sort config. 2023-06-04 16:49:25 -06:00
Félix Suárez 593d197016 Remove reference to tnetwork_matrix 2023-06-04 16:12:29 -06:00
Jorge Rincon 0658282306 #11406 Fixed the bug that allows to show the delete icon of the OS component 2023-05-31 15:10:01 +02:00
miguel angel rasteu 80aeaebfad #11266 Add hint 2023-05-31 09:26:42 +02:00
miguel angel rasteu 08a4c28953 #11266 Fix location of console.log 2023-05-31 09:22:16 +02:00
Daniel Rodriguez dbf7d4dcfe Merge branch 'ent-11054-15466-modo-legacy-con-problemas' into 'develop' 
fixed visual errors in legacy VC pandora_enterprise#11054

See merge request artica/pandorafms!5829
 2023-05-23 10:07:14 +00:00
Rafael Ameijeiras b3f37f8bb4 Merge branch 'ent-10991-15445-usuario-estandar-con-perfil-pandora-administrator-no-puede-ver-vista-authentication' into 'develop' 
Ent 10991 15445 usuario estandar con perfil pandora administrator no puede ver vista authentication

See merge request artica/pandorafms!5751
 2023-05-17 14:42:27 +00:00
Daniel Rodriguez dbd0e435e1 Merge branch 'ent-11128-mejor-usabilidad-en-los-botones-de-test-de-conexion-con-integraciones' into 'develop' 
Ent 11128 mejor usabilidad en los botones de test de conexion con integraciones

See merge request artica/pandorafms!5848
 2023-05-16 10:12:11 +00:00
Jorge Rincon 257954c026 #11128 Fixed the usability of test connection buttons with integrations 2023-05-08 12:16:12 +02:00