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

17653 Commits

Author SHA1 Message Date
artica 7b78b5820e Auto-updated build strings. 2019-08-14 00:01:10 +02:00
marcos.alconada 3d68641e4e add space in networkp map 2019-08-13 14:41:57 +02:00
marcos.alconada 9310fd8dc1 add deleted condition 2019-08-13 13:58:44 +02:00
artica c0588d95ca Updated version and build strings. 2019-08-13 12:27:44 +02:00
artica a8915e13ad Auto-updated build strings. 2019-08-13 00:01:08 +02:00
Tatiana Llorente bdee45c2dd Fixed duplicated names - #4280 2019-08-12 14:24:26 +02:00
Tatiana Llorente 747e06c8b0 Added margin - #4300 2019-08-12 12:54:06 +02:00
Luis Calvo db349a4783 Fixed empty http_auth_user and pass 2019-08-12 12:26:00 +02:00
marcos.alconada 30f7a48d7b Fixed error with news modal windows 2019-08-12 09:36:16 +02:00
artica 5cecf1f899 Auto-updated build strings. 2019-08-12 00:01:07 +02:00
artica 390acf0459 Auto-updated build strings. 2019-08-11 00:01:09 +02:00
fbsanchez 62ec37cf59 propagate tdatabase updates 2019-08-10 03:18:45 +02:00
fbsanchez adbb48ab87 pandora HA review 2019-08-10 02:13:01 +02:00
artica 4f25e42be1 Auto-updated build strings. 2019-08-10 00:01:17 +02:00
Tatiana Llorente 2bc57b9561 Reduced the speed of events marquee - #4363 2019-08-09 12:50:07 +02:00
Tatiana Llorente b893d55a49 Added item type text to list of items- #4377 2019-08-09 12:09:49 +02:00
Tatiana Llorente 8bfde74a06 Show alias instead of name - #4389 2019-08-09 11:06:17 +02:00
Luis Calvo 72c4b55477 Corregida errata comentario 2019-08-09 10:52:25 +02:00
Luis Calvo 4fe4e58874 Re-uploaded visual-console rack images and db data 2019-08-09 10:46:47 +02:00
Luis Calvo 0cb0a63a8f Re-uploaded visual-console rack images and db data 2019-08-09 10:42:44 +02:00
Daniel Rodriguez 57fcfee36c Merge branch '4003-Arreglos-en-servicios' into 'develop' 
4003 arreglos en servicios

See merge request artica/pandorafms!2621
 2019-08-09 09:04:17 +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
Daniel Rodriguez ff3134c55a Merge branch 'ent-4388-Nuevos-eventos' into 'develop' 
Ent 4388 nuevos eventos

See merge request artica/pandorafms!2628
 2019-08-09 09:00:57 +02:00
artica 992958f4b4 Auto-updated build strings. 2019-08-09 00:01:09 +02:00
alejandro-campos 0461cb04f7 fix graphs not showing in metaconsole monitors view 2019-08-08 15:18:15 +02:00
alejandro-campos 97353bbfed backup changes 2019-08-08 13:36:12 +02:00
Tatiana Llorente 77f57ae87f Don't allow access to update manager offline in community edition - #4484 2019-08-08 09:23:23 +02:00
artica 21c81f6dfe Auto-updated build strings. 2019-08-08 00:01:08 +02:00
Tatiana Llorente 7826ba79e6 Remove disabled modules to create service element - #4458 2019-08-07 14:23:10 +02:00
Jose Gonzalez 191db192c9 Solved issue with metaconsole 2019-08-07 14:14:14 +02:00
manuel 6c90a4dd53 Fixed bug in alerts details view 2019-08-07 13:04:37 +02:00
Tatiana Llorente c32c15ed94 Fixed bug create snmp filter - #4446 2019-08-07 09:35:08 +02:00
artica 871e0568d7 Auto-updated build strings. 2019-08-07 00:01:32 +02:00
Jose Gonzalez 3d03faed9a Solved some issues 2019-08-06 14:56:57 +02:00
manuel 324690ddad Fixed pagination bug 2019-08-06 14:52:43 +02:00
Luis Calvo 47e8a618c2 Fixed alert actions bug 2019-08-06 14:41:54 +02:00
marcos.alconada 9cfa8be1e9 font size for jap and chinese adjusted agents 2019-08-06 14:35:15 +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
artica 5aa9320ae3 Auto-updated build strings. 2019-08-06 00:01:22 +02:00
alejandro-campos b43c489b1a Merge branch 'ent-4388-Nuevos-eventos' of https://brutus.artica.lan:8081/artica/pandorafms into ent-4388-Nuevos-eventos 2019-08-05 16:24:00 +02:00
alejandro-campos 225491feb1 fix minor visual bug in event list 2019-08-05 16:23:37 +02:00
alejandro-campos 28cf43498e lint change 2019-08-05 14:18:23 +02:00
alejandro-campos 9b8e3c540c created integria integration setup 2019-08-05 13:42:01 +02:00
Alejandro Campos 12eacc1933 Merge branch 'develop' into 'ent-4388-Nuevos-eventos' 
# Conflicts:
#   pandora_console/extras/mr/31.sql
#   pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
 2019-08-05 09:26:18 +02:00
artica 2133551889 Auto-updated build strings. 2019-08-05 00:01:08 +02:00
artica 914a41ab8d Auto-updated build strings. 2019-08-04 00:01:08 +02:00
artica e417b775c7 Auto-updated build strings. 2019-08-03 00:01:10 +02:00
Daniel Rodriguez 06591680de Merge branch 'ent-4408-csv-meta-custom-field-views' into 'develop' 
Added title in custom field

See merge request artica/pandorafms!2613
 2019-08-02 14:12:21 +02:00
Daniel Rodriguez 7ff5e23792 Merge branch 'ent-4460-Eliminar-antigua-integracion-con-integria' into 'develop' 
removed all deprecated references to integria from code and db data

See merge request artica/pandorafms!2626
 2019-08-02 12:28:03 +02:00
Alejandro Fraguas f5349e7723 Merge branch 'ent-4424-error-acceso-con-sin-acl-enterprise' into 'develop' 
Fixed agent detail events permission

See merge request artica/pandorafms!2620
 2019-08-02 11:06:42 +02:00
