Commit Graph

17234 Commits

Author SHA1 Message Date
artica 0878af4ab1 Auto-updated build strings. 2019-06-22 00:01:08 +02:00
fbsanchez 5658b98f0b intuitive credential store 2019-06-21 23:51:22 +02:00
fbsanchez e4f6a95a89 MR29 credential store 2019-06-21 23:05:21 +02:00
fbsanchez e9ef9b64a3 credential_store 2019-06-21 19:34:47 +02:00
alejandro-campos 58009b43c6 fix bug: custom graphs not showing properly 2019-06-21 13:39:48 +02:00
Daniel Maya 8f5a206027 Fixed vc-control in public visual console 2019-06-21 13:17:37 +02:00
Daniel Maya 379a0039ae Fixed vc-control 2019-06-21 12:41:05 +02:00
fbsanchez 6682bad19f first steps credential store 2019-06-21 12:03:25 +02:00
artica e2e53cf248 Auto-updated build strings. 2019-06-21 00:01:08 +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 9fa9a346ca Merge remote-tracking branch 'origin/develop' into ent-4238-eventos-csv-e-historico 2019-06-20 19:23:39 +02:00
fbsanchez 8671c7c88c events qa adjustments 2019-06-20 19:23:13 +02:00
Daniel Maya 71ea94eea3 Fixed item save 2019-06-20 16:36:24 +02:00
Daniel Rodriguez 265202f1ed Merge branch 'ent-4136-button-styles' into 'develop'
Review 1

See merge request artica/pandorafms!2470
2019-06-20 16:35:12 +02:00
fbsanchez 2c5cd007d2 reset form on load filter none 2019-06-20 14:18:49 +02:00
Alejandro Fraguas c173f9a58f Merge branch 'ent-4209-bug-vc-grafica-sla-automatica-explota-en-cuanto-se-le-ajustan-un-label' into 'develop'
Bug en label de  auto sla graph

See merge request artica/pandorafms!2517
2019-06-20 13:53:07 +02:00
fbsanchez aa238165d9 events rss 2019-06-20 13:33:37 +02:00
alejandro-campos 13e53e5b10 modified api function for adding agent to policy to make it available on meta 2019-06-20 13:05:19 +02:00
fbsanchez cfe16ee8c3 minor fixes 2019-06-20 11:46:01 +02:00
Alejandro Fraguas 4660ca286f Merge branch 'ent-4225-No-se-pueden-crear-componentes-de-red-en-la-meta' into 'develop'
Ent 4225 no se pueden crear componentes de red en la meta

See merge request artica/pandorafms!2516
2019-06-20 11:41:21 +02:00
Daniel Maya e182997308 Merge branch 'ent-3994-Añadir-actualización-de-ciertos-valores-a-la-api-web-de-la-consola-visual' into ent-3997-anadir-posicionamiento-a-los-elementos-de-la-consola-visual 2019-06-20 11:40:33 +02:00
Alejandro Fraguas 57e3c147c8 Merge branch 'ent-3959-eventos-de-validacion-manual-de-alertas' into 'develop'
Changed message to module name

See merge request artica/pandorafms!2518
2019-06-20 10:22:15 +02:00
Daniel Maya e828fd6690 Fixed Advanced Permissions LDAP 2019-06-20 09:49:54 +02:00
Tatiana Llorente c084adfa27 Add module filter by text -#2094 2019-06-20 09:31:36 +02:00
artica 61b35d4bf2 Auto-updated build strings. 2019-06-20 00:01:08 +02:00
Daniel Maya ac8efd2bef delete cache item when updating 2019-06-19 18:00:53 +02:00
marcos.alconada 98eb1acf00 Add name alert to message 2019-06-19 17:55:09 +02:00
Tatiana Llorente 988eb2e257 Add module filter by text -#2094 2019-06-19 17:36:55 +02:00
fbsanchez 275261e6b3 wip csv export events 2019-06-19 17:30:32 +02:00
fbsanchez 6b944ead97 minor fix 2019-06-19 17:08:18 +02:00
fbsanchez 44d8b977cb event advanced filter fixes 2019-06-19 16:52:14 +02:00
marcos.alconada 358c3f6a55 Changed message to module name 2019-06-19 16:04:08 +02:00
Alejandro Gallardo Escobar 08f100d608 Merge remote-tracking branch 'origin/develop' into ent-3997-anadir-posicionamiento-a-los-elementos-de-la-consola-visual 2019-06-19 15:19:38 +02:00
Alejandro Gallardo Escobar c87919af94 Bugfix 2019-06-19 15:17:13 +02:00
alejandro-campos 45d544ca5d remove typo error in commit 2019-06-19 15:14:41 +02:00
alejandro-campos 5503abc8e1 fix bug in metaconsoles network component creation 2019-06-19 15:12:17 +02:00
Alejandro Fraguas 9a24c90725 Merge branch 'ent-4134-los-informes-no-funcionan-al-exportar-a-csv-json-ni-xml' into 'develop'
Remove entities from json reports

See merge request artica/pandorafms!2512
2019-06-19 14:17:58 +02:00
fbsanchez 524575171a event history viewer 2019-06-19 12:56:16 +02:00
marcos.alconada 174db17a05 remove entities from reports 2019-06-19 12:33:11 +02:00
fbsanchez 4424189632 Merge remote-tracking branch 'origin/develop' into ent-3295-revision-comportamiento-metaconsola-con-nodo-multi-servidor 2019-06-19 10:51:34 +02:00
Rafael Ameijeiras b428797004 delete_file 2019-06-19 10:12:06 +02:00
fbsanchez a7f9484adb minor style change 2019-06-19 08:43:37 +02:00
artica a5b140768a Auto-updated build strings. 2019-06-19 00:01:09 +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 24025ebb74 Merge remote-tracking branch 'origin/develop' into ent-4136-button-styles 2019-06-18 17:48:03 +02:00
fbsanchez c3ebe88178 style review 2019-06-18 17:40:31 +02:00
Daniel Maya 649689b1a1 Update 2019-06-18 17:28:36 +02:00
Daniel Rodriguez a87e3ce97e Merge branch 'ent-3739-Vista-Agent-Module-view-no-funciona-en-pantalla-completa-y-autorefresco' into 'develop'
Fixed bug in Agent-Module fullscreen view

