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

test_dev_resolveConflicts #647

Merged
jsegarra merged 40 commits from test_dev_resolveConflicts into dev 2024-08-27 07:10:20 +00:00
Conversation 0 Commits 40 Files Changed 20 +309 -115
jsegarra commented 2024-08-27 05:35:10 +00:00
Member
Copy Link
No description provided.
jsegarra added 39 commits 2024-08-27 05:35:10 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
c4de1beabf feat: refs #6900 add InvoiceInSerial
gitea/salix-front/pipeline/pr-dev This commit looks good Details
gitea/salix-front/pipeline/pr-test This commit looks good Details
de24a3efdb feat: refs #6900 add locale
gitea/salix-front/pipeline/pr-test This commit looks good Details
e07d573788 Merge branch 'test' into 6900-addSerial
gitea/salix-front/pipeline/pr-test This commit looks good Details
3bba5db1b5 fix: refs #6900 improve logic
gitea/salix-front/pipeline/pr-test This commit looks good Details
ecfdf0b6b9 fix: refs #6900 improve loading
gitea/salix-front/pipeline/head This commit looks good Details
a564f94e30 Merge pull request '#6900 add Serial' (!610) from 6900-addSerial into test 
Reviewed-on: #610
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
gitea/salix-front/pipeline/head This commit looks good Details
83a8f7e147 fix(invoiceOutGlobal): formData is object
gitea/salix-front/pipeline/head This commit looks good Details
gitea/salix-front/pipeline/pr-master This commit looks good Details
b35bf85f4a fix(claim_summary): url links
gitea/salix-front/pipeline/pr-master This commit looks good Details
9086735aa1 test: fix routeList
gitea/salix-front/pipeline/head This commit looks good Details
gitea/salix-front/pipeline/pr-test This commit looks good Details
5206f56cec Merge pull request '#7864 - 7864_testToMaster_2434' (!629) from 7864_testToMaster_2434 into master 
Reviewed-on: #629
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
gitea/salix-front/pipeline/pr-master This commit looks good Details
6e814ed4a8 fix: remove full-height class
gitea/salix-front/pipeline/pr-master This commit looks good Details
145c8b00d5 fix: limit and order TicketTracking
gitea/salix-front/pipeline/pr-master This commit looks good Details
472d477b15 fix: trim vnsearchbar input value
gitea/salix-front/pipeline/pr-test This commit looks good Details
gitea/salix-front/pipeline/head This commit looks good Details
7e3c5a9278 Merge pull request 'HOTFIX remove full-height class' (!631) from hotfix_workerTimeControl_style into master 
Reviewed-on: #631
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
gitea/salix-front/pipeline/pr-master This commit looks good Details
0277aa50ce fix: set right time
gitea/salix-front/pipeline/pr-master This commit looks good Details
d89d324a7e chore: drop ref
gitea/salix-front/pipeline/pr-master This commit looks good Details
7f2407996f chore: const var
gitea/salix-front/pipeline/pr-test This commit looks good Details
gitea/salix-front/pipeline/head This commit looks good Details
172c238ac3 Merge pull request 'hotfix: #6917 set right time' (!632) from hotfix-fixVnInputTime into master 
Reviewed-on: #632
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
gitea/salix-front/pipeline/pr-master This commit looks good Details
292253fb45 fix: Show name in summary instead current value
gitea/salix-front/pipeline/pr-master This commit looks good Details
635ac2716d fix: refs #7323 generate code & minor changes
gitea/salix-front/pipeline/pr-test This commit looks good Details
gitea/salix-front/pipeline/head This commit looks good Details
ed3b604c76 Merge pull request 'Show username instead name' (!634) from hotfix_account_descriptor into master 
Reviewed-on: #634
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
gitea/salix-front/pipeline/pr-master This commit looks good Details
517ec87e16 fix: refs #7323 use timeStamp
gitea/salix-front/pipeline/pr-master This commit looks good Details
9c99266da6 fix: refs #7323 replace day
gitea/salix-front/pipeline/pr-master This commit looks good Details
fd09a6bfbe fix: refs #7323 test
gitea/salix-front/pipeline/pr-master This commit looks good Details
48277a5f20 fix: refs #7323 vertical align
gitea/salix-front/pipeline/pr-test This commit looks good Details
gitea/salix-front/pipeline/head This commit looks good Details
9636d5a3ad Merge pull request 'hotfix: refs #7323 generate code & minor changes' (!635) from 7323-hotfix-workerFineTunning into master 
Reviewed-on: #635
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
gitea/salix-front/pipeline/pr-master This commit looks good Details
6f9cd7fe15 fix: refs #7323 auto fill bic
gitea/salix-front/pipeline/pr-master This commit looks good Details
e1e768948e chore: refs #7323 improve vnselect
gitea/salix-front/pipeline/pr-master This commit looks good Details
c418899fb3 chore: refs #7323 improve vnselect
gitea/salix-front/pipeline/pr-test This commit looks good Details
gitea/salix-front/pipeline/head This commit looks good Details
gitea/salix-front/pipeline/pr-master This commit looks good Details
8277b30033 Merge pull request 'fix: refs #7323 auto fill bic' (!642) from 7323-hotfix-workerCreate into master 
Reviewed-on: #642
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
gitea/salix-front/pipeline/head This commit looks good Details
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
89287c3ea3 Merge pull request '#7864 - Merge master into test' (!630) from master into test 
Reviewed-on: #630
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Jorge Penades <jorgep@verdnatura.es>
jsegarra added 1 commit 2024-08-27 05:36:19 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
461b764f0e Merge branch 'test' into dev
jsegarra requested review from jgallego 2024-08-27 05:38:01 +00:00
jgallego approved these changes 2024-08-27 06:45:09 +00:00
jsegarra merged commit 216cd231bf into dev 2024-08-27 07:10:20 +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#647
No description provided.
Delete Branch "test_dev_resolveConflicts"

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?