wbuezas
/
salix-front-mindshore-fork2
forked from verdnatura/salix-front
0
0
Fork 0
Code Pull Requests Activity
9,120 Commits 155 Branches 0 Tags 30 MiB
Commit Graph

71 Commits

Author SHA1 Message Date
Alex Moreno 221dda174a Merge branch 'dev' into 8316-parkingCardWithVnCardBeta 2025-01-24 08:08:25 +00:00
Alex Moreno b8c8610781 feat: refs #8316 parking inside shelving 2025-01-16 08:06:16 +01:00
Alex Moreno 4c7a35f142 refactor: refs #8316 unify router item and itemType 2025-01-15 10:38:16 +01:00
Alex Moreno 245530b542 refactor: refs #8322 set department inside worker 2025-01-07 13:00:00 +01:00
Alex Moreno 18fd41b82b refactor: refs #8197 adapt AccountAlias 2024-12-16 09:47:46 +01:00
Alex Moreno 2ae0d90e32 chore: refs #8197 replace name 2024-12-09 14:15:33 +01:00
Alex Moreno 907bf3cf3b feat(Account & AccountRole): refs #8197 add VnCardMain 2024-12-02 11:39:01 +01:00
Alex Moreno a46198e2d0 feat: add recover password and reset password 2024-08-13 12:25:08 +02:00
Javier Segarra fac9b6a439 Merge branch 'dev' into feature/AccountConnections 2024-06-11 07:39:41 +00:00
Javi Gallego 911ff376fd Merge pull request '#4560 - gastos-reparto' (!421) from 4560-gastos-reparto into dev 
Reviewed-on: verdnatura/salix-front#421
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-06-10 08:16:57 +00:00
William Buezas bf3c146317 resolve conflicts 2024-06-07 10:24:11 -03:00
Javier Segarra 5551077c92 fix: roles 2024-06-07 11:16:15 +02:00
Javier Segarra 567c9ad307 Merge branch 'dev' into feature/MailAliases 2024-06-07 10:46:24 +02:00
William Buezas 9f6d0b4dc9 Remove roles 2024-06-04 15:15:12 -03:00
William Buezas c71877cdb1 Account connections 2024-06-04 12:23:28 -03:00
William Buezas c96e6482f9 remove mail alias content 2024-06-04 08:42:32 -03:00
Javi Gallego 5f00f3bad4 Merge branch 'dev' into 4560-gastos-reparto 2024-06-04 09:42:44 +02:00
Javi Gallego 56a46cd130 4560 2024-06-03 11:52:19 +02:00
Javi Gallego ca4193e11a Merge branch 'dev' into 4560-gastos-reparto 2024-06-03 11:31:33 +02:00
William Buezas 5c25c77f19 Mail aliases 2024-05-30 13:09:11 -03:00
Javier Segarra aa007117a7 Merge branch 'dev' into 7311_boilerplate_users 2024-05-18 10:16:28 +02:00
Javier Segarra 555b5a663c feat: role router 2024-05-10 18:06:40 +02:00
Javier Segarra 01bedb94d0 feat #7311: enable leftmenu option 2024-05-09 07:54:16 +02:00
William Buezas dbc9e9dd71 Sales monitor base 2024-05-05 19:13:36 -03:00
Jon Elias c1a464d9ae fix: refs #6887 fix conflicts 2024-05-02 13:02:59 +02:00
Jon Elias d5762f65b3 refactor: refs #6887 fixed errors 2024-04-30 10:34:48 +02:00
Jon Elias 5b15558dbf refactor: refs #6887 fixed errors 2024-04-30 10:32:32 +02:00
Javier Segarra 2deeada1f5 Merge remote-tracking branch 'origin/dev' into fix_Customer_1 2024-04-26 12:50:46 +02:00
William Buezas 78561c5f42 Item types 2024-04-22 08:34:38 -03:00
Pablo Natek c65c09c39c feat(agency): refs #4988 add agency router and sections 2024-04-16 07:45:33 +02:00
Jorge Penadés f39595087a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5186-CreateParkingSection 2024-03-14 15:00:16 +01:00
Jorge Penadés 1af5b270a0 fear: refs #5186 WIP parking section 2024-02-21 10:26:20 +01:00
Kevin Martinez 343269fc02 Create roadmap summary page 2024-02-20 08:00:12 -03:00
William Buezas 4fae8e633b Create items module base structure, item descriptor and add it to supplier consumption 2024-01-26 16:36:27 -03:00
William Buezas 113df44705 create entries basic structure and add create entry and clone travel with entries feature to travel list and travel summary 2023-12-29 16:54:35 -03:00
William Buezas 2e09fbd968 Department tree and summary view 2023-12-25 20:38:13 -03:00
Kevin Martinez c0f6906119 Merge branch 'dev' into feature/order 
# Conflicts:
#	src/i18n/en/index.js
#	src/router/modules/index.js
 2023-12-14 07:08:58 -04:00
Alex Moreno 7557096af6 refs #6062 fix: migration errors 2023-12-13 14:19:42 +01:00
Kevin Martinez 9a477c2c25 Create order page 2023-12-11 10:47:16 -04:00
William Buezas 4eb57ab90e resolve conflicts when pulling dev 2023-11-25 20:04:20 -03:00
William Buezas e8b1d0fe7e travel WIP 2023-11-25 19:02:26 -03:00
Kevin Martinez 8e0ee45901 Create Shelving list module 
Adds shelving list, preview and update
 2023-11-23 01:17:23 -03:00
William Buezas 14788b7f7c Suppliers list and suppliers create view 2023-11-22 15:05:12 -03:00
Jorge Penadés 112e057cfa ref #5835 invoiceIn created 2023-10-31 08:56:51 +01:00
Alex Moreno 91de6eb56e refs #6067 feat: outLayout verifyEmail 2023-10-02 14:54:00 +02:00
Alex Moreno d9dd0a4931 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2023-08-10 11:02:36 +02:00
Guillermo Bonet fa120ffa17 refs #5995 Added module route and external cmrs 2023-08-08 14:24:51 +02:00
Alex Moreno 1b79fd633a refs #6076 unnecesary use props 2023-08-04 13:37:12 +02:00
Alex Moreno f01fe1c922 refs #6076 refactor: login use outLayout, feat: twoFactor section 2023-08-04 13:29:31 +02:00
Alex Moreno a554131d77 refs #6076 feat: init twoFactor section 2023-08-03 15:56:55 +02:00