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

959 Commits

Author SHA1 Message Date
Daniel Barbero Martin de926b5677 fix error events pandora_enterprise#9245 2022-07-01 13:54:33 +02:00
Daniel Barbero Martin e28bfe9f3f modal sound events pandora_enterprise#9095 2022-06-30 17:17:05 +02:00
Daniel Barbero Martin e009257d2f bugs events pandora_enterprise#9239 2022-06-30 11:56:25 +02:00
Diego Muñoz-Reja 9120eb44c5 Merge branch 'ent-9231-grave-problema-seguridad-vista-de-eventos-metaconsola' into 'develop' 
fix events pandora_enterprise#9231

See merge request artica/pandorafms!4990
 2022-06-28 15:37:46 +00:00
Daniel Barbero Martin 0957dd338f fix events pandora_enterprise#9231 2022-06-28 16:56:25 +02:00
José González b03356cc3c Merge branch 'develop' into 'ent-9089-Mejoras-usabilidad-menu-gestion-eventos' 
# Conflicts:
#   pandora_console/godmode/menu.php
 2022-06-28 14:08:13 +00:00
Daniel Maya 475524df04 #8939 conflict resolved 2022-06-28 10:58:17 +02:00
Daniel Barbero Martin 1c051f88bc Merge remote-tracking branch 'origin/develop' into ent-7960-filtros-de-alertas-sonoras-sound-events-2 
Conflicts:
	pandora_console/include/functions_events.php
 2022-06-27 16:07:19 +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 4b00e8ee3c refactor events meta pandora_enterprise#9086 2022-06-22 10:29:19 +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 8ad6d350af refactor events meta pandora_enterprise#9086 2022-06-15 13:06:10 +02:00
Daniel Barbero Martin 3b3e964cf9 Merge remote-tracking branch 'origin/develop' into ent-9086-eliminacion-de-la-replicacion-de-eventos-duplicado 2022-06-14 07:57:18 +02:00
Daniel Barbero Martin 5968febd04 Merge remote-tracking branch 'origin/develop' into ent-7960-filtros-de-alertas-sonoras-sound-events-2 
Conflicts:
	pandora_console/include/javascript/pandora.js
 2022-06-13 17:10:19 +02:00
Daniel Barbero Martin 90013603a7 refactor events meta pandora_enterprise#9086 2022-06-13 17:06:09 +02:00
Daniel Rodriguez 38de162f94 Merge branch 'ent-9031-Mejora-visual-Cajas-de-busqueda-avanzada-de-ver-eventos' into 'develop' 
Ent 9031 mejora visual cajas de busqueda avanzada de ver eventos

See merge request artica/pandorafms!4925
 2022-06-13 09:22:54 +00:00
Daniel Rodriguez 3506fd0067 Merge branch 'ent-9030-cambiar-altura-lista-vista-filtro-eventos' into 'develop' 
Change selector size

See merge request artica/pandorafms!4920
 2022-06-13 09:22:22 +00: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
José González 1be4948e2d Changed strings and improve code 2022-06-03 12:26:15 +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 0cda3d3613 refactor events meta pandora_enterprise#9086 2022-06-01 17:27:44 +02:00
Daniel Maya f4784f4922 #9031 Fixed css filter 2022-05-31 17:09:15 +02:00
Daniel Barbero Martin f6de9fb0a0 events sound pandora_enterprise#7960 2022-05-31 10:10:44 +02:00
Daniel Barbero Martin 8e78110d5d events sound pandora_enterprise#7960 2022-05-30 17:47:28 +02:00
José González 24ff171f7f Change selector size 2022-05-27 12:17:26 +02:00
Daniel Maya 4ae2df8ded #8939 comment optimization 2022-05-17 13:42:38 +02:00
José González 77636d68ff Fix fb64 forgiven severity params 2022-04-11 15:22:37 +02:00
alejandro.campos@artica.es d137e0d798 implemented custom data filter in event view 2022-03-29 18:09:19 +02:00
alejandro.campos@artica.es 24d144ae26 minor fix 2022-03-23 17:23:45 +01:00
alejandro.campos@artica.es c7dd55e959 minor fix 2022-03-23 17:18:24 +01:00
alejandro.campos@artica.es 5757d4a933 implement csv export of events in meta and minor fixes 2022-03-23 14:24:39 +01:00
alejandro.campos@artica.es e1ec4ce40e change storage format of custom data field in DB 2022-03-18 11:23:29 +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
Daniel Maya e8d3d93f7f Fixed pandora_black in metaconsole 2022-01-17 10:22:30 +01:00
Daniel Rodriguez 10e282b76b Merge branch 'ent-8108-Error-en-la-vista-de-eventos-de-un-agente-concreto' into 'develop' 
fixed filter loaded from event graph on agent view

