wbuezas
/
salix-front-mindshore-fork2
forked from verdnatura/salix-front
0
0
Fork 0
Code Pull Requests Activity
5,520 Commits 154 Branches 0 Tags 22 MiB
Commit Graph

5520 Commits

Author SHA1 Message Date
Jon Elias 6321ed4ee2 Merge branch 'dev' into plus_key_shortcut 2024-09-05 11:08:52 +00:00
Jon Elias b6e14c4e6a fix: refs #7911 fixed shortcut and related files 2024-09-05 13:08:02 +02:00
Javi Gallego 1b8a72175c Merge pull request '#7277 feat: transfer an invoice' (!674) from 7277-RefundInvoices into dev 
Reviewed-on: verdnatura/salix-front#674
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-09-05 09:07:35 +00:00
Jon Elias 70806769ce feat: refs #7911 added shortcut to modules 2024-09-05 08:25:28 +02:00
Jon Elias 96cdb85258 Merge branch 'dev' of https: refs #7911//gitea.verdnatura.es/verdnatura/salix-front into 7911-plus_key_shortcut 2024-09-05 07:42:55 +02:00
Javier Segarra e3c8adf676 Merge branch '7277-RefundInvoices' of https://gitea.verdnatura.es/verdnatura/salix-front into 7277-RefundInvoices 2024-09-04 22:27:33 +02:00
Javi Gallego c2e2d5ca81 feat: minor fixes 2024-09-04 18:30:20 +02:00
Javi Gallego 91164da2eb feat: refuncInvoiceForm component 2024-09-04 18:16:40 +02:00
Javi Gallego 5d7e6be17c Merge branch 'dev' into 7277-RefundInvoices 2024-09-04 17:51:02 +02:00
Javier Segarra 95e30c88ee Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7277-RefundInvoices 2024-09-04 15:32:14 +02:00
Carlos Satorres 251f27bec6 Merge pull request 'refs #7407 Medical Section' (!667) from 7407-MedicalWorker2 into dev 
Reviewed-on: verdnatura/salix-front#667
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-09-04 13:07:33 +00:00
Carlos Satorres 716270ef92 Merge branch 'dev' into 7407-MedicalWorker2 2024-09-04 12:53:09 +00:00
Jon Elias 63c2da9a51 Merge pull request '#6896 Added missing descriptors and small details' (!671) from Fix_OrderMissingDetails into dev 
Reviewed-on: verdnatura/salix-front#671
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-09-04 10:36:04 +00:00
Jon Elias 4602f4c7b3 refactor: deleted useless prop 2024-09-04 12:25:05 +02:00
Jon Elias 3a1575a385 Merge branch 'Fix_OrderMissingDetails' of https://gitea.verdnatura.es/verdnatura/salix-front into Fix_OrderMissingDetails 2024-09-04 10:05:19 +02:00
Jon Elias 19ae1f9d80 refactor: deleted useless prop in FetchedTags 2024-09-04 10:05:18 +02:00
Jon Elias beaa9ab5c8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into Fix_OrderMissingDetails 2024-09-04 09:53:47 +02:00
Carlos Satorres 3a703141c6 Merge branch 'dev' into 7407-MedicalWorker2 2024-09-04 07:49:14 +00:00
Jon Elias 6097f46e29 Merge branch 'dev' into Fix_OrderMissingDetails 2024-09-04 06:38:34 +00:00
Javi Gallego 5b53e9dc37 feat: transfer an invoice 2024-09-03 15:25:36 +02:00
Javier Segarra 4d4997951c Merge pull request 'fix_mainShortcutMixin' (!673) from fix_mainShortcutMixin into dev 
Reviewed-on: verdnatura/salix-front#673
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
 2024-09-03 08:43:44 +00:00
