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

22021 Commits

Author SHA1 Message Date
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
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
Daniel Rodriguez 30e6d14a7a Merge branch 'fix/dbschema-735' into 'develop' 
Revert 28.sql

See merge request artica/pandorafms!2554
 2019-06-27 16:07:58 +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 d4971c8509 Merge branch 'fix/dbschema-735' into 'develop' 
Minor fixes

See merge request artica/pandorafms!2552
 2019-06-27 10:44:42 +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 cbd75f3d96 Merge branch 'fix/736-mr-aws-migration' into 'develop' 
MR forgotten change

See merge request artica/pandorafms!2549
 2019-06-26 19:41:55 +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