alejandro-campos 41029196d8 fix minor visual bug in events table 2019-08-02 10:04:10 +02:00
artica 3a654c7f79 Auto-updated build strings. 2019-08-02 00:01:11 +02:00
Tatiana Llorente c591dd4260 Show html tags in instructions - #4352 2019-08-01 13:11:50 +02:00
Tatiana Llorente 4e927e1ee5 Fixed bad image for warning status - #4454 2019-08-01 10:36:15 +02:00
artica 28e562a2f7 Auto-updated build strings. 2019-08-01 00:01:09 +02:00
alejandro-campos a36a293f19 added changes to pandora migrate and MR 2019-07-31 17:18:52 +02:00
alejandro-campos 927b1fa37f removed all deprecated references to integria from code and db data 2019-07-31 16:46:26 +02:00
fbsanchez 1e73105fc9 minor fix adding slash if not found 2019-07-31 10:59:51 +02:00
artica 6713f51414 Updated version and build strings. 2019-07-31 09:25:59 +02:00
artica 9995d8b654 Auto-updated build strings. 2019-07-31 00:01:13 +02:00
alejandro-campos b4bd7f0f63 fixed problems in event view and event view custom fields 2019-07-30 16:10:34 +02:00
fbsanchez 755b0bbf7d Merge remote-tracking branch 'origin/develop' into ent-2441-despliegue-de-agentes-desde-pandora 2019-07-30 12:53:23 +02:00
artica 8734697169 Auto-updated build strings. 2019-07-30 00:01:11 +02:00
Jose Gonzalez dd77429aea Solved issue with status names 2019-07-29 17:22:16 +02:00
Luis Calvo f6f96523a0 Added html enconde 2019-07-29 16:57:39 +02:00
Jose Gonzalez 719f56efec Modified SQL queries for avoidance of case sensitive 2019-07-29 16:32:50 +02:00
Luis Calvo 00662058f3 Fixed agent detail events permission 2019-07-29 15:16:24 +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
artica 4d9d0deab7 Auto-updated build strings. 2019-07-29 00:01:08 +02:00
artica 32b013e11c Auto-updated build strings. 2019-07-28 00:01:06 +02:00
artica 3980cefd2c Auto-updated build strings. 2019-07-27 00:01:09 +02:00
fbsanchez f7e2023253 Merge remote-tracking branch 'origin/develop' into ent-2441-despliegue-de-agentes-desde-pandora 2019-07-26 21:56:45 +02:00
fbsanchez db25d3b231 Cleared unused table 2019-07-26 21:56:37 +02:00
artica 871d8e9885 Auto-updated build strings. 2019-07-26 00:01:10 +02:00
fbsanchez 6ac21acd39 wip agent deployment scan 2019-07-25 18:35:51 +02:00
Jose Gonzalez 5ab2bfacbd Modified date formatting to avoid entities 2019-07-25 15:43:46 +02:00
Jose Gonzalez 5cdfb871a1 Modified the divider in print_audit_csv function 2019-07-25 15:35:57 +02:00
fbsanchez 1445740e2c Merge remote-tracking branch 'origin/develop' into ent-2441-despliegue-de-agentes-desde-pandora 2019-07-25 12:08:18 +02:00
Daniel Rodriguez 2475e6a881 Merge branch 'ent-8429-eventos-duplicados-metaconsola' into 'develop' 
SQL Query modified for solve duplicate events issue

See merge request artica/pandorafms!2611
 2019-07-25 10:29:31 +02:00
artica 3f90ebc938 Auto-updated build strings. 2019-07-25 00:01:09 +02:00
fbsanchez ce346bd604 agent deployment 2019-07-24 17:38:25 +02:00
Daniel Maya 4e01967b88 Added title in custom field 2019-07-24 17:05:54 +02:00
Jose Gonzalez ca19e25f74 SQL Query modified for solve duplicate events issue 2019-07-24 16:00:25 +02:00
artica 6e68b8dc5e Auto-updated build strings. 2019-07-24 00:01:09 +02:00
fbsanchez 6c79bfb135 Merge remote-tracking branch 'origin/develop' into ent-2441-despliegue-de-agentes-desde-pandora 2019-07-23 15:28:04 +02:00
fbsanchez 62d8c04ab3 Agent deployment v1 2019-07-23 13:01:50 +02:00
artica 776fcc3f81 Auto-updated build strings. 2019-07-23 00:01:08 +02:00
Luis Calvo 64d93d98ed Fixed minor bugs and format 2019-07-22 16:08:01 +02:00
Luis Calvo ffec3150d4 Fixed minor bugs and format 2019-07-22 16:03:50 +02:00
Luis Calvo 6aa652649d Fixed minor bugs and format 2019-07-22 15:49:12 +02:00
artica 10e2b5beaf Auto-updated build strings. 2019-07-22 00:01:07 +02:00
artica 3d5a40d4da Auto-updated build strings. 2019-07-21 00:01:07 +02:00
artica 86ad61a010 Auto-updated build strings. 2019-07-20 00:01:07 +02:00
Luis Calvo 38f1c45698 Added macro for sql custom reports 2019-07-19 10:07:39 +02:00
Luis Calvo af8055212f Added macro for sql custom reports 2019-07-19 10:05:01 +02:00
artica 921de9aeea Auto-updated build strings. 2019-07-19 00:01:09 +02:00
Daniel Rodriguez fdbc3b5366 Merge branch 'ent-3470-getallheaders_en_PHP_FPM' into 'develop' 
PHP-FPM

See merge request artica/pandorafms!2607
 2019-07-18 15:40:59 +02:00
Daniel Rodriguez 651c24fc02 Merge branch 'ent-4269-bad-translation-syslog' into 'develop' 
Fixed bad transalation

See merge request artica/pandorafms!2609
 2019-07-18 13:01:48 +02:00
Daniel Rodriguez f08b5204c7 Merge branch 'ent-3673-bug-webchat-consola' into 'develop' 
Modified jquery window function

See merge request artica/pandorafms!2550
 2019-07-18 12:50: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
Luis Calvo 6df9e04f31 Fixed bad transalation 2019-07-18 12:14:03 +02:00
Daniel Rodriguez 87ebde3f41 Merge branch 'ent-4394-No-cargan-graficas-en-vista-tactica' into 'develop' 
fixed minor error fgraph

See merge request artica/pandorafms!2608
 2019-07-18 09:59:33 +02:00
artica 3d496357d7 Auto-updated build strings. 2019-07-18 00:01:11 +02:00
fbsanchez 8d9c4682c7 WIP Agent repository 2019-07-17 20:37:13 +02:00
Daniel Barbero Martin c900465546 fixed minor error fgraph 2019-07-17 17:40:49 +02:00
Daniel Barbero Martin 7fa95d3e43 PHP-FPM 2019-07-17 17:20:09 +02:00
fbsanchez 17dc0b82ac Merge remote-tracking branch 'origin/develop' into ent-2441-despliegue-de-agentes-desde-pandora 2019-07-17 17:19:58 +02:00
fbsanchez 9b57ab8c13 Review minor 2019-07-17 17:17:54 +02:00
Daniel Barbero Martin 6b6d852ceb Merge remote-tracking branch 'origin/develop' into ent-4205-gigas-proyectos-funcionamiento-incorrecto-del-wizard-snmp-con-exec-server 
Conflicts:
	pandora_console/godmode/agentes/agent_wizard.snmp_interfaces_explorer.php
 2019-07-17 15:06:38 +02:00
Daniel Rodriguez c97074ea74 Merge branch 'ent-4354-Revision_completa_de_macros_de_reports' into 'develop' 
fixed macros reports

See merge request artica/pandorafms!2595
 2019-07-17 13:49:38 +02:00
