a0f3c6183b
Merge branch 'test' into 7219-sale_replaceItem
7d50907676
Merge branch 'master' into test
786a5a68b9
hotfix: EKT
62596de1dd
Merge branch 'master' into test
db5b0d7967
hotfix: ticket#174761 Greatest fix null possibility
ffd7b3cf50
Merge branch 'dev' into 6500-procRefactor8
22006ea3fb
Merge pull request '#6938 add scope & acls' (!2301) from 6938-hideWorkerPhone into dev
adb2249d2f
fix: refs #6938 e2e tests
3c9ac9634b
fix: refs #6938 front tests
3e1218463c
fix: refs #6938 filters & scope
5feb4a21a5
Merge pull request 'feat: refs #6679 add icon' (!276) from 6679-addCreateIcon into dev
81f29d815d
Merge branch '6679-addCreateIcon' of https://gitea.verdnatura.es/verdnatura/salix-front into 6679-addCreateIcon
87ae6870a9
feat: refs #6679 add icon
130869dcdb
Merge branch 'dev' into 6679-addCreateIcon
d178d7dc6a
feat: refs #6679 add icon
feat: refs #6679 add icon
81f29d815d
Merge branch '6679-addCreateIcon' of https://gitea.verdnatura.es/verdnatura/salix-front into 6679-addCreateIcon
87ae6870a9
feat: refs #6679 add icon
130869dcdb
Merge branch 'dev' into 6679-addCreateIcon
c2048afb53
Merge pull request '#6938 hide personal phone' (!290) from 6938-hideWorkerPhone into dev
b2211369ea
fix: refs #6938 remove personal phone
1e77e82784
fix: refs #6938 id filter
68069ba9c6
feat: refs #6938 hide personal phone
d178d7dc6a
feat: refs #6679 add icon
d70da976c2
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6679-addCreateIcon
32382622e4
Merge pull request 'refactor: refs #6425 new translation proposal' (!250) from 6425-translationProposal into dev
5cd32ec2fe
Merge branch 'dev' into 6425-translationProposal
372863e693
Merge pull request '#6946 add table and floating button' (!248) from 6946-refactorEntryNotes into dev
9ee3e76594
Merge branch 'dev' into 5855-temporaryTable
ba94bcdb19
Merge pull request 'feat(binlog): refs #4409 New function for binlog queue monitoring' (!2299) from 4409-binlogQueueFn into dev
31e27f1926
Merge branch '4409-binlogQueueFn' of https://gitea.verdnatura.es/verdnatura/salix into 4409-binlogQueueFn
5414aaa1b4
fix(binlog): refs #4409 Fixtures for binlogQueue
ba9e1d9233
Merge branch 'dev' into 4409-binlogQueueFn
a41aa46c3a
Merge branch 'dev' into 6500-procRefactor8
ba94bcdb19
Merge pull request 'feat(binlog): refs #4409 New function for binlog queue monitoring' (!2299) from 4409-binlogQueueFn into dev
31e27f1926
Merge branch '4409-binlogQueueFn' of https://gitea.verdnatura.es/verdnatura/salix into 4409-binlogQueueFn
5414aaa1b4
fix(binlog): refs #4409 Fixtures for binlogQueue
ba9e1d9233
Merge branch 'dev' into 4409-binlogQueueFn
36b3a92ca3
Merge branch 'dev' into 6500-procRefactor8
40473d0cc9
Merge pull request 'test: refs #null commit' (!2297) from testHusky_deleteme into dev
cc57fa72fd
fix: remove logs
827f152783
fix: husky
f0604bedd0
test: refs #null asd
800fa36d04
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6500-procRefactor8
b5f3b5ebee
Fix version
c0cabc894b
refactor: refs #7181 Added grant
f0472b7ace
Merge branch 'test' into dev
69280c63b4
Merge branch 'master' into test