Commit Graph

475 Commits

Author SHA1 Message Date
William Buezas 0b5aea76d9 Move translations
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-29 09:39:04 -03:00
William Buezas cf193b07c5 Item tax 2024-04-26 08:02:17 -03:00
Javier Segarra 98846bbd1a Merge remote-tracking branch 'origin/dev' into feature/ItemBotanical
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-26 09:28:40 +02:00
Javier Segarra 3c033458d3 fix: minor changes
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-26 09:02:51 +02:00
Pablo Natek cb22eaee4d Merge branch 'dev' into 4988-agencySection
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-26 06:58:53 +00:00
Javier Segarra 22d9d369c8 Merge remote-tracking branch 'origin/dev' into feature/ItemBotanical 2024-04-26 08:52:05 +02:00
Javier Segarra aa87d54f57 Merge remote-tracking branch 'origin/dev' into feature/ItemLog
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-26 08:34:05 +02:00
Pablo Natek f29f7a55a2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 4988-agencySection 2024-04-25 16:28:30 +02:00
Pablo Natek 5544676a1b fix: mistakes like console.log an disables
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-04-25 16:18:06 +02:00
William Buezas 823351f76d Item botanical
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-04-25 10:55:48 -03:00
Pablo Natek d490d85ecc feat: agencyWorkCenter
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-04-25 12:34:19 +02:00
Pablo Natek e184f70be5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 4988-agencySection
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-04-25 09:59:17 +02:00
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 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 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 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 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 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
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