Commit Graph

9272 Commits

Author SHA1 Message Date
Carlos Jimenez Ruiz e1a77b7d43 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2279-save_button_if_new_data 2020-12-14 17:28:16 +01:00
Jorge Benedito Llopis 927f92dfea Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2547-supplier_billing_data
gitea/salix/pipeline/head This commit looks good Details
2020-12-14 16:11:59 +01:00
Jorge Benedito Llopis f62d3139bb Supplier.billingData section 2020-12-14 16:09:17 +01:00
Joan Sanchez 032a88a163 Merge pull request '2503-jest' (#476) from 2503-backend_unit_jest into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #476
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2020-12-14 08:38:09 +00:00
Joan Sanchez d7dde7e4eb Updated e2e
gitea/salix/pipeline/head This commit looks good Details
2020-12-14 07:46:32 +01:00
Carlos Jimenez Ruiz 3ad6534160 client module refactors 2020-12-13 14:57:42 +01:00
Carlos Jimenez Ruiz c0289f87e9 order module refactors 2020-12-13 13:55:54 +01:00
Carlos Jimenez Ruiz cbaa95ebda item module refactors 2020-12-13 13:54:17 +01:00
Joan Sanchez 0a4016be41 Updated unit tests & changed ACL
gitea/salix/pipeline/head This commit looks good Details
2020-12-11 15:04:55 +01:00
Carlos Jimenez Ruiz f3d1891c17 jest refactor
gitea/salix/pipeline/head This commit looks good Details
2020-12-11 11:00:03 +01:00
Carlos Jimenez Ruiz 1e02024b95 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2503-backend_unit_jest 2020-12-11 10:02:02 +01:00
Joan Sanchez 59c622481f Updated image fixtures
gitea/salix/pipeline/head There was a failure building this commit Details
2020-12-10 13:21:11 +01:00
Joan Sanchez 260b502cd6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2576-photo_uploader 2020-12-10 07:30:31 +01:00
Javi Gallego f48abfe7d4 Merge pull request 'ticket descriptor translate' (#475) from 2630-ticket_descriptor into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #475
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2020-12-09 15:31:44 +00:00
Bernat Exposito a1d8b3175e ticket descriptor translate
gitea/salix/pipeline/head This commit looks good Details
2020-12-09 15:26:57 +01:00
Juan Ferrer 6f6f23bec4 LDAP user sync only syncs changed attributes
gitea/salix/pipeline/head This commit looks good Details
2020-12-09 12:28:18 +01:00
Javi Gallego ccc651a445 Merge pull request 'refactor descriptors' (#474) from 2651-descriptor_icons_visible into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #474
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2020-12-09 07:58:56 +00:00
Bernat Exposito 96f603a44b refactor descriptors
gitea/salix/pipeline/head This commit looks good Details
2020-12-04 13:40:58 +01:00
Joan Sanchez 4f40075c2e Merge branch 'dev' into 2657-zone_log
gitea/salix/pipeline/head This commit looks good Details
2020-12-03 11:16:18 +00:00
Javi Gallego 5bfc8a546d Merge pull request 'fix ticket component' (#473) from 2656-ticket_component into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #473
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2020-12-03 09:30:53 +00:00
Bernat Exposito aaee855da3 fix ticket component
gitea/salix/pipeline/head Build started... Details
2020-12-03 10:26:49 +01:00
Bernat Exposito 6eeecc553b zoneLog calendar
gitea/salix/pipeline/head This commit looks good Details
2020-12-02 12:49:50 +01:00
Bernat Exposito 6605e5ae4c zoneLog 2020-12-02 12:05:47 +01:00
Juan Ferrer cc9f313867 Docker replicas restored
gitea/salix/pipeline/head This commit looks good Details
2020-11-30 19:20:52 +01:00
Juan Ferrer 49111e3d73 Replicas removed from compose
gitea/salix/pipeline/head This commit looks good Details
2020-11-30 19:11:20 +01:00
Juan Ferrer fc9412bddd Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2020-11-30 19:05:44 +01:00
Juan Ferrer 954ba0c69d Back replicas
gitea/salix/pipeline/head This commit looks good Details
2020-11-30 19:05:33 +01:00
Juan Ferrer f0817188bb Merge branch 'master' into test 2020-11-30 18:51:40 +01:00
Juan Ferrer b2a3adc96f LDAP sync hotfix
gitea/salix/pipeline/head This commit looks good Details
2020-11-30 18:50:04 +01:00
Juan Ferrer 61bb2f14ba LDAP sync hotfix
gitea/salix/pipeline/head This commit looks good Details
2020-11-30 18:45:50 +01:00
Joan Sanchez 1ba1d27ba0 2576 - Photo upload component
gitea/salix/pipeline/head There was a failure building this commit Details
2020-11-27 13:10:39 +01:00
Joan Sanchez 5dbf4f3926 Merge pull request 'log refactor' (#469) from 2610-log_refactor into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #469
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2020-11-27 11:40:36 +00:00
Bernat Exposito ba156a2e42 log refactor
gitea/salix/pipeline/head This commit looks good Details
2020-11-27 11:56:41 +01:00
Bernat Exposito 857b876808 Merge pull request '2645-export_production' (#468) from 2645-export_production into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #468
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2020-11-25 12:13:36 +00:00
Bernat Exposito 06e7583f2b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2645-export_production
gitea/salix/pipeline/head This commit looks good Details
2020-11-25 12:47:17 +01:00
Bernat Exposito 78f25e0b46 export production 2020-11-25 12:37:44 +01:00
Bernat Exposito 34c1115954 Merge pull request '2588 - No ellipsize on summary notes or address' (#467) from 2588-summaries_refactor into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #467
Reviewed-by: Bernat Exposito <bernat@verdnatura.es>
2020-11-25 07:12:25 +00:00
Joan Sanchez 5ff364dcf0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2588-summaries_refactor
gitea/salix/pipeline/head This commit looks good Details
2020-11-25 08:01:47 +01:00
Bernat Exposito 200e0acdfd Merge pull request '2628 - Remove item name from search on tag removal' (#466) from 2628-catalog_search_fix into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #466
Reviewed-by: Bernat Exposito <bernat@verdnatura.es>
2020-11-25 06:58:47 +00:00
Joan Sanchez 27f0a5cd63 Updated Node version
gitea/salix/pipeline/head This commit looks good Details
2020-11-25 07:54:20 +01:00
Joan Sanchez d3f1f06588 Updated selector 2020-11-25 07:50:02 +01:00
Joan Sanchez 8eb14a8bdc 2588 - No ellipsize on summary notes or address
gitea/salix/pipeline/head This commit looks good Details
2020-11-24 14:56:10 +01:00
Joan Sanchez ca4a89199c Updated selector
gitea/salix/pipeline/head This commit looks good Details
2020-11-24 14:09:05 +01:00
Joan Sanchez 561991f18c 2628 - Remove item name from search on tag removal
gitea/salix/pipeline/head This commit looks good Details
2020-11-24 13:54:31 +01:00
Carlos Jimenez Ruiz 2a2104936c Merge pull request '2629 - Open ticket lines on new window' (#465) from 2629-ticket_lines_newtab into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #465
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
2020-11-24 11:39:47 +00:00
Joan Sanchez d9e14a0c3a 2629 - Open ticket lines on new window
gitea/salix/pipeline/head This commit looks good Details
2020-11-24 12:10:02 +01:00
Carlos Jimenez Ruiz 2e623eb100 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2503-backend_unit_jest 2020-11-24 11:41:54 +01:00
Joan Sanchez cca33e0945 Merge pull request 'Added section' (#452) from 2569-travel_extra_community into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #452
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
2020-11-24 10:29:34 +00:00
Joan Sanchez b2794dc413 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2569-travel_extra_community
gitea/salix/pipeline/head This commit looks good Details
2020-11-24 10:52:35 +01:00
Joan Sanchez cb22112ed4 package update 2020-11-24 10:52:30 +01:00