tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-30 17:25:26 +02:00
Code Issues Packages Projects Releases Wiki Activity
22,040 Commits 34 Branches 30 Tags
Commit Graph

22040 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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