marcos
|
fe45afa662
|
Merge remote-tracking branch 'origin/develop' into ent-4226-mejoras-plugin-sap
|
2019-11-13 12:01:36 +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 |
|
marcos
|
e7dfd9b968
|
Add sap view
|
2019-11-12 19:53:46 +01:00 |
fbsanchez
|
d1fbd36a97
|
WIP omnishell
|
2019-11-12 19:31:38 +01:00 |
Daniel Barbero Martin
|
25f879df00
|
add step 3
|
2019-11-12 18:45:20 +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 |
|
Daniel Barbero Martin
|
02677849ce
|
add new css
|
2019-11-12 13:17:00 +01:00 |
|
Daniel Barbero Martin
|
9d3c9febad
|
Add alert correlation wizard
|
2019-11-12 13:16:25 +01:00 |
|
marcos
|
7b06ceaafc
|
add sap menu
|
2019-11-12 10:54:36 +01:00 |
|
fbsanchez
|
19d06dc061
|
Merge remote-tracking branch 'origin/ent-EDF' into ent-4226-mejoras-plugin-sap
|
2019-11-12 10:19:34 +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 |
|
fbsanchez
|
d1f9a86622
|
Merge branch 'ent-4774-welcome-to-pandorafms' into ent-EDF
|
2019-11-11 15:36:47 +01:00 |
|
fbsanchez
|
01de54a220
|
other icon
|
2019-11-11 15:36:38 +01:00 |
|
fbsanchez
|
1637b09b1e
|
Merge branch 'ent-4774-welcome-to-pandorafms' into ent-EDF
|
2019-11-11 15:23:35 +01:00 |
|
fbsanchez
|
946ef2fae4
|
icon review tick badge
|
2019-11-11 15:23:23 +01:00 |
|
fbsanchez
|
53954ec853
|
Merge branch 'ent-4774-welcome-to-pandorafms' into ent-EDF
|
2019-11-11 14:26: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
|
0b610cd8ba
|
Merge branch 'ent-4774-welcome-to-pandorafms' into ent-EDF
|
2019-11-11 13:39:08 +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 |
|
fbsanchez
|
2daf473ba9
|
wip omnishell, command executor and directories
|
2019-11-08 17:07:14 +01:00 |
|
Daniel Barbero Martin
|
0213bc675e
|
add changes bbdd
|
2019-11-08 11:28:37 +01:00 |
|
Daniel Barbero Martin
|
deb2657353
|
Merge remote-tracking branch 'origin/ent-EDF' into ent-4610-Alertas-de-logs
|
2019-11-08 11:14:51 +01:00 |
|
fbsanchez
|
ec2d46c299
|
Merge remote-tracking branch 'origin/ent-4752-Herramientas-de-diagnostico' into ent-EDF
|
2019-11-08 11:09:11 +01:00 |
|
fbsanchez
|
ec72820c88
|
Icon adjustment
|
2019-11-08 11:08:43 +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 |
|
Daniel Barbero Martin
|
c78e3f4184
|
fixed minor error
|
2019-11-08 08:55:58 +01:00 |
|
fbsanchez
|
d9d8cbfd35
|
Merge remote-tracking branch 'origin/ent-EDF' into ent-4772-omnishell
|
2019-11-07 19:43:18 +01:00 |
|
fbsanchez
|
cf0a06f216
|
Merge branch 'ent-4766-feedback-de-ayudas' into ent-EDF
|
2019-11-07 19:41:36 +01:00 |
|
fbsanchez
|
36ae77a33c
|
minor fix
|
2019-11-07 19:41:23 +01:00 |