verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 67 Releases Wiki Activity
15,679 Commits 275 Branches 0 Tags 128 MiB
Commit Graph

15679 Commits

Author SHA1 Message Date
Vicent Llopis b3e7cedd1e refs #5128 borrada línea por error
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-18 09:49:12 +02:00
Joan Sanchez cebab42b47 Merge pull request 'hotfix delivery' (!1457) from hotfix-delivery-231401 into test
gitea/salix/pipeline/head This commit looks good Details 
Reviewed-on: #1457
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
 2023-04-18 07:35:16 +00:00
Alexandre Riera 4eb7e19c43 Merge branch 'test' into hotfix-delivery-231401
gitea/salix/pipeline/head Build queued... Details
2023-04-18 07:30:27 +00:00
Alexandre Riera 89f6f0fbdb hotfix delivery
gitea/salix/pipeline/head This commit looks good Details
2023-04-18 09:29:36 +02:00
Vicent Llopis c5225cb632 refs #5128 borrado código innecesario
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-18 09:23:19 +02:00
Vicent Llopis fef9387782 Merge pull request 'fix intermintent test' (!1456) from fix_intermitentTest into test
gitea/salix/pipeline/head This commit looks good Details 
Reviewed-on: #1456
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2023-04-18 07:18:28 +00:00
Vicent Llopis 48cd23750e refs #5128 add testBack
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-18 09:09:09 +02:00
Joan Sanchez 6c71bda814 Merge pull request 'masterHotfix_arcRfid' (!1455) from masterHotfix_arcRfid into master
gitea/salix/pipeline/head This commit looks good Details 
Reviewed-on: #1455
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
 2023-04-18 07:00:09 +00:00
Vicent Llopis c9dffe9175 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5128-client.credit-management
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-18 08:39:43 +02:00
Joan Sanchez 6fd5c8ae2d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser 2023-04-18 08:34:20 +02:00
Joan Sanchez d6fb05cc93 Merge pull request 'refs #5213 cambios e2e, descriptor' (!1437) from 5213-minorBugs2 into dev
gitea/salix/pipeline/head This commit looks good Details 
Reviewed-on: #1437
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
 2023-04-18 06:33:47 +00:00
Joan Sanchez 6d593a0937 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5213-minorBugs2
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-18 08:32:22 +02:00
Vicent Llopis edc49ab5b3 refactor code
gitea/salix/pipeline/head This commit looks good Details
2023-04-18 08:26:26 +02:00
Vicent Llopis ce3e299d09 fix intermintent test
gitea/salix/pipeline/head This commit looks good Details
2023-04-18 08:20:50 +02:00
Pablo Natek 3636543f73 refs #5075
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-18 08:19:23 +02:00
Carlos Satorres 8b60e9f5fd sql arreglado
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-18 08:07:35 +02:00
Alex Moreno 560b5b374f Merge branch 'dev' into 5075-client_balance
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-18 05:37:12 +00:00
Vicent Llopis d99815356a refs #5144 manejado que el usuario sea NULL
gitea/salix/pipeline/head This commit looks good Details
2023-04-18 07:26:35 +02:00
Joan Sanchez 2192cd4066 Merge pull request 'hotfix minor version delivery' (!1454) from hotfix-applyChanges-delivery into test
gitea/salix/pipeline/head This commit looks good Details 
Reviewed-on: #1454
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
 2023-04-18 05:20:09 +00:00
Alexandre Riera 18b859ae71 Merge branch 'hotfix-applyChanges-delivery' of https://gitea.verdnatura.es/verdnatura/salix into hotfix-applyChanges-delivery 2023-04-18 07:19:35 +02:00
Alexandre Riera 5a2dbbabfd template string 2023-04-18 07:19:33 +02:00
Alexandre Riera 095135807d Merge branch 'test' into hotfix-applyChanges-delivery
gitea/salix/pipeline/head Build queued... Details
2023-04-18 05:18:29 +00:00
Alexandre Riera b3fb661f12 hotfix minor version delivery
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-18 07:17:36 +02:00
Joan Sanchez a41cf2f3f9 Merge pull request 'refs #5553 Don't save image extension' (!1453) from 5553-dontSaveImageExtension into master
gitea/salix/pipeline/head This commit looks good Details 
Reviewed-on: #1453
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
 2023-04-18 05:05:12 +00:00
