Commit Graph

9776 Commits

Author SHA1 Message Date
Joan Sanchez d174a363d2 Removed wait
gitea/salix/pipeline/head This commit looks good Details
2020-11-18 11:23:51 +01:00
Joan Sanchez 9f5ba5bb85 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-18 10:44:00 +01:00
Joan Sanchez ac5f30924a Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2020-11-18 08:20:46 +01:00
Joan Sanchez 0fc01b2316 1419 - Claim update discount hotfix
gitea/salix/pipeline/head This commit looks good Details
2020-11-18 08:16:37 +01:00
Carlos Jimenez Ruiz 315cec6843 Merge pull request '2276-travel_summary - e2e in progress' (#457) from 2276-travel_summary into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #457
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2020-11-17 17:13:02 +00:00
Carlos Jimenez Ruiz 7dff246e46 adapted e2e path for full run
gitea/salix/pipeline/head This commit looks good Details
2020-11-17 18:07:04 +01:00
Carlos Jimenez Ruiz 71f0a19320 descriptor path fix
gitea/salix/pipeline/head This commit looks good Details
2020-11-17 17:19:22 +01:00
Carlos Jimenez Ruiz 7dc8ae9dbc e2e path for travel descriptor
gitea/salix/pipeline/head This commit looks good Details
2020-11-17 16:52:19 +01:00
Carlos Jimenez Ruiz a7c830d87a refactor
gitea/salix/pipeline/head This commit looks good Details
2020-11-17 15:54:45 +01:00
Carlos Jimenez Ruiz cb88265471 removed commented code
gitea/salix/pipeline/head This commit looks good Details
2020-11-17 11:04:17 +01:00
Carlos Jimenez Ruiz dc7a6d4ce1 dot menu along with clone option
gitea/salix/pipeline/head This commit looks good Details
2020-11-16 19:04:37 +01:00
Joan Sanchez 8a3f5345f4 Merge branch 'dev' into 2575-image_download
gitea/salix/pipeline/head This commit looks good Details
2020-11-16 13:54:47 +00:00
Carlos Jimenez Ruiz c0b2ef9666 travel descriptor quicklinks
gitea/salix/pipeline/head This commit looks good Details
2020-11-16 14:50:03 +01:00
Carlos Jimenez Ruiz 55a1ae0348 added entry descriptor to item last entries 2020-11-16 14:43:35 +01:00
Joan Sanchez f4e9fc83ec Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2569-travel_extra_community
gitea/salix/pipeline/head There was a failure building this commit Details
2020-11-16 10:48:16 +01:00
Bernat Exposito 0542874fda Merge pull request 'Supplier cargo migration to vn' (#456) from cargo_supplierFreighter into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #456
Reviewed-by: Bernat Exposito <bernat@verdnatura.es>
2020-11-16 08:21:25 +00:00
Joan Sanchez 359dcc904d Version merge
gitea/salix/pipeline/head This commit looks good Details
2020-11-16 09:08:39 +01:00
Joan Sanchez 8194801308 Supplier cargo migration to vn
gitea/salix/pipeline/head This commit looks good Details
2020-11-16 08:48:42 +01:00
Joan Sanchez d17a61d4c1 Version merge
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2020-11-16 08:45:20 +01:00
Carlos Jimenez Ruiz 90d6018d34 Merge pull request 'e2e fix ticket sale' (#455) from e2e-fix into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #455
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
2020-11-13 19:59:54 +00:00
Javi Gallego b01f18187d e2e fix ticket sale
gitea/salix/pipeline/head This commit looks good Details
2020-11-13 17:37:02 +01:00
Juan Ferrer 235f0980a3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2020-11-13 15:03:48 +01:00
Juan Ferrer 06adb3c9da package-lock 2020-11-13 15:03:33 +01:00
Javi Gallego 0d2e3ab5bf Merge pull request '2604-travel_index_colors' (#454) from 2604-travel_index_colors into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #454
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2020-11-13 13:03:04 +00:00
Juan Ferrer dde89e3b9f Merge branch 'test' into dev 2020-11-13 13:50:15 +01:00
Carlos Jimenez Ruiz 1e35e199f7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2604-travel_index_colors
gitea/salix/pipeline/head This commit looks good Details
2020-11-13 13:22:09 +01:00
Juan Ferrer 6e5eac1f78 Account synchronization fixes
gitea/salix/pipeline/head This commit looks good Details
2020-11-13 13:20:37 +01:00
Carlos Jimenez Ruiz 8373c6f5d1 filter by selection + unit tests for travel index 2020-11-13 13:04:22 +01:00
Juan Ferrer 0490edc2d4 Model redeclaration fix
gitea/salix/pipeline/head This commit looks good Details
2020-11-13 11:07:05 +01:00
Juan Ferrer 80cbb53dfe Merge branch 'test' into dev 2020-11-13 10:49:59 +01:00
Juan Ferrer 9652711d9a Locale fix
gitea/salix/pipeline/head This commit looks good Details
2020-11-13 10:48:26 +01:00
Juan Ferrer c20abad1ba Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into test 2020-11-13 10:33:38 +01:00
Juan Ferrer cdf6cb661f Login sync fixes 2020-11-13 10:33:34 +01:00
Joan Sanchez 031051abcb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2569-travel_extra_community
gitea/salix/pipeline/head There was a failure building this commit Details
2020-11-13 09:33:24 +01:00
Bernat Exposito 6fc14d569c Merge branch 'dev' into 2575-image_download
gitea/salix/pipeline/head This commit looks good Details
2020-11-13 08:32:39 +00:00
Joan Sanchez 0ff931b71b Increased jest workers
gitea/salix/pipeline/head There was a failure building this commit Details
2020-11-13 09:31:10 +01:00
Joan Sanchez 4acdfd6d4e Th refactor 2020-11-13 09:30:40 +01:00
Carlos Jimenez Ruiz 5fb4442221 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2604-travel_index_colors 2020-11-13 09:29:21 +01:00
Joan Sanchez 0edd6071c8 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2020-11-13 07:43:02 +01:00
Joan Sanchez 2680ad2c07 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2020-11-13 07:39:24 +01:00
Joan Sanchez d174d7b15b Contextmenu filter hotfix
gitea/salix/pipeline/head This commit looks good Details
2020-11-13 07:38:18 +01:00
Joan Sanchez cb8e9655af Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2020-11-13 07:22:12 +01:00
Juan Ferrer 2a30f93e00 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2020-11-12 23:20:33 +01:00
Juan Ferrer 4b46b0787b User syncronization fixes, improvements, refactor 2020-11-12 23:20:25 +01:00
Carlos Jimenez Ruiz 7597df2dab calendar e2e amends 2020-11-12 16:52:42 +01:00
Javi Gallego 5633ea9295 Merge pull request '2597-2593-autcomplete_translations_and_index_anchors' (#453) from 2597-2593-autcomplete_translations_and_index_anchors into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #453
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2020-11-12 15:41:20 +00:00
Carlos Jimenez Ruiz 7f899cc4e9 index navigation through anchors
gitea/salix/pipeline/head This commit looks good Details
2020-11-12 16:03:23 +01:00
Joan Sanchez 785453fab3 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into 2569-travel_extra_community
gitea/salix/pipeline/head This commit looks good Details
2020-11-12 15:01:11 +01:00
Carlos Jimenez Ruiz b9e3db61db ticket advanced search grouped state translations
gitea/salix/pipeline/head This commit looks good Details
2020-11-12 13:33:33 +01:00
Joan Sanchez 23e8d64678 Contextmenu hotfix
gitea/salix/pipeline/head This commit looks good Details
2020-11-12 13:18:31 +01:00