Commit Graph

7296 Commits

Author SHA1 Message Date
Joan Sanchez ea5a337942 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/test This commit looks good Details
2020-02-14 08:16:14 +01:00
Joan Sanchez bba6c9be15 Return response when the sender equals recipient
gitea/salix/master This commit looks good Details
2020-02-14 07:53:13 +01:00
Carlos Jimenez Ruiz 2d2aea5ea3 Merge branch '2094-claim_send_chat' of verdnatura/salix into dev
gitea/salix/dev This commit has test failures Details
2020-02-13 22:54:22 +00:00
Joan Sanchez fd45c41210 removed focus
gitea/salix/2094-claim_send_chat This commit looks good Details
2020-02-13 15:01:24 +01:00
Joan Sanchez 5360c407d5 updated unit test
gitea/salix/2094-claim_send_chat This commit looks good Details
2020-02-13 14:46:18 +01:00
Joan Sanchez be07e33e5f updated unit test
gitea/salix/2094-claim_send_chat This commit looks good Details
2020-02-13 14:39:33 +01:00
Joan Sanchez 39470e837b 2094 Regularize claim send chat even if doesn't have destination
gitea/salix/2094-claim_send_chat This commit looks good Details
2020-02-13 13:20:31 +01:00
Joan Sanchez c5840f322f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 845-order_catalog_datalist
gitea/salix/845-order_catalog_datalist This commit looks good Details
2020-02-13 11:38:18 +01:00
Joan Sanchez df873b4ac0 added datalist to catalog filter
gitea/salix/845-order_catalog_datalist This commit looks good Details
2020-02-13 11:05:00 +01:00
Joan Sanchez fe91ca080e Merge branch '2002-e2e-client-summary' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2020-02-13 10:00:17 +00:00
Joan Sanchez c45ce23cd6 Merge branch '2105-export_structure_db' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2020-02-13 08:55:13 +00:00
Carlos Jimenez Ruiz 845e01c8dd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2002-e2e-client-summary
gitea/salix/2002-e2e-client-summary This commit looks good Details
2020-02-13 09:47:14 +01:00
Carlos Jimenez Ruiz f7dc279489 #2002 e2e client.summary 2020-02-13 09:47:05 +01:00
Bernat Exposito Domenech b78858eb7c export structure db
gitea/salix/2105-export_structure_db This commit looks good Details
2020-02-13 09:30:18 +01:00
Bernat Exposito Domenech 1887cc8c60 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2105-export_structure_db 2020-02-13 08:44:25 +01:00
Bernat Exposito e1bb3649de Merge branch '2079-acl_update_ticket_weekly' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2020-02-13 07:39:17 +00:00
Bernat Exposito Domenech 4b48a89eaa ticket descriptor update acl
gitea/salix/2079-acl_update_ticket_weekly This commit looks good Details
2020-02-13 08:31:29 +01:00
Bernat Exposito a3e0d0d628 Merge branch '2006-e2e-route-summary' of verdnatura/salix into dev
gitea/salix/dev There was a failure building this commit Details
2020-02-13 06:24:51 +00:00
Bernat Exposito Domenech 4abf87552d db production exported 2020-02-12 14:38:51 +01:00
Carlos Jimenez Ruiz 2a7f826cf6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2006-e2e-route-summary
gitea/salix/2006-e2e-route-summary This commit looks good Details
2020-02-12 14:36:14 +01:00
Carlos Jimenez Ruiz e8a178d5f4 #2006 e2e route.summary plus refactors 2020-02-12 14:36:05 +01:00
Carlos Jimenez Ruiz 5b03cadb3c Merge branch '2060-report_route_driver' of verdnatura/salix into dev
gitea/salix/dev There was a failure building this commit Details
2020-02-12 13:14:53 +00:00
Carlos Jimenez Ruiz 8002fa459b Merge branch '1893-dbTest_ticket_recalcComponents' of verdnatura/salix into dev
gitea/salix/dev There was a failure building this commit Details
2020-02-12 13:13:56 +00:00
Bernat Exposito Domenech 2be5e04a39 changed title in report driver-route
gitea/salix/2060-report_route_driver This commit looks good Details
2020-02-12 13:20:08 +01:00
Bernat Exposito Domenech e0f7b917d7 db test ticket_recalcComponent
gitea/salix/1893-dbTest_ticket_recalcComponents This commit looks good Details
2020-02-12 10:39:46 +01:00
Bernat Exposito 679ee97337 Merge branch '2024-e2e-travel-thermograph' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2020-02-12 06:50:20 +00:00
Carlos Jimenez Ruiz 752621fbf6 removed unused timout arg
gitea/salix/2024-e2e-travel-thermograph This commit looks good Details
2020-02-12 07:31:46 +01:00
Carlos Jimenez Ruiz 14cee74ae2 #2024 e2e travel.thermograph + refactors
gitea/salix/2024-e2e-travel-thermograph This commit looks good Details
2020-02-12 07:21:53 +01:00
Joan Sanchez c78c154ab0 Added datalist
gitea/salix/845-order_catalog_datalist This commit looks good Details
2020-02-11 14:41:59 +01:00
Joan Sanchez cbc5ea7a00 Merge branch '1910-informe_consumo' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2020-02-11 12:58:28 +00:00
Bernat Exposito Domenech 5375952778 translate
gitea/salix/1910-informe_consumo This commit looks good Details
2020-02-11 13:52:05 +01:00
Bernat Exposito Domenech 1d73d9f89d refactor campaing report
gitea/salix/1910-informe_consumo This commit looks good Details
2020-02-11 13:25:41 +01:00
Joan Sanchez e8ae2f5767 Merge branch '1996-datalist_component' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2020-02-11 11:00:18 +00:00
Joan Sanchez 294e11f848 changes
gitea/salix/1996-datalist_component This commit looks good Details
2020-02-11 11:53:26 +01:00
Joan Sanchez dbcc641016 1996 - Datalist component 2020-02-11 11:34:54 +01:00
Joan Sanchez 3a662782d6 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2020-02-11 10:56:02 +01:00
Joan Sanchez 9c419c8863 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/test This commit looks good Details
2020-02-11 09:45:55 +01:00
Joan Sanchez df21309e0a Changes
gitea/salix/master This commit looks good Details
2020-02-11 09:41:09 +01:00
Joan Sanchez d481b0c71f 2093 - Mention destinatary sending to department room 2020-02-11 09:40:57 +01:00
Joan Sanchez 375807dec4 2089 - Removed mention from message 2020-02-11 09:40:42 +01:00
Joan Sanchez a82f7d7584 #2083 Login on auth error 2020-02-11 09:40:02 +01:00
Carlos Jimenez Ruiz 420f059211 Merge branch '1684-ticket_transfer_salesLog' of verdnatura/salix into dev
gitea/salix/dev There was a failure building this commit Details
2020-02-11 08:30:08 +00:00
Carlos Jimenez Ruiz 5313ffff2e Merge branch '2093-chat_mention_destinatary' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2020-02-11 08:24:54 +00:00
Joan Sanchez 7b958ba929 Changes
gitea/salix/2093-chat_mention_destinatary This commit looks good Details
2020-02-11 09:14:40 +01:00
Joan Sanchez f350158806 2093 - Mention destinatary sending to department room
gitea/salix/2093-chat_mention_destinatary There was a failure building this commit Details
2020-02-11 09:00:06 +01:00
Joan Sanchez 91210c3a0d 1684 - Log old quantity value
gitea/salix/1684-ticket_transfer_salesLog This commit looks good Details
2020-02-11 08:19:03 +01:00
Joan Sanchez f2fdce11cd Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2020-02-10 14:54:59 +01:00
Joan Sanchez 8ad2344735 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/test This commit looks good Details
2020-02-10 14:54:21 +01:00
Bernat Exposito Domenech d26597c395 fix ticket.sale sms
gitea/salix/master This commit looks good Details
2020-02-10 14:34:53 +01:00
Bernat Exposito Domenech d1c8c8ad58 ticket/client.sms validations 2020-02-10 14:33:38 +01:00