Alejandro Fraguas 657515d79c Merge branch 'ent-2140-Faltan-OIDs-SNMP-Interface-Wizard' into 'develop' 
Added selector for all or common modules- #2140

See merge request artica/pandorafms!2540
 2019-07-17 13:14:39 +02:00
Daniel Barbero Martin 7f4701f22e exec server error wizard 2019-07-17 11:11:38 +02:00
Luis Calvo 53c239f558 fixed minor errors 2019-07-17 10:34:56 +02:00
artica 02d62a9e78 Auto-updated build strings. 2019-07-17 00:01:11 +02:00
fbsanchez f0bfe6910d WIP agent deployment 2019-07-16 20:56:47 +02:00
Jose Gonzalez b7c662d3f9 Added session control for unexpected or forced logouts 2019-07-16 17:55:44 +02:00
Daniel Rodriguez cc603dbefe Merge branch 'ent-4039-7977-cambiar-mensaje-por-uno-mas-intuitivo' into 'develop' 
Ent 4039 7977 cambiar mensaje por uno mas intuitivo

See merge request artica/pandorafms!2503
 2019-07-16 17:01:47 +02:00
Tatiana Llorente 0316c55d39 Added feature to autorefresh in events view with datatables - #4330 2019-07-16 16:46:36 +02:00
Tatiana Llorente 9ad4c98268 Added feature to autorefresh in events view with datatables - #4330 2019-07-16 15:43:52 +02:00
Daniel Rodriguez 4dc5ee2fca Merge branch 'ent-4318-Añadir-buscador-en-operaciones-masivas-vol2' into 'develop' 
Added filter by agent - #4318

See merge request artica/pandorafms!2588
 2019-07-16 14:05:39 +02:00
Daniel Rodriguez c80561f595 Merge branch 'ent-4338-No_funcionan_las_alertas_sonoras' into 'develop' 
fixed events sound

See merge request artica/pandorafms!2603
 2019-07-16 11:57:59 +02:00
Tatiana Llorente 0fbe7e0128 Merge branch 'develop' into 'ent-2140-Faltan-OIDs-SNMP-Interface-Wizard' 
Conflicts:
  pandora_console/godmode/agentes/agent_wizard.snmp_interfaces_explorer.php
 2019-07-16 11:57:36 +02:00
Daniel Rodriguez ab7743b578 Merge branch 'ent-4307-No-se-puede-copiar-agent_name-ni-ID-de-agente-en-vista-de-agente-Firefox' into 'develop' 
Changed disabled to readonly in agent name and id- #4307

See merge request artica/pandorafms!2578
 2019-07-16 11:52:12 +02:00
Daniel Rodriguez 304301a54a Merge branch 'ent-4283-Elementos-superpuestos' into 'develop' 
Fixed minor style bug in pagination events - #4283

See merge request artica/pandorafms!2569
 2019-07-16 11:51:41 +02:00
Daniel Rodriguez fbd71d942a Merge branch 'ent-4035-add-serialize-precision-value-notification' into 'develop' 
Added notification for serialize_precicion value

See merge request artica/pandorafms!2432
 2019-07-16 11:45:38 +02:00
Daniel Barbero Martin dfee153983 fixed errors template node report 2019-07-16 11:22:58 +02:00
Daniel Rodriguez b8f6626947 Merge branch 'ent-4201-Agent-info-campos-vacios-siguen-saliendo' into 'develop' 
Dont show empty custom fields in agent view - #4201

See merge request artica/pandorafms!2572
 2019-07-16 11:20:53 +02:00
Daniel Rodriguez 18da97e9a7 Merge branch 'ent-4306-Error-de-paginacion-en-Nodo' into 'develop' 
Fix pagination blank page - #4306

See merge request artica/pandorafms!2580
 2019-07-16 10:49:14 +02:00
Daniel Barbero Martin 397ee95849 fixed minor error sound events 2019-07-16 10:16:25 +02:00
Daniel Rodriguez e69024f4e2 Merge branch 'ent-4267-edicion-text-informes' into 'develop' 
Solved wrong variable rewriting

See merge request artica/pandorafms!2553
 2019-07-16 10:10:53 +02:00
Alejandro Fraguas 1320e76d3d Merge branch 'ent-3927-contador-de-intentos-fallidos-en-la-pantalla-de-error-de-login' into 'develop' 
Ent 3927 contador de intentos fallidos en la pantalla de error de login

See merge request artica/pandorafms!2383
 2019-07-16 09:54:02 +02:00
Tatiana Llorente cb14a9f2e8 Added feature to autorefresh in events view with datatables - #4330 2019-07-16 09:38:52 +02:00
artica a1055311ad Auto-updated build strings. 2019-07-16 00:01:17 +02:00
fbsanchez 3bbd01026e WIP agent deployment 2019-07-15 19:37:04 +02:00
Luis Calvo 94250cb870 Fixed minor bug 2019-07-15 17:46:59 +02:00
Tatiana Llorente 7d119bfe5a Added feature to autorefresh in events view with datatables - #4330 2019-07-15 17:41:20 +02:00
Alejandro Fraguas 59b8b9a8bb Merge branch 'ent-4370-Export_data_SQL_ERROR' into 'develop' 
fixed error SQL

See merge request artica/pandorafms!2602
 2019-07-15 17:35:41 +02:00
Alejandro Fraguas 8c55c1b287 Merge branch 'ent-4094-Error-al-cambiar-intervalo-de-agentes-por-masivas' into 'develop' 
fixed bug: agent interval not being changed in agent config when changing its…

See merge request artica/pandorafms!2601
 2019-07-15 16:56:41 +02:00
Daniel Rodriguez 791d8f512a Merge branch 'ent-4311-Fallos_en_graficas_al_descargar_informes' into 'develop' 
fixed error in pdf

See merge request artica/pandorafms!2585
 2019-07-15 16:53:07 +02:00
Alejandro Fraguas e3e187b122 Merge branch 'ent-4308-error-sql-en-la-vista-de-reprotes-en-html-de-groups-event-report-metaconsola' into 'develop' 
Resolved error query

See merge request artica/pandorafms!2566
 2019-07-15 15:44:39 +02:00
Daniel Barbero Martin 45e1c32473 fixed events sound 2019-07-15 15:31:01 +02:00
Luis Calvo a0ad1f2681 Merge remote-tracking branch 'origin/develop' into ent-4035-add-serialize-precision-value-notification 2019-07-15 15:04:13 +02:00
Alejandro Fraguas 5498e1df3c Merge branch 'ent-4038-warning-php-vodat' into 'develop' 
Fixed wrong img paths

See merge request artica/pandorafms!2551
 2019-07-15 14:51:23 +02:00
Daniel Rodriguez 69da2f22ec Merge branch 'ent-3793-fallo-en-la-resolucion-de-los-informes-de-netflow' into 'develop' 
Fixed netflow reports resolution

Closes pandora_enterprise#3793

See merge request artica/pandorafms!2310
 2019-07-15 14:21:19 +02:00