See merge request artica/pandorafms!4564
 2021-12-28 12:02:56 +00:00
Jose Gonzalez 37675e0fce Added php8 function and solve issue with agent id sorting in events 2021-12-16 16:35:31 +01:00
fbsanchez cad0c6cea6 Merge remote-tracking branch 'origin/develop' into ent-8130-ncm-fase-2 
Conflicts:
	pandora_console/extras/mr/51.sql
 2021-12-02 10:43:30 +01:00
alejandro.campos@artica.es da22381044 fixed filter loaded from event graph on agent view 2021-12-01 11:13:28 +01:00
Calvo d7f590bacb Merge remote-tracking branch 'origin/develop' into ent-7844-revision-acl-enterprise-parte-3-fallos-actuales 2021-11-24 13:42:48 +01:00
fbsanchez a9485024f4 Merge remote-tracking branch 'origin/develop' into ent-8130-ncm-fase-2 
Conflicts:
	pandora_console/extras/mr/51.sql
 2021-11-23 14:29:23 +01:00
Daniel Maya c3295b8fd2 #8191 Fixed filter 2021-11-19 11:38:11 +01:00
Calvo 9d3c691ad1 Merge remote-tracking branch 'origin/develop' into ent-7844-revision-acl-enterprise-parte-3-fallos-actuales 2021-11-15 18:33:35 +01:00
José González bdc4d0a8b1 Revert "Merge branch 'ent-7662-rebranding-meta' into 'develop'" 
This reverts merge request !4302
 2021-11-04 16:28:15 +01:00
Jose Gonzalez 8696d21a42 Fixed any minor bugs 2021-09-29 17:03:13 +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
Calvo 3204fdb71f Merge remote-tracking branch 'origin/develop' into ent-7844-revision-acl-enterprise-parte-3-fallos-actuales 2021-09-01 11:06:20 +02: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 fe30b9c785 Merge branch 'ent-7445-Fallo-al-almacenar-dato-string-en-tevento-dentro-de-un-evento-Alert-fired' into 'develop' 
implemented capacity to handle string data for event data

See merge request artica/pandorafms!4184
 2021-08-17 12:19:54 +00:00
Calvo 34c3b00426 WIP: Revision ACL part 3 2021-08-13 15:57:01 +02:00
Daniel Rodriguez 77d00fd9e2 Merge branch 'ent-7647-vulnerabilidad-xss-en.nombre.filtro-eventos' into 'develop' 
Fixedd XSS on load filter event name

See merge request artica/pandorafms!4174
 2021-08-09 09:00:15 +00:00
Alejandro Campos ff93169049 Merge branch 'develop' into 'ent-7445-Fallo-al-almacenar-dato-string-en-tevento-dentro-de-un-evento-Alert-fired' 
# Conflicts:
#   pandora_console/extras/mr/48.sql
 2021-08-09 06:45:46 +00:00
