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

4566 Commits

Author SHA1 Message Date
Daniel Rodriguez 637fae3e8d Merge branch 'ent-8898-anida-mapas-de-red-no-actualizan-bien' into 'develop' 
Ent 8898 anida mapas de red no actualizan bien

See merge request artica/pandorafms!5143
 2022-09-29 12:36:37 +00:00
Daniel Rodriguez c784e03883 Merge branch 'ent-9119-Metaconsola-Error-paginacion-vista-monitores' into 'develop' 
Ready

See merge request artica/pandorafms!5084
 2022-09-29 11:25:40 +00:00
José González a4be805ba4 Fix 2022-09-29 00:24:31 +02:00
José González f8efbc5fce Fixed issue with module name 2022-09-28 16:29:18 +02:00
Jimmy Olano 09e934395f Merge branch 'ent-9456-giss-errores-en-la-paginacion-vista-alertas-metaconsola' into 'develop' 
Fix alerts list pagination on meta

Ref: pandora_enterprise#9456

See merge request artica/pandorafms!5095
 2022-09-27 14:10:47 +00:00
Daniel Rodriguez 5047f8afb9 Merge branch 'ent-8659-mostrar-nombre-completo-del-usuario-para-el-owner-de-un-evento' into 'develop' 
Ent 8659 mostrar nombre completo del usuario para el owner de un evento

See merge request artica/pandorafms!5114
 2022-09-27 10:50:17 +00:00
José González 1ae6267acc Fix issue with agent_alias 2022-09-27 11:14:18 +02:00
Calvo 2a4176085f Fix alerts meta datatables 2022-09-26 09:22:19 +02:00
José González 09c6c5a0f9 Fix 2022-09-23 12:54:51 +02:00
Calvo bc5f1d0dce Fix meta alert datatable order 2022-09-19 14:02:50 +02:00
edu.corral af7ad37b50 ent 8659 fullname event owner 2022-09-16 11:04:01 +02:00
Calvo 56c5f324b0 Fix alerts metaconsole datatable order 2022-09-15 18:01:16 +02:00
José González 68654804b4 Fixed minor issue 2022-09-14 17:18:39 +02:00
José González 9164f1e681 IP Allow control 2022-09-12 12:41:09 +02:00
José González 0daeb906f1 WIP 2022-09-06 14:58:38 +02:00
Daniel Maya d3612439fb #8898 conflict resolved 2022-08-29 14:06:15 +02:00
Daniel Maya 53cbb4d3da #9107 conflict resolved 2022-08-29 10:13:39 +02:00
Daniel Maya 16554cfc7a #8898 networkmap 2022-08-29 09:39:47 +02:00
Daniel Maya b4a061a190 #9442 Fixed enterprise acl 2022-08-23 13:22:10 +02:00
Daniel Maya 182bb2d2c4 8898 Refresh time 2022-08-23 11:17:48 +02:00
Daniel Maya b58b0d6c51 #9348 fixed update relations 2022-08-17 12:52:02 +02:00
Daniel Barbero 9b3d7ba763 fixed 500 php7.2 pandora_enterprise#9387 2022-08-11 14:05:01 +02:00
Daniel Barbero de922dd0b2 fixed 500 php7.2 pandora_enterprise#9387 2022-08-11 13:52:34 +02:00
Daniel Maya 08da6de1da #8898 Added options icon 2022-08-11 09:36:08 +02:00
Daniel Barbero 2a51a448ac Merge remote-tracking branch 'origin/develop' into ent-6367-report-server-gestion-de-informes-extensos-varios-cientos-de-agentes-val 
Conflicts:
	pandora_console/godmode/menu.php
 2022-08-02 10:34:21 +02:00
Daniel Barbero Martin bbf9174903 fix error custom data events list pandora_enterprise#9304 2022-07-22 10:11:14 +02:00
Jimmy Olano 33f6ae1875 Merge branch 'ent-8797-giss-13405-acciones-vista-de-alertas-metaconsola' into 'develop' 
Alerts list datatable

Ref: pandora_enterprise#8797

See merge request artica/pandorafms!5018
 2022-07-22 02:39:35 +00:00
Daniel Rodriguez 5d674b76b6 Merge branch 'ent-8942-token-para-cambiar-comportamiento-de-la-busqueda-de-grupos-en-filtro-de-eventos' into 'develop' 
new filter search eventspandora_enterprise#8942

See merge request artica/pandorafms!5007
 2022-07-21 10:15:49 +00:00