Daniel Rodriguez 81c4bd1a76 Merge branch 'ent-3333-etiquetas-a-los-items-en-el-builder-de-consolas-visuales' into 'develop' 
Ent 3333 etiquetas a los items en el builder de consolas visuales

See merge request artica/pandorafms!2344
 2019-07-15 14:12:16 +02:00
Daniel Rodriguez 5f3684fb4e Merge branch 'ent-3786-evitar-cambio-tipo-modulo-politicas' into 'develop' 
Modified control for module edition

See merge request artica/pandorafms!2563
 2019-07-15 14:09:32 +02:00
Daniel Rodriguez 6765544b66 Merge branch 'ent-3382-comprobacion-de-grupos-secundarios-y-primarios-al-creareditar-un-agente' into 'develop' 
Added advice when a primary group will be selected when is currentl a secondary group

See merge request artica/pandorafms!2353
 2019-07-15 13:59:29 +02:00
Daniel Rodriguez 244c00e96f Merge branch 'ent-3428-error-grafica-events-per-agent-en-item-event-report-group-en-meta' into 'develop' 
fixed errors with graphs in meta

See merge request artica/pandorafms!2594
 2019-07-15 13:10:55 +02:00
Alejandro Fraguas 9ea7ac0859 Merge branch 'ent-4080-nombre-agente-lista-modulos' into 'develop' 
Modified agent alias name

See merge request artica/pandorafms!2556
 2019-07-15 13:02:37 +02:00
Daniel Rodriguez ab308b7d10 Merge branch 'ent-4167-cambio-recon-task-listado-servidores' into 'develop' 
Changed link to Discovery task list and added ui_get_full_url function over other links

See merge request artica/pandorafms!2555
 2019-07-15 12:36:52 +02:00
Daniel Rodriguez 26e30f7c25 Merge branch 'ent-3656-Vista_tactica_modulos_sec' into 'develop' 
fixed errors modules/sec in tactical view

See merge request artica/pandorafms!2600
 2019-07-15 12:36:11 +02:00
Daniel Barbero Martin 56ddf0700e fixed error SQL 2019-07-15 11:58:27 +02:00
Luis Calvo ef9502a552 Fixed errors on sum report uncompressed checkbox 2019-07-15 11:56:57 +02:00
alejandro-campos 95254341ce add condition to check if agent interval token should be updated in massive operations based on previous result 2019-07-15 11:53:25 +02:00
alejandro-campos eb831dbbcd fixed bug: agent interval not being changed in agent config when changing its value through massive operations 2019-07-15 11:46:35 +02:00
Daniel Barbero Martin 2f110b8e2e Merge remote-tracking branch 'origin/develop' into ent-4354-Revision_completa_de_macros_de_reports 2019-07-15 11:37:02 +02:00
artica 7a8413154f Auto-updated build strings. 2019-07-15 10:21:25 +02:00
artica 17dcb2feb3 Auto-updated build strings. 2019-07-13 00:01:10 +02:00
fbsanchez 9fb32c4699 Deployment area single targets 2019-07-12 18:29:58 +02:00
Daniel Barbero 683059af43 fixed errors mod/sec tactical view 2019-07-12 14:53:44 +02:00
Daniel Barbero 7288a6e262 fixed errors modules/sec in tactical view 2019-07-12 13:36:29 +02:00
Daniel Rodriguez 91f55c326e Merge branch 'ent-4351-Modificar-imagenes-con-bordes-blancos-para-que-sean-transparentes' into 'develop' 
Changed images with transparent borders - #4351

See merge request artica/pandorafms!2597
 2019-07-12 13:24:44 +02:00
Alejandro Fraguas bfc267691b Merge branch 'ent-3105-comportamiento-public_url' into 'develop' 
Ent 3105 comportamiento public url

See merge request artica/pandorafms!2568
 2019-07-12 13:02:42 +02:00
fbsanchez e2f3a3fd0c Update functions_ui.php minor adjustment 2019-07-12 12:35:39 +02:00
fbsanchez cca5c7fcf3 Update ui_get_full_url meta with def. target/pandora_console as public_url 2019-07-12 12:27:58 +02:00
fbsanchez 5cfad4587d Revert "Update index.php metaconsole redirection" 
This reverts commit 56ef03c27d
 2019-07-12 12:17:26 +02:00
fbsanchez 56ef03c27d Update index.php metaconsole redirection 2019-07-12 11:36:37 +02:00
Luis Calvo a1e2693d4b Merge remote-tracking branch 'origin/develop' into ent-3875-Report-type-summation-not-working-properly 2019-07-12 11:33:27 +02:00
Luis Calvo 41d8afaeea added summation report uncompressed module cehckbox 2019-07-12 11:32:56 +02:00
Daniel Rodriguez 24cbe3bd8e Merge branch 'ent-4347-Desplazamiento-de-un-cuadro-sobre-otro-en-la-configuracion-de-las-visual-styles' into 'develop' 
Ent 4347 desplazamiento de un cuadro sobre otro en la configuracion de las visual styles

See merge request artica/pandorafms!2598
 2019-07-12 10:26:05 +02:00
Daniel Barbero ecaba5ebd3 fixed errorsr macros reports 2019-07-12 10:24:46 +02:00
Tatiana Llorente fca4a288a2 Changed gray image in discovery - #4351 2019-07-12 10:23:20 +02:00
Tatiana Llorente cac34e3311 Changed gray image in discovery - #4351 2019-07-12 10:21:54 +02:00
fbsanchez c386a29b80 Merge remote-tracking branch 'origin/develop' into ent-3105-comportamiento-public_url 2019-07-12 09:38:28 +02:00
Tatiana Llorente 46f55c6d65 Fixed several minor visual bugs - #4347 2019-07-12 08:59:26 +02:00
artica fe98189779 Auto-updated build strings. 2019-07-12 00:01:08 +02:00
fbsanchez 1e05f9a396 WIP agent deployment 2019-07-11 19:25:49 +02:00
Daniel Rodriguez f3060dd428 Merge branch 'ent-4099-8092-busqueda-general-politicas' into 'develop' 
Ent 4099 8092 busqueda general politicas

See merge request artica/pandorafms!2479
 2019-07-11 18:40:48 +02:00
Alejandro Fraguas 99a219aa64 Merge branch 'ent-3545-8250-7558-7882-monitorizar-servicios-de-azure' into 'develop' 
Ent 3545 8250 7558 7882 monitorizar servicios de azure

See merge request artica/pandorafms!2591
 2019-07-11 18:28:34 +02:00
fbsanchez 5fd7b87a06 Merge remote-tracking branch 'origin/develop' into ent-2441-despliegue-de-agentes-desde-pandora 2019-07-11 18:27:49 +02:00
marcos.alconada 055bafe4d7 changed UM to AW for search policies 2019-07-11 17:28:22 +02:00
Tatiana Llorente f701bcb44e Fixed several minor visual bugs - #4347 2019-07-11 17:00:50 +02:00
Alejandro Fraguas f5a92b3157 Merge branch 'ent-4255-8206-Allowed-memory-size-exhausted-en-custom-graph' into 'develop' 
fix bug: custom graphs not showing properly

