Commit Graph

12541 Commits

Author SHA1 Message Date
Vicent Llopis 4872407723 fix test
gitea/salix/pipeline/head There was a failure building this commit Details
2022-04-12 11:57:56 +02:00
Joan Sanchez 3d8f851de8 Added version
gitea/salix/pipeline/head This commit looks good Details
2022-04-12 11:46:14 +02:00
Joan Sanchez 2bc7b2db0c Removed keep file
gitea/salix/pipeline/head This commit looks good Details
2022-04-12 10:15:30 +02:00
Vicent Llopis e1de41f801 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3752-claim_action
gitea/salix/pipeline/head There was a failure building this commit Details
2022-04-12 10:09:36 +02:00
Vicent Llopis 313e911940 fix(claim_action): smart-table
gitea/salix/pipeline/head There was a failure building this commit Details
2022-04-12 10:09:00 +02:00
Alex Moreno ad149b3024 intro
gitea/salix/pipeline/head This commit looks good Details
2022-04-12 07:58:37 +02:00
Alex Moreno 4a714a4b6f feat(client): add privileges to administrative role
gitea/salix/pipeline/head This commit looks good Details
2022-04-12 07:56:03 +02:00
Alex Moreno c9e8826627 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3758-client_unpaid
gitea/salix/pipeline/head This commit looks good Details
2022-04-12 07:08:55 +02:00
Carlos Jimenez Ruiz 3c93e69aa6 Merge pull request '3837 - Import data from external service' (#937) from 3837-edi_import into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #937
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
2022-04-11 14:14:04 +00:00
Joan Sanchez 7228394393 Merge branch 'dev' into 3837-edi_import
gitea/salix/pipeline/head This commit looks good Details
2022-04-11 12:43:52 +00:00
Joan Sanchez 99499b214e Updated RocketChat unit tests
gitea/salix/pipeline/head This commit looks good Details
2022-04-11 14:43:20 +02:00
Joan Sanchez 255086c7e6 Removed package-lock.json
gitea/salix/pipeline/head This commit looks good Details
2022-04-11 13:42:50 +02:00
Joan Sanchez 4dd591e447 Renamed variable name
gitea/salix/pipeline/head There was a failure building this commit Details
2022-04-11 13:38:49 +02:00
Carlos Jimenez Ruiz a056a74e02 Merge pull request '3347-worker_basic-data' (#925) from 3347-worker_basic-data into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #925
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
2022-04-11 11:02:14 +00:00
Carlos Jimenez Ruiz 018047b6be Merge branch 'dev' into 3347-worker_basic-data
gitea/salix/pipeline/head This commit looks good Details
2022-04-11 10:52:56 +00:00
Carlos Jimenez Ruiz 5426445451 Merge pull request '3802-ticket_sale_mana' (#924) from 3802-ticket_sale_mana into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #924
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
2022-04-11 10:50:17 +00:00
Carlos Jimenez Ruiz 56e52c35d8 Merge branch 'dev' into 3802-ticket_sale_mana
gitea/salix/pipeline/head This commit looks good Details
2022-04-11 10:40:52 +00:00
Carlos Jimenez Ruiz eddbe85ca9 Merge pull request '3605-invoiceIn_intrastat3' (#921) from 3605-invoiceIn_intrastat3 into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #921
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
2022-04-11 10:40:16 +00:00
Carlos Jimenez Ruiz b087d275dc Merge branch 'dev' into 3605-invoiceIn_intrastat3
gitea/salix/pipeline/head This commit looks good Details
2022-04-11 10:29:01 +00:00
Joan Sanchez fb514c21d6 Removed model ACL
gitea/salix/pipeline/head There was a failure building this commit Details
2022-04-11 12:11:59 +02:00
Joan Sanchez 39d18093eb Updated SQL files
gitea/salix/pipeline/head There was a failure building this commit Details
2022-04-11 12:04:34 +02:00
Joan Sanchez 47a2f76aa4 3837 - Import data from external service
gitea/salix/pipeline/head There was a failure building this commit Details
2022-04-11 11:58:40 +02:00
Vicent Llopis 6e999302bf refactor: replace let for const
gitea/salix/pipeline/head This commit looks good Details
2022-04-11 10:09:54 +02:00
Vicent Llopis fefff80af4 pull request changes
gitea/salix/pipeline/head This commit looks good Details
2022-04-11 10:01:15 +02:00
Vicent Llopis d88a404ce6 refactor: pull request changes 2022-04-11 10:01:00 +02:00
Vicent Llopis a348762153 refactor: pull request changes
gitea/salix/pipeline/head This commit looks good Details
2022-04-11 09:09:05 +02:00
Vicent Llopis 655db502f7 refactor: pull request changes
gitea/salix/pipeline/head This commit looks good Details
2022-04-11 09:04:05 +02:00
Vicent Llopis d8a1bd1b1c fix: pull request changes
gitea/salix/pipeline/head This commit looks good Details
2022-04-11 08:23:54 +02:00
Alex Moreno 786b7fa84f feat(descriptor): button open summary popup
gitea/salix/pipeline/head This commit looks good Details
2022-04-11 08:02:05 +02:00
Vicent Llopis ddd6d61d9e fix(claim_photos): consider other image types in html
gitea/salix/pipeline/head This commit looks good Details
2022-04-11 07:58:23 +02:00
Vicent Llopis 5431dbdc3e refactor: resize vide0s
gitea/salix/pipeline/head This commit looks good Details
2022-04-08 14:33:00 +02:00
Vicent Llopis 20494e8c0b feat(claim_photos): add files in storage/claim
gitea/salix/pipeline/head This commit looks good Details
2022-04-08 13:53:56 +02:00
Vicent Llopis c00be015ab feat(claim_photo): add fixtures and backTest 2022-04-08 13:53:25 +02:00
Vicent Llopis 90b079a0ac refactor: description back routes
gitea/salix/pipeline/head This commit looks good Details
2022-04-08 12:25:06 +02:00
Vicent Llopis ea4266ef8c feat: add deleteOldFiles
gitea/salix/pipeline/head This commit looks good Details
2022-04-08 12:20:39 +02:00
Alex Moreno c7b8b61a08 feat(item): add model itemPackingType
gitea/salix/pipeline/head This commit looks good Details
2022-04-08 10:34:36 +02:00
Joan Sanchez 321d684f34 Merge pull request '3756-client_address_isLogifloraAllowed' (#930) from 3756-client_address_isLogifloraAllowed into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #930
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-04-08 07:49:43 +00:00
Vicent Llopis 5567e07773 feat(claim_photo): can upload videos
gitea/salix/pipeline/head This commit looks good Details
2022-04-08 09:34:46 +02:00
Joan Sanchez b93f44b220 Merge branch 'dev' into 3756-client_address_isLogifloraAllowed
gitea/salix/pipeline/head This commit looks good Details
2022-04-08 07:29:00 +00:00
Joan Sanchez d2adee3cce Merge pull request '3863-feat(client.defaulter&claim): change socialName to name' (#933) from 3863-client_name into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #933
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-04-08 07:13:10 +00:00
Joan Sanchez d2ecbe898e Merge branch 'dev' into 3863-client_name
gitea/salix/pipeline/head This commit looks good Details
2022-04-08 07:03:23 +00:00
Alex Moreno 90a19d52fb use variable
gitea/salix/pipeline/head This commit looks good Details
2022-04-08 09:02:27 +02:00
Alex Moreno 8c2bc76b88 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3756-client_address_isLogifloraAllowed 2022-04-08 09:01:38 +02:00
Joan Sanchez 07a1388a94 Merge pull request '3832-client_balance_create' (#931) from 3832-client_balance_create into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #931
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-04-08 06:57:02 +00:00
Alex Moreno 238a9fd5da feat(client.defaulter&claim): change socialName to name
gitea/salix/pipeline/head This commit looks good Details
2022-04-08 08:52:21 +02:00
Joan Sanchez 8414f94cf6 Merge pull request '3736-worker-timeControl_calculate' (#926) from 3736-worker-timeControl_calculate into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #926
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-04-08 06:49:39 +00:00
Joan Sanchez a11bcd3669 Merge branch 'dev' into 3832-client_balance_create
gitea/salix/pipeline/head This commit looks good Details
2022-04-08 06:48:46 +00:00
Joan Sanchez 639930c649 Merge pull request '3043-feat(client_search-panel): filter by province' (#929) from 3043-client_search-panel into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #929
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-04-08 06:48:22 +00:00
Joan Sanchez 381b37b1ff Merge branch 'dev' into 3043-client_search-panel
gitea/salix/pipeline/head This commit looks good Details
2022-04-08 06:31:16 +00:00
Vicent Llopis 5ddce43dd1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3750-claim_photo 2022-04-08 07:57:02 +02:00