Commit Graph

5000 Commits

Author SHA1 Message Date
Joan Sanchez 353dc38e48 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-02-05 11:08:04 +01:00
Bernat b2dc6ce8c6 #9746 update structure db 2019-02-05 10:48:33 +01:00
Bernat 7ce54d223a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-02-05 09:49:52 +01:00
Bernat 2c9a10f277 update structure db #9764 2019-02-05 09:49:33 +01:00
Juan Ferrer 1355fb80e4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-02-05 09:47:45 +01:00
Gerard 8f575fbc45 strings added to the locale 2019-02-05 09:37:01 +01:00
Gerard 6c2fe1d4a3 #1036 order.line 2019-02-05 09:27:01 +01:00
Joan Sanchez d87e2dbbf0 fixed order item category filter #1079 2019-02-05 09:21:29 +01:00
Juan Ferrer 8f72fbad23 Merge 2019-02-05 09:14:22 +01:00
Juan Ferrer 1dbb75a1b8 vnSideMenu, vnBackground, style fixes 2019-02-05 09:13:15 +01:00
Bernat 3a7413dda1 update acl 2019-02-05 08:44:56 +01:00
Joan Sanchez 333d853335 fixed print translations bug 2019-02-05 07:58:05 +01:00
Carlos Jimenez Ruiz d463130515 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-02-04 15:41:06 +01:00
Carlos Jimenez Ruiz ee62ecc843 #1051 task update plus e2e fixes 2019-02-04 15:40:57 +01:00
Joan Sanchez bce67487c1 catalog filter requery fix #1034 2019-02-04 15:21:10 +01:00
Carlos Jimenez Ruiz ef27606047 #1087 Implementar clickIfVisible 2019-02-04 14:47:55 +01:00
Gerard de654f270f Merge branch 'test' into dev 2019-02-04 12:55:27 +01:00
Gerard a19745a3e3 Merge branch 'master' into test 2019-02-04 12:52:58 +01:00
Gerard 3869742fd7 #1088 ticket.descriptor añadir polizon interval server error 2019-02-04 12:41:38 +01:00
Gerard 879c9b8877 #1093 ticket.descriptor ha dejado de funcionar en el modulo item 2019-02-04 12:24:47 +01:00
Joan Sanchez af6a9d8022 fixed zone treeview bugs 2019-02-04 12:14:07 +01:00
Joan Sanchez 7986405a72 added sepa-core & letter-debtor 2019-02-04 10:10:57 +01:00
Bernat e1207edb95 #9699 update structure and create new model 2019-02-04 07:42:12 +01:00
Juan Ferrer 84c0002cb1 Hot bugs fixed 2019-02-01 17:11:14 +01:00
Gerard 89826182c2 bugs with some elements not showing fixed 2019-02-01 13:52:26 +01:00
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