Commit Graph

597 Commits

Author SHA1 Message Date
marcos.alconada 0b118f63ad Merge remote-tracking branch 'origin/develop' into ent-3758-7777-bug-validacion-eventos-en-consola 2019-05-08 15:19:40 +02:00
Daniel Rodriguez 0c8fab6cb3 Merge branch 'ent-3574-7598-bug-botones-y-casillas-vista-de-eventos' into 'develop'
Ent 3574 7598 bug botones y casillas vista de eventos

See merge request artica/pandorafms!2222
2019-05-08 13:52:45 +02:00
alejandro-campos a622dcc9d4 add condition to avoid trying to retrieve a non existing event filter when synchronizing meta and node
Former-commit-id: 83a1f9ad1c99de0e29a880de4ed6c518884bda31
2019-05-06 15:06:26 +02:00
alejandro-campos bcbcd763a1 fixed double load of events in event list
Former-commit-id: ea1294c680b5dbe3b069110012e2b54db5312fd1
2019-04-29 15:04:14 +02:00
marcos.alconada fb87b97cd4 Merge remote-tracking branch 'origin/develop' into ent-3750-carrefour-api-crear-modificar-y-eliminar-perfiles-de-usuarios-metaconsola
Former-commit-id: 628100b56c9528995e0f95ef8918dedaba16c8dd
2019-04-17 15:12:56 +02:00
marcos.alconada ddfd3339ff add api
Former-commit-id: 7704a1226754067aee849526329eebce372063a1
2019-04-12 11:39:34 +02:00
Tatiana Llorente 845cb85c55 New design for tables - #3707
Former-commit-id: 923414d8bf98d6264e6cebc27706118e16710b70
2019-03-27 17:03:55 +01:00
marcos.alconada 94768935ee Pending to review
Former-commit-id: c874be78a33585942c825f23b48010b2d604cd7c
2019-03-26 15:42:56 +01:00
Daniel Barbero Martin 4ea17bb0c6 fixed reload page twice
Former-commit-id: 5944f47d1e0d2e5997deb6afcab6744a514216f7
2019-03-25 12:53:50 +01:00
Alejandro Fraguas 5411eb9d17 Merge branch 'ent-3735-Buguete-filtrado-de-eventos-por-grupo' into 'develop'
fix bug in event filter by group when not using secondary groups

See merge request artica/pandorafms!2276

Former-commit-id: e414c5033fbcde1d97a28190170454080531ef34
2019-03-25 10:22:45 +01:00
alejandro-campos c19ec2b041 fix bug when filtering events by group
Former-commit-id: f5ee52f47cd615007f22ce54e67c1c345eed802b
2019-03-22 10:47:40 +01:00
alejandro-campos b5e1487736 add strict comparator
Former-commit-id: 0561976f26d6bc59f3076f48a5a4261dafaad28b
2019-03-20 15:26:42 +01:00
alejandro-campos 36119ebb85 fix bug in event filter by group when not using secondary groups
Former-commit-id: fe9c88e8e2d7552fed7e5c7cd5a5694d47ee444f
2019-03-20 14:48:02 +01:00
samucarc 5b3dd6121b Fixed error in event filters when is only new events
Former-commit-id: a1e0529b58e4a1c62c8c35cba7b133c218f59a93
2019-03-11 17:14:26 +01:00
daniel 798567bf8e fixed minor errors change word command for parameters
Former-commit-id: 6e6e56bded99331c606f7a9f6179826afee22d16
2019-03-07 09:05:38 +01:00
marcos.alconada f0fa992912 Ticket Resolved
Former-commit-id: 023a3b09aff3255b4ea6744ab12ddc2d2a5f540d
2019-02-28 10:08:33 +01:00
marcos.alconada c7cd59ffb5 Ticket resolved
Former-commit-id: c7b3a4c44941a8e2ea91faf811730bbec4d7f877
2019-02-27 18:25:37 +01:00
daniel 8780571a74 add new functionality in event response
Former-commit-id: 2cf28b95c068c40e79b8f05b212aad0f720de79b
2019-02-27 10:59:44 +01:00
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