Commit Graph

6604 Commits

Author SHA1 Message Date
Joan Sanchez e55645486a Merge branch '2020-worker_index' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2020-02-03 13:10:46 +00:00
Bernat Exposito Domenech 759ac5b5c7 add icon in worker.index
gitea/salix/2020-worker_index This commit looks good Details
2020-02-03 14:03:09 +01:00
Joan Sanchez 5d56ed8f88 Merge branch '2071-ticket_sale_split' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2020-02-03 11:44:49 +00:00
Bernat Exposito Domenech 0681f5efc8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2071-ticket_sale_split
gitea/salix/2071-ticket_sale_split This commit looks good Details
2020-02-03 11:12:09 +01:00
Bernat Exposito Domenech 668f20c433 update lastActiveTickets 2020-02-03 11:12:04 +01:00
Joan Sanchez 2c2e4548d8 Merge branch '2039-ticket_basicData' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2020-02-03 08:41:59 +00:00
Bernat Exposito Domenech 6265796260 add icon in ticket.basicData
gitea/salix/2039-ticket_basicData This commit looks good Details
2020-02-03 09:24:49 +01:00
Carlos Jimenez Ruiz bfd91d2918 Merge branch '2064-catalog_refactor' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2020-01-30 13:59:04 +00:00
Joan Sanchez 43693c35ad removed fdescribe
gitea/salix/2064-catalog_refactor This commit looks good Details
2020-01-30 14:35:21 +01:00
Joan Sanchez 8f851d5c15 refactor
gitea/salix/2064-catalog_refactor This commit looks good Details
2020-01-30 13:53:14 +01:00
Joan Sanchez 31349b2ebf Merge branch 'test' into dev
gitea/salix/dev This commit looks good Details
2020-01-30 11:54:51 +01:00
Joan Sanchez 71576fdaf9 Merge branch 'fixGetWorkerHours' of verdnatura/salix into master
gitea/salix/master This commit looks good Details
gitea/salix/test This commit looks good Details
2020-01-30 10:38:41 +00:00
Bernat Exposito Domenech c07d5f337a fix getWorkerdHours
gitea/salix/fixGetWorkerHours This commit looks good Details
2020-01-30 11:20:41 +01:00
Joan Sanchez 3164b7dbee Merge branch '2003-adress_validate_uee_members' of verdnatura/salix into dev
gitea/salix/dev This commit has test failures Details
2020-01-30 09:51:11 +00:00
Joan Sanchez 1be640a59d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2003-adress_validate_uee_members
gitea/salix/2003-adress_validate_uee_members This commit has test failures Details
2020-01-29 14:51:37 +01:00
Joan Sanchez c174d0a29e acl fix
gitea/salix/2003-adress_validate_uee_members This commit looks good Details
2020-01-29 14:50:53 +01:00
Juan Ferrer 777a2e5fed Prevent index caching, automatic docker ports
gitea/salix/master This commit looks good Details
2020-01-29 14:43:15 +01:00
Joan Sanchez 499bd082fc changed messages
gitea/salix/2003-adress_validate_uee_members This commit looks good Details
2020-01-29 14:13:25 +01:00
Joan Sanchez 5ebe800c5f html fix
gitea/salix/master This commit looks good Details
gitea/salix/test This commit looks good Details
gitea/salix/dev This commit looks good Details
2020-01-29 13:41:55 +01:00
Joan Sanchez a6d94737af changed version
gitea/salix/2003-adress_validate_uee_members This commit looks good Details
2020-01-29 13:15:24 +01:00
Joan Sanchez a078898627 Merge branch '2049-hotfix_percentage' of verdnatura/salix into master
gitea/salix/master This commit looks good Details
gitea/salix/test This commit looks good Details
gitea/salix/dev This commit looks good Details
2020-01-29 10:29:35 +00:00
Joan Sanchez b27d514918 percentage hotfix
gitea/salix/2049-hotfix_percentage This commit looks good Details
2020-01-29 11:09:42 +01:00
Joan Sanchez 86c5e33e1a Merge branch '2044-ticket.request' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
gitea/salix/test This commit looks good Details
2020-01-29 06:49:32 +00:00
Joan Sanchez 3039372d21 Merge branch '2050-order_lines_e2e' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2020-01-28 11:16:23 +00:00
Bernat Exposito Domenech b576238713 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2044-ticket.request
gitea/salix/2044-ticket.request This commit looks good Details
2020-01-28 12:11:33 +01:00
Bernat Exposito Domenech 58717a7c46 fix order e2e
gitea/salix/2050-order_lines_e2e This commit looks good Details
2020-01-28 11:59:36 +01:00
Joan Sanchez b0ec7ce15b updated e2e
gitea/salix/2003-adress_validate_uee_members This commit looks good Details
2020-01-28 11:56:26 +01:00
Joan Sanchez 184babf14a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2003-adress_validate_uee_members 2020-01-28 11:32:53 +01:00
Joan Sanchez 4d263765df Merge branch 'loopback-componenet-storage' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2020-01-28 10:32:26 +00:00
Carlos Jimenez Ruiz 671c5d7f3f downgraded package as per version bug
gitea/salix/loopback-componenet-storage This commit looks good Details
2020-01-28 11:26:12 +01:00
Bernat Exposito Domenech 35b9820e73 update ticket request
gitea/salix/2044-ticket.request There was a failure building this commit Details
2020-01-28 09:05:01 +01:00
Joan Sanchez 35e443a112 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2003-adress_validate_uee_members 2020-01-28 09:03:33 +01:00
Joan Sanchez 0044bd2efa updated tests
gitea/salix/2003-adress_validate_uee_members There was a failure building this commit Details
2020-01-28 09:03:20 +01:00
Joan Sanchez ddceb885ec Merge branch 'puppeteer' of verdnatura/salix into dev
gitea/salix/dev There was a failure building this commit Details
2020-01-28 06:52:30 +00:00
Carlos Jimenez Ruiz 5e153a7887 #2052 client.dms test fails fixed
gitea/salix/puppeteer There was a failure building this commit Details
2020-01-28 07:42:26 +01:00
Carlos Jimenez Ruiz 4309720286 dms path is now reliative to project
gitea/salix/puppeteer There was a failure building this commit Details
2020-01-28 07:39:42 +01:00
Carlos Jimenez Ruiz 3195964bc1 removed usuned task
gitea/salix/puppeteer There was a failure building this commit Details
2020-01-27 18:58:36 +01:00
Carlos Jimenez Ruiz 0f20532fa5 task 2052 created for test failure
gitea/salix/puppeteer There was a failure building this commit Details
2020-01-27 18:44:34 +01:00
Carlos Jimenez Ruiz 9650beedba e2e fixes after merge
gitea/salix/puppeteer There was a failure building this commit Details
2020-01-27 18:35:39 +01:00
Carlos Jimenez Ruiz 87ad594f8a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into puppeteer 2020-01-27 14:31:33 +01:00
Joan Sanchez 65ae94ef90 Merge branch '2022-update_model_zone' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2020-01-27 08:58:55 +00:00
Bernat Exposito Domenech 849faad6ea add m3Max in agency.basicData
gitea/salix/2022-update_model_zone This commit looks good Details
2020-01-27 09:45:13 +01:00
Carlos Jimenez Ruiz e53ce1ce1b removed debug info to prevent click issues
gitea/salix/puppeteer There was a failure building this commit Details
2020-01-27 09:34:05 +01:00
Joan Sanchez 9484a3e742 Merge branch '1997-client_log' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2020-01-27 07:01:35 +00:00
Carlos Jimenez Ruiz a1fd5a01a7 #1976 Implementar Puppeteer
gitea/salix/puppeteer There was a failure building this commit Details
2020-01-27 00:48:00 +01:00
Carlos Jimenez Ruiz 7fef6dc2b0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into puppeteer 2020-01-26 21:59:46 +01:00
Bernat Exposito Domenech 9f73c68210 udate client.log styles
gitea/salix/1997-client_log This commit looks good Details
2020-01-24 14:22:11 +01:00
Joan Sanchez 921af4dcc2 Merge branch '2014-remove_bi_from_db' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2020-01-24 12:52:30 +00:00
Carlos Jimenez Ruiz 9fd28bd0ca Merge branch '#2037-worked-hours' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2020-01-24 12:48:20 +00:00
Bernat Exposito Domenech b244df4807 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2014-remove_bi_from_db
gitea/salix/2014-remove_bi_from_db This commit looks good Details
2020-01-24 12:56:01 +01:00