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

1938 Commits

Author SHA1 Message Date
Jorge Penadés d8a0adb852 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5186-CreateParkingSection 2024-03-07 15:57:54 +01:00
Javier Segarra 13cfbf0224 Merge pull request 'Update input date/time behaviour' (!223) from hyervoni/salix-front-mindshore:feature/input-date-updates into dev 
Reviewed-on: verdnatura/salix-front#223
Reviewed-by: JAVIER SEGARRA MARTINEZ <jsegarra@verdnatura.es>
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-03-07 11:20:07 +00:00
Kevin Martinez 80b2683001 Merge branch 'salix-dev' into feature/input-date-updates 2024-03-07 08:11:48 -03:00
Carlos Satorres d189ebca28 Merge pull request 'fix px' (!231) from fixCheckbox into dev 
Reviewed-on: verdnatura/salix-front#231
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-03-07 10:27:58 +00:00
Carlos Satorres 39009d055d fix px 2024-03-07 11:19:25 +01:00
Carlos Satorres aefc237c3f Merge pull request 'refs #6892 fix checkbox' (!230) from 6892-fixCheckbox into dev 
Reviewed-on: verdnatura/salix-front#230
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-03-07 08:38:05 +00:00
Carlos Satorres cd8eb4ce5c refs #6892 fix checkbox 2024-03-07 09:24:17 +01:00
Guillermo Bonet d8331dcfa5 Merge pull request 'refactor: refs #6948 Bank to Accouting' (!224) from 6948-bank into dev 
Reviewed-on: verdnatura/salix-front#224
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-03-07 06:19:45 +00:00
Guillermo Bonet 61f13861f8 Merge branch 'dev' into 6948-bank 2024-03-07 06:17:20 +00:00
Kevin Martinez c34fc0f79e Fix date time timezone 2024-03-06 22:45:23 -03:00
Pablo Natek d549077ffa Merge pull request 'fix(ticket): refs #6486 add a and style to card headers' (!229) from 6486-fix-TicketHeaders into dev 
Reviewed-on: verdnatura/salix-front#229
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-03-06 13:48:01 +00:00
Pablo Natek 00df197653 Merge branch 'dev' into 6486-fix-TicketHeaders 2024-03-06 13:27:52 +00:00
Pablo Natek 70dc144019 fix(ticket): refs #6486 add a and style to card headers 2024-03-06 14:28:33 +01:00
Alex Moreno 4443edd800 fix(claimSummary) header color 2024-03-06 13:45:02 +01:00
Javier Segarra 7bfbf26606 Merge pull request '6336-refactor-claimSummary' (!227) from 6336-refactor-claimSummary into dev 
Reviewed-on: verdnatura/salix-front#227
Reviewed-by: JAVIER SEGARRA MARTINEZ <jsegarra@verdnatura.es>
 2024-03-06 10:44:30 +00:00
