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

22358 Commits

Author SHA1 Message Date
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
Daniel Rodriguez ffc554f219 Merge branch 'ent-3536-Falta_token_syncserver_en_conf_del_server' into 'develop' 
add syncserver conf

See merge request artica/pandorafms!2604
 2019-07-15 17:52:43 +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 1323de2097 add syncserver conf 2019-07-15 15:43:53 +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