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

608 Commits

Author SHA1 Message Date
Daniel Barbero b4d306b9b1 Merge remote-tracking branch 'origin/develop' into ent-9554-nuevas-graficas-de-tarta-que-reemplazar-a-las-actuales-3 2022-12-19 09:38:21 +01:00
Daniel Barbero a0ddad63b8 Merge remote-tracking branch 'origin/develop' into ent-9135-buscar-por-nombre-de-usuario-en-eventos 
Conflicts:
	pandora_console/extras/mr/59.sql
 2022-12-13 09:17:39 +01:00
Daniel Barbero 01d14ae3b8 new chart chartjs pandora_enterprise#9554 2022-12-13 09:10:13 +01:00
Rafael Ameijeiras 884e07d11e Merge branch 'ent-9747-14463-faltan-eventos-en-la-consola-cuando-se-seleccionan-todos' into 'develop' 
Ent 9747 14463 faltan eventos en la consola cuando se seleccionan todos

See merge request artica/pandorafms!5251
 2022-12-12 22:54:27 +00:00
Rafael Ameijeiras d3a079765d Merge branch 'ent-9246-13884-habilitar-_groupcontact_-en-las-respuestas-de-eventos' into 'develop' 
add new macro event response group_contact pandora_enterprise#9246

See merge request artica/pandorafms!5240
 2022-12-12 22:53:21 +00: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
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
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
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