743 Commits

Author SHA1 Message Date
Daniel Maya
bb4fce07a1 Added secondary groups in event details 2019-12-11 12:35:27 +01:00
Jose Gonzalez
3652f31a18 Code reset and solved other issues with comments 2019-12-05 17:06:58 +01:00
marcos
21bf49c218 update id_source_event 2019-11-22 13:38:08 +01:00
marcos
ab1a64a2e6 Merge remote-tracking branch 'origin/develop' into ent-3837-7848-campo-id_source_event-en-vista-de-eventos-y-poder-filtrar-por-este 2019-11-22 10:56:36 +01:00
marcos
de3f8b2a0f updates 2019-11-22 10:56:30 +01:00
Marcos Alconada
34cdcdfd6e Merge branch 'develop' into 'ent-3837-7848-campo-id_source_event-en-vista-de-eventos-y-poder-filtrar-por-este'
# Conflicts:
#   pandora_console/extras/mr/29.sql
#   pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
#   pandora_console/include/functions_events.php
2019-11-21 10:13:00 +01:00
Daniel Maya
fad70cfdc0 fixed secondary group in events 2019-11-20 16:34:56 +01:00
Tatiana Llorente
bae61d4225 Changed date format to last remote contact 2019-11-20 10:30:22 +01:00
Jose Gonzalez
62fbdd36a0 Solution for lost comments in the events section modal window 2019-11-13 15:36:52 +01:00
Luis Calvo
5676872f0a Fixed macro agent address empty ip 2019-10-18 15:44:05 +02:00
Alejandro Fraguas
78610b127c Merge branch 'ent-4682-Comentarios-en-eventos-no-se-ven-en-metaconsola' into 'develop'
Ent 4682 comentarios en eventos no se ven en metaconsola

See merge request artica/pandorafms!2775
2019-10-15 11:42:00 +02:00
Tatiana Llorente
7b862429af Change defined metaconsole to is_metaconsole function in api - #4771 2019-10-08 15:28:35 +02:00
Daniel Rodriguez
debbbdc4e5 Merge branch 'ent-4726-truncado-eventos-texto-muy-largo' into 'develop'
Improved truncate system and solved issue

See merge request artica/pandorafms!2774
2019-10-07 13:49:57 +02:00
Jose Gonzalez
7ac12e45ef Solved visual issue 2019-10-07 13:33:18 +02:00
marcos.alconada
a7b66e6365 revert changes 2019-10-07 12:07:31 +02:00
marcos.alconada
a9e8b1113e add default comments when change owner or status on events 2019-10-07 11:15:25 +02:00
Kike
b25c9ca793 Merge remote-tracking branch 'origin/develop' into 4689-mostrar-instrucciones-en-la-vista-de-eventos
Conflicts:
	pandora_console/include/functions_events.php
2019-10-03 15:59:15 +02:00
marcos.alconada
a44e1feeb4 fixed error comments events 2019-10-01 16:24:02 +02:00
Kike
dfea704154 Show instructions on mouse over 2019-09-27 14:48:45 +02:00
alejandro-campos
a5ea095734 Merge remote-tracking branch 'origin/develop' into ent-4461-Configuracion-integracion-integria 2019-09-24 15:16:22 +02:00
Kike
4ae14e0888 Fixed issue with instructions in events view 2019-09-24 15:14:17 +02:00
manuel
b7ff7bc121 Fixed bug in report items 2019-09-23 15:27:06 +02:00
alejandro-campos
0df2447770 added comment management and fixed some errors in incident edition 2019-09-20 12:37:47 +02:00
Jose Gonzalez
d7ca703c99 Cleaned the javascript call 2019-09-20 10:53:09 +02:00
Tatiana Llorente
ca6fe42298 Merge remote-tracking branch 'origin/ent-4461-Configuracion-integracion-integria' into ent-4642-Listado-de-tickets-integración-Integria 2019-09-13 12:00:04 +02:00
alejandro-campos
11cb53582c backup changes 2019-09-02 17:01:41 +02:00
Daniel Rodriguez
c47b24d84c Merge branch 'ent-4278-Bug-ACL-al-cargar-o-gestionar-filtros-de-eventos' into 'develop'
Fixed bug permissions on filter events- 4278

