2320 Commits

All Branches

Search

Author	SHA1	Message	Date
William Buezas	fc4a69b2c6	resolve conflicts in worker routes	2024-04-09 15:28:11 -03:00
William Buezas	c3835dfd7a	resolve conflicts	2024-04-09 15:23:05 -03:00
William Buezas	9bffc9bb25	classes and size improvements	2024-04-09 15:20:29 -03:00
William Buezas	faa8d05313	Change saturday and sunday days color	2024-04-09 14:48:51 -03:00
William Buezas	c573019038	Sizes and spacings	2024-04-09 14:13:40 -03:00
William Buezas	9ea0a62046	Add border and change background color	2024-04-09 14:03:18 -03:00
William Buezas	dfcf6e35d5	Change WorkerEventLabels separations	2024-04-09 11:06:07 -03:00
William Buezas	3e5a5dfe1c	remove import	2024-04-09 10:53:07 -03:00
William Buezas	881c6e2f7f	Improve translations	2024-04-09 09:54:23 -03:00
William Buezas	fb4f35a378	Rename WorkerDateLabel and change colors	2024-04-09 09:21:35 -03:00
William Buezas	0941d74d52	Move default value assignment	2024-04-09 09:14:41 -03:00
William Buezas	196679b9e9	Change v-if variable	2024-04-09 09:07:46 -03:00
William Buezas	e4166c85fa	Move add absences text to a i18n variable	2024-04-09 09:05:15 -03:00
William Buezas	b05c28f571	Add chaining to holiday detail and holiday type	2024-04-09 08:57:39 -03:00
Guillermo Bonet	be9dd8b2b7	Merge pull request 'feat: refs #6636 Added pickup in claim' (!268) from 6636-pickup into dev ... Reviewed-on: #268 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-04-09 08:04:58 +00:00
Guillermo Bonet	4b9e69625b	Merge branch 'dev' into 6636-pickup	2024-04-09 08:02:30 +00:00
Jon Elias	f1c67a9775	Merge pull request 'refactor: refs #6973 updated label and updated cypress test' (!275) from 6973-UpdateVnLocationLabel into dev ... Reviewed-on: #275 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-04-09 06:48:49 +00:00
Jon Elias	f988923b4b	Merge branch 'dev' into 6973-UpdateVnLocationLabel	2024-04-09 06:48:06 +00:00
Jon Elias	b7788512bc	refactor: refs #6973 fix requested changes	2024-04-09 08:41:44 +02:00
Jon Elias	3bededcd94	refactor: refs #6973 updated label and updated cypress test	2024-04-09 07:47:40 +02:00
Javier Segarra	1a9e9d35ca	Merge pull request 'fix_merge_worker_submoduls' (!272) from fix_merge_worker_submoduls into dev ... Reviewed-on: #272 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-04-08 07:04:29 +00:00
Javier Segarra	f2d513766e	fix_merge_worker_submoduls	2024-04-08 07:03:42 +00:00
Javier Segarra	dafc9f83b9	Merge pull request 'Desarrollo de los submodulos basic data, notes y pbx' (!245) from hyervoni/salix-front-mindshore:features/ms_submodulos_worker into dev ... Reviewed-on: #245 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-04-08 06:19:28 +00:00
Guillermo Bonet	b2ef381f1d	Merge branch 'dev' into 6636-pickup	2024-04-08 05:18:34 +00:00
William Buezas	4b6038d1d2	Last changes	2024-04-06 14:10:08 -03:00
William Buezas	4701714aa9	merge with dev	2024-04-05 08:42:13 -03:00
William Buezas	970d1a48e3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into features/ms_submodulos_worker	2024-04-05 08:25:28 -03:00
William Buezas	03be831ee5	remove package-lock.json	2024-04-05 08:24:55 -03:00
William Buezas	dae08c322d	visual adjustments	2024-04-05 08:04:34 -03:00
Guillermo Bonet	1a15ccec2c	fix: refs #6636 Call getEnumValues method	2024-04-05 11:01:48 +02:00
Javier Casado	d72c151d82	Merge pull request 'refs #6816 remove microsip tag' (!267) from 6816-removeMicroSip into dev ... Reviewed-on: #267 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-04-05 08:01:10 +00:00
Javier Casado	5d7fed3b32	Merge branch 'dev' into 6816-removeMicroSip	2024-04-05 07:57:21 +00:00
Alex Moreno	e14993c114	minor changes	2024-04-05 09:12:49 +02:00
Guillermo Bonet	9310d863aa	fix: refs #6636 Icon save and reset	2024-04-05 07:39:05 +02:00
Guillermo Bonet	58b9eb1c78	feat: refs #6636 Requested changes	2024-04-05 07:29:25 +02:00
Guillermo Bonet	8d7670cc85	Merge branch 'dev' into 6636-pickup	2024-04-05 05:24:31 +00:00
William Buezas	cb55115cd2	Remove unused component	2024-04-04 12:02:43 -03:00
William Buezas	78dc3c1c9a	Move data fetching to main component	2024-04-04 11:20:30 -03:00
Jon Elias	b5f721316b	Merge pull request 'refactor: refs #6894 changed filter fields and checked functionality' (!269) from 6894-invoiceInChangeFilters into dev ... Reviewed-on: #269 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-04-04 12:33:34 +00:00
Jon Elias	59a631b19e	Merge branch 'dev' into 6894-invoiceInChangeFilters	2024-04-04 12:32:40 +00:00
William Buezas	fd5ea8f6f5	WIP	2024-04-04 09:27:17 -03:00
Jon Elias	97b7c2469a	refactor: refs #6894 changed filter fields and checked functionality	2024-04-04 14:13:34 +02:00
Guillermo Bonet	b09ecefad4	feat: refs #6636 Added pickup in claim	2024-04-04 14:12:16 +02:00
William Buezas	503efb79c9	WIP	2024-04-04 08:39:52 -03:00
Guillermo Bonet	b21c54f20d	Merge branch 'test' into dev	2024-04-04 11:31:20 +02:00
Guillermo Bonet	d98e5d78ff	hotfix: refs #6930 Rollback tokenMultimedia	2024-04-04 10:17:13 +02:00
jcasado	d00ec3c41c	refs #6816 remove microsip tag	2024-04-04 09:38:47 +02:00
Alex Moreno	06af04a043	Merge pull request '7167-testToMaster_2414' (!266) from 7167-testToMaster_2414 into master ... Reviewed-on: #266 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-04-04 05:35:07 +00:00
William Buezas	0f6c6cde91	Improve visually WorkerDateLabel	2024-04-03 17:32:22 -03:00
Pablo Natek	ef489b74df	Merge pull request '7128-copyStyles' (!265) from 7128-copyStyles into dev ... Reviewed-on: #265 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-04-03 19:12:23 +00:00