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

4583 Commits

Author SHA1 Message Date
Diego Muñoz-Reja 4c74f1bee7 Merge branch 'ent-9423-respuestas-de-evento-en-metaconsola-usan-configuracion-de-nodo' into 'develop' 
fixed response events pandora_enterprise#9423

See merge request artica/pandorafms!5141
 2022-10-17 10:49:01 +00:00
Jimmy Olano 9c413b355d Merge branch 'ent-9579-derivado-del-trabajo-q-a-765-desactivar-opcion-activate-events-history-en-metaconsola' into 'develop' 
remove tmetaconsole_history token pandora_enterprise#9579

pandora_enterprise#9579

See merge request artica/pandorafms!5161
 2022-10-14 08:33:26 +00:00
Jimmy Olano 1a28c91992 Merge branch 'ent-9519-un-widget-tipo-agent-module-view-en-un-dashboard-falla-al-agregar-mas-modulos-del-mismo-agente' into 'develop' 
fixed agent/module widget pandora_enterprise#9519

pandora_enterprise#9519

See merge request artica/pandorafms!5118
 2022-10-13 15:26:14 +00:00
Diego Muñoz-Reja 6d076adb9f Merge branch 'ent-8597-13156-anadir-opciones-en-busqueda-de-eventos' into 'develop' 
filter events multiselector nodes pandora_enterprise#8597

See merge request artica/pandorafms!5152
 2022-10-11 15:15:07 +00:00
Jimmy Olano c14074d4ae Merge branch 'ent-9578-14208-evento-no-validado-ack-sale-como-1970' into 'develop' 
ack_utimestamp integer pandora_enterprise#9578

pandora_enterprise#9578

See merge request artica/pandorafms!5165
 2022-10-11 12:03:29 +00:00
Jimmy Olano 132c720901 Merge branch 'ent-9297-derivado-del-trabajo-q-a-764-falso-positivo-de-violacion-de-acl-png' into 'develop' 
Ent 9297 derivado del trabajo q a 764 falso positivo de violacion de acl png

ref: pandora_enterprise#9297

See merge request artica/pandorafms!5142
 2022-10-11 10:25:58 +00:00
Daniel Barbero 58221a7c12 fixed minor error array servers pandora_enterprise#8597 2022-10-10 17:08:20 +02:00
Daniel Barbero d90005d0f5 Merge remote-tracking branch 'origin/develop' into ent-8597-13156-anadir-opciones-en-busqueda-de-eventos 2022-10-10 16:37:45 +02:00
Daniel Maya a674bdceb0 #9595 Fixed order 2022-10-03 10:16:00 +02:00
Daniel Barbero ead788cfd5 ack_utimestamp integer pandora_enterprise#9578 2022-09-30 12:30:01 +02:00
Daniel Barbero 4609e141ee remove tmetaconsole_history token pandora_enterprise#9579 2022-09-30 08:56:19 +02:00
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
Daniel Barbero 3dea1f3146 filter events multiselector nodes pandora_enterprise#8597 2022-09-29 09:17:37 +02: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
Daniel Barbero 755432b381 Merge remote-tracking branch 'origin/develop' into ent-9423-respuestas-de-evento-en-metaconsola-usan-configuracion-de-nodo 2022-09-28 08:52:43 +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
Daniel Barbero 7bedb8ecf7 Merge remote-tracking branch 'origin/develop' into ent-9423-respuestas-de-evento-en-metaconsola-usan-configuracion-de-nodo 2022-09-27 09:52:24 +02:00
Daniel Barbero fbce8b7533 fixed response events pandora_enterprise#9423 2022-09-27 09:51:37 +02:00
Calvo 8174925a91 Delete favourite vc from menu when vc is deleted 2022-09-26 11:32:07 +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
Daniel Barbero 229436b972 fixed agent/module widget pandora_enterprise#9519 2022-09-19 14:40:31 +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