See merge request artica/pandorafms!2671
2019-08-30 16:07:45 +02:00
manuel
3901a1abb6 Fixed bug in metaconsole filter events 2019-08-27 15:46:22 +02:00
Daniel Barbero Martin
31da17db03 fixed event view metaconsole 2019-08-22 14:27:45 +02:00
Alejandro Fraguas
4c3d705340 Merge branch 'ent-4352-Evento-con-intructions-no-las-muestra-como-enlaces' into 'develop'
Ent 4352 evento con intructions no las muestra como enlaces

See merge request artica/pandorafms!2630
2019-08-20 14:29:47 +02:00
Tatiana Llorente
38547052fb Fixed bug permissions on filter events- 4278 2019-08-20 13:42:04 +02:00
Tatiana Llorente
c591dd4260 Show html tags in instructions - #4352 2019-08-01 13:11:50 +02:00
alejandro-campos
b4bd7f0f63 fixed problems in event view and event view custom fields 2019-07-30 16:10:34 +02:00
Jose Gonzalez
ca19e25f74 SQL Query modified for solve duplicate events issue 2019-07-24 16:00:25 +02:00
Alejandro Fraguas
e3e187b122 Merge branch 'ent-4308-error-sql-en-la-vista-de-reprotes-en-html-de-groups-event-report-metaconsola' into 'develop'
Resolved error query

See merge request artica/pandorafms!2566
2019-07-15 15:44:39 +02:00
Daniel Rodriguez
244c00e96f Merge branch 'ent-3428-error-grafica-events-per-agent-en-item-event-report-group-en-meta' into 'develop'
fixed errors with graphs in meta

See merge request artica/pandorafms!2594
2019-07-15 13:10:55 +02:00
Daniel Rodriguez
ac3de84bda Merge branch 'ent-4309-Falta-mensaje-de-Successfull-al-cambiar-el-owner-de-un-evento' into 'develop'
Added success and error messages when change the event owner - #4309

See merge request artica/pandorafms!2590
2019-07-11 11:36:03 +02:00
marcos.alconada
6382cb2abe fixed errors with graphs in meta 2019-07-10 14:18:23 +02:00
Tatiana Llorente
bfb7897149 Added success and error messages when change the event status - #4309 2019-07-10 12:15:41 +02:00
Daniel Rodriguez
207bcceb5f Merge branch 'ent-3685-7702-al-poner-evento-en-in-progress-no-se-muestra-el-campo-user' into 'develop'
Resolved

See merge request artica/pandorafms!2253
2019-07-09 18:00:13 +02:00
Tatiana Llorente
084d1a229e Added success and error messages when change the event owner - #4309 2019-07-09 16:41:00 +02:00
marcos.alconada
4430f18ac5 Resolved error query 2019-07-02 12:21:58 +02:00
fbsanchez
c1ac6b7ed6 mini_severity virtual column added 2019-06-24 19:23:41 +02:00
fbsanchez
c85965d793 SQLerror tasg reference 2019-06-24 19:05:46 +02:00
fbsanchez
0ea8904e0a SQLerror tasg reference 2019-06-24 18:52:38 +02:00
marcos.alconada
31ec8933a2 changed duplicated code with id_souce_event field 2019-06-21 12:37:32 +02:00
Marcos Alconada
f1110c6d56 Merge branch 'develop' into 'ent-3837-7848-campo-id_source_event-en-vista-de-eventos-y-poder-filtrar-por-este'
# Conflicts:
#   pandora_console/extras/mr/29.sql
2019-06-21 11:31:01 +02:00
fbsanchez
7a425e7e96 qa event viewer latest fixes 2019-06-20 21:33:38 +02:00
fbsanchez
526ebdebd9 ajax comments 2019-06-20 21:11:56 +02:00
fbsanchez
8671c7c88c events qa adjustments 2019-06-20 19:23:13 +02:00