Commit Graph

8275 Commits

Author SHA1 Message Date
gerard 25d9655c0c Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-06-20 14:17:26 +02:00
gerard b22e41c983 Bug #137 Refactorización Textfield 2018-06-20 14:15:14 +02:00
Joan Sanchez 723ea3f57b model saleTracking 2018-06-20 12:47:43 +02:00
gerard 37e52b54b0 Tarea #333 Ultimas Entradas 2018-06-20 12:30:59 +02:00
gerard b8ff2dbb0a Tarea #333 Ultimas Entradas 2018-06-20 12:29:30 +02:00
gerard 42eacd4905 Tarea #333 Ultimas Entradas 2018-06-20 11:39:29 +02:00
gerard eebb19cceb Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-06-20 10:21:42 +02:00
gerard 2301c3663f Bug #137 Refactorización Textfield 2018-06-20 10:21:27 +02:00
Juan e33df7098d Merge branch 'test' into dev 2018-06-20 09:54:10 +02:00
Juan 6e137283ec salesPerson filter fixed 2018-06-20 09:53:13 +02:00
Bernat 377332a4d7 update procedure itemLastEntries 2018-06-20 09:48:08 +02:00
Joan Sanchez 9037636de5 one-binding changed to two-way binding on finished date. 2018-06-20 09:16:15 +02:00
gerard 97c994b3e0 Bug #137 Refactorización Textfield 2018-06-20 08:41:59 +02:00
Bernat 2eeaf9e66b create new modul 'pedidos' update structure DB, fixtures, add hedera to the package and create model Order and orderRow 2018-06-20 08:30:16 +02:00
Joan Sanchez 0ab7d09a41 Hour translation 2018-06-19 14:37:56 +02:00
Joan Sanchez 8f6a88f9b6 Display sale taxes #342 2018-06-19 12:10:38 +02:00
Joan Sanchez 0822f3ce53 back-end tests updated 2018-06-19 09:20:14 +02:00
Joan Sanchez db5457420d Mark/Unmark sale as reserved #349 2018-06-19 09:09:49 +02:00
gerard 8448d76ebe Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-06-19 09:06:22 +02:00
gerard f2596af6b8 Dropdown ahora acepta traducciones CR Juan 2018-06-19 09:06:04 +02:00
Joan Sanchez 8cd0a5a9e2 stackable snackbar. Updated E2E #357 2018-06-19 08:12:36 +02:00
gerard 1ecb3f3d2b Bug #358 Credit create no da un error comprensible 2018-06-18 13:41:49 +02:00
gerard 532d20cd7f Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-06-18 12:04:10 +02:00
gerard 5c92dc4216 Bug solved 2018-06-18 12:03:39 +02:00
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