Daniel Rodriguez
|
3a3cd5c1c5
|
Merge branch 'ent-4769-modulos-ssh-php-perl' into 'develop'
modulos ssh php perl
See merge request artica/pandorafms!2799
|
2019-11-20 17:26:15 +01:00 |
fbsanchez
|
e9432aaaa5
|
Merge remote-tracking branch 'origin/develop' into ent-4769-modulos-ssh-php-perl
Conflicts:
pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
|
2019-11-20 15:51:47 +01:00 |
Alejandro Fraguas
|
2469b65192
|
Merge branch 'ent-4841-8948-Errores-migrate_pandora-6-a-7' into 'develop'
fix migrate missing content
See merge request artica/pandorafms!2840
|
2019-11-20 13:17:45 +01:00 |
alejandro-campos
|
4d332f2bef
|
fix duplicated operation in migrate file
|
2019-11-20 12:43:08 +01:00 |
|
fbsanchez
|
446d6c3507
|
Fix windows commands
|
2019-11-20 12:35:55 +01:00 |
|
alejandro-campos
|
33b11af3c1
|
fix missing line in migrate
|
2019-11-20 11:26:28 +01:00 |
|
alejandro-campos
|
8295f70ae0
|
Merge remote-tracking branch 'origin/develop' into ent-4841-8948-Errores-migrate_pandora-6-a-7
|
2019-11-20 11:23:16 +01:00 |
Daniel Barbero Martin
|
6bf9ceac3e
|
fixed minor error
|
2019-11-20 10:00:57 +01:00 |
|
Daniel Barbero Martin
|
67fb2216d4
|
Fix
|
2019-11-20 09:48:35 +01:00 |
artica
|
12123d68df
|
Auto-updated build strings.
|
2019-11-20 00:01:37 +01:00 |
|
fbsanchez
|
471389a72a
|
Merge branch 'develop' into 'ent-4769-modulos-ssh-php-perl'
Conflicts:
pandora_console/extras/mr/33.sql
|
2019-11-19 14:11:38 +01:00 |
|
Daniel Barbero Martin
|
1b5dcc3e28
|
Fixed errors in remote command
|
2019-11-19 12:35:52 +01:00 |
|
Alejandro Fraguas
|
aa4ae996d2
|
Merge branch 'ent-4986-La-vista-Module-Groups-se-ve-con-cualquier-grupo-asignado-al-usuario' into 'develop'
Ent 4986 la vista module groups se ve con cualquier grupo asignado al usuario
See merge request artica/pandorafms!2894
|
2019-11-19 12:22:01 +01:00 |
|
fbsanchez
|
be1e4324d2
|
missed port
|
2019-11-19 12:02:10 +01:00 |
|
artica
|
04076a04b1
|
Auto-updated build strings.
|
2019-11-19 00:01:12 +01:00 |
Tatiana Llorente
|
15aaf0cae6
|
Added acl checks to module groups view
|
2019-11-18 17:18:40 +01:00 |
|
alejandro-campos
|
070fe32d1e
|
Merge remote-tracking branch 'origin/develop' into ent-4841-8948-Errores-migrate_pandora-6-a-7
|
2019-11-18 16:27:12 +01:00 |
|
Alejandro Fraguas
|
0c30047da5
|
Merge branch 'ent-4930-create_event-no-anade-comentarios-evento' into 'develop'
Solution for lost comments in the events section modal window
See merge request artica/pandorafms!2884
|
2019-11-18 12:29:32 +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 |
|
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 |
|
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 |
|
artica
|
378192a449
|
Auto-updated build strings.
|
2019-11-15 00:01:12 +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 |
|
Daniel Barbero Martin
|
42fc81a408
|
fixed errors
|
2019-11-13 17:50:22 +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 |
|
Jose Gonzalez
|
adb6f00597
|
Missed line added
|
2019-11-13 16:34:08 +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
|
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 |
|
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 |
|
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 |