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

1049 Commits

Author SHA1 Message Date
miguel angel rasteu 55fa824792 #12037 Fix size of agent text and event text 2023-09-11 11:41:30 +02:00
miguel angel rasteu 99f92b9bec #10676 Fix truncate text 2023-09-11 10:09:34 +02:00
daniel ce0468b37e Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 
Conflicts:
	pandora_console/include/functions_menu.php
 2023-09-08 13:11:52 +02:00
miguel angel rasteu 9cdc7273a6 #10676 increase chars in agents name in monitor view and truncate at the end 2023-09-08 10:42:40 +02:00
Pablo Aragon 87c02fd0a7 11801-Resolve conflict 2023-09-07 11:08:31 +02:00
daniel fce86cb2ac Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-09-06 07:50:27 +02:00
Rafael Ameijeiras f2b99cf38e Merge branch 'ent-10639-unificacion-de-controles-de-fecha' into 'develop' 
Ent 10639 unificacion de controles de fecha

See merge request artica/pandorafms!6212
 2023-09-05 07:50:45 +00:00
daniel 1a1087e311 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 
Conflicts:
	pandora_console/extras/mr/66.sql
 2023-09-04 08:16:48 +02:00
miguel angel rasteu 083043eaba #11650 Change style for tooltip 2023-09-01 14:06:48 +02:00
Gorka Sanchez 7dcb38f382 Merge branch 'ent-11821-error-sql-en-vista-de-eventos-al-agregar-columna-de-comentarios' into 'develop' 
Ent 11821 error sql en vista de eventos al agregar columna de comentarios

See merge request artica/pandorafms!6359
 2023-09-01 09:24:10 +00:00
Pablo Aragon 9010d079d3 11801-Datatables add parameter Start disabled (enable on filter) 2023-08-31 14:58:47 +02:00
Gorka Sanchez 6102cb5015 Merge branch 'ent-11423-nueva-herramienta-graph-analytics' into 'develop' 
Ent 11423 nueva herramienta graph analytics

See merge request artica/pandorafms!6327
 2023-08-31 10:30:27 +00:00
Jonathan 4ca9b6d8d2 Merge branch 'develop' into ent-10639-unificacion-de-controles-de-fecha 2023-08-29 12:29:41 +02:00
Pablo Aragon 17bfcba735 11960-Fix url import datatables node/meta 2023-08-28 14:10:03 +02:00
Pablo Aragon e0c5b2777d 11821-Show events comment in table 2023-08-25 12:06:29 +02:00
Pablo Aragon fac107ca49 Merge branch 'develop' into ent-11821-error-sql-en-vista-de-eventos-al-agregar-columna-de-comentarios 2023-08-25 11:45:41 +02:00
Pablo Aragon 9271dc33f1 11821-Events not sort by comments 2023-08-24 14:43:05 +02:00
Jonathan d9e897568a Merge branch 'develop' into ent-10639-unificacion-de-controles-de-fecha 2023-08-24 10:06:19 +02:00
Jonathan 92fae2bb54 #11929 fix datatable for port != 80 2023-08-23 13:25:06 +02:00
Pablo Aragon 6757e69a75 11423-Graph analytics. Resolve Confict 2023-08-23 11:55:41 +02:00
Pablo Aragon 63d3745794 11423-Graph analytics. Get filter data (WIP) 2023-08-16 15:12:31 +02:00
daniel 133eef456a Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-08-14 08:14:34 +02:00
Daniel Cebrian 06eae47560 Merge branch 'develop' into ent-11326-security-hardening-console 2023-08-09 13:27:21 +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 496afbc973 #11326 reorganized tables 2023-08-08 08:46:56 +02:00
Daniel Maya aef7f0edd0 #11739 Fixed deprecated functions 4 2023-08-01 14:51:31 +02:00
Jonathan f2328407b1 Merge branch 'develop' into ent-10639-unificacion-de-controles-de-fecha 2023-08-01 09:39:56 +02:00
Daniel Maya 8bbaa11ce3 resolved conflict 2023-07-31 09:44:46 +02:00
Rafael Ameijeiras 6db5b41633 Merge branch 'ent-10875-15383-limitar-ancho-y-o-largo-de-la-linea-de-los-eventos' into 'develop' 
Ent 10875 15383 limitar ancho y o largo de la linea de los eventos

See merge request artica/pandorafms!6034
 2023-07-31 06:40:38 +00:00
Daniel Cebrian 21435b32c3 Merge branch 'develop' into ent-11326-security-hardening-console 2023-07-28 13:39:22 +02:00
miguel angel rasteu 014d32181c #10875 Fix title 2023-07-28 12:12:14 +02:00
miguel angel rasteu b4ae714af3 #10875 Truncate long string 2023-07-28 10:39:46 +02: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
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 Cebrian 001ffc1799 Merge branch 'develop' into ent-11326-security-hardening-console 2023-07-26 10:55:49 +02:00
Pablo Aragon ccf124103d 11135-Move js code from ui_print_datatable. Resolve conflict 2023-07-24 10:46:19 +02:00
Daniel Cebrian 2d0fe4b149 #11326 added design 2023-07-20 15:13:58 +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 Cebrian 6eaa8e9cd8 #11326 fixed pagination with multiples datatable 2023-07-18 14:52:34 +02: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
daniel a29497f659 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-07-17 10:52:15 +02:00
Rafael Ameijeiras d860d613d6 Merge branch 'ent-10598-nuevo-wizard-de-bienvenida' into 'develop' 
Ent 10598 nuevo wizard de bienvenida

