Commit Graph

2600 Commits

Author SHA1 Message Date
Javi Gallego af925de00c Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-06-18 07:26:12 +02:00
Juan 0aa4b8bba3 Merge branch 'test' into dev 2018-06-12 17:17:59 +02:00
Juan 3174f37e3e Routes fixed to use HTTPS 2018-06-12 17:17:40 +02:00
Juan cd94460168 Merge branch 'test' into dev 2018-06-12 17:01:56 +02:00
Juan cde2458404 nginx SSL 2018-06-12 14:38:27 +02:00
Juan e053515997 Config volume on all containers 2018-06-12 13:45:20 +02:00
Juan 1eb218cbab Compose fixes 2018-06-12 13:01:50 +02:00
Juan a227ea31c2 Compose fixes 2018-06-12 12:47:09 +02:00
Juan 40a4e83f0a Compose version increased 2018-06-12 12:31:07 +02:00
Juan 8b474f4464 Gulp composer bugs fixed 2018-06-12 12:04:15 +02:00
Juan a1aef51f3c Compose service tag label 2018-06-12 11:59:34 +02:00
Juan 320b18551e Composer sintax bugs fixed 2018-06-12 11:39:50 +02:00
Juan f24395f074 Lavels to compose services 2018-06-12 11:24:43 +02:00
Juan bfb89690d6 Jenkinsfile small fixes 2018-06-12 09:00:40 +02:00
Juan 8dbbaafa47 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-06-11 21:03:56 +02:00
Juan 2c9bbcd571 Deploy fixes 2018-06-11 21:01:55 +02:00
Juan 166d4ab242 Jenkinsfile bugs fixed 2018-06-11 20:22:25 +02:00
Juan ab830ae526 Jenkins bugs fixed 2018-06-11 20:21:50 +02:00
Juan e93cbda6d0 Zero deploy downtime, deploy speed improved 2018-06-11 20:19:18 +02:00
Juan a860873819 Deploy speed inprovements 2018-06-11 14:03:40 +02:00
Juan 0c7b1084f8 Jenkinsfile bugs fixed 2018-06-11 12:56:17 +02:00
Juan f2b9ba41bc Jenkinsfile stages removed 2018-06-11 12:51:32 +02:00
Juan 281f539aea Improved deploy speed 2018-06-11 12:31:11 +02:00
Juan 9004173f15 Jenkinsfile sintax fixed 2018-06-11 09:35:21 +02:00
Juan d83072cee7 Deploy: COMPOSER_HTTP_TIMEOUT increased 2018-06-11 09:33:41 +02:00
Juan bf909c6620 Deploy bugs solved 2018-06-11 09:09:47 +02:00
Javi Gallego 64da648a2f Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-06-11 08:01:43 +02:00
Javi Gallego 80b98f14e5 traduccion grade 2018-06-09 12:15:16 +02:00
Javi Gallego 1b4c97fa6a Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-06-09 11:56:29 +02:00
Javi Gallego 9e0e97db66 traduccion order 2018-06-09 11:56:05 +02:00
Juan 240f080de3 Icons updated, test fixed, paging rows adjusted 2018-06-08 13:26:06 +02:00
Juan 2951a737a7 Merge 2018-06-07 23:56:16 +02:00
Juan 9fa12d4baf Automatic pagination with vnPagination, improved vnSearchbar 2018-06-07 23:47:19 +02:00
Javi Gallego e891d7f3e6 traducciones 2018-06-07 13:31:52 +02:00
Bernat 61eb0d1551 update structure DB 2018-06-07 07:19:27 +02:00
Bernat 905122c864 update structure DB 2018-06-07 07:11:43 +02:00
gerard 8c34dba79e Tarea #296 seccion ticket.line menu de mover lineas 2018-06-06 16:54:40 +02:00
Bernat 16a9201302 update structure db 2018-06-06 15:08:22 +02:00
Bernat f7930ad664 update structure and fixtures 2018-06-06 14:49:31 +02:00
Bernat bde61a8509 update structure DB 2018-06-06 14:28:15 +02:00
Bernat 5c00931952 update ticket state 2018-06-06 09:32:00 +02:00
Bernat 0931cf2906 update structure DB 2018-06-05 12:49:33 +02:00
Bernat 8b7710746b update structure BD and clone.js error 2018-06-05 08:24:53 +02:00
gerard 5e28d0485c removed duplicated model 2018-06-04 12:00:47 +02:00
gerard 689a04e21e Bug #319 Arreglar colores segun nuevas directivas de paco 2018-06-04 11:57:27 +02:00
gerard 89c9af878f Tarea #316 Nuevo formulario del registro de compra-venta 2018-06-04 10:02:17 +02:00
gerard e0256ccbf0 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-06-04 09:48:52 +02:00
gerard c0c3925470 Tarea #316 Nuevo formulario del registro de compra-venta 2018-06-04 09:48:32 +02:00
Bernat 61137e214b update itemDiary procedure 2018-06-04 08:41:58 +02:00
Bernat 7f99d370f3 update fixtures tbl buy tblContadores and container 2018-06-01 12:36:20 +02:00