19084 Commits

All Branches

Search

Author	SHA1	Message	Date
Jorge Penadés	6e915d36d6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6744-fixWorkerSetPassword	2024-02-13 09:42:05 +01:00
Guillermo Bonet	bbb3f3807a	Merge pull request 'fix: refs #6184 Minor change' (!2031) from 6184-externalCmr into dev ... Reviewed-on: #2031 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-02-13 08:45:03 +00:00
Guillermo Bonet	b449da28ef	Merge branch 'dev' into 6184-externalCmr	2024-02-13 08:42:31 +00:00
Jorge Penadés	995e249495	Merge pull request '#6106 where filter' (!2024) from 6106-fixSignView into dev ... Reviewed-on: #2024 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-02-13 08:42:14 +00:00
Guillermo Bonet	744171dd4c	fix: refs #6184 Requested changes	2024-02-13 09:41:26 +01:00
Jorge Penadés	c8e13fa858	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6106-fixSignView	2024-02-13 09:36:07 +01:00
Guillermo Bonet	e08fb3d229	fix: refs #6184 Minor change	2024-02-13 08:59:58 +01:00
Josep Domingo	5b137ad825	Merge pull request 'feat: refs #6685 RestoreViewCredit' (!2028) from 6685-fixRestoreViewCredit into dev ... Reviewed-on: #2028 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-02-13 07:46:18 +00:00
Josep Domingo	a897a05e8b	feat: refs#6685RestoreViewCredit	2024-02-13 07:52:09 +01:00
Guillermo Bonet	8f4b901818	Merge pull request 'refs #6184 saveCmr' (!1788) from 6184-saveCmr into dev ... Reviewed-on: #1788 Reviewed-by: Alex Moreno <alexm@verdnatura.es> Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-02-13 06:47:05 +00:00
Guillermo Bonet	97f02187e3	Merge branch 'dev' into 6184-saveCmr	2024-02-13 07:35:07 +01:00
Jorge Penadés	7b862c5c30	fix: refs #6744 fix setPassword	2024-02-12 16:10:58 +01:00
Ivan Mas	0ed5a0ff16	Merge pull request 'refs #6446 Delete function nz from db' (!2022) from 6446-Delete-function-nz-from-DB into dev ... Reviewed-on: #2022 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-02-12 12:56:05 +00:00
Ivan Mas	474c616b86	Merge branch 'dev' into 6446-Delete-function-nz-from-DB	2024-02-12 12:54:21 +00:00
Jorge Penadés	534b5bb05a	fix: refs #6106 where filter	2024-02-12 11:26:00 +01:00
Jorge Penadés	d7e51e01a2	Merge pull request '#6379 fixDriverRouteEmail' (!2018) from 6379-fixDriverRouteEmail into dev ... Reviewed-on: #2018 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-02-12 07:46:55 +00:00
Jorge Penadés	d60a95feaa	fix: refs #6379 await & locale	2024-02-12 08:34:25 +01:00
Jorge Penadés	80bae4fdac	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6379-fixDriverRouteEmail	2024-02-12 08:31:59 +01:00
Ivan Mas	b06f80e091	refs #6446 Delete function nz from db	2024-02-12 08:11:49 +01:00
Sergio De la torre	278337dc97	Merge pull request 'refs #6651 feat:add urlImage' (!2015) from 6651_itemShelving_get into dev ... Reviewed-on: #2015 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-02-12 06:24:55 +00:00
Sergio De la torre	1f99450ecb	Merge branch 'dev' into 6651_itemShelving_get	2024-02-12 05:57:02 +00:00
Ivan Mas	a0599403c8	Merge pull request 'fix: refs #6443 #6444 #6445 ChangeRevokeToGrant' (!2019) from 6443-6444-6445-fix-permissions into dev ... Reviewed-on: #2019 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-02-09 13:02:38 +00:00
Jorge Penadés	1be1990936	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6379-fixDriverRouteEmail	2024-02-09 14:01:24 +01:00
Ivan Mas	222335809e	Merge branch 'dev' into 6443-6444-6445-fix-permissions	2024-02-09 13:00:47 +00:00
Jorge Penadés	e96b14ad04	Merge pull request '#6806 fix lastEntriesFilter' (!2013) from 6806-fixEntryFilter into dev ... Reviewed-on: #2013 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-02-09 12:47:17 +00:00
Jorge Penadés	9cf5edb26e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6379-fixDriverRouteEmail	2024-02-09 13:45:33 +01:00
Jorge Penadés	c3b0a8260a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6806-fixEntryFilter	2024-02-09 13:38:59 +01:00
Ivan Mas	362d825202	fix: refs #6443 #6444 #6445 ChangeRevokeToGrant	2024-02-09 13:38:09 +01:00
Jorge Penadés	e61b6b0c13	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6379-fixDriverRouteEmail	2024-02-09 13:36:53 +01:00
Jorge Penadés	e0de498f65	fix: refs #6379 add Error & locale	2024-02-09 13:04:27 +01:00
Carlos Satorres	3ee63e489e	Merge pull request 'refs #6791 remake negativeBases' (!2017) from 6791-negativeNickname into dev ... Reviewed-on: #2017 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-02-09 11:49:37 +00:00
Carlos Satorres	e03e871529	Merge branch 'dev' into 6791-negativeNickname	2024-02-09 11:47:36 +00:00
Carlos Satorres	1597f17230	refs #6791 remove intro	2024-02-09 12:47:17 +01:00
Jorge Penadés	4075375d6e	fix: refs #6379 get mail	2024-02-09 12:12:10 +01:00
Carlos Satorres	3e57bf2b34	refs #6791 remake negativeBases	2024-02-09 11:49:29 +01:00
Sergio De la torre	dcefc9d382	refs #6651 feat:add urlImage	2024-02-09 11:14:30 +01:00
Jorge Penadés	3f08cdd51c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6806-fixEntryFilter	2024-02-09 09:45:10 +01:00
Jorge Penadés	e5f2be9f9c	Merge pull request '#6272 updateFiscalData' (!2001) from 6272-updateFiscalData into dev ... Reviewed-on: #2001 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-02-09 08:41:41 +00:00
Jorge Penadés	8cef56f4f8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6272-updateFiscalData	2024-02-09 09:35:28 +01:00
Juan Ferrer	26d4dbbe34	fix: refs#6706 docker-compose.yml fixes	2024-02-09 09:26:46 +01:00
Juan Ferrer	f18191d6e9	refactor: refs#6706 root dir clean, minimist dep removed	2024-02-09 09:23:00 +01:00
Sergio De la torre	08728d3162	refs #6651 feat:add urlImage	2024-02-09 07:51:51 +01:00
Jorge Penadés	4f9c1b8c95	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6272-updateFiscalData	2024-02-09 07:49:32 +01:00
Jorge Penadés	30069ded15	fix: refs #6806 fix date filter	2024-02-08 16:01:34 +01:00
Guillermo Bonet	cd613c770c	Merge branch 'dev' into 6184-saveCmr	2024-02-08 11:25:24 +00:00
Guillermo Bonet	8e8ee39302	Merge pull request 'refactor: refs #6609 sectorType description to code' (!2008) from 6609-sectorType into dev ... Reviewed-on: #2008 Reviewed-by: Robert Ferrús <robert@verdnatura.es>	2024-02-08 11:19:38 +00:00
Guillermo Bonet	6a94a48a9d	refactor: refs #6609 sectorType description to code	2024-02-08 12:18:37 +01:00
Guillermo Bonet	a2bb3c476c	Merge branch '6609-sectorType' of https://gitea.verdnatura.es/verdnatura/salix into 6609-sectorType	2024-02-08 12:08:20 +01:00
Guillermo Bonet	3f400f92e5	refactor: refs #6609 sectorType description to code	2024-02-08 12:08:19 +01:00
Guillermo Bonet	2676cb840c	Merge branch 'dev' into 6609-sectorType	2024-02-08 11:05:05 +00:00