3460 Commits

All Branches

Search

Author	SHA1	Message	Date
Javier Segarra	67b3888f8c	feat: AccountForm as dialog	2024-05-31 10:10:15 +02:00
Javier Segarra	5b9d64128b	fix: AccountFilter	2024-05-31 09:45:01 +02:00
William Buezas	56dd5e0a76	change fn name	2024-05-29 16:27:44 -03:00
William Buezas	1414b93633	Account create	2024-05-29 11:53:11 -03:00
William Buezas	e47bda0afc	small changes	2024-05-29 08:47:33 -03:00
William Buezas	6c34a250db	Remove more unnecesary files	2024-05-29 08:28:17 -03:00
William Buezas	5c9f62bd59	Remove unnecesary files	2024-05-29 08:26:07 -03:00
William Buezas	fd7f46cbe2	several changes	2024-05-28 18:33:18 -03:00
William Buezas	062de82bca	Account list	2024-05-28 17:30:39 -03:00
William Buezas	4292804922	Merge branch '7311_boilerplate_users' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/AccountList	2024-05-28 11:30:10 -03:00
Javier Segarra	d98717f253	Merge pull request 'Zone Locations' (!390) from hyervoni/salix-front-mindshore:feature/ZoneLocations into dev ... Reviewed-on: #390 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-05-28 10:53:26 +00:00
Javier Segarra	909c545106	Merge branch 'dev' into feature/ZoneLocations	2024-05-28 10:46:53 +00:00
Alex Moreno	c88934218a	Merge pull request 'feat: refs #7494 new icons' (!409) from 7494-icons into dev ... Reviewed-on: #409 Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2024-05-28 10:20:52 +00:00
Alex Moreno	d15f31de03	Merge branch 'dev' into 7494-icons	2024-05-28 10:19:49 +00:00
Alex Moreno	93fb3096e0	feat: refs #7494 new icons	2024-05-28 12:17:51 +02:00
Alex Moreno	35f7a6036e	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-05-28 12:13:06 +02:00
Alex Moreno	2c307e5f29	deploy: fix e2e after db deploy	2024-05-28 12:12:31 +02:00
Alex Moreno	9f18c12c33	feat: refs #7494 new icons	2024-05-28 08:56:59 +02:00
Alex Moreno	8304dcb0a5	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-05-28 07:48:51 +02:00
Alex Moreno	75e9bc42aa	Merge pull request '7489-testToMaster' (!408) from 7489-testToMaster into master ... Reviewed-on: #408 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-05-28 05:33:16 +00:00
William Buezas	8d7568d9a2	Search childs fix	2024-05-27 14:40:33 -03:00
Javier Segarra	47248680ba	test: #7489 Fix VnLocation.spec.js	2024-05-27 18:35:34 +02:00
William Buezas	fcaca42b1f	resolve conflicts	2024-05-27 12:35:59 -03:00
William Buezas	a2df7b5cf7	small fix	2024-05-27 12:32:13 -03:00
Alex Moreno	3ae523ef04	test(WorkerList): refs #7589 fix e2e	2024-05-27 16:52:53 +02:00
Alex Moreno	f7a6e3d471	test(ClaimPhoto): refs #7589 fix e2e	2024-05-27 16:13:40 +02:00
William Buezas	f2df252a94	improvement	2024-05-27 10:32:10 -03:00
Carlos Satorres	ff251fbb85	Merge pull request 'refs #7391 fix textarea' (!402) from 7391-defaulterMods into dev ... Reviewed-on: #402 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-05-27 11:59:10 +00:00
Carlos Satorres	4162e040cc	Merge branch 'dev' into 7391-defaulterMods	2024-05-27 11:58:11 +00:00
Juan Ferrer	24c0a62edf	Merge branch 'test' into dev	2024-05-27 13:32:19 +02:00
Juan Ferrer	3a2b0e757a	ci: refs #7442 Kubernetes deploy	2024-05-27 13:31:40 +02:00
William Buezas	b408e0daaf	remove on selected	2024-05-27 08:29:52 -03:00
William Buezas	c304c68c9e	Zone tree abstraction	2024-05-27 08:29:24 -03:00
William Buezas	d9e6baf7e3	Move container card to parent view	2024-05-26 20:57:45 -03:00
Javier Segarra	d46b906020	feat: bolierplate layout samba and ldap	2024-05-25 10:37:52 +02:00
Javier Segarra	cedc3e5c83	Merge pull request '#6957 - Change color FetechedTags' (!407) from 6957_changeColorFetechedTags into dev ... Reviewed-on: #407 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-05-24 16:10:46 +00:00
William Buezas	b4331ab2d2	remove import	2024-05-24 13:02:28 -03:00
William Buezas	66955dbc90	mini fix	2024-05-24 12:33:29 -03:00
William Buezas	9e264e6f1f	Improvement	2024-05-24 12:27:15 -03:00
Javier Segarra	5c711c1bcb	perf: 6957 add color as new shared variable	2024-05-24 14:34:57 +02:00
Javier Segarra	f25385961b	perf: 6957 change fetchedTags color	2024-05-24 14:34:44 +02:00
Carlos Satorres	c7d7ae5373	Merge pull request 'refs #7396 fix summary' (!406) from fix-basicDataWorker into dev ... Reviewed-on: #406 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-05-24 12:02:11 +00:00
Carlos Satorres	ba5407310f	refs #7396 fix summary	2024-05-24 13:40:00 +02:00
Carlos Satorres	f1c688af89	refs #7391 fix textarea	2024-05-24 10:08:10 +02:00
Alex Moreno	b531370e2c	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-05-24 08:33:27 +02:00
Carlos Satorres	70e5b207e5	Merge pull request 'fix: refs #6095 add reFfk null on search' (!383) from 6095-add-refFk-null-on-search into dev ... Reviewed-on: #383 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-05-24 06:29:58 +00:00
Carlos Satorres	4bacc8d836	Merge branch 'dev' into 6095-add-refFk-null-on-search	2024-05-24 06:28:34 +00:00
Javier Segarra	515561b75d	Merge pull request '#6957: FetchedTags refactor template' (!382) from 6957_refactorFetechedTags into dev ... Reviewed-on: #382 Reviewed-by: Alex Moreno <alexm@verdnatura.es> Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2024-05-24 06:18:24 +00:00
Javier Segarra	d015a2e217	Merge branch 'dev' into 6957_refactorFetechedTags	2024-05-24 08:15:11 +02:00
Javier Segarra	4b9e9a84c5	Merge pull request 'Zone Upcoming deliveries' (!381) from hyervoni/salix-front-mindshore:feature/UpcomingDeliveries into dev ... Reviewed-on: #381 Reviewed-by: Alex Moreno <alexm@verdnatura.es> Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-05-24 06:14:43 +00:00