Commit Graph

6641 Commits

Author SHA1 Message Date
Carlos Jimenez Ruiz d1408b812a Merge branch '1575-claim_details_discountError' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2020-01-08 09:55:35 +00:00
Bernat Exposito Domenech 0ef2d92df7 claim.details
gitea/salix/1575-claim_details_discountError This commit looks good Details
2020-01-08 10:08:27 +01:00
Joan Sanchez 6c9def9c6c changed translation
gitea/salix/1972-buyer_week_waste This commit looks good Details
2020-01-08 09:06:19 +01:00
Joan Sanchez e7433fab24 some fixes
gitea/salix/1972-buyer_week_waste This commit looks good Details
2020-01-08 08:53:07 +01:00
Bernat Exposito Domenech 8b0fd79f15 claim.details isEditable
gitea/salix/1575-claim_details_discountError This commit looks good Details
2020-01-07 13:03:45 +01:00
Joan Sanchez cd0fc6d8d3 Merge branch '1947-route_basic_data' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2020-01-07 07:52:56 +00:00
Bernat Exposito Domenech 27a469c786 route.basic finder
gitea/salix/1947-route_basic_data This commit looks good Details
2020-01-07 08:40:23 +01:00
Bernat Exposito Domenech 730b8e160f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1947-route_basic_data 2020-01-07 08:30:55 +01:00
Carlos Jimenez Ruiz f0fd018c56 Merge branch '1924-worker_calendar_dynamic_holidays' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2020-01-07 06:31:05 +00:00
Bernat Exposito Domenech d8e27a4a5c routebasic
gitea/salix/1947-route_basic_data This commit looks good Details
2020-01-03 14:42:50 +01:00
Bernat Exposito Domenech 904602637d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1947-route_basic_data
gitea/salix/1947-route_basic_data This commit looks good Details
2020-01-03 14:31:21 +01:00
Bernat Exposito Domenech 814c96434e routebasic 2020-01-03 14:31:02 +01:00
Joan Sanchez d815948795 Added buyer week-waste email #1972
gitea/salix/1972-buyer_week_waste This commit looks good Details
2020-01-03 13:52:42 +01:00
Joan Sanchez b9293587df Merge branch '1971-frontTest_client.balance' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2020-01-03 11:55:16 +00:00
Bernat Exposito Domenech 8d01cd38c2 refactor client.balance
gitea/salix/1971-frontTest_client.balance This commit looks good Details
2020-01-03 12:48:06 +01:00
Bernat Exposito Domenech b6353f1b5c test client.balance
gitea/salix/1971-frontTest_client.balance There was a failure building this commit Details
2020-01-03 12:29:13 +01:00
Joan Sanchez 8a36e0913f changed fixtures for dynamic holidays
gitea/salix/1924-worker_calendar_dynamic_holidays This commit looks good Details
2020-01-03 08:43:03 +01:00
Carlos Jimenez Ruiz 9c364fccb7 Merge branch '1964-client_balance' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2020-01-02 14:31:52 +00:00
Bernat Exposito Domenech b1c23dfca4 delete console.log
gitea/salix/1964-client_balance This commit looks good Details
2020-01-02 15:07:25 +01:00
Bernat Exposito Domenech 68f437071f refactor client.balance
gitea/salix/1964-client_balance This commit looks good Details
2020-01-02 14:44:51 +01:00
Carlos Jimenez Ruiz 8a38ca7055 Merge branch '1966-teamBoss_worker_time_control' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2020-01-02 11:20:39 +00:00
Carlos Jimenez Ruiz 6a0e4bce72 #1916 Implementar Puppeteer client module
gitea/salix/puppeteer This commit has test failures Details
2020-01-02 11:37:25 +01:00
Joan Sanchez 7fb3f75808 changed comparator
gitea/salix/1966-teamBoss_worker_time_control This commit looks good Details
2020-01-02 11:21:11 +01:00
Joan Sanchez a5eb8e5315 extended worker contract ranges & fixed invoice
gitea/salix/dev There was a failure building this commit Details
2020-01-02 11:10:26 +01:00
Carlos Jimenez Ruiz 3ce5d95010 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into puppeteer 2019-12-31 16:25:01 +01:00
Juan Ferrer 92752fdf1d compose fixes
gitea/salix/master This commit looks good Details
gitea/salix/test This commit looks good Details
2019-12-31 15:00:32 +01:00
Juan Ferrer 7a17532de5 compose refactor
gitea/salix/master There was a failure building this commit Details
gitea/salix/test There was a failure building this commit Details
2019-12-31 14:53:28 +01:00
Carlos Jimenez Ruiz c089e151e7 Merge branch '1967-worker_time_control_worked_hours' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-12-31 13:41:15 +00:00
Joan Sanchez 8f92abe49c fixed procedure bug
gitea/salix/1967-worker_time_control_worked_hours This commit looks good Details
2019-12-31 14:01:05 +01:00
Carlos Jimenez Ruiz 6bf5b4c735 #1916 Implementar Puppeteer
gitea/salix/puppeteer This commit looks good Details
2019-12-31 12:00:16 +01:00
Carlos Jimenez Ruiz e922a05e50 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into puppeteer 2019-12-31 11:40:15 +01:00
Joan Sanchez 417642ac9e updated UserPhone acl
gitea/salix/dev This commit looks good Details
2019-12-31 11:07:46 +01:00
Joan Sanchez b471f51482 refactor
gitea/salix/1959-client_fiscal_data_check_phone There was a failure building this commit Details
2019-12-31 10:38:19 +01:00
Juan Ferrer c8cff581e1 Deploy fixes
gitea/salix/master This commit looks good Details
gitea/salix/test This commit looks good Details
2019-12-31 09:42:08 +01:00
Juan Ferrer 435127b74a Faster npm install
gitea/salix/master This commit looks good Details
2019-12-30 16:57:55 +01:00
Juan Ferrer 98cf5a4a18 Hotfix: restart interval, vnAgencyEvents
gitea/salix/test There was a failure building this commit Details
gitea/salix/master This commit looks good Details
2019-12-30 12:36:19 +01:00
Joan Sanchez e13d457389 Merge branch '1965-update_models' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-12-27 10:43:06 +00:00
Joan Sanchez b4e7a1e3e0 Changed sepa-core title
gitea/salix/dev This commit looks good Details
2019-12-27 10:29:20 +01:00
Joan Sanchez 4d6709712d Merge branch '1958-send_chat_with_avatar' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-12-27 08:55:55 +00:00
Joan Sanchez d880ca2427 changed param
gitea/salix/1958-send_chat_with_avatar This commit looks good Details
2019-12-27 09:02:37 +01:00
Joan Sanchez 0ece53a35e Send chat message with user avatar
gitea/salix/1958-send_chat_with_avatar This commit looks good Details
2019-12-27 08:49:51 +01:00
Bernat Exposito Domenech e9d3b14da7 refactor models component and componentType
gitea/salix/1965-update_models This commit looks good Details
2019-12-27 08:01:53 +01:00
Carlos Jimenez Ruiz e4279733f4 Merge branch '1945-item_type_category' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-12-26 12:59:33 +00:00
Joan Sanchez 195163c4f1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1945-item_type_category
gitea/salix/1945-item_type_category This commit looks good Details
2019-12-26 13:30:57 +01:00
Joan Sanchez b74de37c82 updated selectors
gitea/salix/dev This commit looks good Details
2019-12-26 13:29:50 +01:00
Joan Sanchez f2e9dbd597 added category name to item type autocompletes
gitea/salix/1945-item_type_category This commit looks good Details
2019-12-26 11:27:44 +01:00
Joan Sanchez fd594841d5 Merge branch '1955-client_index' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-12-26 08:16:08 +00:00
Carlos Jimenez Ruiz c992cbc5c6 Merge branch '1935-ticket_create_auto_fill' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-12-26 08:14:22 +00:00
Joan Sanchez 0bfabeb32b Merge branch '1949-show_specie_genus' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-12-26 08:11:07 +00:00
Joan Sanchez fd8eeb626d removed console.log
gitea/salix/1935-ticket_create_auto_fill This commit looks good Details
2019-12-26 08:45:55 +01:00