fbsanchez
|
345eb48fd7
|
save the green lines
|
2019-11-13 17:38:48 +01:00 |
|
fbsanchez
|
83590146b1
|
Merge remote-tracking branch 'origin/develop' into ent-4774-welcome-to-pandorafms
|
2019-11-13 17:38:24 +01:00 |
|
fbsanchez
|
6677b6a5ab
|
hide report in welcomewindow if not enterprise customer
|
2019-11-13 14:32:34 +01:00 |
Daniel Rodriguez
|
f844c660af
|
Merge branch 'ent-4766-feedback-de-ayudas' into 'develop'
add feedback
See merge request artica/pandorafms!2813
|
2019-11-13 13:43:08 +01:00 |
|
Daniel Rodriguez
|
d4c4b3c2d8
|
Merge branch 'ent-4664-Bug-Automatically-combined-graph' into 'develop'
Ent 4664 bug automatically combined graph
See merge request artica/pandorafms!2776
|
2019-11-13 10:01:19 +01:00 |
artica
|
c19d760bdb
|
Auto-updated build strings.
|
2019-11-13 00:01:12 +01:00 |
|
Daniel Rodriguez
|
8961241459
|
Merge branch 'ent-4845-Revision-de-Skins' into 'develop'
Ent 4845 revision de skins
See merge request artica/pandorafms!2833
|
2019-11-12 18:10:58 +01:00 |
Tatiana Llorente
|
484ec9ea60
|
Ent 4845 revision de skins
|
2019-11-12 18:10:58 +01:00 |
|
Daniel Rodriguez
|
2f0b646cd8
|
Merge branch 'ent-4463-Histórico-IP' into 'develop'
Fixed scroll in other ip addres in agent view - #4463
See merge request artica/pandorafms!2641
|
2019-11-12 18:10:16 +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
|
b9633933e1
|
Merge remote-tracking branch 'origin/develop' into ent-4774-welcome-to-pandorafms
Conflicts:
pandora_console/extras/mr/33.sql
pandora_console/general/header.php
|
2019-11-12 14:17:45 +01:00 |
Alejandro Fraguas
|
2aaf78b4ab
|
Merge branch 'ent-3178-integrar-terminal-web-en-la-consola-de-pandora-y-explorar-otras-utilidades-anyterm-replace' into 'develop'
allow to remove user/pass from quick_shell configuration
See merge request artica/pandorafms!2878
|
2019-11-12 13:45:49 +01:00 |
|
fbsanchez
|
0022408538
|
Merge remote-tracking branch 'origin/develop' into ent-3178-integrar-terminal-web-en-la-consola-de-pandora-y-explorar-otras-utilidades-anyterm-replace
Conflicts:
pandora_console/extensions/quick_shell.php
|
2019-11-12 13:25:30 +01:00 |
|
fbsanchez
|
1a7165f751
|
allow to remove user/pass from quick_shell configuration
|
2019-11-12 13:19:03 +01:00 |
|
artica
|
2ee4f9d88f
|
Auto-updated build strings.
|
2019-11-12 00:01:09 +01:00 |
|
fbsanchez
|
01de54a220
|
other icon
|
2019-11-11 15:36:38 +01:00 |
|
fbsanchez
|
946ef2fae4
|
icon review tick badge
|
2019-11-11 15:23:23 +01:00 |
|
fbsanchez
|
65f5223698
|
validation alerts
|
2019-11-11 14:26:04 +01:00 |
|
fbsanchez
|
0c5af7ea24
|
minor fixes
|
2019-11-11 13:46:42 +01:00 |
|
fbsanchez
|
430af38fa6
|
minor fixes in flow control
|
2019-11-11 13:38:27 +01:00 |
|
Daniel Rodriguez
|
7d45cad637
|
Merge branch 'ent-4834-pandora-custom-logo-text-on-conf' into 'develop'
Ent 4834 pandora custom logo text on conf
See merge request artica/pandorafms!2850
|
2019-11-11 13:33:37 +01:00 |
Luis
|
f57f87b50b
|
Ent 4834 pandora custom logo text on conf
|
2019-11-11 13:33:37 +01:00 |
|
artica
|
c390befc2a
|
Auto-updated build strings.
|
2019-11-11 00:01:07 +01:00 |
|
artica
|
7e275febcd
|
Auto-updated build strings.
|
2019-11-10 00:01:07 +01:00 |
|
artica
|
cba38680bd
|
Auto-updated build strings.
|
2019-11-09 00:01:09 +01:00 |
|
artica
|
c8b39740a9
|
Auto-updated build strings.
|
2019-11-08 11:05:59 +01:00 |
|
Alejandro Fraguas
|
fad8d88087
|
Merge branch 'ent-3178-integrar-terminal-web-en-la-consola-de-pandora-y-explorar-otras-utilidades-anyterm-replace' into 'develop'
change execution permissions to pandora_websocket_engine rpm|deb files
See merge request artica/pandorafms!2870
|
2019-11-08 11:00:46 +01:00 |
|
fbsanchez
|
6543756baf
|
change execution permissions to pandora_websocket_engine rpm|deb files
|
2019-11-08 09:49:09 +01:00 |
|
fbsanchez
|
36ae77a33c
|
minor fix
|
2019-11-07 19:41:23 +01:00 |
|
fbsanchez
|
4905b18888
|
Fulfill help path and mail check
|
2019-11-07 19:39:50 +01:00 |
|
fbsanchez
|
424aa10555
|
style minor changes
|
2019-11-07 18:38:52 +01:00 |
|
fbsanchez
|
cb131c7895
|
Some CDE and styling in help feedback
|
2019-11-07 18:33:03 +01:00 |
|
fbsanchez
|
763ec6772c
|
Help feedback style improved
|
2019-11-07 17:26:32 +01:00 |
|
Alejandro Fraguas
|
adc0f24f8e
|
Merge branch 'ent-3178-integrar-terminal-web-en-la-consola-de-pandora-y-explorar-otras-utilidades-anyterm-replace' into 'develop'
Ent 3178 integrar terminal web en la consola de pandora y explorar otras utilidades anyterm replace
See merge request artica/pandorafms!2825
|
2019-11-07 15:48:12 +01:00 |
|
fbsanchez
|
ab6e790b4e
|
minor-fix qs_admin interface
|
2019-11-07 14:20:29 +01:00 |
|
fbsanchez
|
5fe515a3ed
|
Fixed welcome flow
|
2019-11-07 14:05:42 +01:00 |
|
fbsanchez
|
664017aa38
|
same, null is overwritten by ws.php
|
2019-11-07 13:11:11 +01:00 |
|
fbsanchez
|
f95ecb0f28
|
Allow empty configuration for gotty path
|
2019-11-07 13:00:38 +01:00 |
|
Daniel Rodriguez
|
2fe5cb3d84
|
Merge branch 'ent-4937-Quitar-caja-de-Agent-info-si-no-hay-datos-en-ella' into 'develop'
Ent 4937 quitar caja de agent info si no hay datos en ella
See merge request artica/pandorafms!2868
|
2019-11-07 12:09:59 +01:00 |
|
Daniel Rodriguez
|
a550f2d9d3
|
Merge branch 'ent-4403-8401-acanovas-ipam-creacion-de-superredes' into 'develop'
added function to convert cidr prefixes to mask
See merge request artica/pandorafms!2832
|
2019-11-07 11:47:24 +01:00 |
|
fbsanchez
|
f497312d29
|
minor fix. default values QS admin page
|
2019-11-07 10:54:05 +01:00 |
|
fbsanchez
|
d080f1d6a7
|
Welcome pack
|
2019-11-07 10:42:46 +01:00 |
|
Tatiana Llorente
|
90912e2636
|
Hide agent info when only GIS data is displayed and it is empty
|
2019-11-07 09:52:06 +01:00 |
|
Daniel Rodriguez
|
1006c54687
|
Merge branch 'ent-4928-Bug-generacion-PDF-con-set-initial-date' into 'develop'
Ent 4928 bug generacion pdf con set initial date
See merge request artica/pandorafms!2866
|
2019-11-07 09:48:42 +01:00 |
|
Tatiana Llorente
|
90d567a064
|
Merge branch 'develop' into 'ent-4664-Bug-Automatically-combined-graph'
Conflicts:
pandora_console/godmode/reporting/graphs.php
|
2019-11-06 17:48:51 +01:00 |
|
Daniel Rodriguez
|
76d9ca9db5
|
Merge branch 'ent-4853-set-module-data-no-funciona-API' into 'develop'
Ent 4853 set module data no funciona api
See merge request artica/pandorafms!2841
|
2019-11-06 17:19:51 +01:00 |
|
Daniel Rodriguez
|
e81932cf0d
|
Merge branch 'ent-4809-Seleccion-de-tamaño-de-fuente-en-Agent-detail' into 'develop'
Fixed visual styles ticket 4809
See merge request artica/pandorafms!2867
|
2019-11-06 16:23:51 +01:00 |
|
Daniel Rodriguez
|
0647b156a5
|
Merge branch 'ent-4904-8870-No-se-puede-ver-usuarios-sin-permisos-AR' into 'develop'
fix bug in user list permission checks
See merge request artica/pandorafms!2865
|
2019-11-06 16:06:49 +01:00 |
|
Daniel Rodriguez
|
34bfb762fd
|
Merge branch 'ent-4857-Bug-color-pagina-eventos' into 'develop'
Ent 4857 bug color pagina eventos
See merge request artica/pandorafms!2834
|
2019-11-06 15:27:48 +01:00 |
|
Daniel Rodriguez
|
137571f2d1
|
Merge branch 'ent-4856-8969-Filtro-user-ack-evento-no-funciona-del-todo-bien' into 'develop'
user ack filter in event list not displaying users with all group
See merge request artica/pandorafms!2860
|
2019-11-06 14:45:09 +01:00 |