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 |
|
fbsanchez
|
670df456f5
|
wip results omnishell
|
2019-11-13 16:39:24 +01:00 |
|
fbsanchez
|
672ce6db22
|
first task omnishell and minor style checks
|
2019-11-13 15:24:44 +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 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 |
|
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 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 |
|
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
|
ec05b52fb4
|
update omnishell.css
|
2019-11-12 10:08:35 +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 |
|
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
|
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
|
763ec6772c
|
Help feedback style improved
|
2019-11-07 17:26:32 +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 |
|
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 |
|
manuel
|
a486738920
|
Fixed visual styles ticket 4809
|
2019-11-06 10:31:26 +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 |
|
Daniel Barbero Martin
|
ebb7cbfe6c
|
Fix styles css
|
2019-11-05 15:12:24 +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 |
|
marcos
|
334cea472e
|
add method ui_progress_extend(work in progress)
|
2019-10-30 14:47:28 +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 |
|
Daniel Barbero
|
c4aea1ac59
|
add styles validation form of modal
|
2019-10-25 13:28:01 +02:00 |
|
Daniel Barbero Martin
|
3dee6888d6
|
fix
|
2019-10-24 17:42:37 +02:00 |
|
marcos
|
e725a0185b
|
cambios semi finales
|
2019-10-24 16:56:13 +02:00 |
|
Daniel Barbero Martin
|
de22fb70e3
|
Merge remote-tracking branch 'origin/develop' into ent-4752-Herramientas-de-diagnostico
|
2019-10-23 19:51:49 +02:00 |
|
Daniel Barbero Martin
|
f06a55c6bb
|
continue feedback mail
|
2019-10-23 19:50:57 +02:00 |
|