See merge request artica/pandorafms!2524
 2019-07-11 16:30:38 +02:00
marcos.alconada 1dbf8240c4 deelted duplicated count 2019-07-11 15:51:35 +02:00
Daniel Rodriguez cdf7c84b81 Merge branch 'ent-4302-Opcion_para_deshabilitar_aviso_de_suscripcion_a_newsletter' into 'develop' 
new tocken user edit newslatter info

See merge request artica/pandorafms!2589
 2019-07-11 15:36:56 +02:00
fbsanchez 08bc1d3da1 Merge remote-tracking branch 'origin/ent-3545-8250-7558-7882-monitorizar-servicios-de-azure' into ent-2441-despliegue-de-agentes-desde-pandora 2019-07-11 15:03:50 +02:00
fbsanchez 219852283d Fix in snmp browser tree 2019-07-11 14:53:00 +02:00
Tatiana Llorente fd24398219 Fixed several minor visual bugs - #4347 2019-07-11 14:46:41 +02:00
fbsanchez 7c8cb75faf WIP discovery agent deployment 2019-07-11 13:25:29 +02:00
Daniel Barbero Martin bd070b706b fixed minor error 2019-07-11 12:45:52 +02:00
fbsanchez 518443ea4e Improved menus 2019-07-11 12:32:48 +02:00
Daniel Rodriguez ac3de84bda Merge branch 'ent-4309-Falta-mensaje-de-Successfull-al-cambiar-el-owner-de-un-evento' into 'develop' 
Added success and error messages when change the event owner - #4309

See merge request artica/pandorafms!2590
 2019-07-11 11:36:03 +02:00
fbsanchez 9548cd4028 Merge remote-tracking branch 'origin/develop' into ent-2441-despliegue-de-agentes-desde-pandora 2019-07-11 11:14:34 +02:00
Daniel Rodriguez f0c539cfcf Merge branch 'ent-4203-Meter-submenus-de-discovery' into 'develop' 
Added discovery submenus to main menu - #4203

See merge request artica/pandorafms!2571
 2019-07-11 11:14:24 +02:00
Tatiana Llorente a8019fd223 Changed images with transparent borders - #4351 2019-07-11 10:49:48 +02:00
marcos.alconada 2d39b442a2 Merge remote-tracking branch 'origin/develop' into ent-4099-8092-busqueda-general-politicas 2019-07-11 09:31:55 +02:00
artica 45c9db2b69 Auto-updated build strings. 2019-07-11 00:01:12 +02:00
fbsanchez 47cc0d9d6e WIP: Agent deployment center 2019-07-10 23:59:09 +02:00
fbsanchez 58465090b2 Merge remote-tracking branch 'remotes/origin/ent-3545-8250-7558-7882-monitorizar-servicios-de-azure' into ent-2441-despliegue-de-agentes-desde-pandora 2019-07-10 22:05:02 +02:00
Daniel Barbero Martin ed0688f853 fixed macros reports 2019-07-10 18:20:43 +02:00
marcos.alconada a4518819e4 add link and change table 2019-07-10 17:58:52 +02:00
marcos.alconada abfa8933f5 Merge remote-tracking branch 'origin/develop' into ent-4099-8092-busqueda-general-politicas 2019-07-10 17:13:39 +02:00
Tatiana Llorente 3b23810323 Added filter by agent in massive copy - #4318 2019-07-10 16:37:24 +02:00
Alejandro Fraguas a752cbd2fe Merge branch 'ent-3693-pete-php-pantalla-en-blanco-con-auth-saml-3' into 'develop' 
changed condition for saml no access

See merge request artica/pandorafms!2593
 2019-07-10 16:32:41 +02:00
marcos.alconada 6382cb2abe fixed errors with graphs in meta 2019-07-10 14:18:23 +02:00
Tatiana Llorente 1f8e143963 Fixed bug to change the event status in modal window - #4309 2019-07-10 13:04:06 +02:00
Daniel Rodriguez e0b6da9615 Merge branch 'ent-4337-8327-bug-tags-filtros-eventos' into 'develop' 
Fix: user filter load tags

See merge request artica/pandorafms!2592
 2019-07-10 12:20:14 +02:00
Tatiana Llorente bfb7897149 Added success and error messages when change the event status - #4309 2019-07-10 12:15:41 +02:00
Daniel Rodriguez 96fbca35a4 Merge branch 'ent-4194-Revision-de-CSS-alternativos' into 'develop' 
Created black theme - #4194

See merge request artica/pandorafms!2564
 2019-07-10 11:47:21 +02:00
Tatiana Llorente 8c7745768c Added success and error messages when change the event owner - #4309 2019-07-10 11:05:06 +02:00
Daniel Rodriguez f864573486 Merge branch 'ent-4252-Ampliacion_del_informe_de_disponibilidad_para_fuentes_secundarias' into 'develop' 
Ent 4252 ampliacion del informe de disponibilidad para fuentes secundarias

See merge request artica/pandorafms!2577
 2019-07-10 09:33:41 +02:00
artica ca237a0fc4 Auto-updated build strings. 2019-07-10 00:01:10 +02:00
marcos.alconada 5b6e7d13cd changed condition for saml no access 2019-07-09 18:13:46 +02:00
Daniel Rodriguez 207bcceb5f Merge branch 'ent-3685-7702-al-poner-evento-en-in-progress-no-se-muestra-el-campo-user' into 'develop' 
Resolved

See merge request artica/pandorafms!2253
 2019-07-09 18:00:13 +02:00
Daniel Rodriguez 0a39f4668f Merge branch 'ent-3942-Visualizacion_de_graficas_en_META_mobile' into 'develop' 
fixed graph in mobile view metaconsole

See merge request artica/pandorafms!2583
 2019-07-09 17:59:46 +02:00
fbsanchez 85e40b30dc Fix: user filter load tags 2019-07-09 17:54:23 +02:00
Tatiana Llorente 7fd284f105 Fixed visual bugs in green and black theme - #4194 2019-07-09 17:36:40 +02:00
fbsanchez cab4a6dc03 Merge remote-tracking branch 'origin/develop' into 3545-8250-7558-7882-monitorizar-servicios-de-azure 2019-07-09 17:28:14 +02:00
Tatiana Llorente 936a7e839f Added success and error messages when change the event owner - #4309 2019-07-09 17:18:37 +02:00
Tatiana Llorente 6af6aa179b Changed background in update manager offline - #4194 2019-07-09 16:45:00 +02:00
Tatiana Llorente 084d1a229e Added success and error messages when change the event owner - #4309 2019-07-09 16:41:00 +02:00
Tatiana Llorente eaf29b798a Fixed minor visual bugs in black theme- #4194 2019-07-09 15:03:38 +02:00
Daniel Barbero d05dd7ecbc fixed minor error 2019-07-09 14:56:42 +02:00
Daniel Barbero ab3cfd4cc9 new tocken user edit newslatter info 2019-07-09 14:08:06 +02:00
Alejandro Fraguas 26c606b0d5 Merge branch 'ent-3090-Personalizacion-saml-2' into 'develop' 
Added more parameters to SAML configuration

