Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

(beta): 64% of February 2025 Jackfruit 🍈 #11417

Merged
merged 165 commits into from
Feb 19, 2025
+6,693 −6,249
Merged

(beta): 64% of February 2025 Jackfruit 🍈 #11417

Changes from 1 commit
Commits
Show all changes
165 commits
Select commit Hold shift + click to select a range
aa02a43
⛴ i18n migration
roiLeo Dec 9, 2024
b73bab6
🔧 i18n build
roiLeo Dec 9, 2024
83f9c2a
⛴ netlify build
roiLeo Dec 10, 2024
b662cf5
🔧 pnpm lock conflict
roiLeo Dec 13, 2024
f74b07b
🔧 pnpm lock
roiLeo Dec 18, 2024
6767be7
Merge branch 'main' into chore/upgrade/i18n
roiLeo Dec 20, 2024
e01a5e4
🔧 lockfile
roiLeo Dec 26, 2024
0657576
Merge branch 'main' into chore/upgrade/i18n
hassnian Dec 31, 2024
7d3c2b5
add: `offers` tab in collections & init support for non specific toke…
hassnian Jan 1, 2025
ec8f682
Merge branch 'main' into issue-11116
hassnian Jan 2, 2025
f113a09
ref(useTrades.ts): cleaner `subscribeToTargetsOfTrades` with better t…
hassnian Jan 2, 2025
400b9de
add(trades): search nft in collection input
hassnian Jan 3, 2025
80d782b
ref(transactionMintToken.ts): use `isAssetHub` util
hassnian Jan 4, 2025
c3858b2
Merge branch 'main' into issue-11116
hassnian Jan 4, 2025
39a4dac
Merge branch 'main' into issue-11116
hassnian Jan 6, 2025
8af29cc
fix(TradeOwnerButton.vue): button config not reactive
hassnian Jan 6, 2025
65aea48
add(TokenInCollection.vue): show cart item skeleton while loading
hassnian Jan 6, 2025
5e7c799
✨ auto imports stores & declaration types
roiLeo Jan 6, 2025
b7d3e9b
Merge branch 'main' into chore/upgrade/i18n
roiLeo Jan 6, 2025
d56226c
ref(GalleryItemTradesTable.vue): offers naming to trdes
hassnian Jan 6, 2025
a9d3e42
fix(SearchInput.vue): input styles
hassnian Jan 6, 2025
3f2c618
fix(swaps): send item copy
hassnian Jan 6, 2025
bc14d25
feat: Add TokenInCollection component to TypeSwap.vue.
hassnian Jan 7, 2025
cc10f5f
fix(TokenInCollection.vue): hide search input for owner of token
hassnian Jan 7, 2025
9ed0c19
ref(TradeOverviewModal.vue): force reset of child components on modal…
hassnian Jan 7, 2025
95416e5
Merge branch 'main' into issue-11116
hassnian Jan 7, 2025
e0eadd5
add(TradeOverviewModal.vue): missing send item events and prop
hassnian Jan 7, 2025
e40fc4a
ref(TradeOwnerButton.vue): hide counter swap button for collection swaps
hassnian Jan 7, 2025
b010710
Merge branch 'main' into issue-11116
hassnian Jan 8, 2025
137d9a6
fix(TokenSearchInput.vue): search item results styles
hassnian Jan 8, 2025
8bbafd2
ref(TradeOverviewModal.vue): unify content of modal based on types
hassnian Jan 8, 2025
b592c81
ref(TokenSearchInput.vue): remove `any`
hassnian Jan 8, 2025
a110ddc
ref(TradeFilter.vue): plurar translation
hassnian Jan 8, 2025
9f3fca1
Merge branch 'main' into issue-11116
hassnian Jan 9, 2025
f2b00c6
add(a-swaps): init incoming offer/swaps and ref query
hassnian Jan 9, 2025
2aacefa
fix(WalletAssetTrades.vue): `formatDistanceToNow` trade created at ti…
hassnian Jan 9, 2025
2ba28be
fix(WalletAssetTrades.vue): match design styles
hassnian Jan 9, 2025
a2f358c
add(WalletAsset.vue): show incoming trades for supported chains
hassnian Jan 10, 2025
458658e
ref(useOwnedCollections.ts): use tanstack useQuery
hassnian Jan 10, 2025
ae1b9ad
Merge branch 'main' into issue-11116
hassnian Jan 10, 2025
c7657c9
add(WalletAssetTrades.vue): show offered if type `SWAP`
hassnian Jan 10, 2025
c9319bc
fix(utils/trades.ts): wrong considered json array
hassnian Jan 10, 2025
2d24c6f
fix(useTrades.ts): wrong orderby
hassnian Jan 10, 2025
9ee2f1a
add(WalletAssetTrades.vue): collection atomic swaps case
hassnian Jan 10, 2025
2a3dbfd
fix(useTrades.ts): `createdAt` date
hassnian Jan 10, 2025
832ec3a
add(WalletAssetTrades.vue): view all trades redirect
hassnian Jan 10, 2025
cc9e224
ref(WalletAssetMenu.vue): change tab name`Swap` -> `Create Swap`
hassnian Jan 10, 2025
90942d9
ref(WalletAssetTrades.vue): code cleanup
hassnian Jan 10, 2025
735baf5
ref(collectionEntities): simplify `useOwnedCollections`
hassnian Jan 10, 2025
f84c93b
ref(WalletAssetTrades.vue): reorginze code
hassnian Jan 10, 2025
14ad3b3
ref(WalletAssetTrades.vue): cleaner `getTradeTypeWithMoreIncomingTrades`
hassnian Jan 10, 2025
7c895cd
ref(composables/useTrades.ts): move types to `components/trade/types`
hassnian Jan 10, 2025
cc9844d
fix: add missing trade types
hassnian Jan 10, 2025
6248289
fix(TradeActivityTable.vue): remove import type
hassnian Jan 10, 2025
a0a6bff
fix(trades): add missing type import
hassnian Jan 10, 2025
f68946b
fix: add missing trade type imports
hassnian Jan 11, 2025
5daf3cf
Merge branch 'main' into chore/upgrade/i18n
roiLeo Jan 13, 2025
1573e03
Merge branch 'main' into issue-11116
hassnian Jan 17, 2025
d2672c0
fix(SearchInput.vue): text color
hassnian Jan 17, 2025
7cd6777
fix(TradeOverviewModal.vue): can't accept token specific trades
hassnian Jan 17, 2025
7c785e7
fix(useTrades.ts): trades table loading forever when empty
hassnian Jan 18, 2025
fc72445
ref(utils/trades.ts): simplify regex and query stringify
hassnian Jan 18, 2025
55e39af
Merge branch 'main' into chore/upgrade/i18n
roiLeo Jan 21, 2025
dd35d5f
Merge branch 'main' into issue-11116
hassnian Jan 21, 2025
45bd653
feat: enhance attribute calc on mass mint
Jarsen136 Jan 22, 2025
ce385de
Merge branch 'main' into chore/upgrade/i18n
roiLeo Jan 23, 2025
9193b4f
Merge branch 'main' into issue-11152-2
Jarsen136 Jan 23, 2025
aef5f52
Merge branch 'main' into issue-11116
hassnian Jan 27, 2025
e7d2a09
Merge branch 'issue-11116' of https://github.com/hassnian/nft-gallery…
hassnian Jan 27, 2025
f546e9d
fix: warning message on empty accounts
preschian Jan 27, 2025
1145695
style(connect-wallet): update icon text color for consistency
preschian Jan 27, 2025
16434df
Merge branch 'main' into chore/upgrade/i18n
roiLeo Jan 27, 2025
87539d6
fix(composables/useTrades.ts): wrong merge conflict
hassnian Jan 27, 2025
21d5355
add(swaps): landing `you swap offers` button
hassnian Jan 27, 2025
bfb0fc1
fix(WalletAssetTrades.vue): remove duplicates pushing adding trades
hassnian Jan 27, 2025
f20e038
fix(WalletAssetTrades.vue): items overflowing from container
hassnian Jan 27, 2025
ea35e6d
fix(swaps): deepscan issues
hassnian Jan 27, 2025
ac6cf9b
Merge pull request #11224 from roiLeo/chore/upgrade/i18n
vikiival Jan 27, 2025
c31809b
Merge pull request #11383 from kodadot/fix--warning-message-on-empty-…
vikiival Jan 27, 2025
c3cbf1b
fix(ProfileDetail.vue): `items` grid in `collection` tab
hassnian Jan 28, 2025
eaf9c2a
Merge branch 'main' into issue-11116
hassnian Jan 28, 2025
8d5df30
Merge pull request #11384 from hassnian/issue-fix-profile-items-grid-…
vikiival Jan 28, 2025
39c07ea
Merge branch 'main' into issue-11116
hassnian Jan 28, 2025
834900d
add(TradeActivityTable.vue): init new swap tables
hassnian Jan 29, 2025
852d581
Merge branch 'issue-11116' into issue-11385
hassnian Jan 30, 2025
e7db821
refactor: deprecate ktheme usages
preschian Jan 30, 2025
a11d9e5
style(blog): enhance blog title text styling
preschian Jan 30, 2025
9812536
style(InfoBox): update color variable names for variants
preschian Jan 30, 2025
f43f0cf
refactor: deprecate ktheme usages (2)
preschian Jan 30, 2025
96a2310
style(styles): replace theme mixins with CSS variables in SCSS files
preschian Jan 30, 2025
43ac2c6
fix(locales/en.json): unify trade keys
hassnian Jan 30, 2025
351f926
add(TradeActivityTable.vue): resposive `swap` new style
hassnian Jan 31, 2025
c68d31c
fix(TradeActivityTable.vue): `offer` type trades view
hassnian Jan 31, 2025
cb3ce3f
Merge branch 'main' into issue-11152-2
Jarsen136 Feb 2, 2025
73df8f4
fix(GalleryItemTradesTable.vue); nested vue lifecycle hooks not working
hassnian Feb 3, 2025
04176f0
fix(GalleryItemTradesTable.vue): can't open trade modal from gallery …
hassnian Feb 3, 2025
a7ccfea
fix(trades): edge cases for floor price calculation
hassnian Feb 3, 2025
78094cb
Merge branch 'issue-11116' into issue-11385
hassnian Feb 3, 2025
eb9e6df
add(trades): responsive design across trade types
hassnian Feb 3, 2025
4970937
fix(GalleryItemTradesTable.vue): update `surcharge` prop
hassnian Feb 3, 2025
9a064fc
ref(trade/types.ts): make `surcharge` default key of `BaseTrade`
hassnian Feb 3, 2025
f3bf93a
fix(GalleryItemTradesTable.vue): counter swaps not working from galle…
hassnian Feb 3, 2025
87914bd
add(SurchargeTag.vue): change tag color and text based on surcharge d…
hassnian Feb 3, 2025
a8140d8
fix(NeoTag.vue): `k-grey` variant not working
hassnian Feb 3, 2025
9b83abf
ref(ActivityTableRowItem.vue): show trade item name while loading met…
hassnian Feb 3, 2025
83625f0
ref(trades): `useTradeType.ts ` composable
hassnian Feb 4, 2025
8d9d01a
chore: trigger build
hassnian Feb 4, 2025
d5d5035
style(onboarding): use rgba for background and text colors
preschian Feb 4, 2025
af43ab7
fix(OverviewModalDetails.vue): always show expiration
hassnian Feb 4, 2025
7e901d8
fix(TradeActivityTable.vue): swap items columns names based on tab type
hassnian Feb 4, 2025
a520399
[skip ci] updated code diagram
kkukelka Feb 4, 2025
6f0be79
add(trades) trade modal with surcharge in item :
hassnian Feb 4, 2025
048b651
Merge pull request #11392 from kodadot/action
vikiival Feb 4, 2025
57d2e7e
Merge branch 'main' into issue-11385
hassnian Feb 5, 2025
1bc391b
add(TradeActivityTableRow.vue): mobile cols labels
hassnian Feb 5, 2025
b03d6dc
style(massmint): update hover background color to use rgba format
preschian Feb 5, 2025
9cf1279
Merge pull request #11319 from hassnian/issue-11116
Jarsen136 Feb 5, 2025
3e8d014
Merge branch 'main' into issue-11385
Jarsen136 Feb 5, 2025
782b73f
fix: use ipfsio gateway on apple device
preschian Feb 6, 2025
c1afd9b
chore: remove nftStorage IPFS provider
preschian Feb 6, 2025
573cf93
fix: Search in collection: Dark mode needs adusting
Jarsen136 Feb 6, 2025
b2e7c11
Merge pull request #11386 from kodadot/refactor--deprecate-ktheme-usages
vikiival Feb 6, 2025
8af35af
chore: format
Jarsen136 Feb 6, 2025
d9e8af0
Merge branch 'issue-11152-2' of github.com:Jarsen136/nft-gallery into…
Jarsen136 Feb 6, 2025
a2c8175
Merge branch 'main' into issue-11152-2
vikiival Feb 6, 2025
067ca51
feat: fetch oda on drops page
preschian Feb 7, 2025
d50b95e
Merge branch 'main' of github.com:kodadot/nft-gallery into feat--fetc…
preschian Feb 7, 2025
6625370
feat(collection): add metadata refresh functionality to generative la…
preschian Feb 7, 2025
5514c43
Merge pull request #11404 from kodadot/feat--fetch-oda-on-drops-page
vikiival Feb 7, 2025
7d1e403
Merge pull request #11374 from Jarsen136/issue-11152-2
vikiival Feb 8, 2025
b4a5361
fix: duplicate fetch on itemsgrid
preschian Feb 10, 2025
d9dbab3
refactor(itemsGrid): move onchain data processing logic to composable
preschian Feb 10, 2025
25c59fa
feat(items): add on-chain data fetching to ItemsGrid component
preschian Feb 10, 2025
32f05bb
Merge branch 'main' into issue-11385
hassnian Feb 11, 2025
e36c56c
:arrow_up: nuxt i18n
vikiival Feb 13, 2025
89b1092
:shrug: add vue, vue-router as devdeps
vikiival Feb 13, 2025
3d59f21
Merge pull request #11407 from kodadot/chore/i18n-up
vikiival Feb 13, 2025
9506821
Merge pull request #11405 from kodadot/fix--duplicate-fetch-on-itemsgrid
vikiival Feb 14, 2025
61577b0
fix(TokenInCollection.vue): make `title` optional prop
hassnian Feb 14, 2025
ab28036
fix(ActivityTable/RowItem.vue): `id` is undefined
hassnian Feb 14, 2025
7364c52
Merge branch 'main' into issue-11385
hassnian Feb 14, 2025
2e64666
Merge branch 'main' into issue-11399
vikiival Feb 14, 2025
5c4add3
Merge pull request #11403 from Jarsen136/issue-11399
vikiival Feb 14, 2025
73ace93
Merge branch 'main' into issue-11385
hassnian Feb 15, 2025
c42ad52
Merge pull request #11389 from hassnian/issue-11385
vikiival Feb 15, 2025
c4cf8c3
Merge branch 'main' of github.com:kodadot/nft-gallery into fix--use-i…
preschian Feb 17, 2025
2cc602c
fix(gallery): update fallback service for video processing on iOS and…
preschian Feb 17, 2025
2676524
Merge branch 'main' of github.com:kodadot/nft-gallery into refactor--…
preschian Feb 17, 2025
0be738d
fix: Offer expiration dropdown menu misplacement
Jarsen136 Feb 17, 2025
1261de0
fix: atomic offer on collection offer table
Jarsen136 Feb 17, 2025
a758cc0
Merge pull request #11415 from Jarsen136/issue-11414
vikiival Feb 17, 2025
b9d0503
Merge branch 'main' into refactor--deprecate-ktheme-usages-(2)
vikiival Feb 17, 2025
ff34a80
Merge pull request #11413 from Jarsen136/issue-11411
vikiival Feb 17, 2025
84c1f97
Merge pull request #11387 from kodadot/refactor--deprecate-ktheme-usa…
vikiival Feb 18, 2025
b90322c
🔧 open graph default image
roiLeo Feb 18, 2025
222cede
fix: Remove Merchstore from footer
Jarsen136 Feb 18, 2025
8885cc7
Merge branch 'main' into issue-11419
Jarsen136 Feb 18, 2025
228827b
Merge pull request #11423 from Jarsen136/issue-11419
vikiival Feb 18, 2025
18d6a5e
ci: adjust collection test
preschian Feb 19, 2025
be23c90
Merge branch 'main' of github.com:kodadot/nft-gallery into ci--adjust…
preschian Feb 19, 2025
03b81ad
revert
preschian Feb 19, 2025
532662c
Merge pull request #11422 from roiLeo/fix/og/k_card
Jarsen136 Feb 19, 2025
95a050d
Merge branch 'main' into fix--use-ipfsio-gateway-on-apple-device
preschian Feb 19, 2025
c19f74b
Merge pull request #11402 from kodadot/fix--use-ipfsio-gateway-on-app…
preschian Feb 19, 2025
207ccf0
Merge pull request #11424 from kodadot/ci--adjust-collection-test
preschian Feb 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
🔧 pnpm lock conflict
@roiLeo
roiLeo committed Dec 13, 2024
commit b662cf5fce95099eb9b502269668c1f012e41883
1,819 changes: 622 additions & 1,197 deletions pnpm-lock.yaml
View file

Large diffs are not rendered by default.

You are viewing a condensed version of this merge commit. You can view the full changes here.