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

657 Commits

Author SHA1 Message Date
jose.gonzalez@pandorafms.com 445a8161cf Merge 2022-12-05 09:44:35 +01:00
Daniel Rodriguez ba4112907d Merge branch 'ent-9494-post-busqueda-de-eventos-por-custom_data-no-permite-espacios-ni-mayusculas' into 'develop' 
Ent 9494 post busqueda de eventos por custom data no permite espacios ni mayusculas

See merge request artica/pandorafms!5208
 2022-11-23 09:47:55 +00:00
Daniel Rodriguez 0fb90e3383 Merge branch 'ent-9861-stored-cross-site-scripting-vulnerability-in-create-event-section' into 'develop' 
Fix events view XSS vulnerabilities

See merge request artica/pandorafms!5284
 2022-11-23 09:46:52 +00:00
jose.gonzalez@pandorafms.com a688182062 Merge remote-tracking branch 'origin' into ent-9662-Restyling-fuentes-colores-botones 2022-11-22 17:47:02 +01:00
Calvo 5aa51f28de Fix events view XSS vulnerabilities 2022-11-22 15:54:19 +01:00
Daniel Rodriguez 833032763d Merge branch 'ent-9822-14530-Problemas-en-Widgets-de-Dashboard' into 'develop' 
minor fix

See merge request artica/pandorafms!5273
 2022-11-22 12:29:37 +00:00
Daniel Maya 4e94976b9d #9494 Fixed custom data search 2022-11-22 13:24:26 +01:00
Daniel Rodriguez 1a77ee9ce4 Merge branch 'ent-9716-14429-no-se-ve-primer-ultimo-evento-al-agrupar-por-extra-id' into 'develop' 
fix timestamp modal event grouped by extra id pandora_enterprise#9716

See merge request artica/pandorafms!5229
 2022-11-22 09:20:47 +00:00
Daniel Barbero 4118a46b9f add new filter search events pandora_enterprise#9135 2022-11-18 14:04:54 +01:00
Daniel Barbero a31733ffef Merge remote-tracking branch 'origin/develop' into ent-9135-buscar-por-nombre-de-usuario-en-eventos 2022-11-18 07:51:26 +01:00
alejandro.campos@artica.es 635eb692d1 minor fix 2022-11-16 16:43:21 +01:00
Daniel Rodriguez 65ea42d8f7 Merge branch 'ent-9723-bug-con-el-get_events-de-la-api-14390' into 'develop' 
fix api get events pandora_enterprise#9723

See merge request artica/pandorafms!5239
 2022-11-14 11:33:59 +00:00
Daniel Barbero 4385442690 fixed acl error in events list pandora_enterprise#9794 2022-11-10 13:13:44 +01:00
Daniel Barbero c16901a5e2 fixed get events API pandora_enterprise#9723 2022-11-10 09:19:32 +01:00
Daniel Barbero b8939cb624 fix api get agent criticity pandora_enterprise#9723 2022-11-08 09:00:25 +01:00
Luis Calvo a40f1909e7 Fix events view coun with no pagination 2022-11-07 16:19:18 +01:00
= 58e5f7180d Fix events view coun with no pagination 2022-11-07 15:59:56 +01:00
jose.gonzalez@pandorafms.com f99a7dc511 Adaptations 2022-11-07 14:04:07 +01:00
Daniel Barbero 33b1c0ab8f add new filter pandora_enterprise#9135 2022-11-03 12:00:58 +01:00
Daniel Barbero 0ff07d7224 add new macro event response group_contact pandora_enterprise#9246 2022-11-02 16:59:04 +01:00
Daniel Barbero 7655c23637 fix api get events pandora_enterprise#9723 2022-11-02 13:40:23 +01:00
Daniel Barbero 12c4217b3f fix timestamp modal event grouped by extra id pandora_enterprise#9716 2022-10-28 10:10:53 +02:00
jose.gonzalez@pandorafms.com 70d0e38382 Adapt views 2022-10-25 11:46:28 +02:00
Diego Muñoz-Reja aff8fdb005 Merge branch 'ent-9425-agrupar-eventos-por-id_extra' into 'develop' 
new group by events for extraid pandora_enterprise#9425

See merge request artica/pandorafms!5147
 2022-10-24 15:19:21 +00:00
Daniel Maya dbe329f1de #9494 Fixed custom data 2022-10-24 15:17:02 +02:00
Daniel Barbero 47a2e01a33 Merge remote-tracking branch 'origin/develop' into ent-2133-14061-recursividad-en-la-vista-de-eventos-accelya 
Conflicts:
	pandora_console/extras/mr/58.sql
 2022-10-18 07:59:26 +02:00
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 fadd5d3a2e Merge branch 'ent-9541-14226-Añadir-comentarios-a-eventos-rapidamente-por-API-rompe-la-visualizacion-del-comentario' into 'develop' 
fixed limitation of group_concat

Ref pandora_enterprise#9541

See merge request artica/pandorafms!5130
 2022-10-14 08:29:58 +00:00
