967 Commits

All Branches

Search

Author	SHA1	Message	Date
Jorge Penadés	34e71c1900	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5835-fixListAndSummary	2024-01-02 12:48:03 +01:00
Jorge Penadés	c6f8bbd616	Merge pull request 'add filter: refs #6606' (!140) from 6606-fixExportBtn into dev ... Reviewed-on: #140 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-01-02 11:49:20 +00:00
Jorge Penadés	9b069fbddd	add filter: refs #6606	2024-01-02 11:38:43 +01:00
Javier Segarra	a6484964dd	Merge pull request 'refs #6363 - Fix style in LoginMain when darkmode is activated' (!131) from 6363_lilium_darkMode_login into dev ... Reviewed-on: #131 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-01-02 09:23:54 +00:00
Javier Segarra	855164015a	Merge branch 'dev' into 6363_lilium_darkMode_login	2024-01-02 09:22:12 +00:00
Javier Segarra	1b5fd42b96	Merge pull request 'Add button to copy current token' (!130) from 6098_lilium_token_copy into dev ... Reviewed-on: #130 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-01-02 09:21:30 +00:00
Javier Segarra	9c6de604f3	Merge branch 'dev' into 6098_lilium_token_copy	2024-01-02 09:18:50 +00:00
Alex Moreno	7f3cfddb25	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-01-02 09:21:06 +01:00
Alex Moreno	24818f5daa	refs #5835 fix(invoiceOutSummary): add ?.	2024-01-02 09:19:29 +01:00
Jorge Penadés	5fb5258cf9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5835-fixListAndSummary	2024-01-02 09:19:03 +01:00
Jorge Penadés	863a9b8213	Merge branch '5835-fixListAndSummary' of https://gitea.verdnatura.es/verdnatura/salix-front into 5835-fixListAndSummary	2024-01-02 09:06:01 +01:00
Jorge Penadés	61d69f7cf7	change btn & prevent error: refs #5835	2024-01-02 09:05:59 +01:00
Jorge Penadés	85d056b491	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5835-fixListAndSummary	2024-01-02 09:00:36 +01:00
Alex Moreno	1b6f2682eb	Merge branch 'dev' into 5835-fixListAndSummary	2024-01-02 07:35:12 +00:00
Alex Moreno	82536847f5	Merge branch 'dev' into 6098_lilium_token_copy	2024-01-02 07:32:56 +00:00
Alex Moreno	deeebd68d1	Merge branch 'dev' into 6363_lilium_darkMode_login	2024-01-02 07:32:22 +00:00
Jorge Penadés	c09848a1cf	Merge pull request 'logs added: refs #6605' (!139) from 6605-invoiceInLog into dev ... Reviewed-on: #139 Reviewed-by: Carlos Satorres <carlossa@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-01-02 07:31:00 +00:00
Jorge Penadés	d374709d4a	logs added: refs #6605	2023-12-29 08:58:32 +01:00
Jorge Penadés	cf99f910a5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5835-fixListAndSummary	2023-12-26 09:16:10 +01:00
Javier Segarra	3cdaa57403	Merge branch 'dev' into 6098_lilium_token_copy	2023-12-22 11:25:13 +00:00
Javier Segarra	e6f4bea466	Merge branch 'dev' into 6363_lilium_darkMode_login	2023-12-22 11:25:07 +00:00
Carlos Satorres	8761f4baaa	Merge pull request 'refs #6128 recharge photo' (!134) from 6128-rechargePhotos into dev ... Reviewed-on: #134 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-12-21 13:19:41 +00:00
Carlos Satorres	f71f341aad	refs #6128 change stateColor	2023-12-21 12:15:01 +01:00
Carlos Satorres	8499bcbe19	refs #6218 refactor dmsFilter	2023-12-21 08:28:03 +01:00
Jorge Penadés	f3a1800cb0	fix breadcrumbs & header: refs #5835	2023-12-20 15:43:09 +01:00
Carlos Satorres	350bc5a3c9	refs #6128 recharge photo	2023-12-20 15:25:45 +01:00
Javier Segarra	ce447b4b76	refs #6363: style: remove !important darkMode for LoginMain	2023-12-20 14:12:28 +01:00
Javier Segarra	bce4551847	refs #6098 feat: copy userToken to clipboard	2023-12-20 09:51:57 +01:00
Javier Segarra	da5b78c2fc	refs #6363: style: fix darkMode for LoginMain	2023-12-20 09:12:11 +01:00
Jorge Penadés	5b79c2ace9	fix margin: refs #5835	2023-12-19 14:03:58 +01:00
Jorge Penadés	c84aeed202	fix test refs #5835	2023-12-18 15:39:26 +01:00
Jorge Penadés	94278e2f53	refactor: refs #5835	2023-12-18 15:36:56 +01:00
Alex Moreno	c9023449c9	refs #6062 fix: correct version	2023-12-15 08:18:48 +01:00
Alex Moreno	eed3267a11	refs #6062 test: fixed e2e due to change of style in the indexes	2023-12-15 08:16:54 +01:00
Alex Moreno	f5cf47b60d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into test	2023-12-15 07:25:47 +01:00
Alex Moreno	f7ebb86960	refs #6576 fix: correct version	2023-12-14 11:42:37 +01:00
Alex Moreno	a149928015	refs #6062 fix: invoiceIn translation	2023-12-13 14:44:56 +01:00
Alex Moreno	6a440e053b	Merge pull request 'refs #6062 fix: migration errors' (!126) from 6062-migration-v1 into dev ... Reviewed-on: #126 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2023-12-13 13:40:38 +00:00
Alex Moreno	bbb2dadc9d	refs #6062 test: fix value name	2023-12-13 14:36:01 +01:00
Alex Moreno	7557096af6	refs #6062 fix: migration errors	2023-12-13 14:19:42 +01:00
Jorge Penadés	055f10e6ff	Merge pull request 'refs #5835 migrateInvoiceIn' (!110) from 5835-migrateInvoiceIn into dev ... Reviewed-on: #110 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-12-13 10:25:06 +00:00
Jorge Penadés	d1a5029ef7	refs #5835 refactor	2023-12-12 12:11:45 +01:00
Jorge Penadés	2c5dc276b2	refs #5835	2023-12-12 09:01:32 +01:00
Jorge Penadés	22a634e7eb	refs #5835 refactor taxRate	2023-12-11 13:49:50 +01:00
Jorge Penadés	61955268f4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5835-migrateInvoiceIn	2023-12-11 12:36:07 +01:00
Jorge Penadés	0e6417ff6a	Merge pull request 'ref #6104 recreate vnlog' (!96) from 6104-changeVnLog into dev ... Reviewed-on: #96 Reviewed-by: Alex Moreno <alexm@verdnatura.es> Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2023-12-11 11:34:36 +00:00
Jorge Penadés	e7c9a18f36	refs #6104 fix package	2023-12-11 12:29:31 +01:00
Jorge Penadés	d2e9a4cde4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5835-migrateInvoiceIn	2023-12-11 12:00:10 +01:00
Jorge Penadés	63372df35a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6104-changeVnLog	2023-12-11 11:59:46 +01:00
Jorge Penadés	52622d9a00	refs #6104 fix tests	2023-12-11 11:59:01 +01:00