Daniel Barbero Martin
|
e6afe84940
|
Fixed pdf
|
2019-11-27 15:22:39 +01:00 |
|
daniel
|
960326b980
|
Add menu omnishell
|
2019-11-21 18:21:46 +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 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 |
|
Daniel Barbero Martin
|
42fc81a408
|
fixed errors
|
2019-11-13 17:50:22 +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 |
|
Daniel Barbero Martin
|
a0db941b1e
|
fixed errors
|
2019-11-13 15:52:09 +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
|
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
|
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 |
|
fbsanchez
|
53954ec853
|
Merge branch 'ent-4774-welcome-to-pandorafms' into ent-EDF
|
2019-11-11 14:26:23 +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 |
|
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
|
c4779f6f91
|
Merge branch 'ent-4766-feedback-de-ayudas' into ent-EDF
|
2019-11-07 18:33:51 +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 |
|
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
|
7c68595241
|
Merge remote-tracking branch 'origin/ent-4774-welcome-to-pandorafms' into ent-EDF
|
2019-11-07 10:43:24 +01:00 |
|
fbsanchez
|
d080f1d6a7
|
Welcome pack
|
2019-11-07 10:42:46 +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 |
|
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 |
|
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 |
|
fbsanchez
|
c07baa614f
|
Merge remote-tracking branch 'origin/ent-4766-feedback-de-ayudas' into ent-EDF
|
2019-10-29 17:00:57 +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 |
marcos
|
8174b4f2eb
|
add help option in welcome window
|
2019-10-29 10:38:22 +01:00 |
|
Daniel Barbero Martin
|
f6fd5cc21f
|
Add image feedback
|
2019-10-29 09:13:48 +01:00 |
|
marcos
|
57bfc364ae
|
add modal confirmation window
|
2019-10-28 18:57:10 +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 |
|
Daniel Barbero
|
c4aea1ac59
|
add styles validation form of modal
|
2019-10-25 13:28:01 +02:00 |
|
Daniel Barbero
|
22a2b7cd0b
|
Add feedback phpInfo
|
2019-10-25 10:43:03 +02:00 |
|
Daniel Barbero Martin
|
3dee6888d6
|
fix
|
2019-10-24 17:42:37 +02:00 |