See merge request artica/pandorafms!2299
2019-06-18 17:00:15 +02:00
Alejandro Fraguas bb64524da9 Merge branch 'ent-4222-No-genera-custom-graphs-lines-average-summation' into 'develop'
Fixed sum/avg graph infinite loop

See merge request artica/pandorafms!2513
2019-06-18 16:58:33 +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
Tatiana Llorente 46f64f75c8 Fixed autorefresh in full screen - #3739 2019-06-18 14:54:40 +02:00
fbsanchez 22272225b8 massive operations over events 2019-06-18 14:26:55 +02:00
Luis Calvo d3016a2839 Fixed sum/avg graph infinite loop 2019-06-18 14:04:38 +02:00
marcos.alconada d39be510cf Remove entitites to availability reports 2019-06-18 14:03:51 +02:00
Alejandro Fraguas 10b337f713 Merge branch 'ent-4001-se-pueden-crear-reportes-de-tipo-general-sin-nombre' into 'develop'
Add javascript for insert name to reports

See merge request artica/pandorafms!2424
2019-06-18 13:53:52 +02:00
marcos.alconada dd78326a4c Remove entities from json reports 2019-06-18 13:38:22 +02:00
Daniel Rodriguez c68f2ada94 Merge branch 'ent-4085-no-se-muestra-lista-de-modulos-con-licencia-invalida' into 'develop'
Fixed module_manager with Agent limit surpassed or license expired

See merge request artica/pandorafms!2475
2019-06-18 13:02:43 +02:00
fbsanchez 823581f398 export current page to csv fixed icon 2019-06-18 12:58:46 +02:00
fbsanchez d8a331bf77 event filters tags, date, module name 2019-06-18 12:48:28 +02:00
Daniel Maya 8f2feac676 Added DESTDIR in license.php 2019-06-18 11:35:59 +02:00
Alejandro Fraguas ec73be66f5 Merge branch 'ent-2707-System-Uptime-data-show-bug' into 'develop'
Fixed bug data in history show

See merge request artica/pandorafms!2504
2019-06-18 11:15:59 +02:00
fbsanchez dc81d168e0 event filters group selectors 2019-06-18 11:00:48 +02:00
fbsanchez f7cf6e1e8b wip events 2019-06-18 10:32:04 +02:00
Daniel Maya 589000fb6c Added save in onItemMoved 2019-06-18 10:13:56 +02:00
artica f293aa2dc0 Auto-updated build strings. 2019-06-18 00:01:08 +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
Luis Calvo 6b2bb1a138 Merge remote-tracking branch 'origin/develop' into ent-2707-System-Uptime-data-show-bug 2019-06-17 16:59:33 +02:00
Luis Calvo 9bdf048fae Fixed and refactored duplicated functions SNMP Browser not showing v3 paramethers 2019-06-17 16:39:27 +02:00
Daniel Rodriguez 2401ac5c6e Merge branch 'ent-4138-7696-Tipo-erróneo-módulos-Ifoperstatus-desde-satélite' into 'develop'
Change module type ifOperStatus on Interface Wizard

See merge request artica/pandorafms!2473
2019-06-17 16:34:14 +02:00
Luis Calvo 08c035a612 Refactorf SNMPBrowserWndow in one unique function 2019-06-17 16:33:57 +02:00
Daniel Rodriguez a583da3de3 Merge branch 'ent-3992-anadir-el-modo-de-edicion-a-la-vista-de-la-consola-visual' into 'develop'
Añadir el modo de edición a la vista de la consola visual

Closes pandora_enterprise#3981

See merge request artica/pandorafms!2482
2019-06-17 15:07:12 +02:00
marcos.alconada 340e253901 Add global config to method getFirstLevel() to remove warning check_acl error 2019-06-17 13:38:05 +02:00
Tatiana Llorente 4d287a6f36 Fixed bug showing total events in tactical view on dashboard - #4075 2019-06-17 12:31:20 +02:00
Alejandro Gallardo Escobar dbf15a759f Added a functionality to allows the live vc item resizement 2019-06-17 12:22:55 +02:00
Luis Calvo 3daddc94d9 Fixed, only evaluate unit 2019-06-17 10:29:28 +02:00
artica 38412f2c9a Auto-updated build strings. 2019-06-17 00:01:06 +02:00
artica ef280b1377 Auto-updated build strings. 2019-06-16 00:01:05 +02:00
artica 5b3e6143b3 Auto-updated build strings. 2019-06-15 00:01:07 +02:00
fbsanchez 36a1387632 WIP event show info 2019-06-14 19:23:04 +02:00
fbsanchez 20257edadd event ACL with tags 2019-06-14 18:30:09 +02:00
Luis Calvo 6f15e97a49 Modified module show data Sys Uptime format 2019-06-14 16:13:01 +02:00
Daniel Rodriguez 975d48a653 Merge branch 'ent-4073-eventos-en-proceso-no-validan-ni-id-evento-ni-id-extra' into 'develop'
Eventos en proceso no se validan ni por id_evento no por id_extra

See merge request artica/pandorafms!2481
2019-06-14 15:51:18 +02:00
Alejandro Fraguas 08019f11c3 Merge branch 'ent-3463-csv-availability-reports-meta' into 'develop'
Fixed reports export to csv meta bugs

See merge request artica/pandorafms!2489
2019-06-14 13:54:50 +02:00
Tatiana Llorente 92dc7d4e8c Truncate long title in modal dialogs - #4112 2019-06-14 13:48:35 +02:00
Daniel Rodriguez 4eab732c94 Merge branch 'ent-4179-No-se-guarda-certificado-SSL-en-el-setup-de-la-consola' into 'develop'
fix bug: path of ssl certificate not being set on general settings

See merge request artica/pandorafms!2501
2019-06-14 13:38:39 +02:00
fbsanchez 129c24c287 minor fix 2019-06-14 13:22:04 +02:00
fbsanchez 132076198d minor fixes and event ACL - groups 2019-06-14 13:20:34 +02:00
Daniel Rodriguez 4362bf3131 Merge branch 'ent-3429-event-report-options-saving' into 'develop'
Added missing options parameters