fbsanchez 3d5ae6887c Event migration warnings popups 2021-07-07 16:11:20 +02:00
Daniel Maya 66e9539818 Added agent ip in custom events 2021-07-07 16:07:08 +02:00
José González 47b6e40799 Added controls for filter with hours 2021-07-05 17:42:45 +02:00
alejandro.campos@artica.es 240efc4dcf truncate string 2021-06-08 16:48:01 +02:00
alejandro.campos@artica.es fdc6d2f4c8 implemented capacity to handle string data for event data 2021-06-08 16:09:37 +02:00
Calvo 2f3cae8d61 Fixedd XSS on load filter event name 2021-06-04 13:36:32 +02:00
Daniel Barbero Martin d88520f752 Wip command center 2021-05-28 14:32:41 +02:00
Daniel Barbero Martin 6b248da428 Wip command center 2021-05-25 17:39:21 +02:00
Daniel Barbero Martin 0b36853553 Wip command center 2021-05-24 17:35:15 +02:00
Daniel Maya 8ef21d9b15 Ent 7395 filtro de eventos en metaconsola server 2021-04-28 10:50:04 +00:00
Daniel Rodriguez 5857c0d231 Merge branch 'ent-7393-Filtro-de-eventos-en-Metaconsola-Severity' into 'develop' 
Ent 7393 filtro de eventos en metaconsola severity

See merge request artica/pandorafms!4070
 2021-04-28 06:51:25 +00:00
Daniel Maya dd124fa7d9 Fixed severity 2021-04-26 14:09:07 +02:00
alejandro.campos@artica.es 8f58b74976 fixed filter load in events view 2021-04-21 13:05:18 +02:00
Daniel Rodriguez 79b11a6b30 Merge branch 'ent-4264-cambios-vista-de-eventos' into 'develop' 
Ent 4264 cambios vista de eventos

See merge request artica/pandorafms!3893
 2021-04-12 08:47:13 +00:00
Daniel Rodriguez b89a860ba7 Merge branch 'ent-6969-bug-refresco-eventos' into 'develop' 
Fixed mixed response from event datatables

See merge request artica/pandorafms!3952
 2021-04-07 10:55:25 +00:00
Daniel Rodriguez e54e06b6ac Merge branch 'ent-7030-Alertas-sonoras-VS-eventos-API' into 'develop' 
fixed errors sound events

See merge request artica/pandorafms!3916
 2021-04-06 17:11:37 +00:00
daniel 89ffb05466 fixed errors sound events 2021-04-06 17:11:37 +00:00
Marcos Alconada 9e1bacb66e fixed visual error 2021-03-29 07:23:03 +00:00
Marcos Alconada 9dd17acb57 fixed visual error 2021-03-26 13:40:55 +00:00
Calvo d9d98fe1e3 Fixed mixed response from event datatables 2021-03-25 13:20:30 +01:00
Daniel Rodriguez f92c75639a Merge branch 'ent-7089-11446-trazas-en-el-codigo-de-release' into 'develop' 
Removed extra verbosity

See merge request artica/pandorafms!3899
 2021-03-23 09:29:05 +00:00
Marcos Alconada 04bae1b4fb fixed visual errors 2021-03-18 17:05:50 +00:00
fbsanchez b63f1ad681 Removed extra verbosity 2021-03-15 10:07:36 +01:00
Daniel Maya 2f7d0f1795 fixed permissions on response 2021-03-11 16:11:06 +01:00
Marcos Alconada d8a628b1c4 Ent 6781 revision de estilos visuales y eliminacion de sistemas skins 2021-03-11 14:40:23 +00:00
Daniel Rodriguez 06a027127f Merge branch 'ent-6851-Quitar-marquesina-de-vista-de-eventos' into 'develop' 
Ent 6851 quitar marquesina de vista de eventos

See merge request artica/pandorafms!3752
 2021-03-09 16:39:26 +00:00
Daniel Maya b54845fdcf Ent 6851 quitar marquesina de vista de eventos 2021-03-09 16:39:26 +00:00
Daniel Rodriguez 825c1f05f0 Merge branch 'ent-6527-mal-link-elementos-servicio' into 'develop' 
Added control for id_agent_module

Closes pandora_enterprise#6527

See merge request artica/pandorafms!3703
 2021-03-09 16:38:32 +00:00