See merge request artica/pandorafms!6043
 2023-07-17 05:57:29 +00:00
daniel 0722cfca1a ITSM fixed pandora_enterprise#11471 2023-07-14 15:42:35 +02:00
Daniel Cebrian b35b4e40a1 #9686 fixed bug pagination in datatable 2023-07-13 10:46:10 +02:00
Rafael Ameijeiras a8d8676422 Merge branch 'ent-10976-busqueda-rapida-agentes-pasar-a-datatables' into 'develop' 
Ent 10976 busqueda rapida agentes pasar a datatables

See merge request artica/pandorafms!5834
 2023-07-12 06:04:56 +00:00
daniel 200750f90b change events user_comment new table tevent_comment pandora_enterprise#11387 2023-07-07 12:53:14 +02:00
Jonathan d6df9ed38e #10639 new datepicker style and filters 2023-07-05 14:38:59 +02:00
Jonathan 8be0236af1 #9478 permisions & confirm on delete alert action 2023-07-05 11:14:09 +02:00
Jonathan a385ff93a3 #9478 creation alerts to nodes on metaconsole 2023-07-04 12:47:04 +02:00
Jonathan 8f227233fd #9478 fix delete mesage and permisions 2023-07-03 14:56:39 +02:00
Jonathan 1c69208a6a Merge branch 'develop' into ent-9478-creacion-y-edicion-directa-de-alertas-desde-metaconsola 2023-07-03 10:21:55 +02:00
miguel angel rasteu 61ab82d808 #10304 Fix action default in agent detail 2023-06-29 12:59:32 +02:00
Jorge Rincon 9a20ea1231 #11025 Fixed the bug that cuts the text of the Search field 2023-06-28 17:21:06 +02:00
Matias Didier 43e158011a Merge branch 'ent-11139-icono-de-lupa-descolocado-en-alert-details' into 'develop' 
Ent 11139 icono de lupa descolocado en alert details

See merge request artica/pandorafms!5877
 2023-06-27 08:37:39 +00:00
Matias Didier e1fe10f3e3 Merge branch 'ent-11380-15677-selector-filtro-por-estado-monitor-view-metaconsola' into 'develop' 
Ent 11380 15677 selector filtro por estado monitor view metaconsola

See merge request artica/pandorafms!5981
 2023-06-26 12:48:46 +00:00
Daniel Cebrian d2413ed461 Merge branch 'develop' into ent-9771-discovery-2-0-sistema-de-extensiones-disco-para-el-discovery 2023-06-26 13:15:09 +02: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
Daniel Cebrian 363f29d333 Merge branch 'develop' into ent-9771-discovery-2-0-sistema-de-extensiones-disco-para-el-discovery 2023-06-14 11:23:32 +02:00
Jorge Rincon 2d40641a9d #11541 Adjusted the background of the autocomplete Agent according to the selected theme 2023-06-14 11:11:22 +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
Daniel Cebrian 6b869f8ca8 #11380 fixed arrow in metaconsole table and filter status in monitors view 2023-05-29 10:32:43 +02:00
Jonathan ae526d5df0 #10598 New wizard welcome 2023-05-23 16:54:40 +02:00
Daniel Maya ef30f19b19 #11328 Fixed toggle 2023-05-23 12:25:56 +02:00
Rafael Ameijeiras cad3355bbf Merge branch 'ent-11064-bug-boton-habilitar-base-de-datos-de-historico-en-meta' into 'develop' 
Ent 11064 bug boton habilitar base de datos de historico en meta

See merge request artica/pandorafms!5803
 2023-05-22 15:52:40 +00:00
miguel angel rasteu 1037eaa8b4 #11064 Fix JS code button 2023-05-18 13:56:40 +02:00
Daniel Rodriguez 00983dfe16 Merge branch 'ent-11176-no-funciona-debug-de-modulos-web' into 'develop' 
Ent 11176 no funciona debug de modulos web

See merge request artica/pandorafms!5888
 2023-05-18 11:19:34 +00:00
Diego Muñoz-Reja b2edd9c19a Merge branch 'ent-11120-mejora-estetica-visualizacion-alertas-en-vista-detallada-de-agente' into 'develop' 
Ent 11120 mejora estetica visualizacion alertas en vista detallada de agente

See merge request artica/pandorafms!5838
 2023-05-17 07:06:59 +00:00
Matias Didier 1e3c24c360 Merge branch 'ent-11124-pequenos-cambios-visuales-en-la-lista-detallada-de-agentes' into 'develop' 
Ent 11124 pequenos cambios visuales en la lista detallada de agentes

