Commit Graph

521 Commits

Author SHA1 Message Date
William Buezas 726699bbc5 Item log
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-04-24 10:38:00 -03:00
Javier Segarra e1f50f5daf fix: minorchanges
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-24 15:05:10 +02:00
Javier Segarra dcb06918dd Merge remote-tracking branch 'mindshore/feature/ItemRequests' into feature/ItemFamily 2024-04-24 14:35:20 +02:00
Javier Segarra e65ffb63c9 Merge remote-tracking branch 'mindshore/feature/ItemsSummary' into feature/ItemRequests 2024-04-24 14:26:12 +02:00
Javier Segarra 299838bfa5 Merge branch 'dev' into feature/ItemsSummary
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-24 14:23:49 +02:00
Javier Segarra f4eb14f487 feat: i18n Clone 2024-04-24 14:22:14 +02:00
Javier Segarra 1c3660050b Merge branch 'dev' into 7190_renewTokenMultimedia
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-24 12:15:34 +02:00
Javier Segarra de91364ee8 Merge remote-tracking branch 'origin/dev' into feature/FixedPrices
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-24 09:33:34 +02:00
Javier Segarra bf08ca7655 Merge branch 'dev' into 7190_renewTokenMultimedia
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-24 06:25:14 +00:00
Javier Segarra 861e4385bb Merge branch 'dev' into feature/ItemsSummary
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-24 07:34:49 +02:00
Javier Segarra 5dc41f8236 Merge branch 'dev' into feature/ItemFamily
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-24 07:01:46 +02:00
Javier Segarra 9a78b8ac3b Merge branch 'dev' into feature/ItemRequests 2024-04-23 13:55:43 +02:00
Javier Segarra bfb7dfb472 Merge branch 'dev' into feature/WorkerTimeControl
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-23 13:31:41 +02:00
Pablo Natek 663c093a00 feat: refs #4988 agency e2e 2024-04-22 18:17:01 +02:00
William Buezas 78561c5f42 Item types
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-22 08:34:38 -03:00
Javier Segarra 5a588ead87 Merge remote-tracking branch 'origin/dev' into 7190_renewTokenMultimedia
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-04-22 07:38:07 +02:00
William Buezas 9212e53905 resolve conflicts
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-19 12:48:07 -03:00
William Buezas 3a03e42cf9 Resolve conflicts
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-19 10:40:04 -03:00
Javier Segarra fb26219354 refs #7190 feat: useTokenConfig 2024-04-19 12:09:04 +02:00
Alex Moreno 6db5c56f5a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6336-claim_changes_v3
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-19 09:36:10 +02:00
William Buezas 6c4901076f Apply ItemsFilterPanel to EntryLatestBuys
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-04-18 13:14:23 -03:00
William Buezas 5f01e5c705 change es translations
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-04-18 09:09:22 -03:00
William Buezas 5addd0056d Add filter panel 2024-04-17 17:18:38 -03:00
William Buezas 5551189f2f resolve conflicts
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-17 08:46:37 -03:00
William Buezas 1dfaef2ffa Resolve conflicts
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-17 08:26:12 -03:00
William Buezas da06e7bc87 WIP 2024-04-17 08:13:34 -03:00
Alex Moreno c4c317ef41 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6336-claim_changes_v3
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-17 10:53:18 +02:00
William Buezas ba2499db9d resolve conflicts
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-16 12:11:57 -03:00
William Buezas e36949ad07 resolve conflicts
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-16 10:11:03 -03:00
Alex Moreno 4f286cd032 Merge branch 'dev' into 6425-fixDevTranslations
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-16 12:32:46 +00:00
William Buezas 2ab7a45114 resolve conflicts
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-16 08:49:34 -03:00
William Buezas 5664ec1313 WIP 2024-04-16 08:21:44 -03:00
Jon Elias b216112d2a refactor: refs #6425 fix failed tests
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-16 11:42:43 +02:00
Jon Elias 73c5a5b7d2 fix: refs #6425 fixed dev translations
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-04-16 11:00:38 +02:00
Robert Ferrús 87ae6870a9 feat: refs #6679 add icon 2024-04-16 09:33:56 +02:00
Robert Ferrús d178d7dc6a feat: refs #6679 add icon
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-16 08:04:57 +02:00
William Buezas 00dfa171b0 WIP 2024-04-15 15:37:41 -03:00
William Buezas d9d868a6af Waste breakdown
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-15 09:02:35 -03:00
William Buezas c50741b4bf Remove single quotes
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-15 08:51:48 -03:00
Alex Moreno f176312163 feat(VnNotes): refs #6336 better design
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-15 12:28:43 +02:00
William Buezas 9c7c98d64d Merge with dev 2024-04-12 16:55:51 -03:00
William Buezas 92429295cd more translations
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-12 10:44:25 -03:00
William Buezas 4d418c9cb7 Pull new traduction yml files and add translations
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-12 10:32:19 -03:00
William Buezas beaffbf685 delete old i18n files and adapt branch to the new ones
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-12 10:20:05 -03:00
William Buezas d38c85a0ef resolve conflicts
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-12 09:39:34 -03:00
William Buezas f2dc50d229 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into WorkerCalendar
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-12 08:13:58 -03:00
Jon Elias f83de74f01 refs #6425 fix conflicts
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-12 11:44:56 +02:00
William Buezas 73703dc778 Add translations
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-11 18:07:02 -03:00
William Buezas 98f273cb93 WIP 2024-04-11 18:04:11 -03:00
William Buezas c032c83e7f Item create view
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-11 08:40:41 -03:00
Javier Casado 6002800000 Merge branch 'dev' into 7179-changesClaimSummary
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-11 11:37:11 +00:00
William Buezas 4a0ae8aa45 Item summary
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-10 17:18:57 -03:00
William Buezas 9dfe5f5e68 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/ItemsList
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-10 09:34:51 -03:00
William Buezas c881fe6577 Resolve conflicts
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-10 09:19:54 -03:00
William Buezas eceb60f6e4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/ItemsList
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-10 08:46:00 -03:00
William Buezas 9ae79a5631 Add translation again
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-10 08:43:57 -03:00
William Buezas e8486099fc Resolve conflicts
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-10 08:37:52 -03:00
William Buezas c3835dfd7a resolve conflicts
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-04-09 15:23:05 -03:00
William Buezas 0144aab7a5 Mini fix
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-09 08:51:00 -03:00
jcasado 97ad1c7579 refs #7179 changes customer proxy and client Id
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-09 13:32:01 +02:00
William Buezas f6e140e369 Apply workerDms changes
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-04-09 08:28:00 -03:00
William Buezas e51ea9996b Item list view
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-09 08:18:18 -03:00
Guillermo Bonet 4b9e69625b Merge branch 'dev' into 6636-pickup
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-09 08:02:30 +00:00
William Buezas 4da540fc9c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/ItemsList 2024-04-08 08:47:56 -03:00
William Buezas f12ec3c0c9 Add redirection to summary and open summary action 2024-04-08 08:47:29 -03:00
Guillermo Bonet b2ef381f1d Merge branch 'dev' into 6636-pickup
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-08 05:18:34 +00:00
William Buezas 7584857c87 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/WorkerTimeControl
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-04-05 09:11:23 -03:00
William Buezas 970d1a48e3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into features/ms_submodulos_worker 2024-04-05 08:25:28 -03:00
Javier Casado 5d7fed3b32 Merge branch 'dev' into 6816-removeMicroSip
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-05 07:57:21 +00:00
Guillermo Bonet b09ecefad4 feat: refs #6636 Added pickup in claim
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-04 14:12:16 +02:00
Javier Segarra 0ad722381e #6425 fix quotes in yml file
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-04 13:38:25 +02:00
jcasado d00ec3c41c refs #6816 remove microsip tag
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-04 09:38:47 +02:00
William Buezas 4ee8c45fdc resolve conflicts 2024-04-03 11:22:52 -03:00
Jon Elias 94b177c9a2 fix: refs #6425 fix yml format
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-03 14:33:47 +02:00
Jon Elias 3e423867e3 fix: refs #6425 fix yml format
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-04-03 13:12:00 +02:00
William Buezas bfee37b631 WIP 2024-04-03 08:08:54 -03:00
Jon Elias 9a160d9248 refactor: refs #6425 merged changes
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-04-03 12:57:23 +02:00
William Buezas fc87bb8293 Add page title name 2024-04-02 13:04:28 -03:00
William Buezas addbe9345b Resolve conflicts 2024-04-02 12:40:26 -03:00
Jon Elias 33c54042df refactor: refs #6425 translation files in .yml format and minor changes 2024-04-02 14:12:01 +02:00
Alex Moreno 181bff6c0c Merge branch 'dev' into 6514-gestDocSupplier
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-28 07:17:28 +00:00
William Buezas 37465ffa4a resolve conflicts
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-27 11:23:54 -03:00
William Buezas b546b63352 resolve conflicts
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-27 10:11:20 -03:00
Jon Elias d555f7e09e Merge branch 'dev' into 6988-SummaryRefactor
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-27 10:02:18 +00:00
Jorge Penadés 9c83c4cd6c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5186-CreateParkingSection
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-27 08:30:37 +01:00
William Buezas 0a74b2a96e QCalendar implementation WIP
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-03-26 15:38:06 -03:00
Jon Elias 1ec54d7664 feat: #6514 create supplierDms lilium
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-26 08:55:01 +01:00
Alex Moreno a4a96a106f Merge branch 'dev' into 6988-SummaryRefactor
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-26 06:41:39 +00:00
Kevin Martinez 5e089e616e Merge branch 'dev' into feature/worker-log
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-25 12:00:06 +00:00
Alex Moreno c335accffb refs #6905 fix translation and warnings
gitea/salix-front/pipeline/head This commit looks good Details
2024-03-25 12:42:48 +01:00
Jon Elias 3e0f151570 refactor: refs #6988 fixed error
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-25 12:36:50 +01:00
Jon Elias 84a25acf22 refactor: refs #6988 used global translations
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-25 11:42:29 +01:00
Jorge Penadés d2efbb204f feat: refs #5186 use arrayData in summary
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-22 14:57:36 +01:00
carlosfonseca aa2db28eda Se crea submodulo mis documentos en worker
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-22 08:30:54 -05:00
Carlos Satorres 95d943e6f5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6905-userPanelConfig
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-22 10:17:36 +01:00
Jorge Penadés 4f242b0840 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5186-CreateParkingSection
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-21 15:31:15 +01:00
William Buezas 65da9a3e69 resolve conflicts 2024-03-21 08:53:42 -03:00
William Buezas fc5d858bf1 WIP 2024-03-21 08:37:11 -03:00
Jon Elias 7658573ec6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6425-translationProposal 2024-03-21 12:23:45 +01:00
Jon Elias 63c6b523fb refactor: refs #6425 new translation proposal
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-21 12:14:54 +01:00