Luis Calvo
|
6fdd88ab65
|
Fixed errors on eHorus user level conf
|
2019-05-28 17:19:13 +02:00 |
|
Luis Calvo
|
5966367f8f
|
eHorus user level login conf added in user editor
|
2019-05-28 13:14:42 +02:00 |
|
Luis Calvo
|
3736d84589
|
Edit ehorus user
|
2019-05-27 18:49:47 +02:00 |
|
Luis Calvo
|
588d19102f
|
Resolve merge conflict
|
2019-05-27 18:30:24 +02:00 |
|
Alejandro Fraguas
|
f284112be2
|
Merge branch 'ent-4020-cambiar-mensaje-de-bienvenida-tnews-2' into 'develop'
changed PK to NULL
See merge request artica/pandorafms!2451
|
2019-05-27 18:13:09 +02:00 |
|
Daniel Rodriguez
|
61d3720787
|
Merge branch 'ent-4076-Quitar-ayudas-vacias-modulos' into 'develop'
Removed empty help icons in modules
See merge request artica/pandorafms!2454
|
2019-05-27 17:53:06 +02:00 |
|
manuel
|
513a74d120
|
Removed empty help icons in local components
|
2019-05-27 17:13:25 +02:00 |
|
Alejandro Fraguas
|
54461fea93
|
Merge branch 'ent-3881-discovery-fase-4' into 'develop'
Minor style, avoided duplicated iface names with spaces
See merge request artica/pandorafms!2453
|
2019-05-27 16:08:45 +02:00 |
|
fbsanchez
|
83602e07b9
|
Merge remote-tracking branch 'origin/develop' into ent-3881-discovery-fase-4
|
2019-05-27 11:06:29 +02:00 |
|
artica
|
de3464bd02
|
Auto-updated build strings.
|
2019-05-27 00:01:05 +02:00 |
|
artica
|
ba97da46c6
|
Auto-updated build strings.
|
2019-05-26 00:01:04 +02:00 |
|
artica
|
a13701ed82
|
Auto-updated build strings.
|
2019-05-25 00:01:06 +02:00 |
|
manuel
|
bf3ac73feb
|
Removed empty help icons
|
2019-05-24 14:26:28 +02:00 |
|
marcos.alconada
|
41bc705c02
|
Image only for welcome message
|
2019-05-24 14:19:31 +02:00 |
|
marcos.alconada
|
9587b4cc44
|
Image only for welcome message
|
2019-05-24 14:18:39 +02:00 |
|
Daniel Rodriguez
|
d1d9307e85
|
Merge branch 'ent-4081-Quitar-ayudas-vacias-plantillas-informes' into 'develop'
Removed empty help icons
See merge request artica/pandorafms!2452
|
2019-05-24 12:59:53 +02:00 |
|
manuel
|
0ee2ed6f5e
|
Removed empty help icons in modules
|
2019-05-24 12:59:25 +02:00 |
|
fbsanchez
|
c5bd3204ab
|
Minor style, avoided duplicated iface names with spaces
|
2019-05-24 11:42:46 +02:00 |
|
manuel
|
0319e4d4e6
|
Removed empty help icons
|
2019-05-24 11:11:30 +02:00 |
|
marcos.alconada
|
01d96728c8
|
changed PK to NULL
|
2019-05-24 11:03:09 +02:00 |
|
Alejandro Fraguas
|
f5586d7b70
|
Merge branch 'ent-3630-7648-7712-campo-label-no-se-muestra-en-informes-de-graficas' into 'develop'
fixed label reports and more fixed
See merge request artica/pandorafms!2413
|
2019-05-24 10:47:15 +02:00 |
|
artica
|
cc09c257bc
|
Auto-updated build strings.
|
2019-05-24 00:01:06 +02:00 |
|
fbsanchez
|
9d7d58f43e
|
Merge branch 'fix/newsletter_ent' into 'develop'
Newsletter reminder settings ent
See merge request artica/pandorafms!2449
|
2019-05-23 19:25:43 +02:00 |
|
fbsanchez
|
4400d9303f
|
subscription manager udp
|
2019-05-23 19:22:05 +02:00 |
|
fbsanchez
|
211b05c9d6
|
minor fix in newsletter logic
|
2019-05-23 18:59:38 +02:00 |
|
fbsanchez
|
0235b4f396
|
Merge branch 'fix/uno' into 'develop'
removed trace from user_edit
See merge request artica/pandorafms!2448
|
2019-05-23 18:54:05 +02:00 |
|
fbsanchez
|
058c9d3806
|
Newsletter reminder settings ent
|
2019-05-23 18:54:04 +02:00 |
|
fbsanchez
|
f46fdea220
|
Merge remote-tracking branch 'origin/develop' into fix/uno
|
2019-05-23 18:46:56 +02:00 |
|
fbsanchez
|
8f9c9fd156
|
removed trace from user_edit
|
2019-05-23 18:46:43 +02:00 |
|
Daniel Barbero Martin
|
1386a44e07
|
fixed errors label report
|
2019-05-23 17:52:28 +02:00 |
|
Daniel Rodriguez
|
51f846af05
|
Merge branch 'ent-3893-Errata-en-Bulk-operation-de-politicas' into 'develop'
Fixed visual bug in policies operations actions
See merge request artica/pandorafms!2369
|
2019-05-23 17:24:59 +02:00 |
|
Daniel Rodriguez
|
7c236149b0
|
Merge branch 'ent-3592-Se-eliminan-items-de-informes-aunque-se-cancele' into 'develop'
Fixed bug in items reports deleted
See merge request artica/pandorafms!2208
|
2019-05-23 17:18:00 +02:00 |
|
Alejandro Fraguas
|
7097481cca
|
Merge branch 'ent-3974-Los-campos-de-module-plugin-no-se-guardan' into 'develop'
fixed bug in macros of plugin modules
See merge request artica/pandorafms!2442
|
2019-05-23 17:08:34 +02:00 |
|
fbsanchez
|
9e1de4cbb3
|
Merge branch 'ent-1668-update-manager' into 'develop'
rb UM GCv
See merge request artica/pandorafms!2447
|
2019-05-23 16:16:26 +02:00 |
|
fbsanchez
|
4ec6aadf7d
|
rb UM GCv
|
2019-05-23 16:12:40 +02:00 |
|
fbsanchez
|
f1c077b753
|
Merge branch 'ent-1668-update-manager' into 'develop'
UM GCv
See merge request artica/pandorafms!2446
|
2019-05-23 16:09:16 +02:00 |
|
fbsanchez
|
4abbbf6680
|
UM GCv
|
2019-05-23 15:55:07 +02:00 |
|
fbsanchez
|
5d4ba6cb01
|
Merge branch 'ent-1668-update-manager' into 'develop'
summarized counts
See merge request artica/pandorafms!2445
|
2019-05-23 15:47:25 +02:00 |
|
fbsanchez
|
08aa824f97
|
summarized counts
|
2019-05-23 15:38:45 +02:00 |
|
Alejandro Fraguas
|
09020c3b9c
|
Merge branch 'fix/pandora_ha_paths' into 'develop'
including several extra tokens in config
See merge request artica/pandorafms!2368
|
2019-05-23 11:58:15 +02:00 |
|
fbsanchez
|
1529a04507
|
Merge branch 'ent-1668-update-manager' into 'develop'
fixed: um url relative
See merge request artica/pandorafms!2444
|
2019-05-23 11:33:46 +02:00 |
|
fbsanchez
|
0ee42fbafe
|
fixed: um url relative
|
2019-05-23 11:23:42 +02:00 |
|
fbsanchez
|
dd8af874fa
|
Merge branch 'ent-1668-update-manager' into 'develop'
license forms sync MC-N
See merge request artica/pandorafms!2441
|
2019-05-23 10:36:43 +02:00 |
|
fbsanchez
|
7b5ae40868
|
multiple fixes
|
2019-05-23 10:27:50 +02:00 |
|
artica
|
4c3dea3ba4
|
Auto-updated build strings.
|
2019-05-23 00:01:07 +02:00 |
|
alejandro-campos
|
0728c73844
|
fixed bug in macros of plugin modules
|
2019-05-22 19:14:01 +02:00 |
|
fbsanchez
|
2cfe4378c2
|
license forms sync MC-N
|
2019-05-22 18:50:51 +02:00 |
|
Daniel Rodriguez
|
dfb7067db2
|
Merge branch 'ent-1668-update-manager' into 'develop'
minor fix MC environments
See merge request artica/pandorafms!2439
|
2019-05-22 16:54:33 +02:00 |
|
Daniel Rodriguez
|
8b511c2ca3
|
Merge branch 'ent-3984-7962-ldap-bug-en-token-force-automatically-create-profile-user' into 'develop'
Changed condition for ldap Force automatically create profile user
See merge request artica/pandorafms!2422
|
2019-05-22 16:15:06 +02:00 |
|
fbsanchez
|
86cb526893
|
minor fix MC environments
|
2019-05-22 15:40:17 +02:00 |
|