Commit Graph

8897 Commits

Author SHA1 Message Date
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
Carlos Jimenez Ruiz f0aedf549e Merge pull request '2592-item_request_accept_decline' (#451) from 2592-item_request_accept_decline into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #451
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2020-11-12 08:51:02 +00:00
Carlos Jimenez Ruiz a62698330a small refactor
gitea/salix/pipeline/head This commit looks good Details
2020-11-12 09:45:41 +01:00
Carlos Jimenez Ruiz 1dd0d463a9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2592-item_request_accept_decline
gitea/salix/pipeline/head This commit looks good Details
2020-11-12 09:21:20 +01:00
Javi Gallego 02a73b8c2a Merge pull request '2557-export_production' (#441) from 2557-export_production into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #441
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2020-11-12 07:56:27 +00:00
Bernat Exposito fd8682e416 fdescribe
gitea/salix/pipeline/head This commit looks good Details
2020-11-12 08:37:08 +01:00
Bernat Exposito 2454999938 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2575-image_download 2020-11-12 08:14:55 +01:00
Bernat Exposito 5be616ad91 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2557-export_production
gitea/salix/pipeline/head This commit looks good Details
2020-11-12 08:04:38 +01:00
Carlos Jimenez Ruiz 95a62f66ad 2548 item diary columns width
gitea/salix/pipeline/head This commit looks good Details
2020-11-11 16:58:56 +01:00
Carlos Jimenez Ruiz e3090fc276 e2e fixed 2020-11-11 16:54:27 +01:00
Carlos Jimenez Ruiz 9a8a32ee9b denied & accepted no longer show deny icon
gitea/salix/pipeline/head This commit looks good Details
2020-11-11 16:08:27 +01:00
Carlos Jimenez Ruiz 1ad4e8bae1 packages 2020-11-11 15:47:30 +01:00
Carlos Jimenez Ruiz e2a6d708de Merge pull request '2500-display_dates' (#450) from 2500-display_dates into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #450
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2020-11-11 14:31:48 +00:00
Carlos Jimenez Ruiz ba86693891 minor refactor
gitea/salix/pipeline/head This commit looks good Details
2020-11-11 15:14:05 +01:00
Carlos Jimenez Ruiz 6cd1332a18 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 14:45:22 +01:00
Carlos Jimenez Ruiz 795d371dc8 Merge pull request '2425-ticket_descriptor_menu' (#447) from 2425-ticket_descriptor_menu into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #447
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
2020-11-11 13:44:59 +00:00
Joan Sanchez 136c127cae Updated back unit test
gitea/salix/pipeline/head This commit looks good Details
2020-11-11 14:32:53 +01:00
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