Daniel Rodriguez 4996be48dc Merge branch 'ent-6966-No-se-ve-fecha-validacion' into 'develop' 
Fixed issue with date

Closes pandora_enterprise#6966

See merge request artica/pandorafms!3818
 2021-03-09 16:37:34 +00:00
fbsanchez 40e97f6cf6 Removed warnings 2021-02-09 10:25:08 +01:00
Jose Gonzalez aee474e43c Fixed issue with date 2021-02-04 14:54:11 +01:00
Luis Calvo 778419e71d Merge remote-tracking branch 'origin/develop' into ent-6844-quitar-vista-estadisticas-eventos 2021-01-25 13:06:36 +01:00
Luis Calvo 210f2057cd Removes event_statistics view 2020-12-21 17:56:24 +01:00
José González 623b729001 Merge branch 'develop' into 'ent-1175-copyright-actualizados' 
# Conflicts:
#   pandora_agents/pc/Win32/pandora_agent.conf
#   pandora_agents/win32/bin/pandora_agent.conf
#   pandora_console/extensions/realtime_graphs.php
#   pandora_console/godmode/snmpconsole/snmp_alert.php
#   pandora_console/include/functions_ui.php
#   pandora_console/install.php
#   pandora_console/operation/agentes/realtime_win.php
 2020-12-14 11:10:35 +01:00
Jose Gonzalez fd6aef1b37 Added control for id_agent_module 2020-12-09 18:15:01 +01:00
Luis 50b1fa3c56 Changed check connection method to ajax. Check deleted from login 2020-12-03 12:27:55 +01:00
Jose Gonzalez 649442f794 Updated copyrights 2020-11-27 13:52:35 +01:00
Luis 2f2556ef79 Ent 6680 ventana de perdida de conexion incorrecta 2020-11-04 16:41:25 +01:00
Daniel Rodriguez 946c548244 Merge branch 'ent-6626filtros-de-eventos-personalizados-no-guardia-varios-apartados' into 'develop' 
Primeras modificaciones del filtro de eventos

See merge request artica/pandorafms!3585
 2020-10-30 14:42:41 +01:00
daniel b3043c2e01 Fixed template events 2020-10-30 13:29:50 +01:00
Daniel Rodriguez 9a5291da5a Merge branch 'ent-6578-Bugs-eventos-sonoros-3' into 'develop' 
fixed sound events

See merge request artica/pandorafms!3566
 2020-10-30 12:16:54 +01:00
Daniel Rodriguez 12b36e7f5a Merge branch 'ent-6554-status-vacio-al-exportar-eventos-a-csv' into 'develop' 
fixed error with value status field

See merge request artica/pandorafms!3548
 2020-10-29 15:15:52 +01:00
marcos 765d37d4e9 formato funcion 2020-10-29 15:06:01 +01:00
Daniel Maya 43ca5e4972 Ent 6482 fallo en la agrupación de eventos 2020-10-29 12:53:09 +01:00
marcos cf108c0a17 se cambia el valor del modulo y marca en el filtro usado 2020-10-29 12:30:54 +01:00
marcos edc9038783 Primeras modificaciones del filtro de eventos 2020-10-29 10:24:37 +01:00
alejandro-campos 4ff0923589 fixed sound events 2020-10-23 13:53:38 +02:00
marcos 8b6b573bde fixed error with value status field 2020-10-21 16:18:07 +02:00
fbsanchez 42cca865ac groups_get_children and propagate update 2020-10-21 11:38:57 +02:00
fbsanchez 2187f9d0c9 Merge remote-tracking branch 'origin/develop' into ent-5822-prueba-concepto-modal-selector-de-grupos 
Conflicts:
	pandora_console/godmode/reporting/reporting_builder.item_editor.php
 2020-10-02 14:56:07 +02:00
fbsanchez b07d24ed25 Merge remote-tracking branch 'origin/develop' into ent-6302-proyectos-anadir-un-campo-de-numero-de-ticket-para-modulos 
Conflicts:
	pandora_console/include/functions_api.php
	pandora_console/operation/events/events.php
 2020-09-30 18:38:27 +02:00