Daniel Barbero 4dd311063e fixed errors view events sort and save filters pandora_enterprise#9425 2022-10-14 09:31:45 +02:00
Daniel Barbero a21048c4c5 Merge remote-tracking branch 'origin/develop' into ent-9425-agrupar-eventos-por-id_extra 2022-10-14 08:11:51 +02:00
Daniel Barbero d068a9e9cc fixed group by extra_id pandora_enterprise#9425 2022-10-10 13:18:57 +02:00
Daniel Barbero 4609e141ee remove tmetaconsole_history token pandora_enterprise#9579 2022-09-30 08:56:19 +02:00
Daniel Barbero 8438045cf6 filter recursive groups in events pandora_enterprise#2133 2022-09-29 12:54:46 +02:00
Daniel Barbero 3dea1f3146 filter events multiselector nodes pandora_enterprise#8597 2022-09-29 09:17:37 +02:00
Daniel Barbero 8d8140faa4 add new macros response events pandora_enterprise#9423 2022-09-28 09:30:30 +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
Daniel Barbero 9e2c6edfeb new group by events for extraid pandora_enterprise#9425 2022-09-27 15:08:09 +02: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
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
Diego Muñoz-Reja 10d97c8cfa Merge branch 'ent-9420-eventos-agrupados-no-muestran-estado-del-ultimo-elemento' into 'develop' 
fixed group by order event_get_all pandora_enterprise#9420

See merge request artica/pandorafms!5106
 2022-09-26 15:16:15 +00:00
Daniel Barbero 225646cd9d fixed response events pandora_enterprise#9423 2022-09-23 13:55:01 +02:00
alejandro.campos@artica.es debf2e7a40 fixed limitation of group_concat 2022-09-21 13:32:36 +02:00
alejandro.campos@artica.es 2852311cf7 fix 2022-09-19 15:42:43 +02:00
edu.corral af7ad37b50 ent 8659 fullname event owner 2022-09-16 11:04:01 +02:00
alejandro.campos@artica.es c49b4db32d fixed 500 2022-09-14 17:09:29 +02:00
Daniel Barbero 7771a96466 fixed group by order event_get_all pandora_enterprise#9420 2022-09-13 14:09:15 +02:00
alejandro.campos@artica.es 82bf0bd4f6 fixed event filter 2022-08-23 11:42:52 +02:00
Jimmy Olano 8d7b02069a Merge branch 'ent-8043-eventos-solo-se-agrupan-si-tienen-el-mismo-estado' into 'develop' 
not group by event status pandora_enterprise#8043

pandora_enterprise#8043

See merge request artica/pandorafms!5031
 2022-08-01 18:46:38 +00:00
Diego Muñoz-Reja 4cbd23d911 Merge branch 'ent-8836-post-macros-para-custom-data-de-eventos-no-funcionan-sin-base64' into 'develop' 
Ent 8836 post macros para custom data de eventos no funcionan sin base64

See merge request artica/pandorafms!4879
 2022-08-01 13:02:00 +00:00
Daniel Barbero e11d46ea60 Merge remote-tracking branch 'origin/develop' into ent-8043-eventos-solo-se-agrupan-si-tienen-el-mismo-estado 
Conflicts:
	pandora_console/include/ajax/events.php
 2022-08-01 07:08:00 +02:00
