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

11133 Commits

Author SHA1 Message Date
Tatiana Llorente dd8fc659ee Created green theme - #4194 2019-07-02 15:15:19 +02:00
Tatiana Llorente beace34567 Created black theme - #4194 2019-07-02 13:12:05 +02:00
Tatiana Llorente 9163f725ed Created black theme - #4194 2019-07-01 16:57:33 +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 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
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
artica ead768c9df Auto-updated build strings. 2019-06-27 00:01:10 +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
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 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
Daniel Rodriguez 61e07abf3a Merge branch 'ent-4238-eventos-csv-e-historico' into 'develop' 
Ent 4238 eventos csv e historico

See merge request artica/pandorafms!2515
 2019-06-25 18:33:49 +02:00
Daniel Rodriguez 35c914dc34 Merge branch 'ent-4181-7962-LDAP-no-parsea-Advanced-Permissions-LDAP' into 'develop' 
Fixed Advanced Permissions LDAP

See merge request artica/pandorafms!2521
 2019-06-25 18:21:42 +02:00
fbsanchez e1bf12a1fb Credential store 2019-06-25 18:21:23 +02:00
fbsanchez 8f914b69a6 Minor fixes 2019-06-25 17:24:16 +02:00
fbsanchez 22d936d4f3 credential store some js controls 2019-06-25 16:43:38 +02:00
fbsanchez 96ca26dc97 minor fix in event mass response process 2019-06-25 16:05:56 +02:00
Daniel Rodriguez 6af895b9c1 Merge branch 'ent-3999-No-se-ve-icono-SO-en-eventos-en-metaconsola' into 'develop' 
Added meta option in function ui_print_os_icon - #3999

See merge request artica/pandorafms!2502
 2019-06-25 16:04:51 +02:00
fbsanchez c5675ded4c fixed alert color 2019-06-25 15:24:42 +02:00
Daniel Rodriguez 10aa0631af Merge branch 'ent-4208-Ayuda-vacia-modulos-unknown' into 'develop' 
Removed empty help in unknown modules - #4208

See merge request artica/pandorafms!2499
 2019-06-25 14:47:20 +02:00
Daniel Rodriguez b18de5cb1c Merge branch 'ent-4160-Fallo-visual-SNMP-browser' into 'develop' 
Fixed visual bug in snmp browser - #4160

See merge request artica/pandorafms!2531
 2019-06-25 14:46:25 +02:00
Daniel Rodriguez 01514ba5b6 Merge branch 'ent-3699-descuadre-visual-recuperar-password' into 'develop' 
Ent 3699 descuadre visual recuperar password

See merge request artica/pandorafms!2336
 2019-06-25 14:26:57 +02:00
fbsanchez 1966c81f2d Merge remote-tracking branch 'origin/develop' into ent-4238-eventos-csv-e-historico 2019-06-25 14:10:32 +02:00
Daniel Rodriguez a3d0e3b55d Merge branch 'ent-4040-menu-resources-no-esta-resaltado-en-vista-de-agente' into 'develop' 
Condition is added to keep the selection color in the main menu

See merge request artica/pandorafms!2464
 2019-06-25 13:10:15 +02:00
Daniel Rodriguez c5be8e55ae Merge branch 'ent-3807-html-special-chars-conversion' into 'develop' 
Ent 3807 html special chars conversion

See merge request artica/pandorafms!2320
 2019-06-25 12:19:01 +02:00
fbsanchez fc0d9463d5 Fixed 2019-06-25 12:07:56 +02:00
Tatiana Llorente ea9540ddce Changed size for modal window for module graph- #4234 2019-06-25 09:19:47 +02:00
artica a469ff29da Auto-updated build strings. 2019-06-25 00:01:09 +02:00
fbsanchez 882aa67b3a aws multi account viewer rc1 2019-06-24 20:35:24 +02:00
fbsanchez 2a95fbb87a Merge remote-tracking branch 'origin/develop' into ent-3980-7966-aws-multicuenta-y-mejora-monitorizacion 2019-06-24 19:58:33 +02:00
fbsanchez c1ac6b7ed6 mini_severity virtual column added 2019-06-24 19:23:41 +02:00
fbsanchez c85965d793 SQLerror tasg reference 2019-06-24 19:05:46 +02:00