Commit Graph

6564 Commits

Author SHA1 Message Date
Joan Sanchez 6f3359c76e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1985-apply_item_type_filter
gitea/salix/1985-apply_item_type_filter There was a failure building this commit Details
2020-01-09 11:24:01 +01:00
Joan Sanchez 7df41fc63c solved bug ordering by tag
gitea/salix/1985-apply_item_type_filter This commit looks good Details
2020-01-09 11:21:54 +01:00
Bernat Exposito Domenech d432c32577 export production and create new models
gitea/salix/1980-models_Thermograph This commit looks good Details
2020-01-09 10:49:09 +01:00
Bernat Exposito Domenech 99f5fbec3c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1980-models_Thermograph 2020-01-09 10:17:23 +01:00
Joan Sanchez c830bc6e8a fixed order by tag
gitea/salix/1985-apply_item_type_filter There was a failure building this commit Details
2020-01-09 09:23:59 +01:00
Carlos Jimenez Ruiz 4a1f32ad56 Merge branch '1972-buyer_week_waste' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2020-01-09 08:01:17 +00:00
Carlos Jimenez Ruiz ff7c6bea6a Merge branch '1986-claim_draggable_pictures' of verdnatura/salix into dev
gitea/salix/dev Build queued... Details
2020-01-09 08:00:35 +00:00
Carlos Jimenez Ruiz a82de9f7b6 Merge branch '1984-travel_summary_total' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2020-01-09 07:59:11 +00:00
Joan Sanchez 436673986c removed focus
gitea/salix/1985-apply_item_type_filter This commit looks good Details
2020-01-09 08:43:33 +01:00
Joan Sanchez a2e6719e1e updated unit tests
gitea/salix/1985-apply_item_type_filter This commit looks good Details
2020-01-09 08:42:58 +01:00
Joan Sanchez e637f32aaa removed opacity effects
gitea/salix/1986-claim_draggable_pictures This commit looks good Details
2020-01-09 08:18:13 +01:00
Joan Sanchez 92b72328b9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1984-travel_summary_total
gitea/salix/1984-travel_summary_total This commit looks good Details
2020-01-09 08:01:07 +01:00
Joan Sanchez 0999c7e2ca renamed field
gitea/salix/1972-buyer_week_waste This commit looks good Details
2020-01-09 07:54:34 +01:00
Joan Sanchez a702d14fa9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1972-buyer_week_waste 2020-01-09 07:52:35 +01:00
Bernat Exposito Domenech 90b9692fba Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1980-models_Thermograph 2020-01-09 07:46:57 +01:00
Joan Sanchez df7493ff14 Updated styles
gitea/salix/1986-claim_draggable_pictures This commit looks good Details
2020-01-08 17:03:08 +01:00
Joan Sanchez 0a9eaa406d changed translations
gitea/salix/1984-travel_summary_total This commit looks good Details
2020-01-08 13:55:26 +01:00
Juan Ferrer a979a17482 Merge branch 'test' into dev
gitea/salix/dev This commit looks good Details
2020-01-08 13:53:10 +01:00
Joan Sanchez f362963dbb Added total by column
gitea/salix/1984-travel_summary_total There was a failure building this commit Details
2020-01-08 13:52:04 +01:00
Juan Ferrer 5e15f38d72 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix
gitea/salix/master This commit looks good Details
gitea/salix/test This commit looks good Details
2020-01-08 13:27:47 +01:00
Juan Ferrer 5d69f50ac0 vnZoneDeliveryDays hotfixes 2020-01-08 13:27:43 +01:00
Joan Sanchez 4f32333894 Updated report phone extension
gitea/salix/master This commit looks good Details
gitea/salix/test This commit looks good Details
2020-01-08 12:29:52 +01:00
Joan Sanchez 5a7bd4e18f filters refactor
gitea/salix/1985-apply_item_type_filter There was a failure building this commit Details
2020-01-08 12:27:18 +01:00
Juan Ferrer 0b7aa7e65e Zone.getEvents hotfix: wrong parameter name 2020-01-08 12:14:09 +01:00
Bernat Exposito Domenech 36108038df refactor sintaxis 2020-01-08 11:00:50 +01:00
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