William Buezas
|
1e67a0feca
|
Make AccountLdap work again
|
2024-06-07 09:35:36 -03:00 |
Jorge Penadés
|
695dd36c1f
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6273-createFreelanceFormOpt
|
2024-06-07 14:23:26 +02:00 |
Jorge Penadés
|
59b85f24ea
|
fix: refs #6273 console error
|
2024-06-07 14:19:10 +02:00 |
Jorge Penadés
|
8d89fc2d90
|
feat: refs #6273 set payMethod to 0
|
2024-06-07 14:08:18 +02:00 |
William Buezas
|
4c84fd9326
|
resolve conflicts
|
2024-06-07 09:03:41 -03:00 |
Javier Segarra
|
301a62aa9d
|
Merge pull request 'Mail aliases' (!418) from hyervoni/salix-front-mindshore:feature/MailAliases into dev
Reviewed-on: verdnatura/salix-front#418
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
|
2024-06-07 10:54:36 +00:00 |
Javier Segarra
|
21a412f688
|
Merge branch 'dev' into feature/MailAliases
|
2024-06-07 10:53:17 +00:00 |
Alex Moreno
|
dce95824be
|
fix(AccountAlias): fix and optimization
|
2024-06-07 12:51:38 +02:00 |
Jon Elias
|
deb6b448fb
|
Merge branch 'dev' into 7003-fixedPriceOrder
|
2024-06-07 10:48:09 +00:00 |
Jon Elias
|
d6bd3de971
|
refactor: refs #7003 fixed order param
|
2024-06-07 12:47:18 +02:00 |
Jon Elias
|
290325b677
|
refactor: refs #7003 changed order filter
|
2024-06-07 12:45:22 +02:00 |
Jorge Penadés
|
213ba4ba52
|
chore: refs #6273 Add default pay method for internal
|
2024-06-07 12:24:48 +02:00 |
Jorge Penadés
|
8b93dbc57d
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6273-createFreelanceFormOpt
|
2024-06-07 12:15:04 +02:00 |
Jorge Penadés
|
6368342be1
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6243-generalizeCmrSection
|
2024-06-07 12:04:00 +02:00 |
Jorge Penadés
|
d35f9c9468
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6243-generalizeCmrSection
|
2024-06-07 12:03:52 +02:00 |
Alex Moreno
|
c392b44195
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
|
2024-06-07 12:03:41 +02:00 |
Javi Gallego
|
9ceac32d89
|
feat: refs #7548 grafana
|
2024-06-07 11:59:26 +02:00 |
Jorge Penadés
|
45998a972b
|
Merge pull request '#7542 use right panel' (!427) from 7542-warmfix-fixRightPanel into test
Reviewed-on: verdnatura/salix-front#427
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
|
2024-06-07 09:56:20 +00:00 |
Jorge Penadés
|
bd7b3c2d06
|
feat: refs #7542 drop space
|
2024-06-07 11:54:26 +02:00 |
Jorge Penadés
|
5922838fcd
|
feat: refs #7542 empty
|
2024-06-07 11:54:06 +02:00 |
Carlos Satorres
|
6a9bba287b
|
Merge pull request 'refs #6905 fix userPanel' (!423) from 6905-fixUserPanelLocal into dev
Reviewed-on: verdnatura/salix-front#423
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
|
2024-06-07 09:50:24 +00:00 |
Carlos Satorres
|
3729817c2b
|
Merge branch 'dev' into 6905-fixUserPanelLocal
|
2024-06-07 09:47:48 +00:00 |
Pablo Natek
|
5197211cf0
|
Merge branch 'dev' into 7499-refactorEntrys
|
2024-06-07 09:38:51 +00:00 |
Pablo Natek
|
d0dccddcf3
|
fix: refs #7499 id article
|
2024-06-07 11:37:11 +02:00 |
Javier Segarra
|
5551077c92
|
fix: roles
|
2024-06-07 11:16:15 +02:00 |
Javier Segarra
|
6053d42442
|
fix: descriptor and i18n
|
2024-06-07 11:09:46 +02:00 |
Javier Segarra
|
567c9ad307
|
Merge branch 'dev' into feature/MailAliases
|
2024-06-07 10:46:24 +02:00 |
Javier Segarra
|
f01d83cfe5
|
Merge pull request 'Account ACLs' (!422) from hyervoni/salix-front-mindshore:feature/AccountAcls into dev
Reviewed-on: verdnatura/salix-front#422
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
|
2024-06-07 08:25:05 +00:00 |
Javier Segarra
|
3f22d098b0
|
Merge branch 'dev' into feature/AccountAcls
|
2024-06-07 08:22:35 +00:00 |
Javier Segarra
|
edad698f72
|
fix: update list when update record
|
2024-06-07 10:21:41 +02:00 |
Javier Segarra
|
6c608e86e6
|
Merge branch 'feature/AccountAcls' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into feature/AccountAcls
|
2024-06-07 10:19:55 +02:00 |
Alex Moreno
|
7f083bde5c
|
build: increase version
|
2024-06-07 10:13:32 +02:00 |
Javier Segarra
|
0ea44eb8db
|
Merge branch 'dev' into feature/AccountAcls
|
2024-06-07 10:07:15 +02:00 |
Jorge Penadés
|
c0c066fd98
|
fix: refs #7542 use right panel
|
2024-06-07 09:52:44 +02:00 |
Javier Segarra
|
b54cb73c91
|
Merge pull request 'Zone Calendar' (!411) from hyervoni/salix-front-mindshore:feature/ZoneCalendar into dev
Reviewed-on: verdnatura/salix-front#411
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
|
2024-06-07 07:40:00 +00:00 |
Javier Segarra
|
ec5d5e52f4
|
Merge branch 'dev' into feature/ZoneCalendar
|
2024-06-07 09:32:51 +02:00 |
Javier Segarra
|
53c47301c7
|
Merge pull request '#6911 save on enter' (!207) from 6911-saveOnEnter into dev
Reviewed-on: verdnatura/salix-front#207
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
|
2024-06-07 07:20:46 +00:00 |
Alex Moreno
|
a56df46678
|
fix(AccountAcls): fix and optimization
|
2024-06-07 09:07:58 +02:00 |
Pablo Natek
|
68e49e2ffa
|
fix: refs #7129 fix some issues on load and tools
|
2024-06-07 07:52:50 +02:00 |
Javier Segarra
|
7880f66c6e
|
Merge branch '6911-saveOnEnter' of https://gitea.verdnatura.es/verdnatura/salix-front into 6911-saveOnEnter
|
2024-06-07 00:59:20 +02:00 |
Javier Segarra
|
28836fc514
|
test: fix test beacuse use {enter}
|
2024-06-07 00:59:17 +02:00 |
Javier Segarra
|
2a85fe21b0
|
Merge branch 'dev' into 6911-saveOnEnter
|
2024-06-07 00:46:42 +02:00 |
Javier Segarra
|
1237dd5c10
|
fix: style workweek
|
2024-06-07 00:13:49 +02:00 |
Javier Segarra
|
17c3a89264
|
fix: show exclusionEvent in Calendar
|
2024-06-07 00:01:35 +02:00 |
Javier Segarra
|
a26401d8eb
|
feat: hide ID
|
2024-06-06 23:51:45 +02:00 |
Javier Segarra
|
e178778264
|
fix: styles
|
2024-06-06 23:46:26 +02:00 |
Javier Segarra
|
fe3ad9dc08
|
fix: styles and i18n
|
2024-06-06 23:40:52 +02:00 |
Javier Segarra
|
17924dfeb3
|
fix: styles and i18n
|
2024-06-06 23:39:38 +02:00 |
William Buezas
|
f305cee3ce
|
Account view forms
|
2024-06-06 14:07:40 -03:00 |
Alex Moreno
|
985ce9a643
|
deploy: test to dev
|
2024-06-06 12:24:08 +02:00 |