2426 Commits

Author	SHA1	Message	Date
Jorge Penadés	ad14d2e776	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5919-locker	2024-05-13 08:55:03 +02:00
Jorge Penadés	a692ca4a18	feat: refs #5919 test & set workerFk null.	2024-05-10 16:01:32 +02:00
Jorge Penadés	7fd4c43b8b	feat: refs #5919 workerlocker	2024-05-10 13:07:58 +02:00
Jon Elias	2183385e58	Merge branch 'dev' into 6767-deleteDivCol	2024-05-10 09:39:31 +00:00
Jorge Penadés	626a369f84	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5919-locker	2024-05-10 08:35:42 +02:00
Carlos Satorres	349a101680	Merge branch 'dev' into 6877-itemRequestMod	2024-05-09 10:53:27 +00:00
Jorge Penadés	ac935b9020	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5919-locker	2024-05-09 08:48:28 +02:00
Javier Segarra	0ebb9c6c52	fix: unnexpected bottom spca	2024-05-08 13:43:45 +02:00
Javier Segarra	fdd94b09f3	style: fix searchba input width	2024-05-08 11:43:18 +00:00
Carlos Satorres	26506c1f9f	refs #6877 remove update	2024-05-08 13:27:42 +02:00
Jorge Penadés	a1f785ccbe	feat: refs #5919 WIP workerlocker	2024-05-08 11:02:40 +02:00
Jorge Penadés	dec9b924eb	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5919-locker	2024-05-08 10:36:03 +02:00
Carlos Satorres	3d3f72757a	Merge branch 'dev' into 6842-errorCalendar	2024-05-08 08:10:37 +00:00
Alex Moreno	d69b362407	Merge branch 'dev' into feature/ItemTags	2024-05-08 08:02:55 +00:00
Carlos Satorres	1b65ec7c38	refs #6877 fix filterdate	2024-05-08 09:39:26 +02:00
Javier Segarra	ccc87a0958	Merge branch 'dev' into 7271_boilerplate_zones	2024-05-08 07:52:59 +02:00
Javier Segarra	9a6dd65774	feat: remove deprecatedHour fn	2024-05-08 07:52:18 +02:00
Jorge Penadés	392d1892ba	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into testToDev	2024-05-07 16:19:13 +02:00
Jorge Penadés	5e0db81a21	fix: refs #6938 conflicts	2024-05-07 15:51:55 +02:00
Jorge Penadés	0a71060f60	fix: refs #6938 workerCard	2024-05-07 15:28:00 +02:00
Alex Moreno	1d9616c25e	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-05-07 14:18:56 +02:00
Alex Moreno	13f8937f12	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test	2024-05-07 14:18:36 +02:00
Carlos Satorres	a691644b9a	refs #6877 changes filter date	2024-05-07 13:38:25 +02:00
Alex Moreno	9b31fa5042	Merge branch 'dev' into feature/ItemShelving	2024-05-07 10:54:12 +00:00
Jorge Penadés	5712810ae2	fix: refs #6938 rollback phone	2024-05-07 12:00:20 +02:00
Javier Segarra	c0dd140a3a	fix: validTag	2024-05-07 11:38:12 +02:00
Carlos Satorres	ac0993aa11	refs #6842 pr changes	2024-05-07 10:20:26 +02:00
Carlos Satorres	b9c6b01437	refs #6877 update model	2024-05-07 08:59:55 +02:00
Carlos Satorres	1a68cc0ced	refs #6877 change attender	2024-05-06 15:00:18 +02:00
Javier Segarra	4d490652ea	feat #7271: add template	2024-05-06 10:11:07 +02:00
Javier Segarra	49b6c57ad4	fix: show Color	2024-05-06 08:53:12 +02:00
Javier Segarra	6a81076874	fix: replace inputMin rule	2024-05-06 08:45:29 +02:00
Javier Segarra	62bf968b0b	change action to st-actions	2024-05-06 08:41:12 +02:00
Javier Segarra	f85665b271	fix: replace QToolbar by Teleport	2024-05-06 08:37:41 +02:00
Javier Segarra	0f5d06614d	feat: VnInput numberValidation	2024-05-06 07:24:52 +02:00
William Buezas	f3b1de1ee4	Item tags	2024-05-03 17:19:13 -03:00
Javier Segarra	743faef956	fix: #6842 Not update calendar correctly	2024-05-03 15:05:37 +02:00
Carlos Satorres	710b45f43a	refs #6842 isFreelance	2024-05-03 14:49:50 +02:00
William Buezas	d15a92ce7d	Resolve conflicts	2024-05-03 08:57:39 -03:00
William Buezas	99adc9aa05	WIP	2024-05-03 08:53:50 -03:00
Jon Elias	312985b427	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7271_boilerplate_zones	2024-05-03 12:37:30 +02:00
Jon Elias	f03ad52387	Merge branch '7271_boilerplate_zones' of https://gitea.verdnatura.es/verdnatura/salix-front into 7271_boilerplate_zones	2024-05-03 12:31:22 +02:00
Jon Elias	1a5f2fbea2	feat: refs #7271 advanced structure	2024-05-03 12:30:53 +02:00
Jon Elias	8f0af24f50	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6767-deleteDivCol	2024-05-03 08:56:38 +02:00
William Buezas	d2e178a41b	resolve conflicts	2024-05-02 12:02:44 -03:00
William Buezas	d68934a526	Item basic data	2024-05-02 11:51:04 -03:00
Javier Segarra	9fa03beda1	Merge branch 'dev' into 6887-endClaimMigration	2024-05-02 12:44:02 +00:00
Javier Segarra	988be19b96	Merge branch 'dev' into 6887-endClaimMigration	2024-05-02 12:42:46 +00:00
Javier Segarra	cb0d721465	feat: zoneSummary	2024-05-02 14:41:51 +02:00
Javier Segarra	d069ca5095	Merge branch '6887-endClaimMigration' of https://gitea.verdnatura.es/verdnatura/salix-front into 6887-endClaimMigration	2024-05-02 14:40:59 +02:00