See merge request artica/pandorafms!2173
2019-06-14 13:19:43 +02:00
Daniel Rodriguez 5c7b45173b Merge branch 'ent-4185-Problema-editar-item-availability-en-report-metaconsole' into 'develop'
fix bug in item edition in metaconsole

See merge request artica/pandorafms!2500
2019-06-14 13:05:27 +02:00
Tatiana Llorente bdeb456a44 Added sorting in last fired column - #3965 2019-06-14 12:54:03 +02:00
fbsanchez ebfdce1073 Improved ui_progress documentation 2019-06-14 10:40:30 +02:00
fbsanchez 7226a45df5 improved ui_progress now accepts ajax updates 2019-06-14 10:35:10 +02:00
alejandro-campos f74b32fe3c Added more parameters to SAML configuration 2019-06-14 10:34:51 +02:00
Alejandro Fraguas 6c4dcdac87 Merge branch 'ent-4199-Fallo-estilo-visual-en-autoconfiguración-de-agentes-y-discovery-vmware' into 'develop'
Ent 4199 fallo estilo visual en autoconfiguración de agentes y discovery vmware

See merge request artica/pandorafms!2498
2019-06-14 10:14:27 +02:00
marcos.alconada b69b0024d7 Changed Scheduled shutdown to Planned Downtime on fms 2019-06-14 09:25:51 +02:00
artica 8f25aa09fc Auto-updated build strings. 2019-06-14 00:01:08 +02:00
fbsanchez 23d09a3c46 wip massive event operations 2019-06-13 20:09:55 +02:00
fbsanchez b08e8b595d multiple fixes 2019-06-13 19:41:21 +02:00
marcos.alconada 3c1336d298 Fixed problem to edit custom graphs on search 2019-06-13 18:27:51 +02:00
Luis Calvo 33bdb26e80 Fixed bug data in history show 2019-06-13 17:36:00 +02:00
marcos.alconada ca89029c99 x 2019-06-13 17:29:07 +02:00
marcos.alconada 2fe0d22d7d x 2019-06-13 17:27:49 +02:00
marcos.alconada f1700fa927 Changed Ignore time to Scheduled shutdown fms 2019-06-13 17:21:33 +02:00
fbsanchez 0df48675f3 event deletion 2019-06-13 16:28:26 +02:00
marcos.alconada 19b68ab784 Merge branch 'develop' of https://brutus.artica.lan:8081/artica/pandorafms into develop 2019-06-13 15:18:17 +02:00
Tatiana Llorente 018c942ecb Added meta option in function ui_print_os_icon - #3999 2019-06-13 15:04:39 +02:00
Daniel Maya e9b4dea6c5 update 2019-06-13 14:51:27 +02:00
fbsanchez 029d3b073f Avoid double validation, avoid redraw 2019-06-13 13:52:38 +02:00
fbsanchez 0afb53dc17 fix in time comparison while validating events 2019-06-13 13:35:02 +02:00
Alejandro Fraguas beea6941e5 Merge branch 'ent-4200-visual-console-omnipresent-group-summary' into 'develop'
Fixed the omnipresent group summary bug

See merge request artica/pandorafms!2496
2019-06-13 13:25:50 +02:00
alejandro-campos 52b1c5e39b fix bug: path of ssl certificate not being set on general settings 2019-06-13 13:18:17 +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
alejandro-campos 8554baef20 fix bug in item edition in metaconsole 2019-06-13 11:11:39 +02:00
Alejandro Fraguas fef1441d9f Merge branch 'ent-4197-#8171-Permisos-en-consolas-visuales-con-ACLS' into 'develop'
Fixed bug in visual consoles permissions with ACLS

See merge request artica/pandorafms!2492
2019-06-13 10:46:39 +02:00
Tatiana Llorente f1787c7920 Removed empty help in unknown modules - #4208 2019-06-13 10:11:03 +02:00
marcos.alconada 91ccee06ab Merge branch 'develop' of https://brutus.artica.lan:8081/artica/pandorafms into develop 2019-06-13 10:06:56 +02:00
artica 60ee0dd0fd Auto-updated build strings. 2019-06-13 00:01:07 +02:00
fbsanchez f3a0f37a1c Events agent grouped 2019-06-12 18:19:39 +02:00
Tatiana Llorente af62bb1ae3 Fixed visual bug in discovery vmware - #4199 2019-06-12 16:47:53 +02:00
Tatiana Llorente 7d54a37e13 Fixed visual bug in discovery vmware - #4199 2019-06-12 16:44:09 +02:00
Alejandro Fraguas d0e7a03926 Merge branch 'ent-3809-error-sql-eventos-de-grupos-de-agentes' into 'develop'
Changed sql error

See merge request artica/pandorafms!2321
2019-06-12 16:00:58 +02:00
Daniel Rodriguez 1780341524 Merge branch 'ent-4183-Ayudas-vacias' into 'develop'
Removed empty helps - #4183

See merge request artica/pandorafms!2491
2019-06-12 14:34:40 +02:00
Daniel Rodriguez f399023d46 Merge branch 'ent-3644-bug-redireccion-de-static-graph' into 'develop'
Solucionado pantalla en blanco

See merge request artica/pandorafms!2269
2019-06-12 14:25:58 +02:00
Alejandro Fraguas b930588f84 Merge branch 'ent-3892-bug-en-bulk-operations-de-plugins' into 'develop'
Ent 3892 bug en bulk operations de plugins

See merge request artica/pandorafms!2389
2019-06-12 13:54:09 +02:00
fbsanchez 4bb300889d Merge remote-tracking branch 'origin/develop' into ent-4136-button-styles 2019-06-12 13:17:36 +02:00
fbsanchez b615b50920 wip event grouped 2019-06-12 13:17:18 +02:00
Alejandro Fraguas 1305e267de Merge branch 'ent-3437-Guardar-user-password-modulos-WMI' into 'develop'
Remove autocomplete user and password in the form to create wmi modules - #3437

