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

459 Commits

Author SHA1 Message Date
vgilc c14a462e63 Merge branch '5027-pandora-db-error-history-db-step' into 'develop' 
Added control for int values

See merge request artica/pandorafms!2927
 2020-01-07 10:20:26 +01:00
Tatiana Llorente 4cd1ca38a4 Ent 5091 unificacion de tamaño de letra en informes 2020-01-07 09:25:31 +01:00
Tatiana Llorente eca876212c Ent 5095 visualizacion formato de fechas 2019-12-17 12:15:51 +01:00
alejandro-campos d30c2c9b3b Fix bug when updating ACL IP list 2019-12-13 14:17:25 +01:00
Jose Gonzalez 6883240931 Added control for int values 2019-12-02 11:54:39 +01:00
Daniel Barbero Martin ea2c5bc8c9 Fixed translate 2019-11-27 11:49:20 +01:00
daniel 960326b980 Add menu omnishell 2019-11-21 18:21:46 +01:00
fbsanchez 83590146b1 Merge remote-tracking branch 'origin/develop' into ent-4774-welcome-to-pandorafms 2019-11-13 17:38:24 +01:00
Daniel Rodriguez 073ca73b2a Merge branch 'ent-4670-Cambiar-tamaño-fuente-en-informes' into 'develop' 
Added token in visual styles to change the font size in items of reports - #4670

See merge request artica/pandorafms!2798
 2019-11-12 18:09:39 +01:00
fbsanchez 72b1fb2b16 Merge remote-tracking branch 'origin/ent-4774-welcome-to-pandorafms' into ent-EDF 
Conflicts:
	pandora_console/include/javascript/pandora.js

	modified:   pandora_console/general/register.php
	modified:   pandora_console/godmode/agentes/configurar_agente.php
	modified:   pandora_console/godmode/agentes/module_manager_editor.php
	new file:   pandora_console/include/ajax/welcome_window.php
	new file:   pandora_console/include/class/WelcomeWindow.class.php
	modified:   pandora_console/include/constants.php
	modified:   pandora_console/include/functions_config.php
	modified:   pandora_console/include/javascript/pandora.js
	new file:   pandora_console/include/styles/new_installation_welcome_window.css
 2019-10-30 16:56:44 +01:00
marcos e725a0185b cambios semi finales 2019-10-24 16:56:13 +02:00
fbsanchez 709f4cac81 WebSocket configuration, quickShell settings, quickShell proxied url compatibility 2019-10-23 19:56:48 +02:00
fbsanchez 6c52462c8c Modular WebSocket engine, added ssh and telnet to quickshell extension 2019-10-21 17:36:26 +02:00
Tatiana Llorente 18679f90e5 Added token in visual styles to change the font size in items of reports - #4670 2019-10-09 16:24:37 +02:00
Daniel Rodriguez c9cfbf0bf2 Merge branch 'ent-4461-Configuracion-integracion-integria' into 'develop' 
Ent 4461 configuracion integracion integria

See merge request artica/pandorafms!2732
 2019-09-26 14:34:50 +02:00
alejandro-campos 96622933fc added new section in integria setup to configure different options for event responses and alert created tickets 2019-09-26 13:22:10 +02:00
Tatiana Llorente 5436df5575 Changed the word incident for ticket - #4461 2019-09-25 16:13:37 +02:00
Tatiana Llorente 84ae4a8391 Merge remote-tracking branch 'origin/develop' into ent-4461-Configuracion-integracion-integria 
Conflicts:
	pandora_console/extras/mr/32.sql
 2019-09-25 10:50:31 +02:00
Daniel Rodriguez e03e83d565 Merge branch 'ent-4260-Fallo-de-label-de-percentile-en-custom-graph' into 'develop' 
fixed error percentil label

See merge request artica/pandorafms!2734
 2019-09-25 10:27:13 +02:00
fbsanchez 746f817fe4 Windows: Revisión general Pandora - Discovery 2019-09-24 19:07:55 +02:00
Daniel Barbero Martin 84d1979c9e fixed error percentil label 2019-09-18 11:15:55 +02:00
alejandro-campos 87f8badc18 completed integria setup and incident creation and update 2019-09-17 13:38:17 +02:00
alejandro-campos 93b9c76f58 Merge branch 'develop' into ent-4047-Simplificacion-de-la-configuracion-del-sistema-de-email 2019-09-10 10:50:53 +02:00
alejandro-campos 11cb53582c backup changes 2019-09-02 17:01:41 +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
fbsanchez c386a29b80 Merge remote-tracking branch 'origin/develop' into ent-3105-comportamiento-public_url 2019-07-12 09:38:28 +02:00
Daniel Barbero Martin bd070b706b fixed minor error 2019-07-11 12:45:52 +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 eb01e9baaf public_url with force option 2019-07-02 14:17:53 +02:00
fbsanchez a6327a16ad Session expiration ignoring notifications checks 2019-07-01 12:46:09 +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
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 f74b32fe3c Added more parameters to SAML configuration 2019-06-14 10:34:51 +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
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
alejandro-campos 89ff40e2b9 moved mail server setup to general setup 2019-06-10 09:43:27 +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
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 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
Luis Calvo 5966367f8f eHorus user level login conf added in user editor 2019-05-28 13:14:42 +02:00
Luis Calvo 588d19102f Resolve merge conflict 2019-05-27 18:30:24 +02:00
fbsanchez 7b5ae40868 multiple fixes 2019-05-23 10:27:50 +02:00
marcos.alconada 86dabc6476 Variability event_storm_protection check is added with empty data 2019-05-17 11:31:02 +02:00
Luis Calvo c527435a0e eHorus user-login settings 
Former-commit-id: e62be3b137ef5583fbd29186a834a86b075e78fb
 2019-05-10 15:32:25 +02:00
marcos.alconada b51cdb93df arreglo con la vista del formulario 
Former-commit-id: 0d5b5c099ce2e096d8e3d8e1c0a6220baa27e0a9
 2019-05-10 15:00:21 +02:00
marcos.alconada 793304b52d Se habilita el boton de ehorus 
Former-commit-id: aceee670b00ad4291b7f4e9e0a90f17dca3feed9
 2019-05-10 12:26:09 +02:00
Luis Calvo ecce1160e1 Added button to select ehorus conf type and box into user conf 2019-05-09 19:23:18 +02:00
marcos.alconada e0729b6ca6 Se vuelve a crear la rama 
Former-commit-id: 8ac69d4e1d15be23411faff82dc2bddcfcf7f7b6
 2019-05-09 14:59:47 +02:00
Alejandro Gallardo Escobar 2d9b4908de Visual Console Refactor: the legacy visual console is enabled by default 
Former-commit-id: 0ee821fac4e3665ac0d869e6b772b12014f76a8a
 2019-04-25 14:08:55 +02:00