3107 Commits

All Branches

Search

Author	SHA1	Message	Date
jcasado	4de9895b38	refs: #6911-saveOnEnter	2024-05-22 12:07:27 +02:00
jcasado	bdfafe9319	Merge branch '6911-saveOnEnter' of https://gitea.verdnatura.es/verdnatura/salix-front into 6911-saveOnEnter	2024-05-14 08:49:19 +02:00
Javier Segarra	a15530dba2	fix: replace key value	2024-05-09 15:48:51 +00:00
Javier Casado	8128e22645	Merge branch 'dev' into 6911-saveOnEnter	2024-05-09 11:17:38 +00:00
Carlos Satorres	fcb6f8dd49	Merge pull request '#6877 - itemRequestMod' (!362) from 6877-itemRequestMod into dev ... Reviewed-on: #362 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-05-09 10:55:03 +00:00
Carlos Satorres	349a101680	Merge branch 'dev' into 6877-itemRequestMod	2024-05-09 10:53:27 +00:00
jcasado	e68b9e63fe	Merge branch '6911-saveOnEnter' of https://gitea.verdnatura.es/verdnatura/salix-front into 6911-saveOnEnter	2024-05-09 10:25:11 +02:00
Javier Casado	9e7301d32e	Merge branch 'dev' into 6911-saveOnEnter	2024-05-09 07:28:03 +00:00
Alex Moreno	8e529a08dc	Merge pull request 'Fix minor styles' (!363) from fix_minor_styles into dev ... Reviewed-on: #363 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-05-09 06:20:38 +00:00
Javier Casado	b1f25266aa	Merge branch 'dev' into 6911-saveOnEnter	2024-05-09 06:04:26 +00: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
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
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
jcasado	49603e5b37	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6911-saveOnEnter	2024-05-06 13:30:59 +02:00
Javier Casado	fc94454cfd	Merge branch 'dev' into 6911-saveOnEnter	2024-05-06 11:24:48 +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