See merge request artica/pandorafms!2485
2019-06-12 13:03:56 +02:00
marcos.alconada ab602d2f1d Merge branch 'develop' of https://brutus.artica.lan:8081/artica/pandorafms into develop 2019-06-12 12:59:00 +02:00
marcos.alconada c1d1c23a4f Merge remote-tracking branch 'origin/develop' into ent-3644-bug-redireccion-de-static-graph 2019-06-12 12:37:52 +02:00
marcos.alconada 608f079ca0 now you need put an agent or visual console, else you cant create or update a Static Grap 2019-06-12 12:36:56 +02:00
marcos.alconada 166adc21e4 now you need put an agent or visual console, else you cant create or update a Static Grap 2019-06-12 12:32:13 +02:00
Daniel Maya e332c4ffba Merge remote-tracking branch 'origin/ent-3997-anadir-posicionamiento-a-los-elementos-de-la-consola-visual' into ent-3994-Añadir-actualización-de-ciertos-valores-a-la-api-web-de-la-consola-visual 2019-06-12 12:23:41 +02:00
Alejandro Gallardo Escobar ee7fb4db5f Merge branch 'develop' into ent-3997-anadir-posicionamiento-a-los-elementos-de-la-consola-visual 2019-06-12 12:13:48 +02:00
marcos.alconada 4b224d1314 ad coments and delete is_metaconsole() condition 2019-06-12 10:13:37 +02:00
Alejandro Gallardo Escobar 8793e2debd Fixed the omnipresent group summary bug 2019-06-12 09:16:47 +02:00
Alejandro Gallardo Escobar d3da3747dd Fixed the visualization of the combined graph item from the new visual console 2019-06-12 08:48:51 +02:00
artica 51d5e1d951 Auto-updated build strings. 2019-06-12 00:01:07 +02:00
Alejandro Fraguas fdce139f84 Merge branch 'ent-4186-Error-en-add-map-connection-al-crear-mapas-gis' into 'develop'
fix bug when adding connection maps in gis map builder

See merge request artica/pandorafms!2490
2019-06-11 18:01:54 +02:00
Tatiana Llorente e4139874dd Removed option to show qr code in header - #4196 2019-06-11 18:00:41 +02:00
Alejandro Gallardo Escobar 7307d34c75 Minor fix 2019-06-11 17:39:46 +02:00
Tatiana Llorente 31905f005a Visual changes in Agent/Module View - #3739 2019-06-11 17:34:13 +02:00
Alejandro Gallardo Escobar 5735326430 Added an async task to persist the visual console item movement to the database 2019-06-11 17:27:22 +02:00
Daniel Rodriguez 4cf0fda28c Merge branch 'ent-3300-Error-borrado-masivo-de-informes' into 'develop'
Fix bug in report massive deletion

See merge request artica/pandorafms!2493
2019-06-11 17:17:14 +02:00
Alejandro Fraguas cb6d71b930 Merge branch 'ent-3474-Exportar-a-csv-custom-field-view' into 'develop'
Ent 3474 exportar a csv custom field view

See merge request artica/pandorafms!2483
2019-06-11 17:06:14 +02:00
Alejandro Gallardo Escobar 9d15ece41a Added an event handler for move events of the visual console items 2019-06-11 16:44:19 +02:00
marcos.alconada 23469796f8 Limited result for user groups 2019-06-11 16:23:42 +02:00
Alejandro Campos cc9a7553bc Merge branch 'develop' into 'ent-3300-Error-borrado-masivo-de-informes'
# Conflicts:
#   pandora_console/godmode/reporting/reporting_builder.php
2019-06-11 16:18:29 +02:00
Daniel Maya 4815d73149 Update 2019-06-11 15:26:10 +02:00
fbsanchez 48e6fef0b7 Event filters 2019-06-11 12:58:18 +02:00
manuel 40119f6d2e Fixed bug in visual consoles permissions with ACLS 2019-06-11 12:55:43 +02:00
Daniel Rodriguez 1436ec0782 Merge branch 'ent-4088-Falta-campo-estado-en-modulos-plugin-erroneos' into 'develop'
Added image for unknown and no data status - 4088

See merge request artica/pandorafms!2484
2019-06-11 12:07:45 +02:00
marcos.alconada 738958386a guardo cambios 2019-06-11 10:01:51 +02:00
Tatiana Llorente 80ed5dc9c1 Removed empty helps - #4183 2019-06-11 09:33:43 +02:00
artica 4a2688d6ac Auto-updated build strings. 2019-06-11 00:01:06 +02:00
Daniel Rodriguez 9d71c10308 Merge branch 'ent-3639-bug-mensaje-de-tamano-del-log-de-consola-en-diagnostic-info' into 'develop'
Redolved ticket

See merge request artica/pandorafms!2273
2019-06-10 18:47:23 +02:00
Alejandro Fraguas cd1f8d0c10 Merge branch 'ent-3760-Error-de-login-LDAP' into 'develop'
Fixed function ldapsearch

See merge request artica/pandorafms!2301
2019-06-10 18:08:18 +02:00
alejandro-campos 577ddef8b3 fix bug when adding connection maps in gis map builder 2019-06-10 17:04:36 +02:00
marcos.alconada a40e420de0 Removed , from numer format 2019-06-10 16:59:05 +02:00
Daniel Rodriguez 81ac4e5bef Merge branch 'ent-3466-ad-advanced-perms-fixed' into 'develop'
Ent 3466 ad advanced perms fixed

See merge request artica/pandorafms!2194
2019-06-10 16:05:21 +02:00
fbsanchez ef3d299d58 wip event view 2019-06-10 15:18:35 +02:00
marcos.alconada 58ba42cec1 Changed code for conversión 2019-06-10 14:53:47 +02:00
Daniel Maya 78e01d9c7d Added encode 2019-06-10 13:04:52 +02:00
marcos.alconada cf84c3f579 Merge remote-tracking branch 'origin/develop' into ent-3639-bug-mensaje-de-tamano-del-log-de-consola-en-diagnostic-info 2019-06-10 12:43:08 +02:00
Luis Calvo 8092528742 Fixed reports export to csv meta bugs 2019-06-10 12:27:43 +02:00
Alejandro Fraguas d14ad39785 Merge branch 'ent-3915-7828-servicio-hijo-de-otro-no-borra-todos-los-modulos-del-agente-al-elminarlo' into 'develop'
Node deleted disapear in tree view

