3128 Commits

All Branches

Search

Author	SHA1	Message	Date
Carlos Satorres	c18d035be5	Merge pull request 'refs #6842 isFreelance' (!348) from 6842-errorCalendar into dev ... Reviewed-on: #348 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-05-08 10:21:28 +00: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	e4af4d3e4a	Merge pull request 'Item tags' (!350) from hyervoni/salix-front-mindshore:feature/ItemTags into dev ... Reviewed-on: #350 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-05-08 08:03:55 +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	6efd03dc0c	Merge pull request '#7271 - Zones Boilerplate' (!327) from 7271_boilerplate_zones into dev ... Reviewed-on: #327 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-05-08 06:17:41 +00: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	613492d04a	Merge pull request 'fix conflicts' (!361) from testToDev into dev ... Reviewed-on: #361 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-05-07 14:37:08 +00: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	0e7c2c7118	Merge pull request '#6938-warmfix' (!359) from 6938-warmfix into test ... Reviewed-on: #359 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-05-07 14:21:13 +00:00
Jorge Penadés	5e0db81a21	fix: refs #6938 conflicts	2024-05-07 15:51:55 +02:00
Jorge Penadés	ac0ebf431f	Merge pull request '#6938 wamfix workerCard' (!357) from 6938-warmfix-masterToTest into test ... Reviewed-on: #357 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-05-07 13:37:05 +00: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
Javier Segarra	0843d70951	Merge pull request 'Item Shelving' (!343) from hyervoni/salix-front-mindshore:feature/ItemShelving into dev ... Reviewed-on: #343 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-05-07 10:57:43 +00:00
Alex Moreno	9b31fa5042	Merge branch 'dev' into feature/ItemShelving	2024-05-07 10:54:12 +00:00
Javier Segarra	175746a4a4	Merge pull request 'Item Basic data' (!346) from hyervoni/salix-front-mindshore:feature/ItemBasicData into dev ... Reviewed-on: #346 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-05-07 10:47:01 +00:00
Javier Segarra	753b5bf939	Merge branch 'dev' into feature/ItemBasicData	2024-05-07 10:44:48 +00:00
Jorge Penadés	095e62ebac	Merge pull request '#6938 rollback phone' (!355) from 6938-hotfix-rollbackHidePhone into master ... Reviewed-on: #355 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-05-07 10:44:05 +00:00
Jorge Penadés	5712810ae2	fix: refs #6938 rollback phone	2024-05-07 12:00:20 +02:00
Javier Segarra	33dac72f1c	Merge branch 'dev' into feature/ItemTags	2024-05-07 09:39:35 +00: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
Alex Moreno	4caf27b4f8	deploy: init version 2422	2024-05-07 08:37:52 +02:00
Alex Moreno	82db1fac11	Merge pull request '7336_devToTest' (!354) from 7336_devToTest into test ... Reviewed-on: #354 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-05-07 06:33:59 +00:00
Alex Moreno	e4ffd4fcdd	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-05-07 08:04:46 +02:00
Alex Moreno	5341f555ef	Merge pull request '7299_testToMaster' (!351) from 7299_testToMaster into master ... Reviewed-on: #351 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-05-07 05:36:02 +00: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	211da4a995	Merge remote-tracking branch 'origin/dev' into 7271_boilerplate_zones	2024-05-06 10:03:29 +02:00
Javier Segarra	605a24156b	Merge branch 'dev' into feature/ItemShelving	2024-05-06 07:54:28 +00: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 Casado	f6abcc6693	Merge pull request 'refs #7113 fix test' (!318) from 7113-fixClaimPhoto into dev ... Reviewed-on: #318 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-05-06 06:38:47 +00: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	dbc9e9dd71	Sales monitor base	2024-05-05 19:13:36 -03: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