Commit Graph

579 Commits

Author SHA1 Message Date
Alejandro Fraguas a9eb3cf37b Merge branch 'ent-3458-Metaconsola_filtro_eventos_por_nombre_agente_no_machea_nombres_con_espacios' into 'develop'
Fixed filter by name of agents in events when they contain spaces

See merge request artica/pandorafms!2160

Former-commit-id: 725ca1b5279d8074454ae8ed4b3af27f084e9594
2019-02-21 17:07:36 +01:00
daniel d116e4742a add new tocken max events responses
Former-commit-id: f65e6a478812a913d25fa7b87e9ac2b26b9a5ff4
2019-02-19 12:14:42 +01:00
Daniel Maya ba7540c9ee improvement of optimization for list event
Former-commit-id: a7788b01160c661139e6a3a6aac70c69441265a1
2019-02-08 09:51:08 +01:00
Daniel Maya c2a44e073f Update events.build_query.php
Former-commit-id: 4622b27b1ce9e81ce81d89d7bc9d2eeb1b30fb93
2019-02-07 18:03:28 +01:00
Samuel Carcases 23a8d0640f Update events.build_query.php
Former-commit-id: 189244aa57d58eb33dd43f707eb6ac929f58e537
2019-02-07 17:05:05 +01:00
samucarc 92af9f84bc Fixed conflict
Former-commit-id: c0e0826c5a70772c049d9e0ce168f3d0b35118c0
2019-02-07 17:00:52 +01:00
Tatiana Llorente 9baa3dcfa2 Merge remote-tracking branch 'origin/develop' into 3358-Mejora-en-la-aplicación-de-estilos
Conflicts:
	pandora_console/extensions/agents_modules.php
	pandora_console/extensions/module_groups.php
	pandora_console/general/login_page.php
	pandora_console/godmode/alerts/alert_list.builder.php
	pandora_console/godmode/alerts/alert_list.list.php
	pandora_console/godmode/gis_maps/configure_gis_map.php
	pandora_console/godmode/groups/group_list.php
	pandora_console/godmode/reporting/visual_console_builder.data.php
	pandora_console/godmode/reporting/visual_console_builder.editor.php
	pandora_console/godmode/reporting/visual_console_builder.elements.php
	pandora_console/godmode/setup/setup_visuals.php
	pandora_console/include/chart_generator.php
	pandora_console/include/functions_networkmap.php
	pandora_console/include/functions_pandora_networkmap.php
	pandora_console/include/functions_ui.php
	pandora_console/include/functions_visual_map_editor.php
	pandora_console/include/styles/common.css
	pandora_console/include/styles/countdown.css
	pandora_console/include/styles/datepicker.css
	pandora_console/include/styles/dialog.css
	pandora_console/include/styles/help.css
	pandora_console/include/styles/menu.css
	pandora_console/include/styles/pandora.css
	pandora_console/include/styles/pandora_forms.css
	pandora_console/operation/agentes/estado_monitores.php
	pandora_console/operation/agentes/interface_traffic_graph_win.php
	pandora_console/operation/agentes/realtime_win.php
	pandora_console/operation/agentes/stat_win.php
	pandora_console/operation/events/events.php
	pandora_console/operation/snmpconsole/snmp_view.php
	pandora_console/operation/tree.php
	pandora_console/operation/visual_console/render_view.php


Former-commit-id: 87793fc5a319121753f591da7949ad0ff3bd72b1
2019-02-05 09:23:53 +01:00
samucarc c5805e439e Fixed filter by name of agents in events when they contain spaces
Former-commit-id: 93557e0ef296d1683acd86cb70ce2da6677e3e6c
2019-02-01 12:38:31 +01:00
Alejandro Gallardo Escobar d38236091b Format fixes
Former-commit-id: 58823652a8bda566d0b0e340a1249abb4f7f219e
2019-02-01 09:55:29 +01:00
artica b3da2803a4 Changed the format of the .php files
Former-commit-id: 4dc926a81de14e27df8be7982406b09d8e808399
2019-01-30 16:18:44 +01:00
tatiana.llorente@artica.es f5c96b7e5d New organization of CSS files - #3358
Former-commit-id: 8512adc7742eecb64db2b0ee539acfddd33406c2
2019-01-24 11:10:49 +01:00
alejandro-campos 9048a13840 fix bug: in progress events deleting on event view massive deletion
Former-commit-id: 4c4f0a387ad3abd7cfea913b45c885ab3af4ecc6
2019-01-15 13:27:14 +01:00
alejandro-campos 5235b62c0d fix disable actions in event list when centralized mode is enabled
Former-commit-id: d5f16b4453b1e291ba051cd381fc6c09ce0bd027
2019-01-15 11:29:12 +01:00
alejandro-campos 1ed90180c9 disable actions in event list when centralized mode is enabled and improve behavior of checkboxes when a massive action is applied
Former-commit-id: 11f4606d2e7dd9b91c918323dc8a3dada0c8f765
2019-01-15 11:27:05 +01:00
alejandro-campos efa2e5332f fix massive custom event responses
Former-commit-id: 24db40167b05bfd7fe4de88060f03a7a0ec38e73
2019-01-14 13:40:49 +01:00
alejandro-campos 5a8e46d608 modify the way event responses are executed in event list
Former-commit-id: 14ef545eef10427d95f96484e8d6b8d9656bd53c
2019-01-14 12:10:43 +01:00
vgilc 14d683b003 Merge branch '2917-Error-al-cambiar-de-página-en-eventos-agrupados-por-agente' into 'develop'
Changed url - #2917

