Commit Graph

6484 Commits

Author SHA1 Message Date
Joan Sanchez 1fcd54e8d7 Merge branch 'test' into dev
gitea/salix/dev This commit looks good Details
2020-01-17 13:33:57 +01:00
Joan Sanchez 6b314d8dbe fixed date bug
gitea/salix/master This commit looks good Details
gitea/salix/test This commit looks good Details
2020-01-17 13:22:32 +01:00
Joan Sanchez 826dfe8092 changes to percentage filter
gitea/salix/master This commit looks good Details
2020-01-17 11:46:45 +01:00
Joan Sanchez 3a4c379033 Added waste section 2020-01-17 11:44:05 +01:00
Carlos Jimenez Ruiz 8807f64e09 Merge branch '1972-buyer_week_waste' of verdnatura/salix into dev 2020-01-17 11:42:53 +01:00
Joan Sanchez 1704f5e93b Merge branch '2011-client_phone' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2020-01-17 06:48:57 +00:00
Bernat Exposito Domenech 74b688dc4b client phone refactor
gitea/salix/2011-client_phone This commit looks good Details
2020-01-17 07:24:57 +01:00
Bernat Exposito e1aefc795b Merge branch '2008-item_buyer_waste_detail' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2020-01-16 13:42:12 +00:00
Joan Sanchez 3cba6f0293 Translated family names
gitea/salix/2008-item_buyer_waste_detail This commit looks good Details
2020-01-16 14:35:40 +01:00
Joan Sanchez 5c8892073d Merge branch '1998-client_sms' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2020-01-16 13:12:13 +00:00
Joan Sanchez 2b2e6532f6 changes to percentage filter
gitea/salix/2008-item_buyer_waste_detail This commit looks good Details
2020-01-16 13:39:32 +01:00
Bernat Exposito Domenech ba2300288f sendSms test
gitea/salix/1998-client_sms This commit looks good Details
2020-01-16 12:40:28 +01:00
Bernat Exposito Domenech 1307f6c5fb update structure
gitea/salix/2008-item_buyer_waste_detail There was a failure building this commit Details
2020-01-15 13:43:38 +01:00
Bernat Exposito Domenech b42b2ec8c3 refactor sms send
gitea/salix/1998-client_sms Something is wrong with the build of this commit Details
2020-01-15 13:27:14 +01:00
Joan Sanchez 708789502d Added waste section
gitea/salix/2008-item_buyer_waste_detail There was a failure building this commit Details
2020-01-15 13:07:33 +01:00
Joan Sanchez 1ad9f9bb2a Merge branch '1994-plantilla_instalacio_impresora' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2020-01-15 08:21:54 +00:00
Joan Sanchez 8f449566bb Merge branch '2000-client.sms' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2020-01-15 08:20:40 +00:00
Bernat Exposito Domenech bc40473e9b modificar plantilla
gitea/salix/1994-plantilla_instalacio_impresora This commit looks good Details
2020-01-15 08:48:17 +01:00
Joan Sanchez 0fb6d27fd1 Merge branch '1999-travel_basicData' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2020-01-15 07:47:12 +00:00
Bernat Exposito Domenech 1f60aac446 export structure db
gitea/salix/1999-travel_basicData This commit looks good Details
2020-01-15 08:19:22 +01:00
Bernat Exposito Domenech cbda081608 refactor sms component
gitea/salix/2000-client.sms This commit looks good Details
2020-01-14 09:10:54 +01:00
Joan Sanchez 5888623521 Merge branch '1981-travel_thermograph' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2020-01-13 11:19:49 +00:00
Bernat Exposito Domenech f4e3649d9e new section thermograph
gitea/salix/1981-travel_thermograph This commit looks good Details
2020-01-13 11:53:10 +01:00
Bernat Exposito 456845dbd6 Merge branch '1995-ticket_summary_with_zone' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2020-01-13 06:55:15 +00:00
Joan Sanchez 048fcb733d added zone name to ticket summary
gitea/salix/1995-ticket_summary_with_zone This commit looks good Details
2020-01-13 07:42:41 +01:00
Joan Sanchez de05cadef4 Merge branch '1975-delivery_note_tags' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2020-01-10 11:09:29 +00:00
Joan Sanchez da64bbffe1 Merge branch '1990-create_entry_section' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2020-01-10 11:08:02 +00:00
Bernat Exposito Domenech 6c4e25bfe3 create entry.index
gitea/salix/1990-create_entry_section This commit looks good Details
2020-01-10 11:52:35 +01:00
Joan Sanchez e235bf94a6 removed syntax error
gitea/salix/1975-delivery_note_tags This commit looks good Details
2020-01-10 11:31:12 +01:00
Joan Sanchez 16a9a1f5f8 updated styles
gitea/salix/1975-delivery_note_tags This commit looks good Details
2020-01-10 11:29:11 +01:00
Joan Sanchez 5cf8328476 added more rows to sms textarea
gitea/salix/1975-delivery_note_tags There was a failure building this commit Details
2020-01-09 13:58:50 +01:00
Carlos Jimenez Ruiz 44c611db5b Merge branch '1983-client_address' of verdnatura/salix into dev
gitea/salix/dev There was a failure building this commit Details
2020-01-09 11:50:29 +00:00
Bernat Exposito Domenech 5511ef2537 client address index
gitea/salix/1983-client_address There was a failure building this commit Details
2020-01-09 12:39:03 +01:00
Carlos Jimenez Ruiz 83d2ec40d4 Merge branch '1985-apply_item_type_filter' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2020-01-09 10:50:26 +00:00
Carlos Jimenez Ruiz 369f08ed94 Merge branch '1980-models_Thermograph' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2020-01-09 10:47:40 +00:00
Bernat Exposito Domenech 78fab48840 update models
gitea/salix/1980-models_Thermograph There was a failure building this commit Details
2020-01-09 11:27:53 +01:00
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