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

516 Commits

Author SHA1 Message Date
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
Daniel Rodriguez 82474264a7 Merge branch 'ent-8339-POST-Macros-para-custom-data-de-eventos' into 'develop' 
Ent 8339 post macros para custom data de eventos

See merge request artica/pandorafms!4749
 2022-03-18 13:56:49 +00:00
Daniel Maya 860400fa9c #8339 added macros _customdata_json_ and _customdata_text_ 2022-03-08 16:42:19 +01:00
Daniel Maya 7e29cd5a60 #8547 added macros _current_username_ and _owner_username_ 2022-03-08 10:44:24 +01:00
fbsanchez 4d912fbd34 Merge remote-tracking branch 'origin/develop' into ent-6802-super-8 2022-02-11 09:55:34 +01:00
Daniel Rodriguez 0fe50cf938 Merge branch 'ent-8568-error-sql-cargar-filtro-eventos' into 'develop' 
Fix issue with filters in SQL query

Closes pandora_enterprise#8568

See merge request artica/pandorafms!4690
 2022-02-10 18:41:24 +00:00
Jose Gonzalez 034329d96d Fix issue with filters in SQL query 2022-02-10 16:09:53 +01:00
fbsanchez aa2b08f516 php8 incompatibility fixes 2022-02-07 13:35:00 +01:00
Jose Gonzalez 40efaa157d Merge remote-tracking branch 'origin' into ent-8422-Revision-completa-audit-logs 2022-02-01 13:42:30 +01:00
Jose Gonzalez d81e6571ec New audit logs 2022-02-01 13:39:18 +01:00
Jose Gonzalez 3252832cc7 WIP: Check audit logs 2022-01-20 10:55:23 +01:00
alejandro.campos@artica.es a751fd7077 fixed event view filter 2022-01-18 09:07:49 +01:00
fbsanchez f852df2f1c Merge remote-tracking branch 'origin/develop' into ent-8130-ncm-fase-2 
Conflicts:
	pandora_console/extras/mr/51.sql
 2021-12-14 11:03:04 +01:00
Daniel Rodriguez c3f9ed1bf2 Merge branch 'ent-8042-agrupacion-eventos-no-funcionan-bien-comentarios' into 'develop' 
Added feature for read comments in grouped events

Closes pandora_enterprise#8042

See merge request artica/pandorafms!4467
 2021-12-07 16:51:07 +00:00
Jose Gonzalez 3238811f96 Fixed comments issues 2021-12-01 13:15:34 +01:00
fbsanchez 582cb9a082 Merge remote-tracking branch 'origin/develop' into ent-8130-ncm-fase-2 
Conflicts:
	pandora_console/extras/mr/51.sql
 2021-11-19 10:51:46 +01:00
fbsanchez 9ff3c8eee1 wip ncm2 2021-11-15 18:58:57 +01:00
Daniel Rodriguez 8b258f9b5c Merge branch 'ent-8044-Inconsistencia-en-ID-de-eventos-agrupados' into 'develop' 
fix wrong event id in grouped events

See merge request artica/pandorafms!4461
 2021-11-15 12:24:47 +00:00
Jose Gonzalez 3f28a98744 Added feature for read comments in grouped events 2021-10-13 14:58:31 +02:00
Jose Gonzalez eaaab1e250 Added visual tab Custom data in events 2021-10-08 14:59:18 +02:00
alejandro.campos@artica.es 088193438f fix wrong event id in grouped events 2021-10-08 11:59:29 +02:00
Daniel Rodriguez ce40b36923 Merge branch 'ent-7582-anadir-selector-horas-eventos' into 'develop' 
Ent 7582 anadir selector horas eventos

Closes pandora_enterprise#7582

See merge request artica/pandorafms!4266
 2021-09-21 13:17:30 +00:00
Daniel Rodriguez d701e50b9f Merge branch 'ent-7684-mostrar-campo-con-el-nombre-de-nodo-que-viene-en-metaconsola-en-la-vista-de-detalle-del-evento' into 'develop' 
add node name on event details

See merge request artica/pandorafms!4274
 2021-08-25 13:01:02 +00:00
Daniel Rodriguez 22587a0dde Merge branch 'ent-7036-11346-Introducir-el-campo-de-IP-del-agente-en-la-vista-de-eventos' into 'develop' 
Ent 7036 11346 introducir el campo de ip del agente en la vista de eventos

See merge request artica/pandorafms!4275
 2021-08-25 13:00:42 +00:00
Daniel Rodriguez 3f4e0ee0f4 Merge branch 'ent-7692-selector-de-cambio-de-propietario-muy-estrecho-en-modal-de-eventos-metaconsola' into 'develop' 
more size for select owner modal events

See merge request artica/pandorafms!4222
 2021-08-11 07:11:18 +00:00
Daniel Rodriguez 66ebc14dca Merge branch 'ent-7532-11853-Cambio-comportamiento-tags-en-Widget-de-eventos-en-dashboards' into 'develop' 
Ent 7532 11853 cambio comportamiento tags en widget de eventos en dashboards

See merge request artica/pandorafms!4233
 2021-08-04 12:04:57 +00:00
Daniel Maya 66e9539818 Added agent ip in custom events 2021-07-07 16:07:08 +02:00
marcos 46bfa151a0 add node name on event details 2021-07-07 14:54:29 +02:00
José González 47b6e40799 Added controls for filter with hours 2021-07-05 17:42:45 +02:00
José González 498a353a29 Improve code for get secondary groups 2021-07-02 12:20:53 +02:00
Daniel Maya 76d996a966 Fixed tags in events 2021-06-24 12:51:14 +02:00
marcos 5aeab363e9 more size for select owner modal events 2021-06-21 11:25:19 +02:00
José González 11d1b785b2 Fixed issue with group events in reports 2021-05-20 14:44:40 +02:00
Daniel Rodriguez dcbeaa1b3e Merge branch 'ent-7295-bug-visual-en-modal-eventos' into 'develop' 
Fixed visual bug on event modal event responses

See merge request artica/pandorafms!4022
 2021-05-11 13:49:40 +00:00
Luis b9398604f6 Fixed visual bug on event modal event responses 2021-05-11 13:49:40 +00:00
Marcos Alconada 8f324b942b fixed visual error black theme event modal 2021-05-10 09:16:19 +00:00
Daniel Rodriguez 599a38fbd1 Merge branch 'ent-7404-Respuestas-de-eventos-en-usuario-solo-lectura' into 'develop' 
Ent 7404 respuestas de eventos en usuario solo lectura

See merge request artica/pandorafms!4077
 2021-04-28 14:18:35 +00:00
Daniel Rodriguez e117fd8fd0 Merge branch 'ent-7411-Error-SQL-en-items-Module-event-report-y-Agent-event-report-metaconsola' into 'develop' 
Fixed errors SQL metaconsole events

See merge request artica/pandorafms!4076
 2021-04-28 08:44:26 +00:00
Daniel Rodriguez c54f542b45 Merge branch 'ent-7376-11735-varios-problemas-de-visualizacion-modo-en-tema-oscuro' into 'develop' 
fixed minnor error black theme 7376

See merge request artica/pandorafms!4064
 2021-04-27 14:05:08 +00:00
Marcos Alconada 177be1f1a4 fixed error with special charact filter in user commens 2021-04-27 11:46:16 +00:00
Daniel Maya 49d2e9a437 #7404 fixed acl in event response 2021-04-27 10:19:05 +02:00
Daniel Barbero Martin 8324655aab Fixed errors SQL metaconsole events 2021-04-27 10:03:34 +02:00