See merge request artica/pandorafms!2486
2019-06-10 10:51:26 +02:00
artica 7bf087dd25 Auto-updated build strings. 2019-06-10 00:01:06 +02:00
artica ab4039fe5b Auto-updated build strings. 2019-06-09 00:01:06 +02:00
artica 0ee04ecb21 Auto-updated build strings. 2019-06-08 00:01:07 +02:00
fbsanchez bb552226a6 minor fix 2019-06-07 22:58:49 +02:00
fbsanchez f67bf8c2b7 wip event list filters 2019-06-07 22:44:02 +02:00
fbsanchez d4d4509266 wip event view 2019-06-07 21:22:07 +02:00
fbsanchez 419a90d69c wip event list 2019-06-07 17:35:13 +02:00
marcos.alconada 833248991b Add mr 29 2019-06-07 11:24:00 +02:00
marcos.alconada 1e843777bc Delete line with log4x 2019-06-07 10:57:15 +02:00
Marcos Alconada f89aefa7ab Merge branch 'revert-928f6a79' into 'develop'
Revert "Merge branch 'ent-3626-referencias-log4x' into 'develop'"

See merge request artica/pandorafms!2487
2019-06-07 10:24:27 +02:00
Marcos Alconada d49d303469 Update pandoradb_data.sql 2019-06-07 10:20:29 +02:00
Marcos Alconada be82afc9c5 Update pandoradb_data.sql 2019-06-07 09:50:49 +02:00
Alejandro Fraguas 021ae9b1cd Merge branch 'ent-3561-error-herramienta-db-schema-check' into 'develop'
Ticket Resolved

See merge request artica/pandorafms!2227
2019-06-07 09:48:51 +02:00
Marcos Alconada 241eda5c39 Revert "Merge branch 'ent-3626-referencias-log4x' into 'develop'"
This reverts merge request !2282
2019-06-07 09:35:13 +02:00
marcos.alconada a13dab3f35 resolving merge conflict 2019-06-07 09:22:07 +02:00
artica 2f0aa6c6a1 Auto-updated build strings. 2019-06-07 00:01:07 +02:00
marcos.alconada 73466b9096 Node deleted disapear in tree view 2019-06-06 18:47:10 +02:00
fbsanchez 23e6711f09 WIP Events 2019-06-06 17:50:47 +02:00
Tatiana Llorente 4f9f9e65c2 Remove autocomplete user and password in the form to create wmi modules - #3437 2019-06-06 16:51:11 +02:00
Luis Calvo ac679797a3 Merge remote-tracking branch 'origin/develop' into ent-4073-eventos-en-proceso-no-validan-ni-id-evento-ni-id-extra 2019-06-06 14:53:14 +02:00
Luis Calvo 701c11a457 Added event in process status validation when same extra id 2019-06-06 14:52:39 +02:00
Tatiana Llorente a4ea5e7c77 Added image for unknown and no data status - 4088 2019-06-06 14:16:09 +02:00
Alejandro Fraguas 527a9f4a35 Merge branch 'ent-3614-Vista-de-Servicios' into 'develop'
New styles for Services table view - #3614

See merge request artica/pandorafms!2468
2019-06-06 12:58:06 +02:00
Tatiana Llorente 2d84081ca7 Add styles for metaconsole - #3614 2019-06-06 12:09:35 +02:00
Tatiana Llorente 334e66aaf1 Export csv from custom field view meta - #3474 2019-06-06 10:39:09 +02:00
Luis Calvo 83743da2f5 Merge remote-tracking branch 'origin/develop' into ent-3429-event-report-options-saving 2019-06-06 10:34:07 +02:00
Luis Calvo c6d1bb6533 Fixed fields not saving in event reports 2019-06-06 10:33:46 +02:00
artica 034a910000 Auto-updated build strings. 2019-06-06 00:01:07 +02:00
Alejandro Fraguas 7883fc5f96 Merge branch 'ent-4121-meta-user-edition-bug' into 'develop'
Fixed bug in meta user_edir form url

See merge request artica/pandorafms!2472
2019-06-05 12:00:31 +02:00
Alejandro Fraguas 9791b174b2 Merge branch 'ent-4030-bug-en-busqueda-de-inventario' into 'develop'
Ent 4030 bug en busqueda de inventario

See merge request artica/pandorafms!2431
2019-06-05 10:23:43 +02:00
marcos.alconada 1ee347684e Added condition if enterprise installed 2019-06-05 10:17:28 +02:00
Luis Calvo 3475684cdc Merge remote-tracking branch 'origin/develop' into ent-3429-event-report-options-saving 2019-06-05 09:36:57 +02:00
Alejandro Gallardo Escobar 1e74502866 Bugfix 2019-06-05 09:08:23 +02:00
manuel cc43e40694 Merge branch 'develop' into ent-3739-Vista-Agent-Module-view-no-funciona-en-pantalla-completa-y-autorefresco
Conflicts:
pandora_console/extensions/agents_modules.php
2019-06-05 08:47:16 +02:00
artica 95574adf80 Auto-updated build strings. 2019-06-05 00:01:08 +02:00
fbsanchez 5b2eb8891b tab moved 2019-06-04 22:43:26 +02:00
fbsanchez 6ed2a0636e styles review 2019-06-04 22:34:17 +02:00
fbsanchez b14cdfb4c2 minor fix in tactical 2019-06-04 22:22:33 +02:00
fbsanchez a1be1e7332 styles review 2019-06-04 22:16:58 +02:00
Daniel Rodriguez 537a73be04 Merge branch 'ent-4131-error-migrate-6-a-7' into 'develop'
Added missing create table to migrate 6 to 7

See merge request artica/pandorafms!2477
2019-06-04 18:26:12 +02:00
Alejandro Gallardo Escobar 0c21a2956c Bugfix 2019-06-04 17:34:40 +02:00
Tatiana Llorente 1a8b09229c Export csv from custom field view meta - #3474 2019-06-04 17:28:55 +02:00
Alejandro Gallardo Escobar 795542b311 Added a mode to enable the edit mode of the visual console client items 2019-06-04 17:21:54 +02:00
marcos.alconada 9bc83b4ffd Add new else 2019-06-04 17:08:08 +02:00
Luis Calvo 29529f18cd API events in process state validation 2019-06-04 17:06:47 +02:00
marcos.alconada 22efc4ba44 Resolved problem with counts on search main 2019-06-04 17:05:17 +02:00
Daniel Rodriguez 5d961c1485 Merge branch 'ent-3187-snmp-browser-no-muestra-datos-v3' into 'develop'
Unified SNMP version 3 code.