See merge request artica/pandorafms!2506
 2019-07-09 13:18:12 +02:00
fbsanchez 0cabc4d4da Azure discovery task form completed 2019-07-09 12:02:29 +02:00
fbsanchez bd80e013f5 minor fix to avoid log messages 2019-07-09 12:02:07 +02:00
Daniel Rodriguez 7fa79f2043 Merge branch 'ent-4227-Componentes_de_red_no_funcionan_bien' into 'develop' 
fixed error network component plugin

See merge request artica/pandorafms!2581
 2019-07-09 10:27:08 +02:00
Daniel Rodriguez 2f69bff9d7 Merge branch 'ent-3693-pete-php-pantalla-en-blanco-con-auth-saml-2' into 'develop' 
add message no acces saml without saml.php file

See merge request artica/pandorafms!2587
 2019-07-09 10:08:54 +02:00
Daniel Rodriguez 972e7447ea Merge branch 'ent-4195-Status-sets-Visual' into 'develop' 
Changed default images status set for css - #4195

See merge request artica/pandorafms!2530
 2019-07-09 10:01:09 +02:00
fbsanchez 297bd7c107 Merge remote-tracking branch 'origin/develop' into 3545-8250-7558-7882-monitorizar-servicios-de-azure 2019-07-09 09:53:04 +02:00
Tatiana Llorente 0f280494a0 Changed images for divs to show preview in visual styles - #4195 2019-07-09 09:33:49 +02:00
artica 729fb32ffb Auto-updated build strings. 2019-07-09 00:01:10 +02:00
Daniel Barbero 127f67f2ac fixed error in network component 2019-07-08 19:33:54 +02:00
Tatiana Llorente 6d6c8fe197 Added filter by agent - #4318 2019-07-08 17:57:23 +02:00
Daniel Rodriguez e43469954a Merge branch 'ent-4109-Bug-en-utilizacion-de-macro-en-report-a-traves-de-plantillas' into 'develop' 
fix item name macros when using report templates

See merge request artica/pandorafms!2570
 2019-07-08 17:13:13 +02:00
marcos.alconada 09e5feef05 add message no acces saml without saml.php file 2019-07-08 17:02:28 +02:00
alejandro-campos 95d264059a conflict resolution 2019-07-08 16:15:47 +02:00
alejandro-campos d5362c1d5d fix bug: label macros not being replaced in view report 2019-07-08 16:07:22 +02:00
Alejandro Fraguas a295c9b789 Merge branch 'ent-3962-notification-timeout-session' into 'develop' 
Session expiration ignoring notifications checks

See merge request artica/pandorafms!2561
 2019-07-08 15:57:02 +02:00
Daniel Barbero b70c904ec3 fixed minor error network components 2019-07-08 13:40:52 +02:00
Daniel Barbero 58cb113d40 fixed error in pdf 2019-07-08 13:23:35 +02:00
Tatiana Llorente 0cccafc7be Heartbeat gifs with black background - #4194 2019-07-08 10:37:34 +02:00
Daniel Barbero 8ea9b67326 fixed graph in mobile view metaconsole 2019-07-08 10:20:43 +02:00
Tatiana Llorente b6d551d583 Changed images with white background - #4194 2019-07-08 10:08:04 +02:00
artica 034181037d Auto-updated build strings. 2019-07-08 00:01:17 +02:00
artica 90497410c7 Auto-updated build strings. 2019-07-07 00:01:07 +02:00
artica d0f3a6bc0b Auto-updated build strings. 2019-07-06 00:01:19 +02:00
Alejandro Fraguas 8242bf34b8 Revert "Merge branch 'ent-3693-pete-php-pantalla-en-blanco-con-auth-saml' into 'develop'" 
This reverts merge request !2562
 2019-07-05 14:55:22 +02:00
Tatiana Llorente 745ab711de Created green theme - #4194 2019-07-05 14:02:59 +02:00
Tatiana Llorente d1bc6cc2ff Created green theme - #4194 2019-07-05 13:59:48 +02:00
Daniel Barbero 6e7dfb38fd fixed error network component plugin 2019-07-05 13:46:48 +02:00
Alejandro Fraguas da110f1d33 Merge branch 'ent-4315-No-funcionan-las-politicas-en-meta' into 'develop' 
fix bug in api function that removes an agent from a policy

See merge request artica/pandorafms!2579
 2019-07-05 10:36:15 +02:00
Daniel Barbero 7175d716f0 fixed translate 2019-07-05 10:32:10 +02:00
Tatiana Llorente 31b19ab970 Fix pagination blank page - #4306 2019-07-05 09:31:23 +02:00
artica 8229f634e0 Auto-updated build strings. 2019-07-05 00:01:09 +02:00
fbsanchez 0e3fd848f7 minor fixes and visual change in azure credentials 2019-07-04 19:34:03 +02:00
alejandro-campos a10945d209 fix bug in api function that removes an agent from a policy 2019-07-04 18:33:12 +02:00
Alejandro Fraguas d269f3b69c Merge branch 'ent-3714-Eliminar-opciones-template-y-wizard-en-la-visual-console-open' into 'develop' 
Hidden buttons template and wizard in the open visual console

See merge request artica/pandorafms!2264
 2019-07-04 17:10:05 +02:00
Tatiana Llorente de6a0c2192 Changed disabled to readonly in agent name and id- #4307 2019-07-04 16:20:01 +02:00
Alejandro Fraguas 8c1d119819 Merge branch 'ent-3693-pete-php-pantalla-en-blanco-con-auth-saml' into 'develop' 
Add message for autenticaition error SAML

See merge request artica/pandorafms!2562
 2019-07-04 14:45:45 +02:00
Daniel Barbero Martin 000cdfdcfd WIP failover 2019-07-04 12:09:08 +02:00
Daniel Barbero Martin c25b7155fa WIP failover 2019-07-04 11:17:12 +02:00
Alejandro Fraguas e0a1f1b8b9 Merge branch 'ent-3360-fallo-en-agrupacion-de-agentes-con-mismo-alias-en-reports-2' into 'develop' 
final merge 3360 ticket

See merge request artica/pandorafms!2575
 2019-07-04 10:21:23 +02:00
artica f4b8b39704 Auto-updated build strings. 2019-07-04 00:01:09 +02:00
Daniel Barbero Martin 22734a4ea2 WIP failover 2019-07-03 17:51:47 +02:00
marcos.alconada 2ad44fcf90 final merge 3360 ticket 2019-07-03 17:07:31 +02:00
Alejandro Fraguas 04cd368410 Merge branch 'ent-4152-excec-satellite-serever-warn-remote-conf-needed' into 'develop' 
Added satellite remote conficg check in snmp wizard

See merge request artica/pandorafms!2539
 2019-07-03 16:54:39 +02:00