Juan Ferrer 1c4f919e89 refs #5553 Don't save image extension
gitea/salix/pipeline/head This commit looks good Details
2023-04-17 22:24:19 +02:00
Juan Ferrer 378400c6d2 refs #5553 Image scrubing method improved
gitea/salix/pipeline/head This commit looks good Details 
Remove & dryRun options, check that collection exists, performance improved, exclusive lock
 2023-04-17 18:19:25 +02:00
Carlos Satorres f76727903a update insert
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-17 15:17:05 +02:00
Juan Ferrer 0423fac88c refs #5553 Image clean method Image/scrub
gitea/salix/pipeline/head This commit looks good Details
2023-04-17 14:33:07 +02:00
Alex Moreno 0c475be10b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4617-use_tmp_in_ticketToInvoice
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-17 14:23:02 +02:00
Alex Moreno 2a8383f9cc Merge pull request 'fix e2e' (!1450) from fix_e2e into dev
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-17 12:19:26 +00:00
Joan Sanchez 06a845e7f0 Cambios SQL
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-17 14:15:39 +02:00
Alex Moreno 6a0a08be95 typo
gitea/salix/pipeline/head This commit looks good Details
2023-04-17 13:03:09 +02:00
Alex Moreno b5434c5e4e tab
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-17 12:58:55 +02:00
Alex Moreno 6144c24a44 fix(ticket_edit): fix e2e
gitea/salix/pipeline/head This commit looks good Details
2023-04-17 12:44:58 +02:00
Alexandre Riera 7d8a0597c1 Merge branch 'dev' into 5518-log-user-role
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-17 09:53:36 +00:00
Alexandre Riera 2675c02d13 refs #5518 moved models to account
gitea/salix/pipeline/head This commit looks good Details
2023-04-17 11:52:52 +02:00
Alex Moreno f97d169cbf observationEmail
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-17 11:52:31 +02:00
Alexandre Riera 2bc190b01e Merge branch 'dev' into 5293-claim-sections
gitea/salix/pipeline/head This commit looks good Details
2023-04-17 08:49:41 +00:00
Alexandre Riera 0dcbc9fc8b refs #5293 redirected claim.photos to lilium
gitea/salix/pipeline/head This commit looks good Details
2023-04-17 10:46:26 +02:00
Carlos Satorres d399cda050 refs #5316 quitar comment
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-17 10:34:08 +02:00
Joan Sanchez 3ee29553b4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-17 09:00:52 +02:00
Joan Sanchez 610f51aaf8 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-17 08:59:49 +02:00
Joan Sanchez f53ebb7641 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2023-04-17 08:59:34 +02:00
Joan Sanchez 02c573bd23 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser 2023-04-17 08:57:24 +02:00
Carlos Satorres 60d3729b4a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5316-kkeoEntryNotes 2023-04-17 08:55:22 +02:00
Alex Moreno 0bfdbcb750 refs #4617 use temporary instead of vn
gitea/salix/pipeline/head This commit looks good Details
2023-04-17 08:44:24 +02:00
Joan Sanchez 51e42e485b Merge pull request 'refs #5284 new onCreateClaimAccepted y createClaim' (!1372) from 5284-fueraPlazo into dev
gitea/salix/pipeline/head There was a failure building this commit Details 
Reviewed-on: #1372
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
 2023-04-17 06:44:17 +00:00
Carlos Satorres af8603185c refs #5439 inheritedRole
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-17 08:35:44 +02:00
Joan Sanchez 9e4c261a87 Merge pull request 'hotfix saveSign one sign for every ticket' (!1440) from hotfix-saveSign-oneSignForEveryTicket into test
gitea/salix/pipeline/head This commit looks good Details 
Reviewed-on: #1440
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
 2023-04-17 05:39:57 +00:00
Juan Ferrer c5dcfd3cab refs #4480, #5484 Front & back tests passed, md5 password removed from code, some e2e missing
gitea/salix/pipeline/head This commit looks good Details
2023-04-15 14:24:50 +02:00