fbsanchez 5d63bc547e Group selection review 2020-09-29 14:22:58 +02:00
fbsanchez 5f4893ef1a Merge remote-tracking branch 'origin/develop' into ent-5822-prueba-concepto-modal-selector-de-grupos 2020-09-29 12:47:11 +02:00
fbsanchez 724de97818 removed extra content 2020-09-18 11:53:16 +02:00
fbsanchez 696b58544c fixes 2020-09-18 11:47:50 +02:00
fbsanchez bc166dfba2 module custom id in event list + minor fixes 2020-09-17 16:51:23 +02:00
Daniel Rodriguez aceedbe795 Merge branch 'ent-6250-Errores-log-consola' into 'develop' 
Ent 6250 errores log consola

Closes pandora_enterprise#6250

See merge request artica/pandorafms!3436
 2020-09-15 15:30:07 +02:00
fbsanchez c2238ac295 minor changes 2020-09-11 15:30:18 +02:00
fbsanchez 09a5bad4f1 Fixes in visualization (groups selection) 2020-09-11 15:17:08 +02:00
fbsanchez 3374a89ae0 Group selection improvement 2020-09-11 14:34:41 +02:00
Jose Gonzalez 18a993145e Fixed type array warning messages 2020-09-07 14:38:43 +02:00
marcos 6f02ee8206 fixed error with refresh in events filter 2020-09-04 12:38:46 +02:00
alejandro-campos 6b989109d8 fix event pagination when events history is activated 2020-08-13 10:34:31 +02:00
Luis Calvo 9a8c42f4ac Fixed xss event comments vulnerabiluty and some acls on event ajax 2020-06-26 15:36:51 +02:00
alejandro-campos 1d167d4aba fixed agent id strange behavior in events table 2020-05-25 11:12:29 +02:00
Daniel Maya 8ae8ac45f5 Ent 5690 vulnerabilidad critica inyeccion de comandos en llamada a event response 2020-04-15 15:50:08 +02:00
fbsanchez e48ef76f35 merge 2020-03-26 14:38:23 +01:00
Tatiana Llorente 4777ecd4bf Ent 5439 error grafica eventos de agente 2020-03-24 10:12:14 +01:00
fbsanchez ce11d89953 Frontent changes 2020-03-13 14:03:50 +01:00
Tatiana Llorente 7c928b8100 Ent 4795 check seleccionar todos queda marcado 2020-01-14 08:37:04 +01:00
Daniel Maya 7204e7c0f2 Ent 4862 mas opciones en los filtros de severidad 2020-01-13 18:24:29 +01:00
Tatiana Llorente 1747806256 Ent 3136 no se ven los eventos en el mapa de servicios cuando haces click en los elementos de un servicio creado en la meta 2020-01-13 18:19:50 +01:00
Tatiana Llorente 9d3426c0e9 Ent 4897 filtro erroneo de eventos al clickar en grafica events 24h de agente 2 2019-12-10 15:29:35 +01:00
marcos 21bf49c218 update id_source_event 2019-11-22 13:38:08 +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 Rodriguez 137571f2d1 Merge branch 'ent-4856-8969-Filtro-user-ack-evento-no-funciona-del-todo-bien' into 'develop' 
user ack filter in event list not displaying users with all group

See merge request artica/pandorafms!2860
 2019-11-06 14:45:09 +01:00
Daniel Rodriguez d460429509 Merge branch 'ent-4898-No-funciona-filtro-de-eventos-cuando-el-idioma-del-usuario-está-en-catalán' into 'develop' 
Fixed agent name and error lenght

See merge request artica/pandorafms!2845
 2019-11-06 13:14:06 +01:00
alejandro-campos e9b516c399 change access permission to users in user ack filter in event list 2019-11-06 12:56:42 +01:00
Daniel Rodriguez 0e628a365d Merge branch 'ent-4625-Cambiar-titulo-a-archivo-CSV-de-la-vista-de-eventos' into 'develop' 
Ent 4625 cambiar titulo a archivo csv de la vista de eventos

