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.

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

[branded dex]: gleecdex #813

Draft
wants to merge 104 commits into
base: dev
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
104 commits
Select commit Hold shift + click to select a range
2d8cda3
feat(CMake): Update project name and primary coins
Apr 16, 2021
4a0c566
Merge remote-tracking branch 'origin/dev' into GleecDEX
Apr 16, 2021
22281ce
feat(CMake): Update company name, website and social media links
Apr 16, 2021
58480e6
feat(assets): Update sidebar logos
Apr 16, 2021
9814eb8
feat(services): Disable self_update_service
Apr 16, 2021
a0156bc
feat(assets): Update tray icon and linux icons
Apr 16, 2021
fa837b5
Merge branch 'dev' of https://github.com/KomodoPlatform/atomicDEX-Des…
Milerius Apr 16, 2021
167634a
feat(coins): update coins.json
Milerius Apr 16, 2021
48c33f2
Merge remote-tracking branch 'origin/GleecDEX' into GleecDEX
Milerius Apr 16, 2021
7b8074e
feat(ci): update ci for gleec
Milerius Apr 16, 2021
de08119
feat(ci): disable notarization for osx gleec
Milerius Apr 16, 2021
67a950e
feat(assets): Update Linux and Win icons
Apr 16, 2021
b81f0d3
Merge remote-tracking branch 'origin/dev' into GleecDEX
Apr 16, 2021
e5b50a1
feat(CMake): Update appdata path
Apr 16, 2021
e792f02
Update project.metadata.cmake
Milerius Apr 16, 2021
f5e8e3d
Merge remote-tracking branch 'origin/dev' into GleecDEX
Apr 16, 2021
eed6973
feat(pie_chart): fix crash pie chart
Milerius Apr 16, 2021
1d9653d
feat(gleec): update light theme
Milerius Apr 16, 2021
f52e0b4
Merge branch 'dev' of https://github.com/KomodoPlatform/atomicDEX-Des…
Milerius Apr 16, 2021
0005cfd
Merge branch 'dev' of https://github.com/KomodoPlatform/atomicDEX-Des…
Milerius Apr 17, 2021
db6d7db
Merge branch 'dev' of https://github.com/KomodoPlatform/atomicDEX-Des…
Milerius Apr 17, 2021
1a1f155
Merge branch 'dev' of https://github.com/KomodoPlatform/atomicDEX-Des…
Milerius Apr 17, 2021
b53aaf8
feat(gleecdex): finalize
Milerius Apr 17, 2021
405018a
Merge branch 'dev' of https://github.com/KomodoPlatform/atomicDEX-Des…
Milerius Apr 19, 2021
0d5fd4d
Merge branch 'dev' of https://github.com/KomodoPlatform/atomicDEX-Des…
Milerius Apr 19, 2021
0cdce2c
feat(osx): remove signature
Milerius Apr 19, 2021
a06b7ae
Merge remote-tracking branch 'origin/GleecDEX' into GleecDEX
Milerius Apr 19, 2021
4cebf56
Trigger notification
Milerius Apr 19, 2021
c08ed64
Merge branch 'dev' of https://github.com/KomodoPlatform/atomicDEX-Des…
Milerius Apr 19, 2021
721254b
feat(gleecdex): remove old ts cfg
Milerius Apr 20, 2021
443b8d6
feat(gleecdex): remove old ts cfg
Milerius Apr 20, 2021
1014b55
feat(gleecdex): sync gleecdex
Milerius Apr 20, 2021
315b639
feat(gleecdex): sync dex
Milerius Apr 20, 2021
91125e2
Merge branch 'dev' of https://github.com/KomodoPlatform/atomicDEX-Des…
Milerius Apr 24, 2021
6e30046
Merge branch 'dev' of https://github.com/KomodoPlatform/atomicDEX-Des…
Milerius Apr 28, 2021
213c213
Merge branch 'dev' into GleecDEX
May 3, 2021
7248d6e
Merge branch 'dev' of https://github.com/KomodoPlatform/atomicDEX-Des…
Milerius May 10, 2021
e6edfa9
feat(gleecdex): sync gleecdex with dev
Milerius May 10, 2021
b9cd38a
Merge remote-tracking branch 'origin/dev' into GleecDEX
May 12, 2021
fcf5711
feat(gleecdex): sync gleecdex
Milerius May 16, 2021
ee0c17b
feat(gleecdex): sync with dev
Milerius May 26, 2021
3a26b35
feat(gleecdex): sync with dev
Milerius May 26, 2021
42fbd2a
Merge branch 'dev' of https://github.com/KomodoPlatform/atomicDEX-Des…
Milerius Jun 21, 2021
6d4b6a3
Merge branch 'dev' of https://github.com/KomodoPlatform/atomicDEX-Des…
Milerius Jun 21, 2021
9d2547d
Merge branch 'dev' of https://github.com/KomodoPlatform/atomicDEX-Des…
Milerius Jun 21, 2021
2193c0a
feat(gleecdex): sync with dev
Milerius Jun 22, 2021
0ee9c9f
Merge branch 'dev' of https://github.com/KomodoPlatform/atomicDEX-Des…
Milerius Jun 22, 2021
988484a
Merge branch 'dev' of https://github.com/KomodoPlatform/atomicDEX-Des…
Milerius Jun 23, 2021
1687575
Merge branch 'dev' of https://github.com/KomodoPlatform/atomicDEX-Des…
Milerius Jun 28, 2021
cc57ab3
Merge branch 'dev' of https://github.com/KomodoPlatform/atomicDEX-Des…
Milerius Jun 28, 2021
d223201
Merge branch 'dev' of https://github.com/KomodoPlatform/atomicDEX-Des…
Milerius Jul 13, 2021
a8034d2
feat(gleecdex): sync gleecdex
Milerius Jul 20, 2021
fc3ac4e
Merge branch 'dev' of https://github.com/KomodoPlatform/atomicDEX-Des…
Milerius Jul 20, 2021
70f7c79
Merge branch 'dev' of https://github.com/KomodoPlatform/atomicDEX-Des…
Milerius Jul 20, 2021
607b4ed
feat(gleec): better default cfg
Milerius Jul 20, 2021
1bd0873
Merge branch 'dev' of https://github.com/KomodoPlatform/atomicDEX-Des…
Milerius Jul 23, 2021
49a4974
Merge branch 'dev' of https://github.com/KomodoPlatform/atomicDEX-Des…
Milerius Jul 26, 2021
36b43df
feat(gleecdex): sync gleecdex
Milerius Aug 9, 2021
ec60c88
feat(gleecdex): update gleecdex themes
Milerius Aug 9, 2021
ad761f9
Merge remote-tracking branch 'origin/dev' into GleecDEX
Aug 25, 2021
28ffe18
feat(app): Hide theme switching possibilities
Aug 26, 2021
a4f55a4
feat(gleecdex): sync with dev
Milerius Sep 6, 2021
86ee836
Merge branch 'dev' of https://github.com/KomodoPlatform/atomicDEX-Des…
Milerius Sep 23, 2021
43d61d5
Merge pull request #1352 from KomodoPlatform/dev
tonymorony Sep 30, 2021
d8f5cb6
Merge branch 'dev' of https://github.com/KomodoPlatform/atomicDEX-Des…
Milerius Oct 4, 2021
2f48e39
Merge branch 'dev' of https://github.com/KomodoPlatform/atomicDEX-Des…
Milerius Oct 23, 2021
ba0f646
Merge remote-tracking branch 'origin/dev' into GleecDEX
Dec 10, 2021
a31ba55
Merge branch 'dev' of https://github.com/KomodoPlatform/atomicDEX-Des…
Milerius Dec 11, 2021
e6bd1b3
Merge branch 'dev' of https://github.com/KomodoPlatform/atomicDEX-Des…
Milerius Dec 11, 2021
3763341
Merge branch 'dev' of https://github.com/KomodoPlatform/atomicDEX-Des…
Milerius Dec 12, 2021
d67396a
Merge branch 'dev' of https://github.com/KomodoPlatform/atomicDEX-Des…
Milerius Dec 12, 2021
38cb7d1
Merge branch 'dev' of https://github.com/KomodoPlatform/atomicDEX-Des…
Milerius Dec 12, 2021
fecda01
Merge branch 'dev' of https://github.com/KomodoPlatform/atomicDEX-Des…
Milerius Jan 2, 2022
ab60dd8
Merge remote-tracking branch 'origin/dev' into GleecDEX
Mar 19, 2022
f0c5fd4
merge from dev
smk762 Aug 10, 2022
ff29c7a
uncomment signing sections
smk762 Aug 11, 2022
92ddd37
Merge pull request #1931 from KomodoPlatform/gleec-signing
tonymorony Aug 11, 2022
e63696a
update CI workflow
smk762 Aug 12, 2022
938a1a3
Merge branch 'stop_bech' into GleecDEX
smk762 Oct 18, 2022
3504b28
Merge pull request #2020 from KomodoPlatform/dev
ca333 Nov 20, 2022
e25a584
update to 0.5.7
smk762 Nov 22, 2022
4af2a8a
Merge pull request #2159 from KomodoPlatform/dev
smk762 Mar 7, 2023
bea819c
Merge pull request #2246 from KomodoPlatform/dev
smk762 Apr 14, 2023
3b17aa4
Merge pull request #2296 from KomodoPlatform/dev
smk762 Jun 27, 2023
23e0bf0
Merge pull request #2322 from KomodoPlatform/dev
smk762 Jul 10, 2023
5f6101d
Merge pull request #2328 from KomodoPlatform/dev
tonymorony Jul 10, 2023
f76a532
Merge branch 'dev' into GleecDEX
smk762 Sep 19, 2023
c1cc203
use gleec logos
smk762 Sep 19, 2023
a2e2853
margin for simple highlight header
smk762 Sep 19, 2023
0ab9ce0
Merge pull request #2363 from KomodoPlatform/dev
smk762 Sep 23, 2023
dfe2250
Merge branch 'dev' into GleecDEX
smk762 Sep 23, 2023
1df9e5a
Merge branch 'master' into GleecDEX
smk762 Sep 24, 2023
5d802e3
Merge pull request #2396 from KomodoPlatform/dev
smk762 Dec 22, 2023
0bfa58d
Merge pull request #2398 from KomodoPlatform/dev
smk762 Dec 22, 2023
bcc289a
Merge pull request #2399 from KomodoPlatform/dev
smk762 Dec 22, 2023
1556d38
Merge branch 'dev' into GleecDEX
smk762 Jan 10, 2024
2547e1e
Merge pull request #2407 from KomodoPlatform/dev
smk762 Jan 20, 2024
9585616
Merge branch 'dev' into GleecDEX
smk762 Jan 20, 2024
28dddc4
Merge pull request #2410 from KomodoPlatform/dev
smk762 Feb 23, 2024
1952847
Merge pull request #2426 from KomodoPlatform/dev
smk762 Apr 10, 2024
056f76f
Merge pull request #2459 from KomodoPlatform/dev
smk762 Jun 24, 2024
b1599b9
Merge branch 'master' into GleecDEX
smk762 Jul 3, 2024
f2b5f38
gitignore kdf binaries
smk762 Aug 30, 2024
a2e98b8
Merge branch 'dev' into GleecDEX
smk762 Aug 30, 2024
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
14 changes: 7 additions & 7 deletions .github/workflows/atomicdex-desktop-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@ on:
workflow_dispatch:

