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

3905 Commits

Author SHA1 Message Date
Jorge Penadés 332e96f184 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6942-improveInvoceIn 2024-05-27 14:36:57 +02:00
Carlos Satorres ff251fbb85 Merge pull request 'refs #7391 fix textarea' (!402) from 7391-defaulterMods into dev 
Reviewed-on: verdnatura/salix-front#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
Jorge Penadés 30cec965e8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6942-improveInvoceIn 2024-05-27 13:36:34 +02:00
Jorge Penadés ef9f8b8705 refactor: refs #6942 store key & actions 2024-05-27 13:36:16 +02: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
Jorge Penadés b6f11096f3 feat: refs #6942 url update 2024-05-27 09:07:22 +02:00
Jorge Penadés 3b799efa22 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6942-improveInvoceIn 2024-05-27 08:57:34 +02:00
Jorge Penadés 66c6c857db fix: refs #6942 drop console.log 2024-05-27 08:57:21 +02:00
William Buezas d9e6baf7e3 Move container card to parent view 2024-05-26 20:57:45 -03:00
William Buezas 62443ff44b Abstract ZoneCalendarGrid in a component and reuse it 2024-05-26 20:52:46 -03:00
William Buezas f52f5df78b Make searchbar work 2024-05-26 19:35:12 -03:00
William Buezas dbcd701725 Change Zone Calendar name 2024-05-26 18:59:16 -03:00
William Buezas 3cb17eeb66 remove console.logs 2024-05-26 18:55:35 -03:00
William Buezas bfba4875cc Minor change in exclusion form 2024-05-26 18:54:59 -03:00
William Buezas 097197b8dc Zone exclude form and tree implementation 2024-05-26 17:17:58 -03:00
Javier Segarra d46b906020 feat: bolierplate layout samba and ldap 2024-05-25 10:37:52 +02:00
William Buezas a1fde3f645 WIP 2024-05-24 15:25:00 -03:00
William Buezas 68bb4251a4 WIP 2024-05-24 14:12:17 -03:00
Javier Segarra cedc3e5c83 Merge pull request '#6957 - Change color FetechedTags' (!407) from 6957_changeColorFetechedTags into dev 
Reviewed-on: verdnatura/salix-front#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: verdnatura/salix-front#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
William Buezas 9b3135fd97 WIP 2024-05-24 08:18:38 -03:00
Jorge Penadés 933e0be028 fix: refs #6942 e2e tests 2024-05-24 12:10:27 +02:00
Jorge Penadés d460b198a4 fix: refs #6942 skip e2e tests 2024-05-24 11:43:54 +02:00
Carlos Satorres f1c688af89 refs #7391 fix textarea 2024-05-24 10:08:10 +02:00
Jorge Penadés 1c76d86710 fix: refs #6942 e2e tests 2024-05-24 09:56:16 +02:00
Jorge Penadés 12016f8653 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6942-improveInvoceIn 2024-05-24 09:02:24 +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: verdnatura/salix-front#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: verdnatura/salix-front#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: verdnatura/salix-front#381
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-05-24 06:14:43 +00:00
Javier Segarra cabee09052 Merge branch 'feature/UpcomingDeliveries' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into feature/UpcomingDeliveries 2024-05-24 08:13:40 +02:00
Javier Segarra 286fe0d20c Merge branch 'dev' into feature/UpcomingDeliveries 2024-05-24 08:13:37 +02:00
Alex Moreno f12c9d5a9e refactor: add flat 2024-05-24 07:55:54 +02:00
Jorge Penadés 75c2800e55 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6942-improveInvoceIn 2024-05-23 16:49:18 +02:00
Jorge Penadés b6638e3545 refactor: refs #6942 use router hook 2024-05-23 16:48:50 +02:00
Carlos Satorres a603f37144 refs #7391 fix textarea 2024-05-23 15:54:57 +02:00
Carlos Satorres 4bf4d754a2 Merge pull request 'refs #6111 fix qtable, actions, scroll' (!264) from 6111-modsRouteList into dev 
Reviewed-on: verdnatura/salix-front#264
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-05-23 12:48:28 +00:00
Carlos Satorres 6388f08ffb Merge branch 'dev' into 6111-modsRouteList 2024-05-23 12:47:38 +00:00