Daniel Barbero Martin 027f61daff Merge remote-tracking branch 'origin/develop' into ent-8942-token-para-cambiar-comportamiento-de-la-busqueda-de-grupos-en-filtro-de-eventos 
Conflicts:
	pandora_console/extras/mr/56.sql
 2022-07-19 10:18:04 +02:00
Calvo 642c60428c Merge remote-tracking branch 'origin/develop' into ent-8797-giss-13405-acciones-vista-de-alertas-metaconsola 2022-07-19 09:40:56 +02:00
Daniel Barbero Martin 84fbf0e3dd double refresh page events pandora_enterprise#9279 2022-07-18 16:44:31 +02:00
Calvo 34333f9f88 Alerts list datatable 2022-07-15 12:15:37 +02:00
Daniel Maya 987678b339 #9107 Fixed filter event 2022-07-15 11:38:46 +02:00
Diego Muñoz-Reja 74d19b3dbd Merge branch 'ent-9029-Mejora-estética-en-header-vista-agente' into 'develop' 
Ent 9029 mejora estética en header vista agente

See merge request artica/pandorafms!5003
 2022-07-13 12:54:54 +00:00
Daniel Maya 9d259a4097 #9029 Added starmap 3 2022-07-12 16:18:17 +02:00
Daniel Barbero Martin 01ba149280 new console report pandora_enterprise#6367 2022-07-08 13:40:20 +02:00
Diego Muñoz-Reja c756f804a7 Merge branch 'ent-9095-cambios-visuales-en-la-interfaz-consola-sonora-de-eventos' into 'develop' 
modal sound events pandora_enterprise#9095

See merge request artica/pandorafms!4998
 2022-07-06 14:57:44 +00:00
Daniel Maya a71c26b4a7 #9029 Added starmap 2022-07-05 17:44:52 +02:00
Diego Muñoz-Reja a257f43d49 Merge branch 'ent-8939-Cambiar-comportamiento-de-los-comentarios-en-eventos-rendimiento' into 'develop' 
Ent 8939 cambiar comportamiento de los comentarios en eventos rendimiento

See merge request artica/pandorafms!4889
 2022-07-05 15:44:24 +00:00
Diego Muñoz-Reja 3ebcf710ee Merge branch 'ent-9245-13886-auth-token-en-respuesta-de-vista-de-eventos' into 'develop' 
fix error events pandora_enterprise#9245

See merge request artica/pandorafms!5002
 2022-07-05 15:14:18 +00:00
Daniel Barbero Martin 12f73d86fd new filter search eventspandora_enterprise#8942 2022-07-05 17:02:40 +02:00
Daniel Barbero Martin 033027f360 modal sound events pandora_enterprise#9095 2022-07-04 17:09:30 +02:00
Diego Muñoz-Reja 08a9761046 Merge branch 'ent-9239-bug-eventos-nodo' into 'develop' 
bugs events pandora_enterprise#9239

See merge request artica/pandorafms!4995
 2022-07-04 11:04:04 +00:00
Daniel Barbero Martin 15363b1ac5 Merge remote-tracking branch 'origin/develop' into ent-9095-cambios-visuales-en-la-interfaz-consola-sonora-de-eventos 2022-07-04 09:12:10 +02:00
Daniel Barbero Martin de926b5677 fix error events pandora_enterprise#9245 2022-07-01 13:54:33 +02:00
Daniel Barbero Martin 2dc16a2a19 modal sound events pandora_enterprise#9095 2022-07-01 13:08:39 +02:00
Jimmy Olano c074cd81bf Merge branch 'ent-8302-Añadir-opción-de-mostrar-solo-grupos-con-datos-en-Group-view' into 'develop' 
Ent 8302 añadir opción de mostrar solo grupos con datos en group view

https://brutus.artica.es:8081/artica/pandora_enterprise/-/issues/8302

See merge request artica/pandorafms!4949
 2022-07-01 10:47:27 +00:00
Daniel Barbero Martin e28bfe9f3f modal sound events pandora_enterprise#9095 2022-06-30 17:17:05 +02:00
Diego Muñoz-Reja ef48206e7f Merge branch 'ent-8763-g-sanchez-anadir-filtro-de-grupos-al-widget-de-vista-tactica' into 'develop' 
Ent 8763 g sanchez anadir filtro de grupos al widget de vista tactica

See merge request artica/pandorafms!4937
 2022-06-30 12:54:40 +00:00
Daniel Barbero Martin e009257d2f bugs events pandora_enterprise#9239 2022-06-30 11:56:25 +02:00