See merge request artica/pandorafms!1869
2018-11-30 13:08:53 +01:00
alejandro-campos 8371e75757 modified event list visualization 2018-11-26 16:40:20 +01:00
daniel 494b858a20 fixed errors session_start 2018-11-21 13:08:58 +01:00
vgilc 9b4eeb5c84 Merge branch '2723-Fallo-hint-en-eventos' into 'develop'
new function that adds a border to the image if the status is warning - #2723

See merge request artica/pandorafms!1743
2018-10-25 12:07:58 +02:00
tatiana.llorente@artica.es f96c626823 Changed url - #2917 2018-10-18 16:34:03 +02:00
fermin831 2693bbe209 Merge remote-tracking branch 'origin/develop' into 2737-Optimización-de-tags-dev
Conflicts:
	pandora_console/godmode/massive/massive_delete_modules.php
	pandora_console/operation/agentes/ver_agente.php
2018-10-10 19:39:27 +02:00
danielmaya 4558c909ef Changed source filter in event list 2018-10-10 16:57:04 +02:00
tatiana.llorente@artica.es eeba7b9350 Added two missing parameters in the url - #2884 2018-10-09 09:58:28 +02:00
danielmaya e8621e54e5 Updated tags optimization 2018-10-05 09:40:08 +02:00
samucarc 3c54710d1b Fixed conflicts 2018-10-03 13:09:39 +02:00
danielmaya 453fb3f67b TODO List 2018-09-27 13:30:32 +02:00
tatiana.llorente@artica.es d36c10fa08 new function that adds a border to the image if the status is warning - #2723 2018-09-10 13:22:02 +02:00
danielmaya 5b30aa5560 Added source, comment and id_extra in event filter 2018-08-31 16:25:12 +02:00
vgilc a4d1cfc9e6 Merge branch '2641-no-se-filtran-eventos-por-grupo-secundario-en-meta' into 'develop'
2641 no se filtran eventos por grupo secundario en meta

See merge request artica/pandorafms!1688
2018-08-16 11:03:02 +02:00
vgilc dc8020dbdc Merge branch 'ent-2626-pantalla-de-edicion-de-modulos-en-grupos-secundarios' into 'develop'
[Secondary groups] Fixed modules permissions in some views

See merge request artica/pandorafms!1669
2018-08-16 09:46:28 +02:00
fermin831 05a0eb0db6 Fixed events secondary groups filter in metaconsole 2018-08-14 17:06:15 +02:00
fermin831 d3c3304976 Fixed pagination and added filter to All events 2018-08-14 10:40:56 +02:00
fermin831 62617e609c [Secondary groups] Fixed group agents and group events in events filter 2018-08-08 13:17:03 +02:00
fermin831 4315cef4c9 [Secondary groups] Fixed modules permissions in some views 2018-08-08 11:49:54 +02:00
alejandro-campos 097661d82b implemented sort filter to event view custom fields 2018-08-03 10:38:53 +02:00
alejandro-campos 01656f2e76 conflict resolution on branch 2389-Ordenar-eventos-por-campo 2018-08-02 10:27:31 +02:00
manuel.montes a476d008ac fix bug in metaconsole view events 2018-07-26 15:30:49 +02:00
samucarc 202f72d1c3 Fixed fields list in manage events-custom fields 2018-07-25 17:23:13 +02:00
manuel.montes b922066a72 Add items to the view events 2018-07-19 18:04:50 +02:00
alejandro-campos 6ec4787c38 added order filters to events table 2018-07-10 15:11:18 +02:00
fermin831 288d2bafb6 Added in progres selected button to events view 2018-06-20 18:56:44 +02:00
Alejandro Gallardo Escobar f6184b52da Merge branch 'develop' into ent-639-add-user-defined-timezones 2018-06-11 17:42:02 +02:00
Alejandro Gallardo Escobar fac3e21829 Added a lot of fixes to the dates stored as strings without timezone information to made them use the user timezone 2018-06-11 16:40:10 +02:00
fermin831 6bd672fd38 Fixed free search in events view 2018-05-31 20:32:04 +02:00
fermin831 88e060893a Merge branch 'develop' into 2106-intracom-rebranding
Conflicts resolved:
	pandora_console/operation/events/events_rss.php
2018-05-28 12:12:16 +02:00
fermin831 750ed29ac9 [Rebranding] Added a header to white backgrounds and make the favicon and the mobile console configurable 2018-05-24 16:59:50 +02:00
fermin831 ed18d58676 [Rebranding] Open operation/* 2018-05-14 15:52:51 +02:00
fermin831 fe124bff5f Fixed rss events due to secondary groups 2018-05-14 14:41:11 +02:00
vgilc d746af9c28 Merge branch 'ent-1888-anadir-nueva-feature-para-poder-cambiar-los-eventos-a-estado-en-proceso' into 'develop'
Ent 1888 anadir nueva feature para poder cambiar los eventos a estado en proceso

See merge request artica/pandorafms!1442
2018-05-09 10:24:19 +02:00