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

Jump to bottom

[branded dex]: Firo #2403

Draft
wants to merge 79 commits into
base: dev
Choose a base branch
from
Draft

[branded dex]: Firo #2403

wants to merge 79 commits into from

Conversation

smk762
Copy link
Collaborator

@smk762 smk762 commented Jan 10, 2024

For CI/CD only, do not merge

firstcryptoman and others added 30 commits October 11, 2021 14:36
@firstcryptoman
Geoblocking disabled by default
9e57daf
@levonpetrosyan93
Merge pull request #1 from firoorg/geoblocking
d20ce6f 
Geoblocking disabled by default
@levonpetrosyan93
Merge branch 'KomodoPlatform:dev' into dev
7fa8fdd
@firstcryptoman
Set Firo, Bitcoin and Ethereum as default coins
52221bb
@levonpetrosyan93
Merge pull request #2 from firoorg/default_coins_update
b7e6e9c 
Set Firo, Bitcoin and Ethereum as default coins
@levonpetrosyan93
Merge branch 'KomodoPlatform:dev' into dev
6bb2bc3
@firstcryptoman
Rebranding AtomicDex to FiroDex
eb6f9c2
@levonpetrosyan93
Merge pull request #3 from firoorg/rebranding_atomicDex
c8e6157 
Rebranding AtomicDex to FiroDex
@levonpetrosyan93 @firstcryptoman
Mac os version signing temporarly disabled (#4)
7392efd 
* remove code signing secrtificates for macos

* try to fix windows build

* temporary disable tests

* try to fix artifacts upload for windows

* try to fix artifacts upload for windows

* try to fix windows upload artifacts

* try to fix windows artifact upload

* fix artifact uploads for windows

Co-authored-by: firstcryptoman <firstcryptoman@gmail.com>
@firstcryptoman
Change starting assets and proper discord, twitter links (#5)
bdbd490
@firstcryptoman @ca333
@tonymorony @Milerius @smk762
Merge upstream (#7)
2b0408a 
* feat(smtf): add smtf v2

* feat(smtf): remove SMTF-OLD

* rm nim, be ninja

* update mac nim ver

* Update atomicdex-desktop-ci.yml

* feat(version): bump to 0.5.3

* q# Please enter the commit message for your changes. Lines starting

* Updating dex company and site

Co-authored-by: ca333 <ca333@users.noreply.github.com>
Co-authored-by: Anton "TonyL" Lysakov <tlysakov@gmail.com>
Co-authored-by: Sztergbaum <rmscastle@gmail.com>
Co-authored-by: smk762 <smk762@iinet.net.au>
Co-authored-by: smk762 <35845239+smk762@users.noreply.github.com>
@Milerius
feat(firodex): start firodex basis
66030ce
@Milerius
feat(firodex): logos
e00a0b0
@Milerius
Merge branch 'dev' of https://github.com/KomodoPlatform/atomicDEX-Des…
ae3ba44 
…ktop into firodex
Update themes
34a161e
Update dark theme
4e8587b
Merge remote-tracking branch 'origin/dev' into firodex
eab19ee
Merge remote-tracking branch 'origin/firodex' into firodex
4825259
Udpate light theme
6392c56
@Milerius
Merge branch 'dev' of https://github.com/KomodoPlatform/atomicDEX-Des…
654fa61 
…ktop into firodex
@Milerius
Merge branch 'dev' of https://github.com/KomodoPlatform/atomicDEX-Des…
e1d0710 
…ktop into firodex
@Milerius
feat(firodex): use smaller logo
37b77cd
@firstcryptoman
Enable tests (#8)
ada9da1
Update light theme
39ca296
Merge branch 'dev' into firodex
5d3b021
Update themes
ce27a1d
@firstcryptoman
Merge upstream dev branch
66ce83e
@tonymorony
Merge pull request #1527 from KomodoPlatform/dev
0c5f5bb 
(firodex)fix CI
@firstcryptoman
Build Fix
4d3a4a7
@firstcryptoman
Update vcpkg version
b93b4bb
firstcryptoman and others added 25 commits March 21, 2022 11:57
@firstcryptoman
Merge branch 'firodex' of https://github.com/KomodoPlatform/atomicDEX…
d2c5bee 
…-Desktop into merge_upstream
@levonpetrosyan93
Merge pull request #18 from firoorg/merge_upstream
966bf39 
Merge upstream
@firstcryptoman
Trying to fix build fails
64ef3f6
@firstcryptoman
Merge branch 'KomodoPlatform:dev' into dev
9bffe72
@firstcryptoman
Adding missing electrumx server (#20)
b8034f2
@ca333
Merge pull request #2020 from KomodoPlatform/dev
3504b28 
0.5.7
@firstcryptoman
Merge upstream and resolve conflicts
4304392
@firstcryptoman
Add default coins, replace STFIRO with KMD
f7f368a
@firstcryptoman
Try fix build and fix prev version
75c4d87
@firstcryptoman
Try fix osx build
c46c160
@firstcryptoman
Fix osx
f0687e5
@firstcryptoman
Try fix windows installer
f8ff32a
@firstcryptoman
merge upstream dev
d00d03d
@firstcryptoman
Try Fix build
8aebcf7
@smk762
Merge pull request #2159 from KomodoPlatform/dev
4af2a8a 
0.5.7.1 RC
@firstcryptoman
Config fixes
a6359a6
@firstcryptoman
Merge pull request #26 from firoorg/prepare_0.5.7
1552444 
Prepare 0.5.7
@smk762
Merge pull request #2246 from KomodoPlatform/dev
bea819c 
0.5.7.2 Release Candidate
@smk762
Merge pull request #2296 from KomodoPlatform/dev
3b17aa4 
v0.5.8 Release candidate
@smk762
Merge pull request #2322 from KomodoPlatform/dev
23e0bf0 
0.6.0
@tonymorony
Merge pull request #2328 from KomodoPlatform/dev
5f6101d 
update readme logo to visible in light theme (#2327)
@smk762
Merge pull request #2363 from KomodoPlatform/dev
0ab9ce0 
0.6.1 Release Candidate
@smk762
Merge remote-tracking branch 'upstream/master' into upstream_0.6.1
8c1aa2e
@levonpetrosyan93
Merge pull request #31 from firoorg/upstream_0.6.1
ba47993 
Upstream 0.6.1
@smk762
Merge branch 'dev' of github.com:firoorg/FiroDEX-Desktop into firoorg…
c963ef7 
…-dev
@smk762 smk762 marked this pull request as draft January 10, 2024 12:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
do not merge
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@smk762 @firstcryptoman @levonpetrosyan93 @Milerius @tonymorony @ca333