See merge request artica/pandorafms!2471
2019-06-04 16:40:41 +02:00
Alejandro Fraguas a1591f7a84 Merge branch 'ent-3362-7334-Bug-time-comparison-graficas-de-modulos' into 'develop'
Fixed bug in time comparison graphs

See merge request artica/pandorafms!2476
2019-06-04 16:29:52 +02:00
Ramon Novoa 51f57e9247 Fix a typo. 2019-06-04 15:54:32 +02:00
fbsanchez e1eac631c1 tactical icon sizes 2019-06-04 15:42:27 +02:00
fbsanchez 2f5265fcbb color updates 2019-06-04 14:08:07 +02:00
fbsanchez c741020538 styles review 2019-06-04 13:57:55 +02:00
Daniel Rodriguez b2b3d748c1 Merge branch 'ent-3901-Macro-event-id-no-funciona-en-meta-si-el-evento-tiene-server-id-0' into 'develop'
allow fetching of event id in metaconsole event table when getting target of an…

See merge request artica/pandorafms!2437
2019-06-04 12:45:26 +02:00
marcos.alconada c5cb76b271 Add policies to general search 2019-06-04 11:52:56 +02:00
marcos.alconada 4b6c21bb30 Add policies to general search and deleted help functions 2019-06-04 11:44:11 +02:00
Luis Calvo 23e631f7d8 Added missing create table to migrate 6 to 7 2019-06-04 08:52:25 +02:00
artica c584367c14 Auto-updated build strings. 2019-06-04 00:01:06 +02:00
fbsanchez cb1fb19b95 style review 2019-06-03 19:19:18 +02:00
fbsanchez 974db824a8 style review 2019-06-03 19:13:29 +02:00
Daniel Rodriguez efd7abfc66 Merge branch 'ent-3581-proyectos-bug-deshabilitar-agente-software' into 'develop'
ticket resolved

See merge request artica/pandorafms!2207
2019-06-03 18:16:32 +02:00
manuel 5ba2ba1ef3 Fixed bug in time comparison graphs 2019-06-03 15:37:05 +02:00
Daniel Rodriguez d0e99e1018 Merge branch 'ent-3576-ldap-advanced-remote-user-unchecked' into 'develop'
Fixed ldap adv. perms continues apliying when autocreate remote is unselected

See merge request artica/pandorafms!2221
2019-06-03 15:09:15 +02:00
Daniel Rodriguez 909fa354b4 Merge branch '4091-bug-en-permisos-al-crear-usuario-con-ldap-advanced' into 'develop'
Changed for create new user with advanced config enabled and forced automaticly disabled

See merge request artica/pandorafms!2459
2019-06-03 14:51:06 +02:00
fbsanchez 31257c02a4 style review 2019-06-03 14:50:22 +02:00
fbsanchez 7a09a80ace style review 2019-06-03 14:30:23 +02:00
fbsanchez 551a21ed86 Next contact fixes 2019-06-03 13:11:00 +02:00
fbsanchez 13086b596c Next contact 2019-06-03 13:04:49 +02:00
Alejandro Fraguas 45c58a7c72 Merge branch 'ent-4041-7980-bug-parametro-event_storm_protection' into 'develop'
Variability event_storm_protection check is added with empty data

See merge request artica/pandorafms!2428
2019-06-03 11:58:52 +02:00
fbsanchez b4dcf4a6f1 style review 2019-06-03 11:55:56 +02:00
fbsanchez ddf3b7a258 Review 1 2019-06-03 11:21:44 +02:00
fbsanchez 9de5dadbf2 style review 2019-06-03 11:16:51 +02:00
Daniel Maya 419b3f4fb1 Fixed module_manager with Agent limit surpassed or license expired 2019-06-03 10:47:54 +02:00
fbsanchez 88b0802472 style review 2019-06-03 10:46:52 +02:00
fbsanchez eb5ee75d33 Merge remote-tracking branch 'origin/develop' into ent-3295-revision-comportamiento-metaconsola-con-nodo-multi-servidor 2019-06-03 09:18:49 +02:00
artica a11b674467 Auto-updated build strings. 2019-06-03 00:01:06 +02:00
artica cfc8d7d177 Auto-updated build strings. 2019-06-02 00:01:05 +02:00
artica f06d160141 Auto-updated build strings. 2019-06-01 00:01:06 +02:00
ismael.moreno 1aa6d8c298 Change module type ifOperStatus on Interface Wizard 2019-05-31 10:39:48 +02:00
Alejandro Fraguas 4c85066ecd Merge branch 'ent-3670-0-rebelde-en-autoconfigurador-de-agentes' into 'develop'
Resolved

See merge request artica/pandorafms!2245
2019-05-31 10:08:02 +02:00
fbsanchez 69054571ab Style review 2019-05-31 09:50:59 +02:00
artica 2f734f2454 Auto-updated build strings. 2019-05-31 00:01:07 +02:00
fbsanchez 40cca5e1e3 BIG style change, erased all important flags 2019-05-30 18:21:13 +02:00
Luis Calvo cdbd5b3487 Fixed bug in meta user_edir form url 2019-05-30 17:23:32 +02:00
Ramon Novoa e72a55b4f3 Unified SNMP version 3 code. 2019-05-30 16:58:36 +02:00
Daniel Rodriguez 2c36631130 Merge branch 'ent-3518-password-recovery-email-bad-message' into 'develop'
Fixed the error message of the password recovery

See merge request artica/pandorafms!2172
2019-05-30 15:35:18 +02:00
Daniel Rodriguez 16d34bf584 Merge branch 'ent-3643-mensaje-duplicado-con-info-de-la-db_history-en-performance' into 'develop'
ticket resolved, duplicated sentece

See merge request artica/pandorafms!2239
2019-05-30 15:33:27 +02:00
Daniel Rodriguez 6b4f1466f7 Merge branch 'ent-3825-local-components-salen-con-intervalos-inversos' into 'develop'
Changed check value on JS

