Commit Graph

8710 Commits

Author SHA1 Message Date
Joan Sanchez b6f29d205c Merge branch 'dev' into 2425-ticket_descriptor_menu
gitea/salix/pipeline/head This commit looks good Details
2020-11-11 13:06:14 +00:00
Bernat Exposito eb8931bca5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2575-image_download
gitea/salix/pipeline/head This commit looks good Details
2020-11-11 13:57:37 +01:00
Joan Sanchez 378982389a Requested chagnes
gitea/salix/pipeline/head This commit looks good Details
2020-11-11 13:44:42 +01:00
Carlos Jimenez Ruiz 74e4a4e42a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2500-display_dates
gitea/salix/pipeline/head This commit looks good Details
2020-11-11 12:45:58 +01:00
Carlos Jimenez Ruiz 3a0ff3be38 summary title amended + clientDescriptor for alias
gitea/salix/pipeline/head This commit looks good Details
2020-11-11 12:45:45 +01:00
Joan Sanchez db4f226f6f Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2020-11-11 12:39:15 +01:00
Joan Sanchez 75ff7c297f Removed max width
gitea/salix/pipeline/head This commit looks good Details
2020-11-11 12:37:59 +01:00
Joan Sanchez 024fda0f65 2591 - Data checked icon 2020-11-11 12:37:45 +01:00
Joan Sanchez a0d50410aa Added section
gitea/salix/pipeline/head This commit looks good Details
2020-11-11 12:34:07 +01:00
Carlos Jimenez Ruiz 5d70794326 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2500-display_dates
gitea/salix/pipeline/head This commit looks good Details
2020-11-11 12:02:49 +01:00
Carlos Jimenez Ruiz c2f92cb127 small refactor 2020-11-11 12:02:40 +01:00
Bernat Exposito a060ac5c70 fix pr changes
gitea/salix/pipeline/head This commit looks good Details
2020-11-11 11:58:14 +01:00
Carlos Jimenez Ruiz 086ac2538a Merge pull request '2591 - Checked data icon' (#449) from 2591-checked_data_icon into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #449
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
2020-11-11 10:27:02 +00:00
Bernat Exposito 1e95f0105a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2575-image_download 2020-11-11 10:52:46 +01:00
Bernat Exposito 75ffa108fb refactor back download 2020-11-11 10:52:35 +01:00
Joan Sanchez 9d5765724b Removed max width
gitea/salix/pipeline/head This commit looks good Details
2020-11-11 09:17:34 +01:00
Joan Sanchez 5a08798b22 2591 - Data checked icon
gitea/salix/pipeline/head This commit looks good Details
2020-11-11 09:11:11 +01:00
Joan Sanchez d959dbc058 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2425-ticket_descriptor_menu
gitea/salix/pipeline/head This commit looks good Details
2020-11-11 07:34:34 +01:00
Carlos Jimenez Ruiz e22e74a725 expanded date columns + order index translations
gitea/salix/pipeline/head This commit looks good Details
2020-11-10 16:47:39 +01:00
Joan Sanchez 5b7a646245 Merge pull request '2584 - Client consumption fixes' (#445) from 2584-client_consumption into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #445
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
2020-11-10 14:10:30 +00:00
Joan Sanchez 53566be56a Merge branch 'dev' into 2584-client_consumption
gitea/salix/pipeline/head This commit looks good Details
2020-11-10 14:03:38 +00:00
Joan Sanchez 8b699841e7 Merge pull request '2574 Filter tag by composed color' (#443) from 2574-itemTag_refactor into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #443
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
2020-11-10 14:01:48 +00:00
Carlos Jimenez Ruiz 45a2a2d8e6 Merge branch 'dev' into 2584-client_consumption
gitea/salix/pipeline/head This commit looks good Details
2020-11-10 13:30:38 +00:00
Joan Sanchez dfbe1a02d2 Removed unused import
gitea/salix/pipeline/head This commit looks good Details
2020-11-10 14:06:41 +01:00
Joan Sanchez 08af948eb0 Merge branch 'dev' into 2574-itemTag_refactor
gitea/salix/pipeline/head This commit looks good Details
2020-11-10 12:39:17 +00:00
Carlos Jimenez Ruiz 95dae0ab1c e2e toBe -> toContain for message.text
gitea/salix/pipeline/head This commit looks good Details
2020-11-10 12:06:21 +01:00
Bernat Exposito 44d3cf748b change id in ticketLastState model
gitea/salix/pipeline/head This commit looks good Details
2020-11-10 11:44:41 +01:00
Joan Sanchez b8784688b8 e2e fix
gitea/salix/pipeline/head This commit looks good Details
2020-11-10 11:41:10 +01:00
Bernat Exposito c673f2130a fix e2e
gitea/salix/pipeline/head This commit looks good Details
2020-11-10 11:33:01 +01:00
Joan Sanchez a93d9f91cc Updated unit tests
gitea/salix/pipeline/head This commit looks good Details
2020-11-10 10:38:25 +01:00
Bernat Exposito e4e4f37609 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2575-image_download
gitea/salix/pipeline/head There was a failure building this commit Details
2020-11-10 08:46:37 +01:00
Bernat Exposito 4ea5993dcc user image 2020-11-10 08:39:34 +01:00
Carlos Jimenez Ruiz 82c739eab2 stacktrace raw + e2e amends
gitea/salix/pipeline/head There was a failure building this commit Details
2020-11-09 18:25:02 +01:00
Carlos Jimenez Ruiz 282adfa7b6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2425-ticket_descriptor_menu
gitea/salix/pipeline/head There was a failure building this commit Details
2020-11-09 16:06:29 +01:00
Carlos Jimenez Ruiz ca27e79d42 e2e path fix for ticket sales 2020-11-09 16:06:16 +01:00
Bernat Exposito c3b5987a1e Merge pull request 'fixed collection tests pollution' (#446) from 2495-updateCollectionSale_test_pollution_fix into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #446
Reviewed-by: Bernat Exposito <bernat@verdnatura.es>
2020-11-09 14:06:59 +00:00
Carlos Jimenez Ruiz 54d31f15bb fixed collection tests pollution
gitea/salix/pipeline/head This commit looks good Details
2020-11-09 14:53:26 +01:00
Joan Sanchez 637116b17d Added descriptor-menu component
gitea/salix/pipeline/head There was a failure building this commit Details
2020-11-09 14:52:25 +01:00
Juan Ferrer 58563edbab Focus fixes
gitea/salix/pipeline/head This commit looks good Details
2020-11-07 21:05:14 +01:00
Juan Ferrer 0e2c6ed79a Account focus fix
gitea/salix/pipeline/head This commit looks good Details
2020-11-07 14:05:48 +01:00
Juan Ferrer 2628faa9d0 Sync hotfixes
gitea/salix/pipeline/head This commit looks good Details
2020-11-06 22:55:47 +01:00
Joan Sanchez bcd5e6ea76 2584 - Client consumption fixes
gitea/salix/pipeline/head This commit looks good Details
2020-11-06 08:21:25 +01:00
Javi Gallego 53f69ae8e5 Merge pull request 'stowaway test included + supplier contact refactor' (#444) from 2581-e2e_misc_fixes into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #444
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2020-11-05 15:00:22 +00:00
Carlos Jimenez Ruiz 223c8a8528 stowaway test included + supplier contact refactor
gitea/salix/pipeline/head Build started... Details
2020-11-05 15:58:02 +01:00
Carlos Jimenez Ruiz e72869df6b Merge pull request 'supplier basicData + e2e' (#438) from 2544-supplier_basicData into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #438
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
2020-11-05 13:35:18 +00:00
Carlos Jimenez Ruiz 9b7edb0830 updated path for log records
gitea/salix/pipeline/head This commit looks good Details
2020-11-05 14:18:48 +01:00
Carlos Jimenez Ruiz a4ad852390 translations refactor
gitea/salix/pipeline/head This commit looks good Details
2020-11-05 13:59:24 +01:00
Carlos Jimenez Ruiz 18ed685c75 e2e path for supplier basic data
gitea/salix/pipeline/head This commit looks good Details
2020-11-05 13:53:19 +01:00
Bernat Exposito 8765a18bbb fix supplier routes
gitea/salix/pipeline/head This commit looks good Details
2020-11-05 11:46:15 +01:00
Bernat Exposito 0e3d636845 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2544-supplier_basicData
gitea/salix/pipeline/head This commit looks good Details
2020-11-05 10:50:21 +01:00