See merge request artica/pandorafms!2783
 2019-11-05 16:57:23 +01:00
alejandro-campos 9fc635a7a9 user ack filter in event list not displaying users with all group 2019-11-05 11:03:28 +01:00
Daniel Maya 8573add0b3 Fixed agent name and error lenght 2019-10-30 13:01:59 +01:00
Tatiana Llorente 5264de2008 Merge branch 'develop' into 'ent-4720-Redireccion-erronea-de-Meta-a-Nodo-desde-Eventos' 
Conflicts:
   pandora_console/operation/events/events.php
 2019-10-17 09:27:00 +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 d2dc6ba9c1 Merge remote-tracking branch 'origin/develop' into ent-4720-Redireccion-erronea-de-Meta-a-Nodo-desde-Eventos 
Conflicts:
	pandora_console/operation/events/events.php
 2019-10-08 09:14:08 +02:00
Tatiana Llorente 8a85edac93 Merge remote-tracking branch 'origin/develop' into ent-4720-Redireccion-erronea-de-Meta-a-Nodo-desde-Eventos 2019-10-08 08:59:39 +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
Tatiana Llorente 305d74878c Changed title of csv in events - #4625 2019-10-04 11:51:30 +02:00
marcos.alconada a44e1feeb4 fixed error comments events 2019-10-01 16:24:02 +02:00
Jose Gonzalez f55b2ce80f Improved truncate system and solved issue 2019-10-01 11:22:25 +02:00
Tatiana Llorente 9875b7c701 Added link to go to agent view (node) from metaconsole in events view - #4720 2019-09-30 13:31:15 +02:00
Kike 4ae14e0888 Fixed issue with instructions in events view 2019-09-24 15:14:17 +02:00
Luis Calvo 0c60f13ccd Event column instructions maked unsortabe 2019-09-17 19:54:34 +02:00
Daniel Rodriguez c0a0364164 Merge branch 'ent-4608-Bug-en-el-visor-de-eventos-cuando-el-lenguaje-esta-en-español' into 'develop' 
fix bug in events advanced filter: default option other than All

See merge request artica/pandorafms!2706
 2019-09-05 11:39:45 +02:00
alejandro-campos 42fad5acb1 fix bug in events advanced filter: default option other than All 2019-09-05 10:37:12 +02:00
Daniel Rodriguez 258a2f41ce Merge branch 'ent-4363-Marquesinas-ilegibles-desde-Firefox' into 'develop' 
Reduced the speed of events marquee - #4363

See merge request artica/pandorafms!2653
 2019-08-30 14:19:47 +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 d42bcd17c2 Merge branch 'ent-4366-fallos-visuales-en-el-log-de-pandora' into 'develop' 
fixed visual error

See merge request artica/pandorafms!2666
 2019-08-21 12:17:53 +02:00
Tatiana Llorente d85e4caa99 Fixed bug in autorefresh in events view with fullscreen - #4522 2019-08-19 11:36:13 +02:00
Tatiana Llorente 7eeafaf351 Fixed bug in autorefresh in events view with fullscreen - #4522 2019-08-19 11:32:40 +02:00
marcos.alconada 0414b4033e fixed visual error 2019-08-19 10:05:06 +02:00
Tatiana Llorente 2bc57b9561 Reduced the speed of events marquee - #4363 2019-08-09 12:50:07 +02:00
Daniel Rodriguez a1bac9d851 Merge branch '4439-bugs-vista-eventos' into 'develop' 
Added text control to avoid show more of 255 chars in his field

See merge request artica/pandorafms!2619
 2019-08-09 09:01:18 +02:00