See merge request artica/pandorafms!2340
2019-05-30 15:32:16 +02:00
fbsanchez e37d120115 Review 1 2019-05-30 13:58:57 +02:00
fbsanchez 94153b823f Help links 2019-05-30 11:25:09 +02:00
fbsanchez 30320b7897 Fixed login button style and removed help icons from agent_management 2019-05-30 11:12:37 +02:00
Tatiana Llorente 44803b6403 Merge remote-tracking branch 'origin/develop' into ent-3614-Vista-de-Servicios
Conflicts:
	pandora_console/include/styles/pandora.css
2019-05-30 11:09:15 +02:00
Tatiana Llorente 445cc8aab0 New styles for Services table view - #3614 2019-05-30 10:58:59 +02:00
artica bfef8e61ea Auto-updated build strings. 2019-05-30 00:01:06 +02:00
Alejandro Fraguas bc279e99b0 Merge branch 'fix/styles' into 'develop'
Fix/styles

See merge request artica/pandorafms!2461
2019-05-29 18:31:43 +02:00
fbsanchez 48094ffb2e greater icons 2019-05-29 18:24:45 +02:00
fbsanchez c2346842c9 ui_toggle revierw 2019-05-29 18:13:21 +02:00
fbsanchez f16f35ad10 Changes styles 2019-05-29 17:49:09 +02:00
fbsanchez 121ae89b1d dyn style ui_print_help_tip 2019-05-29 17:34:11 +02:00
fbsanchez 3c730fbedf BC updated 2019-05-29 17:10:21 +02:00
Daniel Maya 30b8872ab3 fixed mr 28 2019-05-29 17:06:25 +02:00
fbsanchez 47c9220cbb clippy positions and control overflow 2019-05-29 17:02:01 +02:00
fbsanchez 8c0bfd72a8 avoid icon overlap report view lsit 2019-05-29 16:52:38 +02:00
fbsanchez 53f6649a57 tip img sty 2019-05-29 16:49:51 +02:00
fbsanchez e9198af17c multiple changes 2019-05-29 16:45:53 +02:00
Alejandro Fraguas 2e3338b595 Merge branch 'ent-3961-Añadir-caché-para-los-elementos-de-la-Consola-Visual' into 'develop'
Ent 3961 añadir caché para los elementos de la consola visual

See merge request artica/pandorafms!2443
2019-05-29 15:48:45 +02:00
fbsanchez 4a42756ec6 group_management styles profiles 2019-05-29 15:44:51 +02:00
Daniel Maya 3083482457 Fixed label cache 2019-05-29 15:30:26 +02:00
fbsanchez 4f27ae1021 minor style fix 2019-05-29 15:25:35 +02:00
fbsanchez f58d1bc6ee Styling review 2019-05-29 15:14:13 +02:00
Daniel Maya 76e6588b7a fixed cache in label, icon, clock, box and line 2019-05-29 13:54:14 +02:00
fbsanchez 8bd4a2f8f7 Style align-top 2019-05-29 13:20:31 +02:00
fbsanchez 3046cc5224 Style align-top 2019-05-29 13:13:24 +02:00
fbsanchez 72999244c2 pandora_console/operation/agentes/estado_generalagente.php 2019-05-29 13:13:01 +02:00
fbsanchez 7da60b447a Merge remote-tracking branch 'origin/develop' into fix/styles 2019-05-29 13:06:53 +02:00
fbsanchez 505229abe4 minor style change - box 2019-05-29 13:03:58 +02:00
Daniel Rodriguez 702b7e69ba Merge branch 'ent-4020-cambiar-mensaje-de-bienvenida-tnews-3' into 'develop'
Changed query and comment for tnews message

See merge request artica/pandorafms!2465
2019-05-29 12:58:54 +02:00
Daniel Rodriguez ad1251052e Merge branch 'ent-4105-fallo-desplegable-snmp-wizard' into 'develop'
SNMP Browser fix

See merge request artica/pandorafms!2455
2019-05-29 12:50:09 +02:00
fbsanchez 49dee1e2bc Next contact to seconds 2019-05-29 12:42:55 +02:00
fbsanchez 5131c24772 Merge remote-tracking branch 'origin/develop' into fix/styles 2019-05-29 12:24:28 +02:00
fbsanchez ca083556c3 minor alignment select-multiple 2019-05-29 12:23:54 +02:00
fbsanchez 487ff53825 Min. fields lenght headers 2019-05-29 12:09:45 +02:00
marcos.alconada 1f3656c0d3 Changed query and comment for tnews message 2019-05-29 12:09:44 +02:00
fbsanchez 37af0ad612 Styles 2019-05-29 12:06:05 +02:00
Daniel Rodriguez ee7cd68d39 Merge branch 'ent-1668-update-manager' into 'develop'
UM register, UM newsletter flow improved

See merge request artica/pandorafms!2463
2019-05-29 11:55:34 +02:00
marcos.alconada d5ac57064b Condition is added to keep the selection color in the main menu 2019-05-29 11:34:23 +02:00
fbsanchez 5ec162e058 Data title events 2019-05-29 11:24:17 +02:00
fbsanchez c8649a8dc4 Styles 2019-05-29 11:21:57 +02:00
Daniel Maya 552467286c Merge branch 'develop' into 'ent-3961-Añadir-caché-para-los-elementos-de-la-Consola-Visual'
# Conflicts:
#   pandora_console/extras/mr/28.sql
2019-05-29 11:10:31 +02:00
Alejandro Fraguas c0763b86d2 Merge branch 'ent-3924-eHorus-settings' into 'develop'
Ent 3924 e horus settings

See merge request artica/pandorafms!2417
2019-05-29 10:51:59 +02:00
fbsanchez 32424ddae1 Merge remote-tracking branch 'origin/develop' into fix/styles 2019-05-29 10:50:38 +02:00
fbsanchez 5e3ca1664f UM unregister restriction, only admins 2019-05-29 10:37:02 +02:00
fbsanchez 4a60dbe415 Unregistration form 2019-05-29 10:27:28 +02:00
fbsanchez 28555e09de Unregistration form 2019-05-29 10:26:53 +02:00
fbsanchez 30ce8f65e4 UM register, UM newsletter flow improved 2019-05-29 10:01:21 +02:00
Daniel Rodriguez 9096444f8f Merge branch 'ent-1480-4731-deshabilitado-de-modulos-agencia_aadcm' into 'develop'
Do not add disabled modules to the execution queue.

