3051 Commits

All Branches

Search

Author	SHA1	Message	Date
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
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
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
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	d15a92ce7d	Resolve conflicts	2024-05-03 08:57:39 -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
jcasado	e744077d65	Merge branch '7113-fixClaimPhoto' of https://gitea.verdnatura.es/verdnatura/salix-front into 7113-fixClaimPhoto	2024-05-03 10:21:49 +02:00
jcasado	f7e91424b9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7113-fixClaimPhoto	2024-05-03 10:21:41 +02:00
Javier Casado	534f71c9e3	Merge branch 'dev' into 7113-fixClaimPhoto	2024-05-03 07:26:10 +00: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	e3a36c0ab1	Merge pull request 'refactor: refs #6887 pending claim changes' (!335) from 6887-endClaimMigration into dev ... Reviewed-on: #335 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-05-02 12:45:12 +00:00
Javier Segarra	9fa03beda1	Merge branch 'dev' into 6887-endClaimMigration	2024-05-02 12:44:02 +00:00
Javier Segarra	9dcce336a8	Merge pull request 'Item last entries' (!342) from hyervoni/salix-front-mindshore:feature/ItemLastEntries into dev ... Reviewed-on: #342 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-05-02 12:43:04 +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
Javier Segarra	1a79bd6fb8	feat: zoneSummary	2024-05-02 14:40:56 +02:00
Javier Segarra	03759d2746	Merge branch 'dev' into feature/ItemLastEntries	2024-05-02 14:34:54 +02:00
Javier Segarra	1675919801	fix: minor build bugs	2024-05-02 14:33:24 +02:00
Javier Segarra	7e842f2ce1	Merge pull request 'Item tax' (!337) from hyervoni/salix-front-mindshore:feature/ItemTax into dev ... Reviewed-on: #337 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-05-02 12:23:53 +00:00
William Buezas	8043d72676	Merge branch 'feature/ItemLastEntries' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into feature/ItemLastEntries	2024-05-02 09:16:44 -03:00