Javier Segarra 397a2606f1 fix: cli warnings 2024-09-03 10:31:37 +02:00
Javier Segarra 4e73e74c2c fix: add border-top 2024-09-03 10:31:24 +02:00
Javier Segarra eca68b76a0 perf: improve mainShrotcutMixin 2024-09-03 10:31:01 +02:00
Jon Elias f4694792eb Merge branch 'dev' into Fix_OrderMissingDetails 2024-09-03 07:57:37 +00:00
Jon Elias 75e18a1e2f fix: added missing descriptors and small details 2024-09-03 09:55:58 +02:00
Robert Ferrús ea8fde49ff Merge pull request 'feat: refs #211153 businessDataLinkGrafana' (!663) from 211153-businessDataLinkGrafana into dev 
Reviewed-on: verdnatura/salix-front#663
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-09-03 06:47:24 +00:00
Robert Ferrús 5a684e244f Merge branch 'dev' into 211153-businessDataLinkGrafana 2024-09-03 06:46:35 +00:00
Pablo Natek 18ded3b6f5 Merge pull request 'feat: refs #7129 add km start and end on create form' (!666) from 7129-someFixesAfterMigration into dev 
Reviewed-on: verdnatura/salix-front#666
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-09-03 05:28:09 +00:00
Pablo Natek f6fe05a47a Merge branch 'dev' into 7129-someFixesAfterMigration 2024-09-03 05:26:37 +00:00
Jon Elias e2674e0cd8 Merge pull request '#7354 end Zone migration' (!539) from 7354_ZoneMigration_End into dev 
Reviewed-on: verdnatura/salix-front#539
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-09-03 04:48:17 +00:00
Jon Elias a2eb298733 Merge branch 'dev' into 7354_ZoneMigration_End 2024-09-03 04:36:22 +00:00
Javier Segarra 9063f5e5a8 perf: change directive location 2024-09-02 15:26:06 +02:00
Javier Segarra e4bd19b02d Merge branch 'dev' into plus_key_shortcut 2024-09-02 15:25:42 +02:00
Jorge Penadés 6c113e33fd Merge pull request 'test To Dev' (!665) from testToDev into dev 
Reviewed-on: verdnatura/salix-front#665
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2024-09-02 13:12:20 +00:00
Jorge Penadés a382d8278c Merge branch 'dev' into testToDev 2024-09-02 13:11:08 +00:00
Carlos Satorres e73930a4eb refs #7407 Medical Section remove table 2024-09-02 15:11:04 +02:00
Carlos Satorres 7bd3c0802e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7407-MedicalWorker2 2024-09-02 15:05:51 +02:00
Javier Segarra 05f89d9774 Merge branch 'plus_key_shortcut' of https://gitea.verdnatura.es/verdnatura/salix-front into plus_key_shortcut 2024-09-02 15:05:41 +02:00
Javier Segarra c495698cac Merge branch 'dev' into plus_key_shortcut 2024-09-02 15:05:38 +02:00
Javier Segarra d65b52804d Merge pull request '#7889 - Implmenet main shortcuts' (!655) from 7889_main_shortcuts into dev 
Reviewed-on: verdnatura/salix-front#655
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2024-09-02 13:03:19 +00:00
Javier Segarra 5d511c7b1b Merge branch 'dev' into 7889_main_shortcuts 2024-09-02 13:02:07 +00:00
Carlos Satorres 0475083a2b refs #7407 Medical Section 2024-09-02 14:57:01 +02:00
Javier Segarra c51af96ca7 fix: module icon 2024-09-02 12:56:44 +00:00
Pablo Natek 77d306ffeb Merge branch 'dev' into 7129-someFixesAfterMigration 2024-09-02 12:46:26 +00:00
Pablo Natek 9cd941a01c feat: refs #7129 add km start and end on create form 2024-09-02 14:45:43 +02:00
Jon Elias 8ffbe400d5 refactor: refs #7354 modified VnInputTime 2024-09-02 14:21:58 +02:00
Jon Elias 127d5c9fd3 Merge branch '7354_ZoneMigration_End' of https://gitea.verdnatura.es/verdnatura/salix-front into 7354_ZoneMigration_End 2024-09-02 13:44:26 +02:00
Jon Elias ea1e82939a fix: refs #7354 e2e tests 2024-09-02 13:44:25 +02:00
Jorge Penadés 200481414f Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into testToDev 2024-09-02 13:21:40 +02:00