Guillermo Bonet aa59643cf3 Merge branch 'dev' into 6948-bank 2024-03-06 10:18:49 +00:00
Alex Moreno 5510594b74 Merge branch 'dev' into 6336-refactor-claimSummary 2024-03-06 09:14:27 +00:00
Pablo Natek 5c40789633 Merge pull request 'fix(buid): refs #6486 add custom variable' (!228) from 6486-fixBuild into dev 
Reviewed-on: verdnatura/salix-front#228
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-03-06 09:02:27 +00:00
Pablo Natek 16adef62c3 fix(buid): refs #6486 add custom variable 2024-03-06 09:55:36 +01:00
Alex Moreno ed15ea4c35 feat: update cypress v13 2024-03-06 09:52:51 +01:00
Javier Segarra 7e769164d7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6336-refactor-claimSummary 2024-03-06 09:48:34 +01:00
Pablo Natek 759dbaa066 Merge pull request '6486-salixColors' (!219) from 6486-salixColors into dev 
Reviewed-on: verdnatura/salix-front#219
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-03-06 08:44:29 +00:00
Pablo Natek 1aedb3c7da Merge branch 'dev' into 6486-salixColors 2024-03-06 08:43:21 +00:00
Pablo Natek 0192ec344f Merge branch '6486-salixColors' of https://gitea.verdnatura.es/verdnatura/salix-front into 6486-salixColors 2024-03-06 09:43:45 +01:00
Pablo Natek b584295101 fix: refs #6486 add title to basicData 2024-03-06 09:43:45 +01:00
Carlos Satorres 8a964c7382 Merge pull request '6892-summaryCardRefact' (!221) from 6892-summaryCardRefact into dev 
Reviewed-on: verdnatura/salix-front#221
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-03-06 08:43:10 +00:00
Pablo Natek 28b63831cc Merge branch 'dev' into 6486-salixColors 2024-03-06 08:41:49 +00:00
Carlos Satorres 207b95c0e9 Merge branch 'dev' into 6892-summaryCardRefact 2024-03-06 08:40:46 +00:00
Carlos Satorres b4726da68e Merge pull request 'refs #6935 restyle card' (!222) from 6935-cardDescriptorRemake into dev 
Reviewed-on: verdnatura/salix-front#222
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-03-06 08:40:13 +00:00
Pablo Natek 59d41029d9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6486-salixColors 2024-03-06 09:39:56 +01:00
Carlos Satorres 366ed0974a Merge branch 'dev' into 6935-cardDescriptorRemake 2024-03-06 08:39:19 +00:00
Jorge Penadés b6d1995e16 Merge pull request '#6981 update icons version' (!225) from 6981-updateIconsVersion into dev 
Reviewed-on: verdnatura/salix-front#225
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-03-06 08:36:12 +00:00
Javier Segarra 4637053ab2 refs #6336 feat: useCardSize 2024-03-06 09:35:01 +01:00
Alex Moreno 973a6eb58c Merge branch 'dev' into 6935-cardDescriptorRemake 2024-03-06 08:30:43 +00:00
Pablo Natek 8df9d43fb4 fix(toolbar): refs #6486 add colors 2024-03-06 09:22:32 +01:00
Jorge Penadés de294fae9c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5186-CreateParkingSection 2024-03-06 08:52:54 +01:00
Carlos Satorres 65f1d56d5b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6892-summaryCardRefact 2024-03-05 14:47:42 +01:00
Carlos Satorres ed44d96589 refs #6892 fix checkbox 2024-03-05 14:45:13 +01:00
Javier Segarra 8ad2aed994 refs #6935 perf: improve css class to handle content after 2024-03-05 13:10:29 +01:00
Pablo Natek 23cfe35d94 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6486-salixColors 2024-03-05 12:04:13 +01:00
Jorge Penadés da1296a8c8 feat: refs #6981 replace files 2024-03-05 11:38:32 +01:00
Guillermo Bonet 38783f423a refactor: refs #6948 Bank to Accouting 2024-03-05 10:33:41 +01:00
Kevin Martinez 98cf665126 Update input date/time behaviour 2024-03-04 22:22:23 -03:00
Alex Moreno 5f77115716 refs #6336 feat: polish claims 2024-03-04 14:56:12 +01:00
Alex Moreno 4484f431bf refs #6336 feat: polish claims 2024-03-04 14:42:15 +01:00
Carlos Satorres 8f9048a786 refs #6892 fix scss class 2024-03-04 13:51:14 +01:00
Carlos Satorres adc290da6d refs #6935 restyle card 2024-03-04 12:26:14 +01:00
Carlos Satorres 043d592037 Merge pull request 'refs #6890 change redirect' (!212) from 6980-redirection into dev 
Reviewed-on: verdnatura/salix-front#212
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-03-04 10:54:05 +00:00
Carlos Satorres f8872b81c5 refs #6892 rename color 2024-03-04 11:28:38 +01:00
Carlos Satorres e3cf34fcda Merge branch 'dev' into 6980-redirection 2024-03-04 10:25:21 +00:00