fbsanchez 07edee619a CS filtering and constant 2019-07-03 16:38:26 +02:00
fbsanchez 18d8f90f90 Credential store upgrade Azure 2019-07-03 16:04:40 +02:00
Tatiana Llorente 2298019e6b Dont show empty custom fields in agent view - #4201 2019-07-03 12:41:22 +02:00
Alejandro Fraguas 31187d76fb Merge branch 'ent-3742-Perdida-de-recursion-en-paginacion-inferior' into 'develop' 
Fixed down paginations in manage agents

See merge request artica/pandorafms!2280
 2019-07-03 12:33:16 +02:00
Tatiana Llorente c7e410b16d Added discovery submenus to main menu - #4203 2019-07-03 11:08:17 +02:00
Alejandro Fraguas 8ef22373a7 Merge branch 'ent.3698-Conteo-de-notificaciones-un-poco-raro' into 'develop' 
Fixed messages count

See merge request artica/pandorafms!2260
 2019-07-03 10:12:03 +02:00
artica 3b68964f27 Auto-updated build strings. 2019-07-03 00:01:12 +02:00
Alejandro Campos ffbaac6edc Merge branch 'develop' into 'ent-3742-Perdida-de-recursion-en-paginacion-inferior' 
# Conflicts:
#   pandora_console/godmode/agentes/modificar_agente.php
 2019-07-02 18:22:49 +02:00
alejandro-campos 51d7104de7 fix item name macros when using report templates 2019-07-02 18:09:52 +02:00
Tatiana Llorente 89d00115e2 Fixed minor style bug in pagination events - #4283 2019-07-02 17:45:25 +02:00
fbsanchez 879e61b9aa minor fix in public_url_exclusions 2019-07-02 16:47:19 +02:00
fbsanchez 84cdbefebd cleanup and fix in location reload 2019-07-02 16:22:23 +02:00
Alejandro Fraguas 86610ebe96 Merge branch 'ent-4294-7984-Desplegable-de-grupos-desordenados' into 'develop' 
Fixed unordered groups

See merge request artica/pandorafms!2559
 2019-07-02 16:06:33 +02:00
Tatiana Llorente dd8fc659ee Created green theme - #4194 2019-07-02 15:15:19 +02:00
fbsanchez eb01e9baaf public_url with force option 2019-07-02 14:17:53 +02:00
Tatiana Llorente beace34567 Created black theme - #4194 2019-07-02 13:12:05 +02:00
marcos.alconada 4430f18ac5 Resolved error query 2019-07-02 12:21:58 +02:00
Daniel Barbero 209681e4c2 ADD failover option availability_graph 2019-07-02 11:50:58 +02:00
Tatiana Llorente 1aa0131a81 Merge branch 'develop' into 'ent-4195-Status-sets-Visual' 
Conflicts:
   pandora_console/include/styles/pandora.css
 2019-07-02 11:42:19 +02:00
Alejandro Fraguas 3a76f331c8 Merge branch 'ent-2094-Añadir-buscador-en-operaciones-masivas' into 'develop' 
Add module filter by text -#2094

See merge request artica/pandorafms!2520
 2019-07-02 11:37:01 +02:00
Alejandro Fraguas 1f2e6a50f8 Merge branch 'ent-4214-8207-Tactical-View-contador-de-alertas-disparadas-falla' into 'develop' 
Add condition in tactical view to exclude disabled alerts from count of triggered alerts

See merge request artica/pandorafms!2547
 2019-07-02 10:30:20 +02:00
artica 78bcf83856 Auto-updated build strings. 2019-07-02 00:01:09 +02:00
Daniel Barbero Martin 0064bc0cba fixed errors 2019-07-01 17:07:39 +02:00
Alejandro Fraguas 177eb86956 Merge branch 'ent-3679-7637-7711-Agregar-eliminar-agente-de-politica-en-metaconsola' into 'develop' 
modified api function for adding agent to policy to make it available on meta

See merge request artica/pandorafms!2522
 2019-07-01 17:06:37 +02:00
Tatiana Llorente 9163f725ed Created black theme - #4194 2019-07-01 16:57:33 +02:00
Alejandro Fraguas 8c7acdb02e Merge branch 'ent-3965-Ordenado-y-validado-de-alertas-disparadas' into 'develop' 
Added sorting in last fired column - #3965

See merge request artica/pandorafms!2507
 2019-07-01 15:41:04 +02:00
Jose Gonzalez 52025efbee Modified control for module edition 2019-07-01 13:55:44 +02:00
marcos.alconada 6349c29eb5 Add message for autenticaition error SAML 2019-07-01 13:45:42 +02:00
fbsanchez a6327a16ad Session expiration ignoring notifications checks 2019-07-01 12:46:09 +02:00
Alejandro Fraguas eb94438c7f Merge branch 'ent-3541-7513-nuevo-modificar-informe-de-eventos-por-grupo' into 'develop' 
Show new filters for group events reports

See merge request artica/pandorafms!2534
 2019-07-01 12:38:48 +02:00
Alejandro Fraguas 8ec2ec9d0d Merge branch 'ent-4112-Bug-visual-cuadro-de-datos-tipo-string' into 'develop' 
Truncate long title in modal dialogs - #4112

See merge request artica/pandorafms!2508
 2019-07-01 10:36:24 +02:00
Alejandro Fraguas 1ee2e94766 Merge branch 'ent-3748-component-group-creation-not-working-after-delete-component' into 'develop' 
Fixed create from bug: added action with refresh url

See merge request artica/pandorafms!2284
 2019-07-01 10:19:44 +02:00
Alejandro Fraguas 39ac83ae5e Merge branch 'ent-4250-Cambios-de-estilo-pendientes_2' into 'develop' 
Style changes - #4250

See merge request artica/pandorafms!2557
 2019-07-01 10:02:02 +02:00
Alejandro Fraguas 47838a1134 Merge branch 'ent-4213-SNMP-Walk-dede-modulo-creado-no-muestra-parametros-v3' into 'develop' 
Ent 4213 snmp walk dede modulo creado no muestra parametros v3

See merge request artica/pandorafms!2511
 2019-07-01 09:48:33 +02:00
Alejandro Fraguas 9b0defdc34 Merge branch 'ent-4075-Bug-Tactical-view-en-dashboard-publico-cuando-no-hacemos-login_2' into 'develop' 
Fixed bug showing total events in tactical view on dashboard - #4075

See merge request artica/pandorafms!2509
 2019-07-01 09:39:05 +02:00
artica dd75aa6a42 Auto-updated build strings. 2019-07-01 00:01:07 +02:00
artica c9f101eda6 Auto-updated build strings. 2019-06-30 00:01:05 +02:00
artica eeffe40b6b Auto-updated build strings. 2019-06-29 00:01:07 +02:00
Tatiana Llorente c28185965a Merge remote-tracking branch 'origin/develop' into ent-4112-Bug-visual-cuadro-de-datos-tipo-string 
Conflicts:
	pandora_console/include/styles/js/jquery-ui_custom.css
 2019-06-28 12:28:13 +02:00
