Commit Graph

19715 Commits

Author SHA1 Message Date
Gerard 72a4a96f6c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-02-26 09:55:19 +01:00
Bernat 4e2af7943c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-02-26 08:54:51 +01:00
Gerard 43f26d1bc9 input number now has a option to hide the controls
gitea/salix/test This commit looks good Details
2019-02-25 15:56:42 +01:00
Gerard 65bcae3cfd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-02-25 15:53:05 +01:00
Joan Sanchez 2862501475 Merge branch 'test' into dev
gitea/salix/dev This commit looks good Details
2019-02-25 15:08:42 +01:00
Carlos Jimenez Ruiz 4b37b0fc1e #1155 item.index añadir grouping y packing
gitea/salix/dev This commit looks good Details
2019-02-25 14:55:06 +01:00
Carlos Jimenez Ruiz 65d844152c removed a comma 2019-02-25 14:11:16 +01:00
Joan Sanchez 6068ede6ee removed offset from agency module
gitea/salix/test This commit looks good Details
2019-02-25 14:02:47 +01:00
Gerard 699757543a Merge branch 'test' into dev 2019-02-25 13:46:56 +01:00
Juan Ferrer 94e2f933e9 Docker file fix: install print modules
gitea/salix/test This commit looks good Details
2019-02-25 13:41:56 +01:00
Gerard 8a137e7713 grouping and packing added
gitea/salix/dev This commit looks good Details
2019-02-25 13:40:53 +01:00
Carlos Jimenez Ruiz 0be9458672 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-02-25 13:07:39 +01:00
Carlos Jimenez Ruiz b5f29954ed #796 Test front left-menu.js 2019-02-25 13:07:32 +01:00
Joan Sanchez 353cd2110b added CET timezone to dockerfile
gitea/salix/test This commit looks good Details
2019-02-25 12:52:23 +01:00
Gerard 68aaade0a9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-02-25 12:37:20 +01:00
Joan Sanchez 23ed5e4ddf added offset calendar remove selection
gitea/salix/test This commit looks good Details
2019-02-25 12:22:04 +01:00
Bernat 8743f74c82 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-02-25 12:14:32 +01:00
Bernat 37e7ec5de1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-02-25 12:13:42 +01:00
Carlos Jimenez Ruiz 6d70a45f41 added a comma becouse becouse
gitea/salix/dev This commit looks good Details
2019-02-25 12:08:16 +01:00
Bernat 7ea20833e2 testing gitea 2019-02-25 12:03:47 +01:00
Joan Sanchez 7a7b2c67d0 offset changes
gitea/salix/test This commit looks good Details
2019-02-25 11:55:59 +01:00
Carlos Jimenez Ruiz 11a2be6ac4 #882 e2e claim.action
gitea/salix/dev This commit looks good Details
2019-02-25 11:47:28 +01:00
Joan Sanchez dd4f4e39fb date offset
gitea/salix/test This commit looks good Details
2019-02-25 11:40:50 +01:00
Carlos Jimenez Ruiz 4709a55b8f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-02-25 11:38:18 +01:00
Joan Sanchez a389ca46a2 calendar offset
gitea/salix/test This commit looks good Details
2019-02-25 11:32:29 +01:00
Gerard 2872dcdd3e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-02-25 10:10:47 +01:00
Gerard 007139f2f6 added disable property 2019-02-25 10:10:44 +01:00
Joan Sanchez 559a9fe96f Merge branch 'test' into dev
gitea/salix/dev This commit looks good Details
2019-02-25 10:04:53 +01:00
Joan Sanchez 5ec352b71a fixed vn-mysql time offset
gitea/salix/test This commit looks good Details
2019-02-25 10:04:11 +01:00
Joan Sanchez ac1e619b06 fixed zone bugs 2019-02-25 10:03:50 +01:00
Gerard 54a835eefd added disabled property 2019-02-25 09:50:51 +01:00
Carlos Jimenez Ruiz f6a5fb106f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-02-25 09:35:08 +01:00
Carlos Jimenez Ruiz 69c5c8f1cd #485 2019-02-25 09:28:25 +01:00
Bernat 6e23b5bcc0 update structure db cau 9939
gitea/salix/dev This commit looks good Details
2019-02-25 08:49:08 +01:00
Bernat 45527a43da cau 9939 refactor db/changes files and update structure db 2019-02-25 08:25:53 +01:00
Bernat 04280c5b5a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-02-25 08:10:38 +01:00
Juan Ferrer 5617b59f5a Merge branch 'test' into dev 2019-02-22 21:23:12 +01:00
Juan Ferrer c3f20dba3c Small fix
gitea/salix/test This commit looks good Details
gitea/salix/master This commit looks good Details
2019-02-22 17:23:03 +01:00
Juan Ferrer ba62f545f7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-02-22 16:17:08 +01:00
Juan Ferrer 26419e75c9 Style fixes
gitea/salix/test This commit looks good Details
2019-02-22 16:15:54 +01:00
Juan Ferrer 961eb6edaf Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/test This commit looks good Details
2019-02-22 14:38:45 +01:00
Juan Ferrer 9fc6a2c4c2 Style fixes 2019-02-22 14:34:11 +01:00
Gerard ea9d194368 traduction added
gitea/salix/test This commit looks good Details
2019-02-22 13:18:53 +01:00
Gerard 84b36b601c Merge branch 'test' into dev
gitea/salix/dev This commit looks good Details
2019-02-22 12:43:41 +01:00
Gerard 9370142731 styles fixed
gitea/salix/test This commit looks good Details
2019-02-22 12:43:08 +01:00
Bernat b9dd605c77 udate structure db 2019-02-22 12:38:27 +01:00
Gerard 6364239d8a #1152 updated td-editable
gitea/salix/dev This commit looks good Details
2019-02-22 12:27:56 +01:00
Gerard 35d4c99e53 Merge branch 'test' into dev
gitea/salix/dev This commit looks good Details
2019-02-22 11:30:50 +01:00
Gerard 6c46400d3d checkbox styles fixed
gitea/salix/test This commit looks good Details
2019-02-22 08:52:30 +01:00
Gerard 86b3407e35 item barcode to item created
gitea/salix/test This commit looks good Details
2019-02-22 08:32:18 +01:00