verdnatura/salix-front
verdnatura
/
salix-front
1
2
Fork 1
Code Issues Pull Requests 59 Releases Wiki Activity

Merge dev-test #123

Merged
jsegarra merged 38 commits from dev into test 2023-12-07 08:44:39 +00:00
Conversation 0 Commits 38 Files Changed 31 +844 -114
jsegarra commented 2023-12-07 07:18:04 +00:00
Member
Copy Link
No description provided.
jsegarra added 36 commits 2023-12-07 07:18:04 +00:00
gitea/salix-front/pipeline/head This commit looks good Details
f230fcbca2 refs #6157 claimAction
gitea/salix-front/pipeline/head This commit looks good Details
841ed5d81a refs #6157 change hide, descriptor, development
gitea/salix-front/pipeline/head This commit looks good Details
cea811903e refs #6157 icon mobile
gitea/salix-front/pipeline/head This commit looks good Details
dfa29875d5 refs #6157 store
gitea/salix-front/pipeline/head This commit looks good Details
abb1b3f7c1 refs #6157 card
gitea/salix-front/pipeline/head This commit looks good Details
ef177c01e5 refs #6157 reguralize import migrate
gitea/salix-front/pipeline/head This commit looks good Details
08060d276a refs #6157 fix arraydata, and internal error
gitea/salix-front/pipeline/head This commit looks good Details
6db52e00ea refs #6157 test ui
gitea/salix-front/pipeline/head This commit looks good Details
35eae2f9a5 remove consolelog
gitea/salix-front/pipeline/head This commit looks good Details
b89f5aadf1 Merge branch 'dev' into 6157-actionClaim
gitea/salix-front/pipeline/head This commit looks good Details
ce4fe44b03 refs #6157 refactor
gitea/salix-front/pipeline/head This commit looks good Details
1320db7bf0 refs #6157 e2e + front
gitea/salix-front/pipeline/head This commit looks good Details
d03092f41d refs #6157 arrayData
gitea/salix-front/pipeline/head This commit looks good Details
c3d9085a57 refs #6157 minorFix
gitea/salix-front/pipeline/head This commit looks good Details
98fa68bb80 refs 6157 markerlabel
gitea/salix-front/pipeline/head This commit looks good Details
247f935334 Merge pull request '6157-actionClaim' (!106) from 6157-actionClaim into dev 
Reviewed-on: #106
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
gitea/salix-front/pipeline/head This commit looks good Details
dacfe1a96d refs #5654 fix(descriptors): add data-key
gitea/salix-front/pipeline/head This commit looks good Details
023cfc6ac7 refs #6062 feat(arrayData): support exprBuilder
gitea/salix-front/pipeline/head This commit looks good Details
54379b3e65 typo
gitea/salix-front/pipeline/head This commit looks good Details
cad5d830a0 Merge pull request 'refs #6062 feat(arrayData): support exprBuilder' (!112) from 6062-exprBuilder into dev 
Reviewed-on: #112
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
gitea/salix-front/pipeline/head This commit looks good Details
a3d6275b2f refs #6545 counters created
gitea/salix-front/pipeline/head This commit looks good Details
4eee95b945 refs #6334 fix amount, colors
gitea/salix-front/pipeline/head This commit looks good Details
03e42f676b refs #6334 remove class
gitea/salix-front/pipeline/head This commit looks good Details
a730f2c073 refs #6545 refactor
gitea/salix-front/pipeline/head This commit looks good Details
f8659c2153 Merge pull request 'refs #6334 fix amount, colors' (!117) from 6334-updateLinesAmount into dev 
Reviewed-on: #117
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
gitea/salix-front/pipeline/head This commit looks good Details
ca9d3611af Merge pull request 'refs #6545 counters created' (!116) from 6545-trolleyCounter into dev 
Reviewed-on: #116
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
gitea/salix-front/pipeline/head This commit looks good Details
e82c675d7d Merge branch 'test' into dev
jsegarra requested review from juan 2023-12-07 07:18:12 +00:00
jsegarra requested review from jgallego 2023-12-07 07:18:12 +00:00
jgallego approved these changes 2023-12-07 08:10:09 +00:00
Dismissed
jsegarra added 2 commits 2023-12-07 08:23:41 +00:00
gitea/salix-front/pipeline/head This commit looks good Details
84226d48ed ci: dev-test
gitea/salix-front/pipeline/head This commit looks good Details
e45f4b38bb Merge pull request 'ci: dev-test' (!124) from #6527_dev-test into dev 
Reviewed-on: #124
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
jsegarra dismissed jgallego’s review 2023-12-07 08:23:41 +00:00
Reason:

New commits pushed, approval review dismissed automatically according to repository settings

jgallego removed review request for juan 2023-12-07 08:25:43 +00:00
jgallego approved these changes 2023-12-07 08:25:47 +00:00
jsegarra merged commit 745fcfe2c9 into test 2023-12-07 08:44:39 +00:00
Sign in to join this conversation.
Reviewers
No reviewers
jgallego
Labels
Clear labels   
bug

Something is not working

  
CR / Tests passed

CR / Tests passed

  
duplicate

This issue or pull request already exists

  
enhancement

New feature

  
invalid

Something is wrong

  
Missing Tests

Missing Tests

  
wontfix

This won't be fixed

No Label
bug
CR / Tests passed
duplicate
enhancement
invalid
Missing Tests
wontfix
Milestone
Clear milestone
No items
No Milestone
Assignees
Clear assignees
No Assignees
2 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: verdnatura/salix-front#123
No description provided.
Delete Branch "dev"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?