fbsanchez
|
d3f18a94f7
|
Merge remote-tracking branch 'origin/ent-4226-mejoras-plugin-sap' into ent-EDF
|
2019-11-26 10:48:59 +01:00 |
artica
|
b3fa4b7b7d
|
Auto-updated build strings.
|
2019-11-26 00:01:08 +01:00 |
marcos
|
0490024abc
|
add sap view to autorefresh edit my user
|
2019-11-25 15:01:27 +01:00 |
|
marcos
|
6f8bf104b4
|
update sap view
|
2019-11-25 13:50:26 +01:00 |
|
artica
|
1592773b46
|
Auto-updated build strings.
|
2019-11-25 00:01:07 +01:00 |
|
artica
|
44311c0438
|
Auto-updated build strings.
|
2019-11-24 00:01:07 +01:00 |
|
artica
|
09e6615611
|
Auto-updated build strings.
|
2019-11-23 00:01:09 +01:00 |
artica
|
561e73d524
|
Updated version and build strings.
|
2019-11-22 10:03:53 +01:00 |
|
artica
|
b386da7da6
|
Auto-updated build strings.
|
2019-11-22 00:01:10 +01:00 |
daniel
|
960326b980
|
Add menu omnishell
|
2019-11-21 18:21:46 +01:00 |
Alejandro Fraguas
|
e9bd9f1b58
|
Merge branch 'ent-4444-Rendimiento-en-la-vista-de-eventos-en-metaconsola' into 'develop'
fixed secondary group in events
See merge request artica/pandorafms!2901
|
2019-11-21 16:09:01 +01:00 |
Luis
|
41e818334e
|
Ent 4954 urls documentacion soporte al fallar base datos
|
2019-11-21 11:14:50 +01:00 |
Daniel Rodriguez
|
775289fc20
|
Merge branch 'ent-4550-ACL-acceso-denegado-detalles-agente-icono-grupo' into 'develop'
Changed definition of link in group icon
See merge request artica/pandorafms!2891
|
2019-11-21 10:21:07 +01:00 |
|
artica
|
23e64ab781
|
Auto-updated build strings.
|
2019-11-21 00:01:18 +01:00 |
|
fbsanchez
|
6996969995
|
Merge remote-tracking branch 'origin/ent-4226-mejoras-plugin-sap' into ent-EDF
Conflicts:
pandora_console/extras/mr/33.sql
|
2019-11-20 18:23:17 +01:00 |
|
marcos
|
294c160622
|
semifinal sap sap view agent
|
2019-11-20 18:01:07 +01:00 |
Daniel Maya
|
fad70cfdc0
|
fixed secondary group in events
|
2019-11-20 16:34:56 +01:00 |
|
fbsanchez
|
3b636a12ce
|
Merge remote-tracking branch 'origin/ent-4769-modulos-ssh-php-perl' into ent-EDF
Conflicts:
pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
|
2019-11-20 15:53:00 +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 |
|
Daniel Barbero Martin
|
61568ee3b7
|
Add button diagnostic
|
2019-11-20 13:26:02 +01:00 |
|
Daniel Barbero Martin
|
4d7f92e3f0
|
Add button diagnostic
|
2019-11-20 13:25:16 +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
|
9db7bd37f2
|
Merge remote-tracking branch 'origin/ent-4769-modulos-ssh-php-perl' into ent-EDF
Conflicts:
pandora_console/extras/mr/33.sql
|
2019-11-20 10:12:23 +01:00 |
|
Daniel Barbero Martin
|
556d6e6d01
|
Merge remote-tracking branch 'origin/develop' into ent-EDF
|
2019-11-20 10:10:34 +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 |
|
artica
|
04076a04b1
|
Auto-updated build strings.
|
2019-11-19 00:01:12 +01:00 |
|
marcos
|
76b7e52107
|
update branch
|
2019-11-18 18:46:57 +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 |
|
fbsanchez
|
6a3db40d56
|
Merge remote-tracking branch 'origin/develop' into ent-EDF
|
2019-11-18 16:12:01 +01:00 |
|
Daniel Barbero
|
8811095a3e
|
WIP ALerts
|
2019-11-18 15:25:35 +01:00 |
|
Daniel Barbero
|
79f5e879cc
|
WIP Alerts
|
2019-11-18 13:37:10 +01:00 |
|
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 |