env:
DEX_API: "kdf_kwd"
DEX_RPCPORT: 7762
DEX_RPC: "http://127.0.0.1:7762"
DEX_PROJECT_NAME: "komodo-wallet"
DEX_DISPLAY_NAME: "Komodo Wallet"
DEX_COMPANY: "KomodoPlatform"
DEX_API: "kdf-gleecdex"
DEX_RPCPORT: 7983
DEX_RPC: "http://127.0.0.1:7983"
DEX_PROJECT_NAME: "GleecDEX"
DEX_DISPLAY_NAME: "GleecDEX"
DEX_COMPANY: "Gleec"
DEX_VERSION: "0.8.0"
DEX_WEBSITE: "https://atomicdex.io/"
DEX_WEBSITE: "https://gleec.com/"
VCPKG_DEFAULT_BINARY_CACHE: ${{ github.workspace }}/b/vcpkg_cache
VCPKG_BINARY_SOURCES: clear;x-gha,readwrite
RUNVCPKG_VCPKG_ROOT: ${{ github.workspace }}\komodo-wallet-desktop\ci_tools_atomic_dex\vcpkg-repo
Expand Down
8 changes: 5 additions & 3 deletions assets/config/cfg.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,8 @@
"ETH_ALT": "Ξ",
"BTC": "₿",
"BTC_ALT": "฿",
"LTC": "Ł"
"LTC": "Ł",
"GLEEC": "GLEEC"
},
"available_fiat": [
"USD",
Expand Down Expand Up @@ -94,9 +95,10 @@
],
"possible_currencies": [
"USD",
"BTC",
"KMD",
"BTC",
"LTC",
"DOGE"
"DOGE",
"GLEEC"
]
}
Binary file modified assets/logo/dex-logo-64.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/logo/dex-logo-big.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/logo/dex-logo.icns
Binary file not shown.
Binary file modified assets/logo/dex-logo.ico
Binary file not shown.
Binary file modified assets/logo/dex-logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/logo/dex-tray-icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed assets/themes/Binance - Dark/dex-logo-big.png
Binary file not shown.
Binary file removed assets/themes/Binance - Dark/dex-logo.png
Binary file not shown.
Binary file modified assets/themes/Default - Dark/dex-logo-big.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/themes/Default - Dark/dex-logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/themes/Default - Light/dex-logo-big.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions assets/tools/kdf/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
coins
kdf*
mm2*
4 changes: 2 additions & 2 deletions atomic_defi_design/Dex/Wallet/SendModal.qml
Original file line number Diff line number Diff line change
Expand Up @@ -508,8 +508,8 @@ MultipageModal
DefaultText
{
id: fiat_symbol
visible: _preparePage.cryptoSendMode && API.app.settings_pg.current_currency_sign != "KMD"
font.pixelSize: API.app.settings_pg.current_currency_sign.length == 1 ? 18 : 18 - API.app.settings_pg.current_currency_sign.length * 2
visible: _preparePage.cryptoSendMode && API.app.settings_pg.current_currency_sign != "KMD" && API.app.settings_pg.current_currency_sign != "GLEEC"
font.pixelSize: 18
anchors.centerIn: parent
text: API.app.settings_pg.current_currency_sign
}
Expand Down
Loading
Loading