fbsanchez
|
443eb1168c
|
Merge remote-tracking branch 'origin/ent-EDF' into ent-4610-Alertas-de-logs
|
2019-11-18 12:48:31 +01:00 |
|
fbsanchez
|
6126503285
|
Merge remote-tracking branch 'origin/ent-4772-omnishell' into ent-EDF
|
2019-11-18 12:30:51 +01:00 |
|
fbsanchez
|
61ccd5bdbc
|
help_link omnishell
|
2019-11-18 12:30:12 +01:00 |
|
fbsanchez
|
85ca03b054
|
fix- removed traces
|
2019-11-18 11:07:04 +01:00 |
|
fbsanchez
|
99b0714850
|
PWE keep db connection up
|
2019-11-18 11:06:27 +01:00 |
José González
|
4cddf5a31a
|
Merge branch 'develop' into 'ent-4930-create_event-no-anade-comentarios-evento'
# Conflicts:
# pandora_console/include/functions_events.php
|
2019-11-18 11:02:31 +01:00 |
|
Jose Gonzalez
|
93200e2af1
|
Changed definition of link in group icon
|
2019-11-18 10:51:09 +01:00 |
|
fbsanchez
|
6fb2e3af81
|
Merge remote-tracking branch 'origin/develop' into ent-EDF
|
2019-11-18 10:05:40 +01:00 |
|
fbsanchez
|
61eb7f0635
|
Merge remote-tracking branch 'origin/ent-4226-mejoras-plugin-sap' into ent-EDF
|
2019-11-18 09:55:15 +01:00 |
artica
|
73389a7164
|
Auto-updated build strings.
|
2019-11-18 00:01:07 +01:00 |
|
artica
|
39b449be9c
|
Auto-updated build strings.
|
2019-11-17 00:01:07 +01:00 |
|
artica
|
727b3bde5d
|
Auto-updated build strings.
|
2019-11-16 00:01:11 +01:00 |
|
fbsanchez
|
46c42ef8a4
|
Merge remote-tracking branch 'origin/ent-4772-omnishell' into ent-EDF
|
2019-11-15 16:52:26 +01:00 |
|
fbsanchez
|
84c6640032
|
minor style fix
|
2019-11-15 16:51:53 +01:00 |
|
fbsanchez
|
32466a5f0f
|
Merge remote-tracking branch 'origin/develop' into ent-EDF
|
2019-11-15 16:36:06 +01:00 |
marcos
|
91f28384b8
|
changed sap icon button
|
2019-11-15 16:22:30 +01:00 |
Alejandro Fraguas
|
7e8f22b1de
|
Merge branch 'ent-4936-Comillas-dobles-en-comentarios-de-eventos-no-funcionan' into 'develop'
Ent 4936 comillas dobles en comentarios de eventos no funcionan
See merge request artica/pandorafms!2869
|
2019-11-15 13:20:13 +01:00 |
|
fbsanchez
|
9440570548
|
Merge remote-tracking branch 'origin/ent-4772-omnishell' into ent-EDF
|
2019-11-15 13:08:09 +01:00 |
|
fbsanchez
|
e561b1f906
|
omnishell multiselect
|
2019-11-15 13:07:23 +01:00 |
|
fbsanchez
|
990ad339d3
|
db schema
|
2019-11-15 09:45:49 +01:00 |
|
artica
|
378192a449
|
Auto-updated build strings.
|
2019-11-15 00:01:12 +01:00 |
|
fbsanchez
|
8edbb74354
|
discovery help link and minor fixes
|
2019-11-14 21:52:02 +01:00 |
|
fbsanchez
|
f69b86663a
|
Merge remote-tracking branch 'origin/ent-4226-mejoras-plugin-sap' into ent-EDF
Conflicts:
pandora_console/extras/mr/33.sql
pandora_console/godmode/wizards/Wizard.main.php
|
2019-11-14 21:40:35 +01:00 |
|
fbsanchez
|
dcd9467bfb
|
fix symbols in gotty credentials
|
2019-11-14 21:10:46 +01:00 |
|
fbsanchez
|
547e0c4364
|
Merge remote-tracking branch 'origin/ent-4772-omnishell' into ent-EDF
|
2019-11-14 20:58:16 +01:00 |
|
fbsanchez
|
546b8dc448
|
omnishell minor changes
|
2019-11-14 20:55:55 +01:00 |
|
fbsanchez
|
9dec1709c4
|
Fixed help content well printed
|
2019-11-14 19:10:31 +01:00 |
|
marcos
|
f348310675
|
ADD function to get SAP agents and sap view to sap agents
|
2019-11-14 19:01:23 +01:00 |
|
fbsanchez
|
0d3817d64d
|
dynamic toggle in wizard input printForm
|
2019-11-14 17:45:45 +01:00 |
|
fbsanchez
|
192fd10dd8
|
Merge remote-tracking branch 'origin/ent-EDF' into ent-4772-omnishell
|
2019-11-14 17:14:34 +01:00 |
|
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 |
|
fbsanchez
|
7efb1367ef
|
Merge branch 'ent-EDF' into ent-4772-omnishell
|
2019-11-14 17:12:21 +01:00 |
|
fbsanchez
|
14128590d6
|
Minor corrections&fixes
|
2019-11-14 17:05:01 +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 |
alejandro-campos
|
994b3a9bff
|
changes in service map widget: always show legend and fix visual problem
|
2019-11-14 15:21:24 +01:00 |
|
fbsanchez
|
94d87c2a3c
|
Avoid welcome window on updates.
|
2019-11-14 14:14:50 +01:00 |
Tatiana Llorente
|
9a17a02d61
|
Fixed bug with line breaks in alert commands
|
2019-11-14 12:29:02 +01:00 |
Daniel Barbero Martin
|
c17acefc49
|
Merge remote-tracking branch 'origin/ent-EDF' into ent-4610-Alertas-de-logs
Conflicts:
pandora_console/extras/mr/33.sql
|
2019-11-14 12:22:11 +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 |
|
marcos
|
a8b6f40ca1
|
change sap view menu position
|
2019-11-14 10:51:00 +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 |
manuel
|
607c26529d
|
Fixed bug in visual console line item
|
2019-11-14 09:51:49 +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
|
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
|
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 |
|
Jose Gonzalez
|
62fbdd36a0
|
Solution for lost comments in the events section modal window
|
2019-11-13 15:36:52 +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 |
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 Barbero Martin
|
28c9718c26
|
WIP alerts-log
|
2019-11-13 12:07:23 +01:00 |
|
marcos
|
fe45afa662
|
Merge remote-tracking branch 'origin/develop' into ent-4226-mejoras-plugin-sap
|
2019-11-13 12:01:36 +01:00 |
|
alejandro-campos
|
8c046ecdc6
|
fix bug when accessing certain views as home screen
|
2019-11-13 11:24:25 +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 |
|
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 |
|
Tatiana Llorente
|
a11b18292c
|
Fixed width in the select to load filters in events view
|
2019-11-12 17:12:44 +01:00 |
|
Daniel Barbero Martin
|
fa6bc254a1
|
Fixed errors
|
2019-11-12 16:22:58 +01:00 |
|
Tatiana Llorente
|
50be60409e
|
Dont refresh the page when filter is changed in traps view
|
2019-11-12 15:58:36 +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 |
|
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
|
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 |
|
Tatiana Llorente
|
1b3c7f8ed6
|
Fixed bug in some items of reports in metaconsole
|
2019-11-11 17:58:00 +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 |
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 |
|
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 |
|
fbsanchez
|
a8bdb68cac
|
Merge branch 'ent-4766-feedback-de-ayudas' into ent-EDF
|
2019-11-07 19:40:23 +01:00 |
|
fbsanchez
|
4905b18888
|
Fulfill help path and mail check
|
2019-11-07 19:39:50 +01:00 |
|
fbsanchez
|
9387f59979
|
Merge branch 'ent-4766-feedback-de-ayudas' into ent-EDF
|
2019-11-07 18:39:06 +01:00 |
|
fbsanchez
|
424aa10555
|
style minor changes
|
2019-11-07 18:38:52 +01:00 |
|
fbsanchez
|
c4779f6f91
|
Merge branch 'ent-4766-feedback-de-ayudas' into ent-EDF
|
2019-11-07 18:33:51 +01:00 |
|
fbsanchez
|
307eabc7b9
|
Merge remote-tracking branch 'origin/develop' into ent-EDF
|
2019-11-07 18:33:37 +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 |
|
Tatiana Llorente
|
54c6f3965d
|
Fixed bug with doubles quotes in comments of events
|
2019-11-07 15:25:19 +01:00 |
|
fbsanchez
|
778f49c100
|
Merge branch 'ent-3178-integrar-terminal-web-en-la-consola-de-pandora-y-explorar-otras-utilidades-anyterm-replace' into ent-EDF
|
2019-11-07 14:20:44 +01:00 |
|
fbsanchez
|
ab6e790b4e
|
minor-fix qs_admin interface
|
2019-11-07 14:20:29 +01:00 |
|
fbsanchez
|
ef14de075e
|
Merge branch 'ent-4774-welcome-to-pandorafms' into ent-EDF
|
2019-11-07 14:06:07 +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
|
c49f94fdb5
|
Merge remote-tracking branch 'origin/ent-3178-integrar-terminal-web-en-la-consola-de-pandora-y-explorar-otras-utilidades-anyterm-replace' into ent-EDF
|
2019-11-07 10:54:20 +01:00 |
|
fbsanchez
|
f497312d29
|
minor fix. default values QS admin page
|
2019-11-07 10:54:05 +01:00 |
|
fbsanchez
|
7c68595241
|
Merge remote-tracking branch 'origin/ent-4774-welcome-to-pandorafms' into ent-EDF
|
2019-11-07 10:43:24 +01:00 |
|
fbsanchez
|
6e637954b8
|
Merge remote-tracking branch 'origin/develop' into ent-EDF
|
2019-11-07 10:43:15 +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 |
|
Daniel Barbero Martin
|
b18878148c
|
change load modal
|
2019-11-07 09:38:52 +01:00 |
|
fbsanchez
|
79d165b164
|
Merge remote-tracking branch 'origin/develop' into ent-EDF
|
2019-11-06 20:01:28 +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 |
|
fbsanchez
|
ddd370f7c5
|
Merge remote-tracking branch 'origin/ent-3178-integrar-terminal-web-en-la-consola-de-pandora-y-explorar-otras-utilidades-anyterm-replace' into ent-EDF
|
2019-11-06 15:37:45 +01:00 |
|
fbsanchez
|
98237a8d34
|
Merge remote-tracking branch 'origin/develop' into ent-EDF
Conflicts:
pandora_console/general/header.php
|
2019-11-06 15:36:53 +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 |
|
Daniel Rodriguez
|
d460429509
|
Merge branch 'ent-4898-No-funciona-filtro-de-eventos-cuando-el-idioma-del-usuario-está-en-catalán' into 'develop'
Fixed agent name and error lenght
See merge request artica/pandorafms!2845
|
2019-11-06 13:14:06 +01:00 |
|
alejandro-campos
|
e9b516c399
|
change access permission to users in user ack filter in event list
|
2019-11-06 12:56:42 +01:00 |
|
Alejandro Fraguas
|
37ffff12eb
|
Merge branch '4727-macros-grupos-secundarios' into 'develop'
4727 macros grupos secundarios
See merge request artica/pandorafms!2811
|
2019-11-06 12:20:39 +01:00 |
|
Daniel Rodriguez
|
5a34ec51d2
|
Merge branch 'ent-4687-api-get-all-agents-recursion' into 'develop'
Added recursion to api_get_all_agents
See merge request artica/pandorafms!2753
|
2019-11-06 10:38:17 +01:00 |
|
Tatiana Llorente
|
1a34e488b6
|
Fixed bug in report date in pdf reports
|
2019-11-06 10:34:08 +01:00 |
|
manuel
|
a486738920
|
Fixed visual styles ticket 4809
|
2019-11-06 10:31:26 +01:00 |
|
Tatiana Llorente
|
05e424a24e
|
Merge remote-tracking branch 'origin/develop' into ent-4623-Exportar-a-CSV-los-eventos-separador-erroneo
Conflicts:
pandora_console/include/functions_ui.php
|
2019-11-05 17:25:56 +01:00 |
|
Tatiana Llorente
|
87c5d0025b
|
Merge remote-tracking branch 'origin/develop' into ent-4623-Exportar-a-CSV-los-eventos-separador-erroneo
|
2019-11-05 17:24:10 +01:00 |
|
Daniel Rodriguez
|
35d87400fd
|
Merge branch 'ent-4892-HTML-custom-report-date-vacio' into 'develop'
Ent 4892 html custom report date vacio
See merge request artica/pandorafms!2847
|
2019-11-05 17:19:40 +01:00 |
|
alejandro-campos
|
4b9d6f1ae2
|
fix bug in user list permission checks
|
2019-11-05 17:18:38 +01:00 |
|
Luis
|
b707ebd4a4
|
Added docs and support urls in console. Fixed bugs
|
2019-11-05 17:09:29 +01:00 |
|
Daniel Rodriguez
|
b7d8323583
|
Merge branch 'ent-3687-get-agents-id-name-by-alias-api-cli' into 'develop'
Added API and cli function get_agents_id_by_alias
See merge request artica/pandorafms!2802
|
2019-11-05 17:08:32 +01:00 |
|
Daniel Rodriguez
|
0f2d30698c
|
Merge branch 'ent-4872-Cambiar-titulo-a-archivo-XML-de-los-templates-de-reports' into 'develop'
Ent 4872 cambiar titulo a archivo xml de los templates de reports
See merge request artica/pandorafms!2862
|
2019-11-05 17:03:53 +01:00 |
|
Daniel Rodriguez
|
0e628a365d
|
Merge branch 'ent-4625-Cambiar-titulo-a-archivo-CSV-de-la-vista-de-eventos' into 'develop'
Ent 4625 cambiar titulo a archivo csv de la vista de eventos
See merge request artica/pandorafms!2783
|
2019-11-05 16:57:23 +01:00 |
|
Daniel Rodriguez
|
dd86598298
|
Merge branch 'ent-4902-Querys-predefinidas-en-plantillas-de-informes-no-funcionan' into 'develop'
Fixed visual bug in general report item
See merge request artica/pandorafms!2854
|
2019-11-05 16:43:52 +01:00 |
|
marcos
|
b80cb976f9
|
review fms
|
2019-11-05 16:08:51 +01:00 |
|
Daniel Barbero Martin
|
c68a5b57dd
|
fixed Change bbdd
|
2019-11-05 16:04:48 +01:00 |
|
fbsanchez
|
f4f618c1da
|
Merge remote-tracking branch 'origin/ent-EDF' into ent-4769-modulos-ssh-php-perl
|
2019-11-05 15:40:14 +01:00 |
|
fbsanchez
|
276fc82556
|
Merge branch 'ent-EDF' into ent-4226-mejoras-plugin-sap
Conflicts:
pandora_console/extras/mr/33.sql
|
2019-11-05 15:39:18 +01:00 |
|
Daniel Barbero Martin
|
e5f24ca884
|
Merge develop
|
2019-11-05 15:27:06 +01:00 |
|
fbsanchez
|
ed6dd2983f
|
Merge remote-tracking branch 'origin/ent-4752-Herramientas-de-diagnostico' into ent-EDF
Conflicts:
pandora_console/include/javascript/pandora.js
|
2019-11-05 15:21:21 +01:00 |
|
fbsanchez
|
58cbc3c738
|
Merge remote-tracking branch 'origin/develop' into ent-EDF
Conflicts:
pandora_console/extras/mr/33.sql
pandora_console/pandoradb_data.sql
|
2019-11-05 15:17:09 +01:00 |
|
Daniel Barbero Martin
|
ebb7cbfe6c
|
Fix styles css
|
2019-11-05 15:12:24 +01:00 |
|
Daniel Rodriguez
|
01ba485401
|
Merge branch 'ent-4859-8959-SNMP-console-filter-warning-critical-critical-normal' into 'develop'
fix bug in snmp console filter
See merge request artica/pandorafms!2844
|
2019-11-05 14:01:35 +01:00 |
|
Luis Calvo
|
dab4676a33
|
Resolved merge conflict and fixed bugs
|
2019-11-05 13:57:13 +01:00 |
|
Daniel Rodriguez
|
98d36cfc6d
|
Merge branch 'ent-4896-General-Report-en-Plantillas-no-tiene-bien-la-hora' into 'develop'
Ent 4896 general report en plantillas no tiene bien la hora
See merge request artica/pandorafms!2855
|
2019-11-05 13:33:27 +01:00 |
|
Tatiana Llorente
|
945383b8ec
|
Changed name of xml report
|
2019-11-05 12:43:08 +01:00 |
|
fbsanchez
|
dc565d2575
|
pandora_websocket_engine installation in RPM/DEB packages
|
2019-11-05 12:01:58 +01:00 |
|
fbsanchez
|
e583b71a99
|
missaligned tips
|
2019-11-05 11:51:26 +01:00 |
|
Tatiana Llorente
|
32f4ad2c4f
|
Changed name of variable filter in menu
|
2019-11-05 11:20:57 +01:00 |
|
fbsanchez
|
b1d4bfe149
|
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/pandoradb_data.sql
|
2019-11-05 11:16:26 +01:00 |
|
alejandro-campos
|
9fc635a7a9
|
user ack filter in event list not displaying users with all group
|
2019-11-05 11:03:28 +01:00 |
|
fbsanchez
|
ec3c7ba559
|
Some remote command examples
|
2019-11-04 20:36:03 +01:00 |
|
fbsanchez
|
27038cb0a3
|
Merge branch 'ent-EDF' into ent-4226-mejoras-plugin-sap
|
2019-11-04 20:10:19 +01:00 |
|
Daniel Rodriguez
|
a1b879d065
|
Merge branch 'ent-4728-Desactivar-Restart-Map-para-usuarios-sin-permisos' into 'develop'
Ent 4728 desactivar restart map para usuarios sin permisos
See merge request artica/pandorafms!2805
|
2019-11-04 18:45:57 +01:00 |
|
Tatiana Llorente
|
c83b85c225
|
Ent 4801 error informes pdf csv
|
2019-11-04 18:41:03 +01:00 |
|
Alejandro Fraguas
|
777bbdd180
|
Merge branch '4581-sample-agent-nueva-funcionalidad' into 'develop'
Added feature sample_agent
See merge request artica/pandorafms!2826
|
2019-11-04 17:54:33 +01:00 |
|
Jose Gonzalez
|
f584ac7835
|
Solved issue with query
|
2019-11-04 17:45:56 +01:00 |
|
marcos
|
84bdc8fc17
|
add progress extend
|
2019-11-04 17:39:21 +01:00 |
|
Alejandro Fraguas
|
648778fffe
|
Merge branch 'ent-4810-No-funcionan-los-templates-de-consolas-visuales' into 'develop'
Ent 4810 no funcionan los templates de consolas visuales
See merge request artica/pandorafms!2814
|
2019-11-04 12:40:04 +01:00 |
|
Tatiana Llorente
|
28e2702a48
|
Changed condition for general reports with last value checked
|
2019-11-04 12:00:12 +01:00 |
|
fbsanchez
|
123cf6e4a0
|
Merge branch 'ent-3178-integrar-terminal-web-en-la-consola-de-pandora-y-explorar-otras-utilidades-anyterm-replace' into ent-EDF
|
2019-11-04 11:25:22 +01:00 |
|
Alejandro Fraguas
|
cf3bcefddf
|
Merge branch 'ent-4826-error-accesso-con-sin-acl' into 'develop'
Fixed planned downtime acl
See merge request artica/pandorafms!2829
|
2019-11-04 11:25:17 +01:00 |
|
fbsanchez
|
a7e3614fa6
|
renamed ws service
|
2019-11-04 11:23:31 +01:00 |
|
manuel
|
d0c2c0d1eb
|
Fixed visual bug in general report item
|
2019-11-04 10:39:16 +01:00 |
|
fbsanchez
|
a249132fb5
|
sap discovery - config
|
2019-10-31 21:32:34 +01:00 |
|
fbsanchez
|
aa30a12f31
|
wizard doc minor fix
|
2019-10-31 21:15:18 +01:00 |
|
fbsanchez
|
115c884cd4
|
Discovery SAP
|
2019-10-31 21:13:18 +01:00 |
|
fbsanchez
|
5a42e76650
|
SAP discovery task
|
2019-10-31 18:19:00 +01:00 |
|
fbsanchez
|
c72f792d43
|
SAP discovery task
|
2019-10-31 18:18:38 +01:00 |
|
Tatiana Llorente
|
867ab6d0bf
|
Fixed bug in report date
|
2019-10-31 09:51:38 +01:00 |
|
marcos
|
102ed552bd
|
Merge branch 'ent-4772-omnishell' of https://brutus.artica.lan:8081/artica/pandorafms into ent-4772-omnishell
|
2019-10-31 09:36:18 +01:00 |
|
fbsanchez
|
3eb0a6bb95
|
minor fixes after internal meeting
|
2019-10-30 18:33:33 +01:00 |
|
fbsanchez
|
72b1fb2b16
|
Merge remote-tracking branch 'origin/ent-4774-welcome-to-pandorafms' into ent-EDF
Conflicts:
pandora_console/include/javascript/pandora.js
modified: pandora_console/general/register.php
modified: pandora_console/godmode/agentes/configurar_agente.php
modified: pandora_console/godmode/agentes/module_manager_editor.php
new file: pandora_console/include/ajax/welcome_window.php
new file: pandora_console/include/class/WelcomeWindow.class.php
modified: pandora_console/include/constants.php
modified: pandora_console/include/functions_config.php
modified: pandora_console/include/javascript/pandora.js
new file: pandora_console/include/styles/new_installation_welcome_window.css
|
2019-10-30 16:56:44 +01:00 |
|
Daniel Barbero Martin
|
7bfa076263
|
fixed error bbdd
|
2019-10-30 14:52:10 +01:00 |
|
marcos
|
7a937aeb3a
|
Merge branch 'ent-4772-omnishell' of https://brutus.artica.lan:8081/artica/pandorafms into ent-4772-omnishell
|
2019-10-30 14:47:36 +01:00 |
|
marcos
|
334cea472e
|
add method ui_progress_extend(work in progress)
|
2019-10-30 14:47:28 +01:00 |
|
Daniel Barbero Martin
|
d37410ed8c
|
fixed error bbdd
|
2019-10-30 14:43:10 +01:00 |
Daniel Maya
|
8573add0b3
|
Fixed agent name and error lenght
|
2019-10-30 13:01:59 +01:00 |
|
marcos
|
26f40bbeec
|
Merge branch 'ent-4772-omnishell' of https://brutus.artica.lan:8081/artica/pandorafms into ent-4772-omnishell
|
2019-10-30 10:01:58 +01:00 |
|
Daniel Barbero Martin
|
b7710a6562
|
fix remove mr34 to mr33
|
2019-10-30 08:04:13 +01:00 |
|
marcos
|
bb7ba67dab
|
changes in omnishell.css
|
2019-10-29 17:49:04 +01:00 |
|
Daniel Barbero Martin
|
2bb81a839a
|
Merge remote-tracking branch 'origin/ent-EDF' into ent-4772-omnishell
Conflicts:
pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
pandora_console/godmode/menu.php
pandora_console/pandoradb_data.sql
|
2019-10-29 17:15:19 +01:00 |
|
fbsanchez
|
c07baa614f
|
Merge remote-tracking branch 'origin/ent-4766-feedback-de-ayudas' into ent-EDF
|
2019-10-29 17:00:57 +01:00 |
|
Marcos Alconada
|
613e5741fb
|
Merge branch 'develop' into 'ent-4766-feedback-de-ayudas'
# Conflicts:
# pandora_console/include/functions_ui.php
|
2019-10-29 17:00:39 +01:00 |
|
marcos
|
487da50d31
|
add omnishell.css
|
2019-10-29 16:56:11 +01:00 |
|
fbsanchez
|
383967f68a
|
Merge branch 'ent-4769-modulos-ssh-php-perl' into ent-EDF
|
2019-10-29 16:56:01 +01:00 |
|
fbsanchez
|
0a53c0b915
|
Merge remote-tracking branch 'origin/ent-4752-Herramientas-de-diagnostico' into ent-EDF
|
2019-10-29 16:50:46 +01:00 |
|
fbsanchez
|
7224131126
|
Merge branch 'ent-3178-integrar-terminal-web-en-la-consola-de-pandora-y-explorar-otras-utilidades-anyterm-replace' into ent-EDF
|
2019-10-29 16:50:02 +01:00 |
|
alejandro-campos
|
14230d218a
|
fix bug in snmp console filter
|
2019-10-29 16:14:33 +01:00 |
|
fbsanchez
|
f3fdcb4de0
|
MR update
|
2019-10-29 16:06:34 +01:00 |
|
fbsanchez
|
6478c7a51f
|
minor tips quickshell
|
2019-10-29 15:55:39 +01:00 |
|
fbsanchez
|
06c7544041
|
minor fixes
|
2019-10-29 15:44:46 +01:00 |
|
alejandro-campos
|
cf0321846f
|
fix bug in dynamic report filter group functionality: not applying recursion correctly
|
2019-10-29 12:31:23 +01:00 |
|
marcos
|
8174b4f2eb
|
add help option in welcome window
|
2019-10-29 10:38:22 +01:00 |
|
Luis Calvo
|
64e80e6fee
|
Fixed error message
|
2019-10-29 10:32:59 +01:00 |
|
Luis Calvo
|
7f01f3d014
|
Merge remote-tracking branch 'origin/develop' into ent-3687-get-agents-id-name-by-alias-api-cli
|
2019-10-29 10:23:46 +01:00 |
|
Daniel Barbero Martin
|
6ff85d2abb
|
fixed image
|
2019-10-29 09:21:08 +01:00 |
|
alejandro-campos
|
758804e5de
|
fix minor bug in function groups_get_id_recursive
|
2019-10-29 09:18:21 +01:00 |
|
Daniel Barbero Martin
|
6f52095419
|
Merge remote-tracking branch 'origin/develop' into ent-4752-Herramientas-de-diagnostico
|
2019-10-29 09:14:06 +01:00 |
|
Daniel Barbero Martin
|
f6fd5cc21f
|
Add image feedback
|
2019-10-29 09:13:48 +01:00 |
|
artica
|
6f3e42e732
|
Auto-updated build strings.
|
2019-10-29 00:01:13 +01:00 |
|
marcos
|
57bfc364ae
|
add modal confirmation window
|
2019-10-28 18:57:10 +01:00 |
|
fbsanchez
|
6d21f71617
|
removed trace
|
2019-10-28 18:38:56 +01:00 |
|
fbsanchez
|
7d5b845e1f
|
minor fixes
|
2019-10-28 18:37:01 +01:00 |
|
Tatiana Llorente
|
32da1d287b
|
Fixed API function set_module_data
|
2019-10-28 15:19:39 +01:00 |
|
alejandro-campos
|
049c3c2476
|
fix migrate missing content
|
2019-10-28 13:46:37 +01:00 |
|
fbsanchez
|
e12bcb2ac4
|
Merge remote-tracking branch 'origin/develop' into ent-3178-integrar-terminal-web-en-la-consola-de-pandora-y-explorar-otras-utilidades-anyterm-replace
|
2019-10-28 12:59:02 +01:00 |
|
fbsanchez
|
7accbc97c4
|
Merge remote-tracking branch 'origin/develop' into ent-4769-modulos-ssh-php-perl
|
2019-10-28 12:36:19 +01:00 |
artica
|
3094d5af05
|
Updated version and build strings.
|
2019-10-28 12:35:59 +01:00 |
|
Daniel Barbero Martin
|
9becb90180
|
Merge remote-tracking branch 'origin/develop' into ent-4772-omnishell
|
2019-10-28 12:23:12 +01:00 |
|
Daniel Barbero Martin
|
3056c6741a
|
changes bbdd mr34
|
2019-10-28 12:20:55 +01:00 |
|
fbsanchez
|
74007ebf70
|
33 => 34, cleanup
|
2019-10-28 12:18:56 +01:00 |
|
fbsanchez
|
ccf971c2eb
|
Merge remote-tracking branch 'origin/develop' into ent-4769-modulos-ssh-php-perl
|
2019-10-28 12:18:19 +01:00 |
|
fbsanchez
|
d6681cedd1
|
33 => 34
|
2019-10-28 12:18:13 +01:00 |
|
Alejandro Fraguas
|
ffb9b9052c
|
Merge branch 'ent-4848-phantomjs-se-queda-congelado' into 'develop'
Ent 4848 phantomjs se queda congelado
See merge request artica/pandorafms!2837
|
2019-10-28 11:53:47 +01:00 |
|
Daniel Rodriguez
|
08247c1952
|
Merge branch 'ent-3779-7612-Revision-de-llamadas-a-api-y-cli-agent-name-alias-name' into 'develop'
changed pandora api functions to include possibility of using agent alias when...
See merge request artica/pandorafms!2819
|
2019-10-28 11:25:38 +01:00 |
|
Daniel Barbero Martin
|
b54ece2b70
|
Add menu omnishell
|
2019-10-28 10:46:25 +01:00 |
|
alejandro-campos
|
b16ef248d6
|
minor fixes in cli and api functions
|
2019-10-28 09:48:52 +01:00 |
|
Daniel Barbero Martin
|
89b030c484
|
Merge remote-tracking branch 'origin/develop' into ent-4752-Herramientas-de-diagnostico
|
2019-10-28 08:50:02 +01:00 |