Jose Gonzalez 191db192c9 Solved issue with metaconsole 2019-08-07 14:14:14 +02:00
Jose Gonzalez 6ca2caa511 Added hint and solved other issues when events has a lot of characters 2019-08-06 11:06:11 +02:00
alejandro-campos 225491feb1 fix minor visual bug in event list 2019-08-05 16:23:37 +02:00
alejandro-campos 41029196d8 fix minor visual bug in events table 2019-08-02 10:04:10 +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 243c298ff8 Added text control to avoid show more of 255 chars in his field 2019-07-29 08:59:56 +02:00
Daniel Rodriguez bfb4cb19a0 Merge branch 'ent-4330-Bug-con-autorefresh-en-eventos' into 'develop' 
Added feature to autorefresh in events view with datatables - #4330

See merge request artica/pandorafms!2605
 2019-07-18 12:22:44 +02:00
Daniel Barbero Martin 397ee95849 fixed minor error sound events 2019-07-16 10:16:25 +02:00
Tatiana Llorente 7d119bfe5a Added feature to autorefresh in events view with datatables - #4330 2019-07-15 17:41:20 +02:00
Daniel Barbero Martin 45e1c32473 fixed events sound 2019-07-15 15:31:01 +02:00
fbsanchez 85e40b30dc Fix: user filter load tags 2019-07-09 17:54:23 +02:00
fbsanchez 674c68bd2b avoided issue latin1 btoa javascript event transfer 2019-06-25 12:49:17 +02:00
fbsanchez c1ac6b7ed6 mini_severity virtual column added 2019-06-24 19:23:41 +02:00
marcos.alconada effbf5094f Merge branch 'ent-3837-7848-campo-id_source_event-en-vista-de-eventos-y-poder-filtrar-por-este' of https://brutus.artica.lan:8081/artica/pandorafms into ent-3837-7848-campo-id_source_event-en-vista-de-eventos-y-poder-filtrar-por-este 2019-06-21 11:34:49 +02:00
marcos.alconada 3fd12975aa added 2 lines 2019-06-21 11:34:36 +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
marcos.alconada a0c6dc69aa add element id_source_event to filters events 2019-06-21 11:22:06 +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
fbsanchez 2c5cd007d2 reset form on load filter none 2019-06-20 14:18:49 +02:00
fbsanchez aa238165d9 events rss 2019-06-20 13:33:37 +02:00
fbsanchez cfe16ee8c3 minor fixes 2019-06-20 11:46:01 +02:00
fbsanchez 275261e6b3 wip csv export events 2019-06-19 17:30:32 +02:00
fbsanchez 44d8b977cb event advanced filter fixes 2019-06-19 16:52:14 +02:00
fbsanchez 524575171a event history viewer 2019-06-19 12:56:16 +02:00
fbsanchez a7f9484adb minor style change 2019-06-19 08:43:37 +02:00
fbsanchez 37e98d108b fit mc 2019-06-18 19:17:21 +02:00
fbsanchez 8b8d17f089 event ajax validation little improvement 2019-06-18 18:35:34 +02:00
fbsanchez c3ebe88178 style review 2019-06-18 17:40:31 +02:00
fbsanchez d290b91b28 RC1 event viewer v2 2019-06-18 16:07:53 +02:00
fbsanchez a1f004fdec minor fixes 2019-06-18 15:03:49 +02:00
fbsanchez f7cf6e1e8b wip events 2019-06-18 10:32:04 +02:00
fbsanchez a8a206fa10 events 2019-06-17 19:12:45 +02:00
fbsanchez 457c1c9edf wip event view 2019-06-17 18:33:39 +02:00
fbsanchez ab7d72a1c9 wip event vwr ui-box close tick 2019-06-17 17:02:33 +02:00
fbsanchez 132076198d minor fixes and event ACL - groups 2019-06-14 13:20:34 +02:00
fbsanchez b08e8b595d multiple fixes 2019-06-13 19:41:21 +02:00
fbsanchez 9740275388 dyn redraw 2019-06-13 13:07:11 +02:00
fbsanchez d12773cfd0 Avoid double validation, avoid redraw 2019-06-13 12:36:31 +02:00
fbsanchez ecc2fef8f6 event validation/in process 2019-06-13 12:30:09 +02:00