 Juan Ferrer
|
9023601396
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-02-01 13:01:20 +01:00 |
|
Juan Ferrer
|
1752ffbcaa
|
css zindex fixes
|
2019-02-01 13:01:09 +01:00 |
Gerard
|
69cc821f6f
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-02-01 12:57:04 +01:00 |
|
Gerard
|
630549c7e8
|
deleted duplicated sql
|
2019-02-01 12:56:35 +01:00 |
Carlos Jimenez Ruiz
|
d235495658
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-02-01 12:48:03 +01:00 |
Bernat
|
e5f91079c8
|
#9694 update structure db
|
2019-02-01 12:40:48 +01:00 |
|
Carlos Jimenez Ruiz
|
812833dbf6
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-02-01 12:38:14 +01:00 |
|
Juan Ferrer
|
19d8a2c98c
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-02-01 12:32:50 +01:00 |
|
Juan Ferrer
|
50f580e883
|
nginx config fixes
|
2019-02-01 12:17:23 +01:00 |
|
Carlos Jimenez Ruiz
|
cf10365bc8
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-02-01 12:16:45 +01:00 |
|
Carlos Jimenez Ruiz
|
9d8c2efa3b
|
#1000 e2e de ticket.log
|
2019-02-01 12:16:39 +01:00 |
|
Gerard
|
d648db504c
|
added card.reload and fixed remove stowaway not showing
|
2019-02-01 12:11:56 +01:00 |
|
Juan Ferrer
|
a781346f17
|
nginx conf fixes
|
2019-02-01 11:54:36 +01:00 |
|
Juan Ferrer
|
8889f8d5cf
|
Jenkinsfile fixes, back scaled to 3 servers, nginx conf improved
|
2019-02-01 11:46:54 +01:00 |
|
Gerard
|
48aa29c4a3
|
updated stowaway icon
|
2019-02-01 11:42:31 +01:00 |
|
Gerard
|
329453ed0d
|
deleted trigger from vn.2008expeditions
|
2019-02-01 11:19:26 +01:00 |
|
Juan Ferrer
|
3f08ab1b22
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-02-01 11:06:39 +01:00 |
|
Juan Ferrer
|
c89090dba4
|
nginx config fixed for 404
|
2019-02-01 11:06:23 +01:00 |
|
Juan Ferrer
|
a56a715331
|
Jenkins fixes
|
2019-02-01 09:48:23 +01:00 |
|
Juan Ferrer
|
17d7945065
|
Nginx config fix for 404
|
2019-02-01 09:47:52 +01:00 |
|
Juan Ferrer
|
6290e9e33f
|
Jenkinsfile omit test step when branch not dev
|
2019-02-01 09:44:00 +01:00 |
|
Carlos Jimenez Ruiz
|
2ac6342838
|
test fixed for fixtures dates
|
2019-02-01 09:43:30 +01:00 |
|
Juan Ferrer
|
13ec9006a9
|
Nginx redirect to main page on 404 errors
|
2019-02-01 09:37:20 +01:00 |
|
Juan Ferrer
|
e63e4319cd
|
Worker module fixes
|
2019-02-01 09:31:01 +01:00 |
|
Carlos Jimenez Ruiz
|
fd4205f9ab
|
#1069
|
2019-01-31 17:01:33 +01:00 |
|
Carlos Jimenez Ruiz
|
a288f9efd9
|
removed unused file
|
2019-01-31 15:06:12 +01:00 |
|
Carlos Jimenez Ruiz
|
8e6d38ab31
|
#1069 mostrar el nickname en los sitios donde aparezca nombre solo
|
2019-01-31 14:58:14 +01:00 |
|
Carlos Jimenez Ruiz
|
d109e480a9
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-01-31 14:14:52 +01:00 |
|
Carlos Jimenez Ruiz
|
00ccf9a4a0
|
#1069 mostrar el nickname en los sitios donde aparezca nombre solo
|
2019-01-31 14:14:39 +01:00 |
 Joan Sanchez
|
1bcaf27563
|
changed currency filter, fixed tag value errors
|
2019-01-31 11:44:03 +01:00 |
|
Gerard
|
aac96f4b87
|
#1080 fallos de estilos en order prices-popover
|
2019-01-31 11:26:03 +01:00 |
|
Joan Sanchez
|
e74b7e3118
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-01-31 09:48:11 +01:00 |
|
Joan Sanchez
|
a49d937fd9
|
ita-tag validation error + home shortcuts
|
2019-01-31 09:47:52 +01:00 |
|
Bernat
|
0ca4881fdd
|
fix test
|
2019-01-31 09:12:45 +01:00 |
|
Bernat
|
19cfa1ab75
|
upadte structure db and models
|
2019-01-31 09:12:29 +01:00 |
|
Bernat
|
cd89550678
|
#9670 export acl fix test
|
2019-01-31 09:10:40 +01:00 |
|
Joan Sanchez
|
9cb97662d7
|
removed developer role from agency module
|
2019-01-31 07:20:36 +01:00 |
|
Joan Sanchez
|
15f43c248e
|
agency module ACL's
|
2019-01-31 07:18:07 +01:00 |
 Javi Gallego
|
4fb9d9a3f9
|
autocomplete bug CR juan
|
2019-01-31 07:08:26 +01:00 |
|
Juan Ferrer
|
6bd4b94f11
|
Karma test fixed
|
2019-01-31 01:05:02 +01:00 |
|
Juan Ferrer
|
82d81e0ab9
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-01-31 00:56:48 +01:00 |
|
Juan Ferrer
|
6074c52202
|
Style fixes
|
2019-01-31 00:43:49 +01:00 |
|
Juan Ferrer
|
70fc851841
|
Style fixes
|
2019-01-31 00:39:40 +01:00 |
|
Juan Ferrer
|
8132518186
|
e2e extension fixes
|
2019-01-31 00:34:49 +01:00 |
|
Juan Ferrer
|
f643261a85
|
Styles fixed, change language moved to user config popover
|
2019-01-31 00:33:43 +01:00 |
|
Juan Ferrer
|
1dc8cafc73
|
Style & translation fixes
|
2019-01-30 23:47:06 +01:00 |
|
Carlos Jimenez Ruiz
|
f27ca4ce3b
|
#1069 descriptor de claim
|
2019-01-30 16:03:29 +01:00 |
|
Carlos Jimenez Ruiz
|
f4e202dc62
|
#1069 index now show nicknames
|
2019-01-30 15:10:52 +01:00 |
|
Carlos Jimenez Ruiz
|
a48fa07cad
|
#1069 activeWrokersWithRole now returns the nickname
|
2019-01-30 14:27:35 +01:00 |
|
Carlos Jimenez Ruiz
|
b64609f3a5
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-01-30 14:25:13 +01:00 |