Daniel Barbero Martin fe1a2cd962 collation mysql8 pandora_enterprise#9290 2022-07-29 08:46:17 +02:00
Daniel Barbero Martin e3e9f86119 not group by event status pandora_enterprise#8043 2022-07-26 10:55:11 +02:00
Daniel Barbero Martin 9d33fa08fe fix error collation events pandora_enterprise#9290 2022-07-26 07:57:04 +02: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
Daniel Barbero Martin 13832dcfa2 fix time api create event pandora_enterprise#9284 2022-07-18 17:06:12 +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
Daniel Barbero Martin 12f73d86fd new filter search eventspandora_enterprise#8942 2022-07-05 17:02:40 +02:00
Daniel Barbero Martin e009257d2f bugs events pandora_enterprise#9239 2022-06-30 11:56:25 +02:00
Daniel Maya 475524df04 #8939 conflict resolved 2022-06-28 10:58:17 +02:00
Daniel Maya 2049805de7 #9033 conflict resolved 2022-06-27 17:13:23 +02:00
Daniel Barbero Martin f89aaabc21 minor fixed events 2022-06-23 18:06:25 +02:00
Daniel Barbero Martin 58f5f4e9f1 refactor events meta pandora_enterprise#9086 2022-06-23 12:47:49 +02:00
Daniel Barbero Martin 0c09e7fc22 refactor events meta pandora_enterprise#9086 2022-06-22 14:05:21 +02:00
Daniel Barbero Martin f39d502108 refactor events meta pandora_enterprise#9086 2022-06-22 10:11:24 +02:00
Daniel Barbero Martin 4ca78ec00c refactor events meta pandora_enterprise#9086 2022-06-22 09:44:00 +02:00
Daniel Barbero Martin 9505206328 Merge remote-tracking branch 'origin/develop' into ent-9086-eliminacion-de-la-replicacion-de-eventos-duplicado 2022-06-22 08:48:38 +02:00
José González b2b64ae014 Merge remote-tracking branch 'origin' into ent-9034-Alert-SNMP-como-agent-name-vista-tactica 2022-06-21 14:47:28 +02:00
José González 4480455258 Clean unnecesary message 2022-06-21 14:45:17 +02:00
Daniel Barbero Martin 9bb072a48a refactor events meta pandora_enterprise#9086 2022-06-21 14:10:08 +02:00
Daniel Barbero Martin 9d23b9af4a refactor events meta pandora_enterprise#9086 2022-06-21 11:17:18 +02:00
Daniel Barbero Martin 3e59093b0e refactor events meta pandora_enterprise#9086 2022-06-20 12:29:00 +02:00
Daniel Barbero Martin 7e25a86d52 refactor events meta pandora_enterprise#9086 2022-06-17 12:50:40 +02:00
Daniel Barbero Martin 8e7ed75b3e refactor events meta pandora_enterprise#9086 2022-06-16 11:31:07 +02:00
Daniel Barbero Martin 8ad6d350af refactor events meta pandora_enterprise#9086 2022-06-15 13:06:10 +02:00
Daniel Barbero Martin b82b3c3fb1 refactor events meta pandora_enterprise#9086 2022-06-14 18:47:09 +02:00
Daniel Barbero Martin 90013603a7 refactor events meta pandora_enterprise#9086 2022-06-13 17:06:09 +02:00
Daniel Maya 2cfb4e53c2 #9033 Fixed group events 2022-06-09 14:59:43 +02:00
Daniel Barbero Martin 8dbc860f4a refactor events meta pandora_enterprise#9086 2022-06-08 17:01:15 +02:00
Daniel Barbero Martin ee2810e680 refactor events meta pandora_enterprise#9086 2022-06-07 17:25:51 +02:00
Daniel Barbero Martin 1cd680a971 Merge remote-tracking branch 'origin/develop' into ent-9086-eliminacion-de-la-replicacion-de-eventos-duplicado 
Conflicts:
	pandora_console/operation/events/events.php
 2022-06-03 09:28:18 +02:00
Daniel Barbero Martin 8dd9523b40 refactor events meta pandora_enterprise#9086 2022-06-03 09:20:51 +02:00
Daniel Rodriguez 98dd5b81ce Merge branch 'ent-8766-POST-Error-al-crear-eventos-con-comentarios-que-tienen-salto-de-línea' into 'develop' 
Ent 8766 post error al crear eventos con comentarios que tienen salto de línea

See merge request artica/pandorafms!4796
 2022-06-02 07:33:10 +00:00
Daniel Barbero Martin 0cda3d3613 refactor events meta pandora_enterprise#9086 2022-06-01 17:27:44 +02:00
Daniel Maya 4ae2df8ded #8939 comment optimization 2022-05-17 13:42:38 +02:00
Daniel Maya a2be858a7d #8836 remove base64 decode 2022-05-10 16:25:05 +02:00
Daniel Barbero Martin da0f1db288 8940 fix events view 2022-05-05 11:32:37 +02:00
Daniel Barbero Martin e46be28765 performance events view#8800 2022-04-19 09:30:27 +02:00
Daniel Maya 4a6ab6ce95 #8766 Fixed event comments 2022-04-04 16:02:26 +02:00
alejandro.campos@artica.es 3042755e70 Merge branch 'ent-8340-POST-Custom-data-en-vista-de-eventos' of brutus.artica.es:artica/pandorafms into ent-8340-POST-Custom-data-en-vista-de-eventos 2022-04-01 14:07:31 +02:00
alejandro.campos@artica.es b7aca968a3 minor change 2022-04-01 14:06:51 +02:00
Alejandro Campos 3e5865b539 Merge branch 'develop' into 'ent-8340-POST-Custom-data-en-vista-de-eventos' 
# Conflicts:
#   pandora_console/extras/mr/53.sql
 2022-03-30 08:03:08 +00:00
alejandro.campos@artica.es 7bfa78a3d5 minor fix 2022-03-30 10:01:37 +02:00
Daniel Rodriguez 74e4461d8a Merge branch 'ent-8697-13244-no-funcionan-acciones-de-eventos-a-traves-de-un-dashboard' into 'develop' 
Fix dashboard events responses

See merge request artica/pandorafms!4759
 2022-03-30 07:45:07 +00:00
alejandro.campos@artica.es d137e0d798 implemented custom data filter in event view 2022-03-29 18:09:19 +02:00
Calvo 6ed8851188 Fix event list widget actions on dashboard 2022-03-24 18:52:06 +01:00
Calvo 174f6dce51 Fix dashboard event list, Removed missing debugger in code 2022-03-22 18:02:53 +01:00
Luis ba6a56b9fc WIP: event dashboard responses 2022-03-21 18:15:58 +01:00