William Buezas
|
813bab4e9d
|
manage QCalendar customization classes from wrapper
|
2024-04-16 10:47:16 -03:00 |
William Buezas
|
e36949ad07
|
resolve conflicts
|
2024-04-16 10:11:03 -03:00 |
William Buezas
|
c82f4652f5
|
Move capitalize header week day to wrapper
|
2024-04-16 09:44:52 -03:00 |
William Buezas
|
256461a5bb
|
Change current day colors
|
2024-04-16 09:41:03 -03:00 |
William Buezas
|
a808491c5e
|
use the color of calendar background for the border of panel card
|
2024-04-16 09:37:31 -03:00 |
Alex Moreno
|
892c5986c0
|
Merge pull request 'fix: refs #6425 fixed dev translations' (!294) from 6425-fixDevTranslations into dev
Reviewed-on: verdnatura/salix-front#294
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
|
2024-04-16 12:35:36 +00:00 |
Alex Moreno
|
4f286cd032
|
Merge branch 'dev' into 6425-fixDevTranslations
|
2024-04-16 12:32:46 +00:00 |
William Buezas
|
1577fb701b
|
remove unused span
|
2024-04-16 09:30:17 -03:00 |
William Buezas
|
51eba2ea77
|
Add calendar wrapper
|
2024-04-16 09:28:48 -03:00 |
Alex Moreno
|
5d6a10050e
|
Merge pull request 'WorkerCalendar' (!270) from hyervoni/salix-front-mindshore:WorkerCalendar into dev
Reviewed-on: verdnatura/salix-front#270
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
|
2024-04-16 12:26:20 +00:00 |
William Buezas
|
2ab7a45114
|
resolve conflicts
|
2024-04-16 08:49:34 -03:00 |
Jon Elias
|
b216112d2a
|
refactor: refs #6425 fix failed tests
|
2024-04-16 11:42:43 +02:00 |
Jon Elias
|
73c5a5b7d2
|
fix: refs #6425 fixed dev translations
|
2024-04-16 11:00:38 +02:00 |
Robert Ferrús
|
5feb4a21a5
|
Merge pull request 'feat: refs #6679 add icon' (!276) from 6679-addCreateIcon into dev
Reviewed-on: verdnatura/salix-front#276
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
|
2024-04-16 07:38:35 +00:00 |
Robert Ferrús
|
81f29d815d
|
Merge branch '6679-addCreateIcon' of https://gitea.verdnatura.es/verdnatura/salix-front into 6679-addCreateIcon
|
2024-04-16 09:33:58 +02:00 |
Robert Ferrús
|
87ae6870a9
|
feat: refs #6679 add icon
|
2024-04-16 09:33:56 +02:00 |
Robert Ferrús
|
130869dcdb
|
Merge branch 'dev' into 6679-addCreateIcon
|
2024-04-16 07:30:27 +00:00 |
Jorge Penadés
|
c2048afb53
|
Merge pull request '#6938 hide personal phone' (!290) from 6938-hideWorkerPhone into dev
Reviewed-on: verdnatura/salix-front#290
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
|
2024-04-16 06:38:56 +00:00 |
Robert Ferrús
|
d178d7dc6a
|
feat: refs #6679 add icon
|
2024-04-16 08:04:57 +02:00 |
Robert Ferrús
|
d70da976c2
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6679-addCreateIcon
|
2024-04-16 08:04:23 +02:00 |
Jorge Penadés
|
b2211369ea
|
fix: refs #6938 remove personal phone
|
2024-04-15 13:30:42 +02:00 |
Jorge Penadés
|
1e77e82784
|
fix: refs #6938 id filter
|
2024-04-15 13:28:10 +02:00 |
Robert Ferrús
|
058ddc8e9a
|
feat: refs #6500
|
2024-04-15 13:18:39 +02:00 |
Jorge Penadés
|
68069ba9c6
|
feat: refs #6938 hide personal phone
|
2024-04-15 12:48:07 +02:00 |
Jon Elias
|
32382622e4
|
Merge pull request 'refactor: refs #6425 new translation proposal' (!250) from 6425-translationProposal into dev
Reviewed-on: verdnatura/salix-front#250
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
|
2024-04-12 12:22:23 +00:00 |
Jon Elias
|
5cd32ec2fe
|
Merge branch 'dev' into 6425-translationProposal
|
2024-04-12 12:21:41 +00:00 |
Javier Casado
|
372863e693
|
Merge pull request '#6946 add table and floating button' (!248) from 6946-refactorEntryNotes into dev
Reviewed-on: verdnatura/salix-front#248
Reviewed-by: Jorge Penades <jorgep@verdnatura.es>
|
2024-04-12 11:48:36 +00:00 |
William Buezas
|
6019c7f7b2
|
Add remove chip button only if is manual
|
2024-04-12 08:41:45 -03:00 |
William Buezas
|
9283b190b0
|
Differentiate manual chips
|
2024-04-12 08:35:39 -03:00 |
Jorge Penadés
|
a27bdc37d5
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6946-refactorEntryNotes
|
2024-04-12 13:27:14 +02:00 |
William Buezas
|
c4a8127a5b
|
Add toggle right drawer button
|
2024-04-12 08:24:56 -03:00 |
William Buezas
|
0006761201
|
Use black background on WorkerDateLabel
|
2024-04-12 08:22:17 -03:00 |
William Buezas
|
f2dc50d229
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into WorkerCalendar
|
2024-04-12 08:13:58 -03:00 |
William Buezas
|
3d9d444bb4
|
remove filter field
|
2024-04-12 08:11:58 -03:00 |
William Buezas
|
c12fd77218
|
Remove businessFk from FetchData
|
2024-04-12 08:10:14 -03:00 |
Jon Elias
|
f83de74f01
|
refs #6425 fix conflicts
|
2024-04-12 11:44:56 +02:00 |
Javier Casado
|
a66ece1683
|
Merge pull request 'refs #7179 changes customer proxy and client Id' (!279) from 7179-changesClaimSummary into dev
Reviewed-on: verdnatura/salix-front#279
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
|
2024-04-11 11:38:59 +00:00 |
Javier Casado
|
6002800000
|
Merge branch 'dev' into 7179-changesClaimSummary
|
2024-04-11 11:37:11 +00:00 |
Alex Moreno
|
cc633acfd9
|
deploy: refs #7199 init version 2418
|
2024-04-11 12:34:23 +02:00 |
Alex Moreno
|
3f8d97e2a3
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
|
2024-04-11 12:32:51 +02:00 |
Alex Moreno
|
da8ed5d6b3
|
Merge pull request '7199-devToTest_2316' (!282) from 7199-devToTest_2316 into test
Reviewed-on: verdnatura/salix-front#282
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
|
2024-04-11 10:31:49 +00:00 |
Alex Moreno
|
d99d934dab
|
fix: refs #7199 e2e
|
2024-04-11 12:29:30 +02:00 |
Jon Elias
|
675b764c82
|
refactor: fixed invoiceInVat tests
|
2024-04-11 09:05:02 +02:00 |
Alex Moreno
|
9be132b8a0
|
Merge pull request 'feature/ItemsList' (!280) from hyervoni/salix-front-mindshore:feature/ItemsList into dev
Reviewed-on: verdnatura/salix-front#280
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
|
2024-04-11 05:56:27 +00:00 |
Robert Ferrús
|
de18b56cb2
|
feat: refs #6679 add icon
|
2024-04-10 14:47:20 +02:00 |
Robert Ferrús
|
f59ecbf94e
|
Merge branch '6679-addCreateIcon' of https://gitea.verdnatura.es/verdnatura/salix-front into 6679-addCreateIcon
|
2024-04-10 14:42:48 +02:00 |
Robert Ferrús
|
7f2d8ee1e5
|
feat: refs #6679 add icon
|
2024-04-10 14:42:43 +02:00 |
William Buezas
|
9dfe5f5e68
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/ItemsList
|
2024-04-10 09:34:51 -03:00 |
William Buezas
|
99c576b16e
|
Add actions again
|
2024-04-10 09:32:15 -03:00 |
Javier Segarra
|
478ebfd0ea
|
Merge branch 'dev' into 6679-addCreateIcon
|
2024-04-10 12:22:19 +00:00 |