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

1972 Commits

Author SHA1 Message Date
Pablo Aragon 87c02fd0a7 11801-Resolve conflict 2023-09-07 11:08:31 +02: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
Pablo Aragon 28316e25c3 11423-Graph analytics. Remove Group None from export filter 2023-08-25 10:33:32 +02:00
Pablo Aragon 670cf7d9a7 11423-Graph analytics. Remove graphs & several changes 2023-08-24 12:27:06 +02:00
Pablo Aragon 208304ed80 11943-Dashboards script tag as string 2023-08-24 08:42:20 +02:00
Pablo Aragon 6757e69a75 11423-Graph analytics. Resolve Confict 2023-08-23 11:55:41 +02:00
Pablo Aragon c0933e8b15 11423-Graph analytics 2023-08-23 11:51:29 +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
Pablo Aragon bfa09367d4 11423-Graph analytics. Share function 2023-08-22 15:28:05 +02:00
Rafael Ameijeiras 82389ddf2d Merge branch 'ent-10870-15385-limpiar-eventos-desde-la-vista-detallada-de-evento' into 'develop' 
Ent 10870 [#15385] Limpiar eventos desde la vista detallada de evento

See merge request artica/pandorafms!6174
 2023-08-21 11:10:35 +00:00
Jonathan 563323d0be #11852 warning time lapse more than 30 days 2023-08-21 13:05:39 +02:00
miguel angel rasteu 6cbb332a8a #10701 Fix css conflict 2023-08-21 09:16:22 +02:00
Rafael Ameijeiras a6e1e1cf61 Merge branch 'ent-11794-stored-cross-site-scripting-via-dashboard-panel' into 'develop' 
Ent 11794 stored cross site scripting via dashboard panel

See merge request artica/pandorafms!6296
 2023-08-21 06:23:49 +00:00
Rafael Ameijeiras dbd90d79a7 Merge branch 'ent-10344-conexion-con-el-servidor-se-ha-perdido' into 'develop' 
Ent 10344 Conexion con el servidor se ha perdido

See merge request artica/pandorafms!6228
 2023-08-21 05:58:32 +00:00
Daniel Cebrian fa04db27a7 Merge branch 'develop' into ent-10870-15385-limpiar-eventos-desde-la-vista-detallada-de-evento 2023-08-18 10:40:29 +02: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
miguel angel rasteu 1dc24cdfb4 #11668 Fix black theme 2023-08-03 12:22:20 +02:00
miguel angel rasteu 0a799c51e6 #10701 D3 Tree implementation, links and colors 2023-08-02 12:29:20 +02:00
miguel angel rasteu ca42714fca #10701 include d3 v7 2023-08-01 14:56:44 +02:00
miguel angel rasteu f09ab409cc #11794 Fix entitites in dashboard 2023-07-31 11:24:44 +02:00
Daniel Maya ad24712eed resolved conflict 2 2023-07-31 09:48:42 +02:00
Daniel Maya 8bbaa11ce3 resolved conflict 2023-07-31 09:44:46 +02:00
Daniel Maya 858a6230b3 resolved conflict 2023-07-31 09:02:58 +02:00
Rafael Ameijeiras f7df38a0c4 Merge branch 'ent-11174-graficas-descolocadas-en-diagnostic-info' into 'develop' 
Ent 11174 graficas descolocadas en diagnostic info

See merge request artica/pandorafms!6147
 2023-07-28 05:14:18 +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
miguel angel rasteu 2b20b7f8ee #11386 Fix modal 2023-07-27 10:47:51 +02:00
Pablo Aragon 5dbf61b424 11174-Timezone iana graph firefox 2023-07-27 09:46:29 +02: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
miguel angel rasteu 7c9d441648 #11386 Fix modal error 2023-07-25 11:12:05 +02:00
alejandro.campos@artica.es f027173862 fixed error with new implementation of datatables 2023-07-25 09:26:58 +02:00
miguel angel rasteu a1965de2ea #11386 Fix sound alert modal 2023-07-24 12:25:06 +02:00
Pablo Aragon ccf124103d 11135-Move js code from ui_print_datatable. Resolve conflict 2023-07-24 10:46:19 +02:00
miguel angel rasteu 5084c0490b #11386 Fix changes in soun event dialog 2023-07-21 13:32:12 +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 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 Cebrian c2e0a02f9d #10344 changed translate in popup conexion check in js 2023-07-11 12:21:03 +02:00
daniel d3412a7ad1 add filter events comments pandora_enterprise#11387 2023-07-10 16:26:33 +02:00
Gorka Sanchez 374cad5d8d Merge branch 'ent-11312-15642-problemas-url-publica-de-visual-consoles' into 'develop' 
Ent 11312 15642 problemas url publica de visual consoles

See merge request artica/pandorafms!5963
 2023-07-10 14:12:53 +00:00
Matias Didier 13fb1a707b Merge branch 'ent-11611-Error-al-abrir-Supernet-Treeview-en-IPAM' into 'develop' 
fixed error

See merge request artica/pandorafms!6134
 2023-07-10 13:56:20 +00:00
Gorka Sanchez 504fb8ccd2 Merge branch 'ent-10625-problemas-en-graficas-de-informes-con-las-timezones' into 'develop' 
Ent 10625 problemas en graficas de informes con las timezones

See merge request artica/pandorafms!5816
 2023-07-10 07:20:10 +00:00
miguel angel rasteu 444dbb4599 #11386 Fix modal event sound 2023-07-06 13:15:45 +02:00
Daniel Cebrian d993674c12 Merge branch 'develop' into ent-11567-ventana-about 2023-07-06 11:30:45 +02:00
Matias Didier add65eca5d Merge branch 'ent-9162-10821-modificar-columnas-widget-eventos' into 'develop' 
Ent 9162 10821 modificar columnas widget eventos

See merge request artica/pandorafms!5843
 2023-07-06 08:35:35 +00:00
Jonathan e9064dfd2f Merge branch 'develop' into ent-11093-reticula-en-consola-visual 2023-07-04 14:09:15 +02:00
Matias Didier 203446af70 Merge branch 'ent-11475-cambiar-copyrights-backend-agentes' into 'develop' 
Ent 11475 cambiar copyrights backend agentes

See merge request artica/pandorafms!6172
 2023-07-04 08:49:14 +00:00
Félix Suárez c926349c67 Update copyright years 2023-07-03 09:20:25 -06:00
Jonathan d7a682d48c Merge branch 'develop' into ent-11093-reticula-en-consola-visual 2023-07-03 09:50:59 +02:00
Gorka Sanchez b84525f74f Merge branch 'ent-11267-15611-intervalo-inverso-no-funciona-en-la-creacion-de-modulos-a-traves-de-componentes-de-red' into 'develop' 
Ent 11267 15611 intervalo inverso no funciona en la creacion de modulos a traves de componentes de red

See merge request artica/pandorafms!5961
 2023-07-03 07:40:10 +00:00
Gorka Sanchez aa7186512c Merge branch 'ent-9610-filtrar-por-os-en-bulk-operations' into 'develop' 
Ent 9610 filtrar por os en bulk operations

See merge request artica/pandorafms!5863
 2023-06-30 11:43:50 +00:00