Commit Graph

5817 Commits

Author SHA1 Message Date
Joan Sanchez 3af26900e3 watcher preventing claim creation
gitea/salix/dev This commit looks good Details
2019-09-24 11:55:36 +02:00
Joan Sanchez 5851784e41 Create new order now opens on new window
gitea/salix/dev This commit looks good Details
2019-09-24 11:41:00 +02:00
Joan Sanchez 310f2bae70 Create new order now opens on new window
gitea/salix/master This commit looks good Details
gitea/salix/test This commit looks good Details
2019-09-24 11:35:46 +02:00
Joan Sanchez e6f6c262fa Merge branch 'dev' into test
gitea/salix/test This commit looks good Details
gitea/salix/master This commit looks good Details
2019-09-24 10:43:16 +02:00
Juan Ferrer a319eed5f6 Zone.getLeaves() refactor
gitea/salix/dev This commit looks good Details
2019-09-24 10:41:25 +02:00
Juan Ferrer 4b58078798 Zone.getLeaves refactor & fixes 2019-09-24 10:38:07 +02:00
Juan Ferrer 52a6221b59 recover getLeaves 2019-09-24 10:38:05 +02:00
Carlos Jimenez Ruiz 1cc8b5512e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-09-24 09:31:20 +02:00
Carlos Jimenez Ruiz 25165792c8 #1680 left-menu descriptor scrollbar overlap 2019-09-24 09:29:57 +02:00
Joan Sanchez 4ff8b760b6 Merge branch 'dev' into test
gitea/salix/test This commit looks good Details
gitea/salix/master This commit looks good Details
2019-09-24 08:51:41 +02:00
Joan Sanchez 15183df65f transfer sales error fixed
gitea/salix/dev This commit looks good Details
2019-09-24 08:51:21 +02:00
Joan Sanchez 314b609060 fixed family translation
gitea/salix/dev This commit looks good Details
2019-09-24 08:34:14 +02:00
Joan Sanchez 059a72a719 Merge branch 'dev' into test
gitea/salix/test This commit looks good Details
gitea/salix/master This commit looks good Details
2019-09-24 08:20:17 +02:00
Joan Sanchez e52be911cf Merge branch 'dev' into test
gitea/salix/test This commit looks good Details
gitea/salix/master This commit looks good Details
2019-09-24 07:48:13 +02:00
Joan Sanchez a091674f08 allowed numbers on fiscal name
gitea/salix/dev This commit looks good Details
2019-09-24 07:47:06 +02:00
Joan Sanchez 7f33f4c56e fixed salixfront deletedTicket icon
gitea/salix/dev This commit looks good Details
2019-09-24 07:25:22 +02:00
Joan Sanchez 8e52a6043f fixed salixfront deletedTicket icon
gitea/salix/test This commit looks good Details
gitea/salix/master This commit looks good Details
2019-09-24 07:24:17 +02:00
Joan Sanchez f563833630 Merge branch 'dev' into test 2019-09-24 07:21:57 +02:00
Carlos Jimenez Ruiz 6c1fdb444a removed fdescribe
gitea/salix/dev This commit looks good Details
2019-09-24 07:03:22 +02:00
Joan Sanchez bd8a1ee00e merge with dev
gitea/salix/test This commit looks good Details
2019-09-23 15:02:27 +02:00
Joan Sanchez 6910e6048b fixed sql
gitea/salix/dev This commit looks good Details
2019-09-23 14:50:30 +02:00
Joan Sanchez f2d9323c4f Deprecated ticketCalculate
gitea/salix/dev This commit looks good Details
2019-09-23 14:47:27 +02:00
Joan Sanchez e55b8b7b6b precio por kilo #1690
gitea/salix/dev This commit looks good Details
2019-09-23 14:41:54 +02:00
Carlos Jimenez Ruiz 695ff14b60 removed the tests index used by karma (deprecated)
gitea/salix/dev This commit looks good Details
2019-09-23 14:17:44 +02:00
Carlos Jimenez Ruiz 12ece820ee karma removed from integration tests
gitea/salix/dev This commit looks good Details
2019-09-23 14:02:30 +02:00
Carlos Jimenez Ruiz a48b3b31b7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev There was a failure building this commit Details
2019-09-23 13:55:28 +02:00
Carlos Jimenez Ruiz bcceb94e40 deprecated Karma 2019-09-23 13:55:19 +02:00
Joan Sanchez aad0d09394 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev There was a failure building this commit Details
2019-09-23 09:34:25 +02:00
Bernat a60e31ea13 delete wait(1999) in e2e
gitea/salix/dev There was a failure building this commit Details
2019-09-23 09:31:20 +02:00
Joan Sanchez 36d7e514ff Allow spanish characters on socialName #1712 2019-09-23 09:27:58 +02:00
Bernat e421a95145 #1709 arreglar e2e order
gitea/salix/dev There was a failure building this commit Details
2019-09-23 08:17:21 +02:00
Carlos Jimenez Ruiz 0f04aed2fe #1670 Crear icono isDeleted para ticket.descriptor
gitea/salix/dev There was a failure building this commit Details
2019-09-20 17:20:54 +02:00
Carlos Jimenez Ruiz 7bcc908708 #1704 item.basicData
gitea/salix/dev There was a failure building this commit Details
2019-09-20 16:39:20 +02:00
Carlos Jimenez Ruiz b0e5b46245 #969 componente vnSearchBar front test
gitea/salix/dev There was a failure building this commit Details
2019-09-20 09:35:12 +02:00
Juan Ferrer 7a44152a5c Merge branch 'master' into test
gitea/salix/test There was a failure building this commit Details
2019-09-19 18:00:57 +02:00
Juan Ferrer 6d50012fab agency.location fixes
gitea/salix/master This commit looks good Details
2019-09-19 18:00:40 +02:00
Juan Ferrer f260af12da Merge branch 'master' into test 2019-09-19 17:50:12 +02:00
Juan Ferrer 40c555702d Zone.getLeaves() refactor
gitea/salix/master This commit looks good Details
2019-09-19 17:49:46 +02:00
Juan Ferrer 2dd1420b5c Merge branch 'master' into test
gitea/salix/test This commit looks good Details
2019-09-19 17:30:42 +02:00
Juan Ferrer 05fec10cf2 Zone.getLeaves refactor & fixes
gitea/salix/master This commit looks good Details
2019-09-19 17:30:16 +02:00
Juan Ferrer 3efc1e766e Merge with master
gitea/salix/test This commit looks good Details
2019-09-19 15:55:06 +02:00
Juan Ferrer e0ffef70b1 Method ZoneGeo.getLeaves optimized
gitea/salix/master This commit looks good Details
2019-09-19 15:51:39 +02:00
Juan Ferrer afb06dd4a5 #1167 Fixed
gitea/salix/dev There was a failure building this commit Details
2019-09-19 12:32:34 +02:00
Joan Sanchez e17f708ea5 removed duplicated code
gitea/salix/test This commit looks good Details
2019-09-19 12:30:37 +02:00
Joan Sanchez 7daf2e4328 merge with master
gitea/salix/test This commit looks good Details
2019-09-19 11:48:41 +02:00
Joan Sanchez d6d825ebf1 fixed automerge
gitea/salix/master This commit looks good Details
2019-09-19 10:52:23 +02:00
Joan Sanchez f67006e526 changed fiscal name translation
gitea/salix/master This commit looks good Details
2019-09-19 09:44:50 +02:00
Joan Sanchez 9ce18fbd0a double start pick 2019-09-19 09:44:18 +02:00
Joan Sanchez 4d894365eb Fixed production errors #1699 2019-09-19 09:42:41 +02:00
Joan Sanchez 8cb10759d3 updated transactions 2019-09-19 09:42:32 +02:00