See merge request artica/pandorafms!2456
2019-05-29 09:53:38 +02:00
Luis Calvo 27963c4370 Fixed minor bug 2019-05-29 09:51:26 +02:00
fbsanchez 22de7964c2 Merge remote-tracking branch 'origin/develop' into fix/styles 2019-05-29 08:52:34 +02:00
Daniel Barbero Martin c35cb56699 fixed errors 2019-05-29 08:50:46 +02:00
artica 8572a13319 Auto-updated build strings. 2019-05-29 00:01:07 +02:00
Alejandro Gallardo Escobar f5d5cbf5b8 VC item cache improvements.
-Added a default value to the configuration.
-Changed the control to edit the cache expiration.
- Added the cache to more items.
2019-05-28 18:34:07 +02:00
fbsanchez d64e2cfb8c Merge remote-tracking branch 'origin/develop' into fix/styles 2019-05-28 18:05:33 +02:00
Luis Calvo 8e7b769977 Merge branch 'ent-3924-eHorus-settings' of https://brutus.artica.lan:8081/artica/pandorafms into ent-3924-eHorus-settings 2019-05-28 18:04:52 +02:00
Luis Calvo 58a0ef1bf7 Merge remote-tracking branch 'origin/develop' into ent-3924-eHorus-settings 2019-05-28 18:03:55 +02:00
Luis Calvo 77dbb53db4 Fixed minor bug 2019-05-28 18:03:40 +02:00
fbsanchez 70469c4909 Event list agent view 2019-05-28 18:03:01 +02:00
Luis c8297165e8 Undo undesired changes 2019-05-28 17:41:39 +02:00
Luis Calvo e993dcc3a5 Merge remote-tracking branch 'origin/develop' into ent-3924-eHorus-settings 2019-05-28 17:37:20 +02:00
Luis Calvo 6fdd88ab65 Fixed errors on eHorus user level conf 2019-05-28 17:19:13 +02:00
Daniel Barbero Martin 3b943ae902 fixed errors disabled/enabled module from list agents because not write in conf 2019-05-28 17:11:14 +02:00
fbsanchez 99e485e96e toggle updated 2019-05-28 16:24:28 +02:00
fbsanchez 445db7c43b module list agent view 2019-05-28 16:20:24 +02:00
Tatiana Llorente d68bb176cf Merge branch 'develop' into 'ent-4102-Cambios-vista-detalle-de-evento'
Conflicts:
   pandora_console/include/styles/pandora.css
2019-05-28 15:56:16 +02:00
fbsanchez c57949079b RC1 agent view 2019-05-28 13:32:17 +02:00
Alejandro Fraguas 1df2bd3c21 Merge branch 'ent-4101-Cambios-vista-gráfica-de-módulo' into 'develop'
Ent 4101 cambios vista gráfica de módulo

See merge request artica/pandorafms!2462
2019-05-28 13:30:11 +02:00
fbsanchez 348f0c2a65 agent view styling 2019-05-28 13:27:17 +02:00
Luis Calvo 5966367f8f eHorus user level login conf added in user editor 2019-05-28 13:14:42 +02:00
fbsanchez 9a12b34847 Updates styling 2019-05-28 12:13:29 +02:00
Alejandro Fraguas a3591b799a Merge branch 'ent-3983-Informes-SLA-mensuales-de-keepalive-no-se-calculan-bien' into 'develop'
fix minor bug in reporting functions

See merge request artica/pandorafms!2460
2019-05-28 12:03:55 +02:00
fbsanchez 92ca217800 minor fixes in style view tasklist 2019-05-28 10:57:36 +02:00
fbsanchez 2cd19aa0cb updates styles 2019-05-28 10:47:31 +02:00
Alejandro Gallardo Escobar 5ea79cdfb8 Now only the Group item of the VC is cached by user 2019-05-28 10:39:34 +02:00
fbsanchez bdd7cc1317 Flex agent view 2019-05-28 09:48:09 +02:00
Tatiana Llorente a6c0a082a7 Merge branch 'ent-4104-Cambios-vista-gráfica-de-módulo' into ent-4101-Cambios-vista-gráfica-de-módulo 2019-05-28 08:55:15 +02:00
fbsanchez 8bfb1e6773 Merge remote-tracking branch 'origin/develop' into fix/styles 2019-05-28 08:32:53 +02:00
artica 11e5a4ce18 Auto-updated build strings. 2019-05-28 00:01:07 +02:00
fbsanchez e338d5ba95 Merge remote-tracking branch 'origin/develop' into fix/styles 2019-05-27 22:40:11 +02:00
fbsanchez f57915285f review styles agent view 2019-05-27 22:36:55 +02:00
fbsanchez f1499082fa agent view rebuilt 2019-05-27 21:30:46 +02:00
fbsanchez 954dd0b43a UI_toggle updated 2019-05-27 19:08:41 +02:00
fbsanchez 5be124f315 Styles review 2019-05-27 19:00:48 +02:00
Luis Calvo 3736d84589 Edit ehorus user 2019-05-27 18:49:47 +02:00
alejandro-campos 58d0dc5dbc fix minor bug in reporting functions 2019-05-27 18:31:20 +02:00
Luis Calvo 588d19102f Resolve merge conflict 2019-05-27 18:30:24 +02:00
Alejandro Fraguas f284112be2 Merge branch 'ent-4020-cambiar-mensaje-de-bienvenida-tnews-2' into 'develop'
changed PK to NULL

See merge request artica/pandorafms!2451
2019-05-27 18:13:09 +02:00
fbsanchez f0fb6d7fd9 wip styles 2019-05-27 18:03:56 +02:00
Daniel Rodriguez 61d3720787 Merge branch 'ent-4076-Quitar-ayudas-vacias-modulos' into 'develop'
Removed empty help icons in modules

See merge request artica/pandorafms!2454
2019-05-27 17:53:06 +02:00
marcos.alconada 91d388c8b3 Changed for create new user with advanced config enabled and forced automaticly disabled 2019-05-27 17:47:45 +02:00
Tatiana Llorente 2fd37b531e Visual changes in module graph - #4104 2019-05-27 17:37:57 +02:00