3454 Commits

All Branches

Search

Author	SHA1	Message	Date
Alex Moreno	e804af3512	Merge branch 'dev' into 7130-addFieldInRoutes	2024-04-18 07:25:32 +00:00
Jorge Penadés	b71068ac64	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6480-improveCard	2024-04-18 08:44:10 +02:00
Javier Segarra	19e5694e09	Merge pull request '#6907 - input_clearable_hover' (!198) from 6907_fix_input_clearable_hover into dev ... Reviewed-on: #198 Reviewed-by: Alex Moreno <alexm@verdnatura.es> Reviewed-by: Juan Ferrer <juan@verdnatura.es> Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-04-18 06:42:28 +00:00
Jon Elias	062d743896	refactor: refs #7139 replace warehouse with ticket	2024-04-18 08:20:20 +02:00
Javier Segarra	5382f306e2	Merge branch 'dev' into 6907_fix_input_clearable_hover	2024-04-18 06:18:02 +00:00
Alex Moreno	84dfd6d474	hotFix(workerDms): use undefined	2024-04-18 08:12:11 +02:00
Javier Segarra	817a8fcc71	Merge branch 'dev' into 7180_bug_supplierListScroll	2024-04-18 06:06:01 +00:00
Jon Elias	ace55c554f	refactor: refs #6899 corrected Lilium styles and functionalities	2024-04-18 08:03:57 +02:00
Alex Moreno	180637fefc	Merge pull request '7226-testToMaster_2416' (!303) from 7226-testToMaster_2416 into master ... Reviewed-on: #303 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-04-18 05:41:10 +00:00
William Buezas	5addd0056d	Add filter panel	2024-04-17 17:18:38 -03:00
William Buezas	2903c6a2bf	table adjustments	2024-04-17 14:55:17 -03:00
Alex Moreno	ebd02987b9	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-04-17 16:34:06 +02:00
Alex Moreno	873d528e0d	Merge pull request 'Waste breakdown' (!291) from hyervoni/salix-front-mindshore:feature/WasteBreakdown into dev ... Reviewed-on: #291 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-04-17 12:52:16 +00:00
Jorge Penadés	d6508f1930	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6480-improveCard	2024-04-17 14:20:00 +02:00
Jon Elias	79a90c1163	fix: refs #7130 fix conflicts	2024-04-17 13:48:56 +02:00
William Buezas	5551189f2f	resolve conflicts	2024-04-17 08:46:37 -03:00
Javier Segarra	13214582ac	Merge pull request 'Item create view' (!285) from hyervoni/salix-front-mindshore:feature/ItemCreate into dev ... Reviewed-on: #285 Reviewed-by: Alex Moreno <alexm@verdnatura.es> Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-04-17 11:42:50 +00:00
William Buezas	f5d8e94a24	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/ItemCreate	2024-04-17 08:41:13 -03:00
Javier Segarra	95cd795e7b	Merge pull request 'feat(lilium): refs #6930 Undo rollback salix-back' (!301) from 6930_undo_rollback into dev ... Reviewed-on: #301 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-04-17 11:38:29 +00:00
Javier Segarra	5d7cee38bd	feat(lilium): refs #6930 Undo rollback salix-back	2024-04-17 11:26:35 +00:00
William Buezas	1dfaef2ffa	Resolve conflicts	2024-04-17 08:26:12 -03:00
Jon Elias	6839b5aac2	refactor: refs #6767 deleted <div class="col">	2024-04-17 13:26:08 +02:00
William Buezas	da06e7bc87	WIP	2024-04-17 08:13:34 -03:00
Javier Segarra	55dd401064	Merge pull request '#6930 - Revert/Undo rollback' (!299) from 6930_undo_rollback into dev ... Reviewed-on: #299 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-04-17 11:04:48 +00:00
Alex Moreno	52a0be449d	feat: refs #6336 redesign	2024-04-17 10:58:07 +02:00
Alex Moreno	c4c317ef41	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6336-claim_changes_v3	2024-04-17 10:53:18 +02:00
Javier Segarra	37ad84f239	perf(lilium): refs #6930 Improve setToken fn	2024-04-17 10:09:44 +02:00
Javier Segarra	b95d44c05d	feat(lilium): refs #6930 Undo rollback lilium	2024-04-17 10:07:44 +02:00
Guillermo Bonet	dca954850b	Merge pull request 'feat: refs #6968 Changed groupingMode to enum' (!295) from 6968-groupingModeRefactor into dev ... Reviewed-on: #295 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-04-17 06:48:46 +00:00
Guillermo Bonet	b4462fcdb5	Merge branch 'dev' into 6968-groupingModeRefactor	2024-04-17 06:44:24 +00:00
Javier Segarra	248416b676	fix(lilium) #7180 SupplierList Scroll	2024-04-17 08:41:47 +02:00
William Buezas	a397c6ed30	remove component import	2024-04-16 12:18:36 -03:00
William Buezas	ba2499db9d	resolve conflicts	2024-04-16 12:11:57 -03:00
William Buezas	df2760ef60	Add dense attr to inputs	2024-04-16 11:49:59 -03:00
William Buezas	8e6538b369	Item request view	2024-04-16 11:47:15 -03:00
William Buezas	813bab4e9d	manage QCalendar customization classes from wrapper	2024-04-16 10:47:16 -03:00
William Buezas	e36949ad07	resolve conflicts	2024-04-16 10:11:03 -03:00
William Buezas	c82f4652f5	Move capitalize header week day to wrapper	2024-04-16 09:44:52 -03:00
William Buezas	256461a5bb	Change current day colors	2024-04-16 09:41:03 -03:00
William Buezas	a808491c5e	use the color of calendar background for the border of panel card	2024-04-16 09:37:31 -03:00
Alex Moreno	892c5986c0	Merge pull request 'fix: refs #6425 fixed dev translations' (!294) from 6425-fixDevTranslations into dev ... Reviewed-on: #294 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-04-16 12:35:36 +00:00
Alex Moreno	4f286cd032	Merge branch 'dev' into 6425-fixDevTranslations	2024-04-16 12:32:46 +00:00
William Buezas	1577fb701b	remove unused span	2024-04-16 09:30:17 -03:00
William Buezas	51eba2ea77	Add calendar wrapper	2024-04-16 09:28:48 -03:00
Alex Moreno	5d6a10050e	Merge pull request 'WorkerCalendar' (!270) from hyervoni/salix-front-mindshore:WorkerCalendar into dev ... Reviewed-on: #270 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Javier Segarra <jsegarra@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-04-16 12:26:20 +00:00
William Buezas	2ab7a45114	resolve conflicts	2024-04-16 08:49:34 -03:00
William Buezas	5664ec1313	WIP	2024-04-16 08:21:44 -03:00
Javier Segarra	adb31497e5	Merge branch 'dev' into 6907_fix_input_clearable_hover	2024-04-16 10:20:25 +00:00
Jon Elias	b216112d2a	refactor: refs #6425 fix failed tests	2024-04-16 11:42:43 +02:00
Guillermo Bonet	7b29832966	feat: refs #6968 Changed groupingMode to enum	2024-04-16 11:12:23 +02:00