See merge request artica/pandorafms!5851
 2023-05-16 07:24:02 +00:00
Matias Didier e92490875a Merge branch 'ent-11036-pagination-does-not-work' into 'develop' 
Ent 11036 pagination does not work

See merge request artica/pandorafms!5765
 2023-05-12 07:05:42 +00:00
Daniel Cebrian 5195c6acaf #11176 fixed dialog debug module 2023-05-11 15:39:58 +02:00
Jorge Rincon 4b5cce3343 #11139 fixed the position of the magnifying glass icon, in the template column 2023-05-10 16:24:22 +02:00
Jorge Rincon 53bd63a7d5 #11124 Visual changes are made to the detailed list of agents 2023-05-08 14:26:28 +02:00
Pablo Aragon 886bde919b 11135-Move js code from ui_print_datatable 2023-05-08 14:25:57 +02:00
Jonathan 5e7a3d96d4 #10976 fix pagination search global 2023-05-08 09:42:17 +02:00
miguel angel rasteu c4d706f08b #11120 Change class and js code to fix the visual style 2023-05-05 13:03:38 +02:00
daniel e77a63a91f fix select2 pandora_enterprise#11110 2023-05-04 12:57:01 +02:00
Daniel Rodriguez 06b58d3dfc Merge branch 'ent-10191-nuevas-alertas-sonoras-son-poco-usables' into 'develop' 
Ent 10191 nuevas alertas sonoras son poco usables

See merge request artica/pandorafms!5689
 2023-04-28 06:04:18 +00:00
Jonathan fdc13256cd #9478 create edit delete alerts from meta 2023-04-27 16:05:37 +02:00
miguel angel rasteu 2fe3662724 #11064 Fixed a conditional in the jquery code that generates the toggle which was not executed when the value of the is_metaconsole variable was 1 2023-04-27 12:34:56 +02:00
Daniel Cebrian cc2ab53db4 Merge branch 'develop' into ent-9771-discovery-2-0-sistema-de-extensiones-disco-para-el-discovery 2023-04-26 13:02:13 +02:00
Rafael Ameijeiras 58af8f8d46 Merge branch 'ent-10899-consola-mete-entities-en-los-custom-fields-del-inventario' into 'develop' 
Ent 10899 consola mete entities en los custom fields del inventario

See merge request artica/pandorafms!5699
 2023-04-25 13:27:07 +00:00
Pablo Aragon b3f2c6cad1 11036-Incorrectly closed quotes 2023-04-24 09:51:33 +02:00
Jonathan f5c517ae7d #10191 event sound fix select2 2023-04-21 09:30:22 +02:00
Jonathan fcde5e4452 #10899 fix custom fields server error 2023-04-20 12:25:37 +02:00
Daniel Cebrian 6df1c74722 Merge branch 'develop' into ent-9771-discovery-2-0-sistema-de-extensiones-disco-para-el-discovery 2023-04-18 15:56:59 +02:00
Daniel Rodriguez fb2b261698 Merge branch 'ent-10631-15172-problema-con-carga-de-comentarios-en-tabla-de-eventos' into 'develop' 
fix comments events pandora_enterprise#10631

See merge request artica/pandorafms!5694
 2023-04-18 11:01:14 +00:00
Jonathan d501e49f4c #10899 required module inventory select 2023-04-18 11:36:17 +02:00
Jonathan 726ab896f1 #10899 remove entities from inventory custom fields 2023-04-18 09:49:35 +02:00
Rafael Ameijeiras 852e7ae2a0 Merge branch 'ent-10714-mejoras-de-usabilidad-en-vista-de-inventario-export-csv' into 'develop' 
Ent 10714 mejoras de usabilidad en vista de inventario export csv

See merge request artica/pandorafms!5726
 2023-04-17 15:40:19 +00:00
Daniel Cebrian 8183f7aa5d Merge branch 'develop' into ent-9771-discovery-2-0-sistema-de-extensiones-disco-para-el-discovery 2023-04-17 15:48:23 +02:00
Jonathan cbf122f4c6 #10714 csv inventory button 2023-04-17 14:11:16 +02:00
Jonathan f6be23c353 #10899 json_ucescaped_unicode to inventory manage and visual fix 2023-04-14 12:24:39 +02:00
daniel 976633bc4f fix profiles and users pandora_enterprise#10803 2023-04-14 10:02:41 +02:00
Daniel Cebrian 60700000fe Merge branch 'develop' into ent-9771-discovery-2-0-sistema-de-extensiones-disco-para-el-discovery 2023-04-12 18:28:55 +02:00
Daniel Rodriguez 7ae8f185b0 Merge branch 'ent-10909-se-han-roto-los-iconos-de-grupo-de-agentes-en-v770' into 'develop' 
Ent 10909 se han roto los iconos de grupo de agentes en v770

See merge request artica/pandorafms!5701
 2023-04-12 15:29:44 +00:00