fbsanchez
|
3c87efe113
|
Merge remote-tracking branch 'origin/develop' into ent-EDF
Conflicts:
pandora_console/extras/mr/33.sql
|
2019-11-14 17:13:38 +01:00 |
Alejandro Fraguas
|
27bdf04735
|
Merge branch 'ent-4774-welcome-to-pandorafms' into 'develop'
first changed to welcome window
See merge request artica/pandorafms!2822
|
2019-11-14 16:05:22 +01:00 |
|
fbsanchez
|
94d87c2a3c
|
Avoid welcome window on updates.
|
2019-11-14 14:14:50 +01:00 |
|
Alejandro Fraguas
|
0199c6312a
|
Merge branch 'ent-4752-Herramientas-de-diagnostico' into 'develop'
refactoriced diagnostics pandoraFMS
See merge request artica/pandorafms!2809
|
2019-11-14 11:49:23 +01:00 |
Daniel Barbero Martin
|
750e6e789c
|
fixed minor error
|
2019-11-14 09:58:10 +01:00 |
|
Daniel Barbero Martin
|
879884e6c3
|
fixed errors
|
2019-11-14 09:52:56 +01:00 |
|
Daniel Barbero Martin
|
86162b4c66
|
fixed errors
|
2019-11-14 08:53:45 +01:00 |
artica
|
cfdb5330ae
|
Auto-updated build strings.
|
2019-11-14 00:01:12 +01:00 |
|
fbsanchez
|
b0920d93af
|
Merge branch 'ent-4772-omnishell' into ent-EDF
Conflicts:
pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
|
2019-11-13 18:15:19 +01:00 |
|
fbsanchez
|
78443a029d
|
Omnishell rc1
|
2019-11-13 18:10:16 +01:00 |
|
Daniel Barbero Martin
|
42fc81a408
|
fixed errors
|
2019-11-13 17:50:22 +01:00 |
|
fbsanchez
|
1729b3a2c0
|
Merge remote-tracking branch 'origin/ent-4769-modulos-ssh-php-perl' into ent-EDF
|
2019-11-13 17:43:01 +01:00 |
|
fbsanchez
|
9fffa5fec9
|
Merge remote-tracking branch 'origin/ent-4774-welcome-to-pandorafms' into ent-EDF
|
2019-11-13 17:42:38 +01:00 |
|
fbsanchez
|
1b0cecc4ec
|
Merge remote-tracking branch 'origin/develop' into ent-EDF
|
2019-11-13 17:42:24 +01:00 |
|
fbsanchez
|
0e2a3d0f47
|
minor style fix after feedback cleanup
|
2019-11-13 17:42:14 +01:00 |
|
fbsanchez
|
65d02d4529
|
Merge remote-tracking branch 'origin/ent-EDF' into ent-4774-welcome-to-pandorafms
|
2019-11-13 17:40:45 +01:00 |
|
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 |
|
Daniel Barbero Martin
|
8645b01828
|
fixed errors
|
2019-11-13 16:43:32 +01:00 |
|
fbsanchez
|
360d0d7120
|
added rcmd_timeout base configuration
|
2019-11-13 16:41:36 +01:00 |
|
fbsanchez
|
670df456f5
|
wip results omnishell
|
2019-11-13 16:39:24 +01:00 |
|
Daniel Barbero Martin
|
a0db941b1e
|
fixed errors
|
2019-11-13 15:52:09 +01:00 |
|
fbsanchez
|
6df9f03b5f
|
Merge remote-tracking branch 'origin/develop' into ent-4772-omnishell
|
2019-11-13 15:41:16 +01:00 |
|
fbsanchez
|
672ce6db22
|
first task omnishell and minor style checks
|
2019-11-13 15:24:44 +01:00 |
|
fbsanchez
|
9b1a3a9cd1
|
Firts_task => first_task
|
2019-11-13 14:58:53 +01:00 |
|
fbsanchez
|
6677b6a5ab
|
hide report in welcomewindow if not enterprise customer
|
2019-11-13 14:32:34 +01:00 |
|
fbsanchez
|
c17328d39d
|
Pandora Agent RCMD
|
2019-11-13 14:21:09 +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 |
|
fbsanchez
|
19897c3894
|
Merge remote-tracking branch 'origin/ent-EDF' into ent-4769-modulos-ssh-php-perl
|
2019-11-13 13:34:35 +01:00 |
|
Daniel Barbero Martin
|
5f8ec8f89c
|
fixed errors
|
2019-11-13 13:29:09 +01:00 |
|
fbsanchez
|
875d4430a7
|
Merge remote-tracking branch 'origin/ent-EDF' into ent-4772-omnishell
|
2019-11-13 12:21:42 +01:00 |
|
fbsanchez
|
b11dbc639f
|
Merge remote-tracking branch 'origin/ent-4752-Herramientas-de-diagnostico' into ent-EDF
Conflicts:
pandora_console/general/header.php
|
2019-11-13 12:20:29 +01:00 |
|
Daniel Barbero Martin
|
7103317bc2
|
Merge remote-tracking branch 'origin/develop' into ent-4752-Herramientas-de-diagnostico
Conflicts:
pandora_console/general/header.php
pandora_console/include/styles/pandora.css
|
2019-11-13 12:12:17 +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 |
|
fbsanchez
|
d1fbd36a97
|
WIP omnishell
|
2019-11-12 19:31:38 +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 |
|
Daniel Barbero Martin
|
fa6bc254a1
|
Fixed errors
|
2019-11-12 16:22:58 +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 |
marcos
|
fcfb7617bd
|
Merge branch 'ent-4772-omnishell' of https://brutus.artica.lan:8081/artica/pandorafms into ent-4772-omnishell
|
2019-11-12 10:08:51 +01:00 |
|
marcos
|
ec05b52fb4
|
update omnishell.css
|
2019-11-12 10:08:35 +01:00 |
|
artica
|
2ee4f9d88f
|
Auto-updated build strings.
|
2019-11-12 00:01:09 +01:00 |
|
fbsanchez
|
ca9d168e67
|
wip omnishell
|
2019-11-11 18:12:43 +01:00 |
|
fbsanchez
|
a5a54e215d
|
fix extension agent_modules...
|
2019-11-11 16:42:54 +01:00 |