Daniel Maya 63e0df4434 Fixed unordered groups 2019-06-28 12:11:25 +02:00
Daniel Maya 03842df33e Added mr and uncommented code 2019-06-28 11:19:13 +02:00
Tatiana Llorente 52f391667a Style changes - #4250 2019-06-28 10:24:53 +02:00
artica 8a04e2eec2 Auto-updated build strings. 2019-06-28 00:01:06 +02:00
alejandro-campos 3d75e045f9 added new fields to saml configuration and added check to not allow user creation with all group in case an empty value was specified in group name attribute input 2019-06-27 17:42:29 +02:00
Jose Gonzalez 03edb75b7c Modified agent alias name 2019-06-27 17:19:48 +02:00
Jose Gonzalez 25e5f0914a Added delete_files entry for recon view deletion 2019-06-27 16:58:48 +02:00
Jose Gonzalez 411e62fb0d Changed link to Discovery task list and added ui_get_full_url function over other links 2019-06-27 16:38:00 +02:00
fbsanchez 5ccc16d7d6 Revert 28.sql 2019-06-27 15:04:58 +02:00
Jose Gonzalez a2877b46f3 Solved wrong variable rewriting 2019-06-27 14:58:57 +02:00
fbsanchez d956f08011 Minor fixes 2019-06-27 10:39:43 +02:00
Luis Calvo 1ffb435d5a Fixed wrong img paths 2019-06-27 09:48:37 +02:00
Jose Gonzalez 0e1ad43422 Update webchat.php. Forgotten console log 2019-06-27 09:33:31 +02:00
Jose Gonzalez 77419ee709 Modified jquery window function 2019-06-27 09:05:22 +02:00
artica ead768c9df Auto-updated build strings. 2019-06-27 00:01:10 +02:00
fbsanchez 470e399f50 Fixed url edit task in RDS 2019-06-26 19:34:34 +02:00
fbsanchez 225de6b5ea MR forgotten change 2019-06-26 19:33:42 +02:00
alejandro-campos 2a69e3a75e Merge remote-tracking branch 'origin/develop' into ent-3090-Personalizacion-saml-2 2019-06-26 18:06:23 +02:00
alejandro-campos 058abdd552 Add condition in tactical view to exclude disabled alerts from count of triggered alerts 2019-06-26 17:17:56 +02:00
Daniel Rodriguez 6f4ccff8b2 Merge branch 'ent-4256-cuenta-atras' into 'develop' 
improved countdown

See merge request artica/pandorafms!2546
 2019-06-26 17:00:12 +02:00
Alejandro Fraguas 4c6505e971 Merge branch 'ent-2966-net-tools' into 'develop' 
Fixed

See merge request artica/pandorafms!2537
 2019-06-26 16:31:28 +02:00
fbsanchez 58483e8748 improved countdown 2019-06-26 16:23:54 +02:00
daniel dac6b3cc30 Merge branch 'update_current_package_736' into 'develop' 
update current package

See merge request artica/pandorafms!2545
 2019-06-26 15:41:16 +02:00
Daniel Barbero Martin a10cf51b1b update current package 2019-06-26 15:37:04 +02:00
Daniel Rodriguez f681809f7b Merge branch 'ent-4266-eliminar-los-flashes-al-recargar-graficas-en-la-consola-visuall' into 'develop' 
Eliminar los flashes al recargar gráficas en la consola visual

See merge request artica/pandorafms!2533
 2019-06-26 14:14:35 +02:00
Alejandro Fraguas cda9cd6fe1 Merge branch 'ent-4234-Ventana-popup-que-muestra-graficas-no-tiene-en-cuenta-los-unknown-y-no-cabe' into 'develop' 
Changed size for modal window for module graph- #4234

See merge request artica/pandorafms!2536
 2019-06-26 13:43:57 +02:00
artica fb407c51f2 Updated version and build strings. 2019-06-26 13:25:57 +02:00
Alejandro Gallardo Escobar f36e7966a1 Merge remote-tracking branch 'origin/develop' into ent-4266-eliminar-los-flashes-al-recargar-graficas-en-la-consola-visuall 2019-06-26 13:13:36 +02:00
Daniel Rodriguez 4136f19190 Merge branch 'ent-4258-visual-console-movement-redimension-mode' into 'develop' 
Visual Console's movement and redimension mode

See merge request artica/pandorafms!2527
 2019-06-26 13:06:02 +02:00
Daniel Rodriguez 321ea717af Merge branch 'ent-3644-bug-redireccion-de-static-graph' into 'develop' 
Changed js

See merge request artica/pandorafms!2544
 2019-06-26 13:02:50 +02:00
marcos.alconada c223e0bdad Changed js 2019-06-26 12:50:19 +02:00
marcos.alconada 006e0cd4ec Changed js 2019-06-26 12:31:47 +02:00
Daniel Rodriguez d68617eda1 Merge branch 'ent-4265-array-en-valor-min' into 'develop' 
Changed variable that modify min values

See merge request artica/pandorafms!2538
 2019-06-26 12:04:41 +02:00
Daniel Rodriguez 0ea5b7ff1b Merge branch 'ent-4196-Eliminar-funcionalidad-QR-Code-in-header' into 'develop' 
Removed option to show qr code in header - #4196

See merge request artica/pandorafms!2494
 2019-06-26 12:04:00 +02:00
Daniel Rodriguez 6a27778efb Merge branch 'ent-4204-error-al-editar-una-grafica-combinada-usando-previamente-un-filtro-de-busqueda' into 'develop' 
Ent 4204 error al editar una grafica combinada usando previamente un filtro de busqueda

See merge request artica/pandorafms!2505
 2019-06-26 12:03:13 +02:00
Daniel Rodriguez 6976ba9c8e Merge branch 'ent-3800-mal-enrutamiento-discovery' into 'develop' 
Ent 3800 mal enrutamiento discovery

See merge request artica/pandorafms!2350
 2019-06-26 12:02:43 +02:00
Alejandro Gallardo Escobar 2993278178 Removed the resize functionality of the module graph vc item 2019-06-26 11:33:45 +02:00
Alejandro Fraguas 7224974520 Merge branch 'ent-3980-7966-aws-multicuenta-y-mejora-monitorizacion' into 'develop' 
first steps credential store

See merge request artica/pandorafms!2523
 2019-06-26 11:21:49 +02:00
fbsanchez f66e5b5ef8 Fix class names to avoid addblock hide them 2019-06-26 11:11:21 +02:00
fbsanchez fdf2a983d2 general review credential store 2019-06-26 10:39:18 +02:00
fbsanchez 4754e20784 Merge remote-tracking branch 'origin/develop' into ent-3980-7966-aws-multicuenta-y-mejora-monitorizacion 2019-06-26 09:52:22 +02:00
Alejandro Fraguas 084c4cc651 Merge branch 'ent-4095-8090-cron-lock-ha' into 'develop' 
Added get_lock/release_lock functions to functions_db

See merge request artica/pandorafms!2526
 2019-06-26 09:24:58 +02:00
artica 9a65d8188a Auto-updated build strings. 2019-06-26 00:01:09 +02:00