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 88 commits into
base: dev
Choose a base branch
from
Draft

[branded dex]: Firo #2403

wants to merge 88 commits into from

Commits on Oct 11, 2021

  1. Geoblocking disabled by default

    @firstcryptoman
    firstcryptoman committed Oct 11, 2021
    Configuration menu
    Copy the full SHA
    9e57daf View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1 from firoorg/geoblocking 

    Geoblocking disabled by default
    @levonpetrosyan93
    levonpetrosyan93 authored Oct 11, 2021
    Configuration menu
    Copy the full SHA
    d20ce6f View commit details
    Browse the repository at this point in the history

  3. Merge branch 'KomodoPlatform:dev' into dev

    @levonpetrosyan93
    levonpetrosyan93 authored Oct 11, 2021
    Configuration menu
    Copy the full SHA
    7fa8fdd View commit details
    Browse the repository at this point in the history

Commits on Oct 19, 2021

  1. Set Firo, Bitcoin and Ethereum as default coins

    @firstcryptoman
    firstcryptoman committed Oct 19, 2021
    Configuration menu
    Copy the full SHA
    52221bb View commit details
    Browse the repository at this point in the history

  2. Merge pull request #2 from firoorg/default_coins_update 

    Set Firo, Bitcoin and Ethereum as default coins
    @levonpetrosyan93
    levonpetrosyan93 authored Oct 19, 2021
    Configuration menu
    Copy the full SHA
    b7e6e9c View commit details
    Browse the repository at this point in the history

  3. Merge branch 'KomodoPlatform:dev' into dev

    @levonpetrosyan93
    levonpetrosyan93 authored Oct 19, 2021
    Configuration menu
    Copy the full SHA
    6bb2bc3 View commit details
    Browse the repository at this point in the history

Commits on Nov 24, 2021

  1. Rebranding AtomicDex to FiroDex

    @firstcryptoman
    firstcryptoman committed Nov 24, 2021
    Configuration menu
    Copy the full SHA
    eb6f9c2 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #3 from firoorg/rebranding_atomicDex 

    Rebranding AtomicDex to FiroDex
    @levonpetrosyan93
    levonpetrosyan93 authored Nov 24, 2021
    Configuration menu
    Copy the full SHA
    c8e6157 View commit details
    Browse the repository at this point in the history

Commits on Nov 26, 2021

  1. Mac os version signing temporarly disabled (#4) 

    * 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 <[email protected]>
    @levonpetrosyan93 @firstcryptoman
    levonpetrosyan93 and firstcryptoman authored Nov 26, 2021
    Configuration menu
    Copy the full SHA
    7392efd View commit details
    Browse the repository at this point in the history

Commits on Nov 30, 2021

  1. Change starting assets and proper discord, twitter links (#5)

    @firstcryptoman
    firstcryptoman authored Nov 30, 2021
    Configuration menu
    Copy the full SHA
    bdbd490 View commit details
    Browse the repository at this point in the history

Commits on Dec 6, 2021

  1. Merge upstream (#7) 

    * 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 <[email protected]>
Co-authored-by: Anton "TonyL" Lysakov <[email protected]>
Co-authored-by: Sztergbaum <[email protected]>
Co-authored-by: smk762 <[email protected]>
Co-authored-by: smk762 <[email protected]>
    @firstcryptoman @ca333
    @tonymorony @Milerius @smk762
    6 people authored Dec 6, 2021
    Configuration menu
    Copy the full SHA
    2b0408a View commit details
    Browse the repository at this point in the history

Commits on Dec 11, 2021

  1. feat(firodex): start firodex basis

    @Milerius
    Milerius committed Dec 11, 2021
    Configuration menu
    Copy the full SHA
    66030ce View commit details
    Browse the repository at this point in the history

  2. feat(firodex): logos

    @Milerius
    Milerius committed Dec 11, 2021
    Configuration menu
    Copy the full SHA
    e00a0b0 View commit details
    Browse the repository at this point in the history

Commits on Dec 12, 2021

  1. Merge branch 'dev' of https://github.com/KomodoPlatform/atomicDEX-Des… 

    …ktop into firodex
    @Milerius
    Milerius committed Dec 12, 2021
    Configuration menu
    Copy the full SHA
    ae3ba44 View commit details
    Browse the repository at this point in the history

  2. Update themes

    Syl committed Dec 12, 2021
    Configuration menu
    Copy the full SHA
    34a161e View commit details
    Browse the repository at this point in the history

  3. Update dark theme

    Syl committed Dec 12, 2021
    Configuration menu
    Copy the full SHA
    4e8587b View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'origin/dev' into firodex

    Syl committed Dec 12, 2021
    Configuration menu
    Copy the full SHA
    eab19ee View commit details
    Browse the repository at this point in the history

  5. Merge remote-tracking branch 'origin/firodex' into firodex

    Syl committed Dec 12, 2021
    Configuration menu
    Copy the full SHA
    4825259 View commit details
    Browse the repository at this point in the history

  6. Udpate light theme

    Syl committed Dec 12, 2021
    Configuration menu
    Copy the full SHA
    6392c56 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'dev' of https://github.com/KomodoPlatform/atomicDEX-Des… 

    …ktop into firodex
    @Milerius
    Milerius committed Dec 12, 2021
    Configuration menu
    Copy the full SHA
    654fa61 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'dev' of https://github.com/KomodoPlatform/atomicDEX-Des… 

    …ktop into firodex
    @Milerius
    Milerius committed Dec 12, 2021
    Configuration menu
    Copy the full SHA
    e1d0710 View commit details
    Browse the repository at this point in the history

Commits on Dec 13, 2021

  1. feat(firodex): use smaller logo

    @Milerius
    Milerius committed Dec 13, 2021
    Configuration menu
    Copy the full SHA
    37b77cd View commit details
    Browse the repository at this point in the history

  2. Enable tests (#8)

    @firstcryptoman
    firstcryptoman authored Dec 13, 2021
    Configuration menu
    Copy the full SHA
    ada9da1 View commit details
    Browse the repository at this point in the history

Commits on Dec 16, 2021

  1. Update light theme

    Syl committed Dec 16, 2021
    Configuration menu
    Copy the full SHA
    39ca296 View commit details
    Browse the repository at this point in the history

Commits on Dec 20, 2021

  1. Merge branch 'dev' into firodex

    syl committed Dec 20, 2021
    Configuration menu
    Copy the full SHA
    5d3b021 View commit details
    Browse the repository at this point in the history

  2. Update themes

    syl committed Dec 20, 2021
    Configuration menu
    Copy the full SHA
    ce27a1d View commit details
    Browse the repository at this point in the history

  3. Merge upstream dev branch

    @firstcryptoman
    firstcryptoman committed Dec 20, 2021
    Configuration menu
    Copy the full SHA
    66ce83e View commit details
    Browse the repository at this point in the history

Commits on Dec 21, 2021

  1. Merge pull request #1527 from KomodoPlatform/dev 

    (firodex)fix CI
    @tonymorony
    tonymorony authored Dec 21, 2021
    Configuration menu
    Copy the full SHA
    0c5f5bb View commit details
    Browse the repository at this point in the history

  2. Build Fix

    @firstcryptoman
    firstcryptoman committed Dec 21, 2021
    Configuration menu
    Copy the full SHA
    4d3a4a7 View commit details
    Browse the repository at this point in the history

  3. Update vcpkg version

    @firstcryptoman
    firstcryptoman committed Dec 21, 2021
    Configuration menu
    Copy the full SHA
    b93b4bb View commit details
    Browse the repository at this point in the history

  4. Fixing build

    @firstcryptoman
    firstcryptoman committed Dec 21, 2021
    Configuration menu
    Copy the full SHA
    cdd5373 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #9 from firoorg/merge_upstream 

    Merge upstream
    @levonpetrosyan93
    levonpetrosyan93 authored Dec 21, 2021
    Configuration menu
    Copy the full SHA
    f643c8d View commit details
    Browse the repository at this point in the history

Commits on Dec 22, 2021

  1. Updateing to new version of vcpkg

    @firstcryptoman
    firstcryptoman committed Dec 22, 2021
    Configuration menu
    Copy the full SHA
    47c4e13 View commit details
    Browse the repository at this point in the history

  2. Updating themes and installer icon

    @firstcryptoman
    firstcryptoman committed Dec 22, 2021
    Configuration menu
    Copy the full SHA
    dfe4303 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #10 from firoorg/vcpkg_update 

    Updateing to new version of vcpkg
    @levonpetrosyan93
    levonpetrosyan93 authored Dec 22, 2021
    Configuration menu
    Copy the full SHA
    3734ace View commit details
    Browse the repository at this point in the history

  4. Merge pull request #11 from firoorg/rebrand 

    Updating themes and installer icon
    @levonpetrosyan93
    levonpetrosyan93 authored Dec 22, 2021
    Configuration menu
    Copy the full SHA
    9daa4cb View commit details
    Browse the repository at this point in the history

Commits on Dec 23, 2021

  1. fix disabled send button 

    using same value as dev lite theme.
    @smk762
    smk762 authored Dec 23, 2021
    Configuration menu
    Copy the full SHA
    e8922f7 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1528 from KomodoPlatform/smk762-firo-btn 

    fix disabled send button
    @tonymorony
    tonymorony authored Dec 23, 2021
    Configuration menu
    Copy the full SHA
    9bbed1c View commit details
    Browse the repository at this point in the history

Commits on Dec 27, 2021

  1. Updating README

    @firstcryptoman
    firstcryptoman committed Dec 27, 2021
    Configuration menu
    Copy the full SHA
    89d3dc9 View commit details
    Browse the repository at this point in the history

Commits on Jan 2, 2022

  1. Merge pull request #12 from firoorg/readme_update 

    Updating README
    @levonpetrosyan93
    levonpetrosyan93 authored Jan 2, 2022
    Configuration menu
    Copy the full SHA
    f4027a8 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/KomodoPlatform/atomicDEX-… 

    …Desktop into master_upstream
    @firstcryptoman
    firstcryptoman committed Jan 2, 2022
    Configuration menu
    Copy the full SHA
    5a26423 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #13 from firoorg/master_upstream 

    Merge upstream master branch
    @levonpetrosyan93
    levonpetrosyan93 authored Jan 2, 2022
    Configuration menu
    Copy the full SHA
    d00c836 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'dev' of https://github.com/KomodoPlatform/atomicDEX-Des… 

    …ktop into firodex
    @Milerius
    Milerius committed Jan 2, 2022
    Configuration menu
    Copy the full SHA
    1c44e0c View commit details
    Browse the repository at this point in the history

Commits on Jan 13, 2022

  1. Fixing conflict (#15) 

    * Prepare for merge to master

* Fixing conflict
    @firstcryptoman
    firstcryptoman authored Jan 13, 2022
    Configuration menu
    Copy the full SHA
    3db54c0 View commit details
    Browse the repository at this point in the history

  2. Company and repository name fixed

    @levonpetrosyan93
    levonpetrosyan93 committed Jan 13, 2022
    Configuration menu
    Copy the full SHA
    3051254 View commit details
    Browse the repository at this point in the history

Commits on Jan 14, 2022

  1. Reverting some unneeded changes

    @levonpetrosyan93
    levonpetrosyan93 committed Jan 14, 2022
    Configuration menu
    Copy the full SHA
    fb18b6c View commit details
    Browse the repository at this point in the history

Commits on Feb 10, 2022

  1. feat(firodex): sync with dev

    @Milerius
    Milerius committed Feb 10, 2022
    Configuration menu
    Copy the full SHA
    e350932 View commit details
    Browse the repository at this point in the history

Commits on Feb 12, 2022

  1. Resolve conflicts and sync with upstream

    @firstcryptoman
    firstcryptoman committed Feb 12, 2022
    Configuration menu
    Copy the full SHA
    ed698aa View commit details
    Browse the repository at this point in the history

Commits on Feb 22, 2022

  1. Resolving conflicts

    @firstcryptoman
    firstcryptoman committed Feb 22, 2022
    Configuration menu
    Copy the full SHA
    1a713d3 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'KomodoPlatform-firodex' into dev

    @firstcryptoman
    firstcryptoman committed Feb 22, 2022
    Configuration menu
    Copy the full SHA
    dcabbda View commit details
    Browse the repository at this point in the history

Commits on Mar 19, 2022

  1. Merge remote-tracking branch 'origin/dev' into firodex

    Syl committed Mar 19, 2022
    Configuration menu
    Copy the full SHA
    611e4aa View commit details
    Browse the repository at this point in the history

Commits on Mar 21, 2022

  1. Merge branch 'firodex' of https://github.com/KomodoPlatform/atomicDEX… 

    …-Desktop into merge_upstream
    @firstcryptoman
    firstcryptoman committed Mar 21, 2022
    Configuration menu
    Copy the full SHA
    d2c5bee View commit details
    Browse the repository at this point in the history

  2. Merge pull request #18 from firoorg/merge_upstream 

    Merge upstream
    @levonpetrosyan93
    levonpetrosyan93 authored Mar 21, 2022
    Configuration menu
    Copy the full SHA
    966bf39 View commit details
    Browse the repository at this point in the history

Commits on Mar 28, 2022

  1. Trying to fix build fails

    @firstcryptoman
    firstcryptoman committed Mar 28, 2022
    Configuration menu
    Copy the full SHA
    64ef3f6 View commit details
    Browse the repository at this point in the history

Commits on Mar 31, 2022

  1. Merge branch 'KomodoPlatform:dev' into dev

    @firstcryptoman
    firstcryptoman authored Mar 31, 2022
    Configuration menu
    Copy the full SHA
    9bffe72 View commit details
    Browse the repository at this point in the history

Commits on Apr 3, 2022

  1. Adding missing electrumx server (#20)

    @firstcryptoman
    firstcryptoman authored Apr 3, 2022
    Configuration menu
    Copy the full SHA
    b8034f2 View commit details
    Browse the repository at this point in the history

Commits on Nov 20, 2022

  1. Merge pull request #2020 from KomodoPlatform/dev 

    0.5.7
    @ca333
    ca333 authored Nov 20, 2022
    Configuration menu
    Copy the full SHA
    3504b28 View commit details
    Browse the repository at this point in the history

Commits on Mar 1, 2023

  1. Merge upstream and resolve conflicts

    @firstcryptoman
    firstcryptoman committed Mar 1, 2023
    Configuration menu
    Copy the full SHA
    4304392 View commit details
    Browse the repository at this point in the history

  2. Add default coins, replace STFIRO with KMD

    @firstcryptoman
    firstcryptoman committed Mar 1, 2023
    Configuration menu
    Copy the full SHA
    f7f368a View commit details
    Browse the repository at this point in the history

  3. Try fix build and fix prev version

    @firstcryptoman
    firstcryptoman committed Mar 1, 2023
    Configuration menu
    Copy the full SHA
    75c4d87 View commit details
    Browse the repository at this point in the history

  4. Try fix osx build

    @firstcryptoman
    firstcryptoman committed Mar 1, 2023
    Configuration menu
    Copy the full SHA
    c46c160 View commit details
    Browse the repository at this point in the history

  5. Fix osx

    @firstcryptoman
    firstcryptoman committed Mar 1, 2023
    Configuration menu
    Copy the full SHA
    f0687e5 View commit details
    Browse the repository at this point in the history

Commits on Mar 4, 2023

  1. Try fix windows installer

    @firstcryptoman
    firstcryptoman committed Mar 4, 2023
    Configuration menu
    Copy the full SHA
    f8ff32a View commit details
    Browse the repository at this point in the history

Commits on Mar 6, 2023

  1. merge upstream dev

    @firstcryptoman
    firstcryptoman committed Mar 6, 2023
    Configuration menu
    Copy the full SHA
    d00d03d View commit details
    Browse the repository at this point in the history

  2. Try Fix build

    @firstcryptoman
    firstcryptoman committed Mar 6, 2023
    Configuration menu
    Copy the full SHA
    8aebcf7 View commit details
    Browse the repository at this point in the history

Commits on Mar 7, 2023

  1. Merge pull request #2159 from KomodoPlatform/dev 

    0.5.7.1 RC
    @smk762
    smk762 authored Mar 7, 2023
    Configuration menu
    Copy the full SHA
    4af2a8a View commit details
    Browse the repository at this point in the history

Commits on Mar 19, 2023

  1. Config fixes

    @firstcryptoman
    firstcryptoman committed Mar 19, 2023
    Configuration menu
    Copy the full SHA
    a6359a6 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #26 from firoorg/prepare_0.5.7 

    Prepare 0.5.7
    @firstcryptoman
    firstcryptoman authored Mar 19, 2023
    Configuration menu
    Copy the full SHA
    1552444 View commit details
    Browse the repository at this point in the history

Commits on Apr 14, 2023

  1. Merge pull request #2246 from KomodoPlatform/dev 

    0.5.7.2 Release Candidate
    @smk762
    smk762 authored Apr 14, 2023
    Configuration menu
    Copy the full SHA
    bea819c View commit details
    Browse the repository at this point in the history

Commits on Jun 27, 2023

  1. Merge pull request #2296 from KomodoPlatform/dev 

    v0.5.8 Release candidate
    @smk762
    smk762 authored Jun 27, 2023
    Configuration menu
    Copy the full SHA
    3b17aa4 View commit details
    Browse the repository at this point in the history

Commits on Jul 10, 2023

  1. Merge pull request #2322 from KomodoPlatform/dev 

    0.6.0
    @smk762
    smk762 authored Jul 10, 2023
    Configuration menu
    Copy the full SHA
    23e0bf0 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #2328 from KomodoPlatform/dev 

    update readme logo to visible in light theme (#2327)
    @tonymorony
    tonymorony authored Jul 10, 2023
    Configuration menu
    Copy the full SHA
    5f6101d View commit details
    Browse the repository at this point in the history

Commits on Sep 23, 2023

  1. Merge pull request #2363 from KomodoPlatform/dev 

    0.6.1 Release Candidate
    @smk762
    smk762 authored Sep 23, 2023
    Configuration menu
    Copy the full SHA
    0ab9ce0 View commit details
    Browse the repository at this point in the history

Commits on Sep 24, 2023

  1. Merge remote-tracking branch 'upstream/master' into upstream_0.6.1

    @smk762
    smk762 committed Sep 24, 2023
    Configuration menu
    Copy the full SHA
    8c1aa2e View commit details
    Browse the repository at this point in the history

Commits on Oct 27, 2023

  1. Merge pull request #31 from firoorg/upstream_0.6.1 

    Upstream 0.6.1
    @levonpetrosyan93
    levonpetrosyan93 authored Oct 27, 2023
    Configuration menu
    Copy the full SHA
    ba47993 View commit details
    Browse the repository at this point in the history

Commits on Dec 22, 2023

  1. Merge pull request #2396 from KomodoPlatform/dev 

    0.7.0 Release
    @smk762
    smk762 authored Dec 22, 2023
    Configuration menu
    Copy the full SHA
    5d802e3 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #2398 from KomodoPlatform/dev 

    fix faucet fiat
    @smk762
    smk762 authored Dec 22, 2023
    Configuration menu
    Copy the full SHA
    0bfa58d View commit details
    Browse the repository at this point in the history

  3. Merge pull request #2399 from KomodoPlatform/dev 

    use variable mac is ok with
    @smk762
    smk762 authored Dec 22, 2023
    Configuration menu
    Copy the full SHA
    bcc289a View commit details
    Browse the repository at this point in the history

Commits on Jan 10, 2024

  1. Merge branch 'dev' of github.com:firoorg/FiroDEX-Desktop into firoorg… 

    …-dev
    @smk762
    smk762 committed Jan 10, 2024
    Configuration menu
    Copy the full SHA
    c963ef7 View commit details
    Browse the repository at this point in the history

  2. fix path for vcpkg

    @smk762
    smk762 committed Jan 10, 2024
    Configuration menu
    Copy the full SHA
    e0eb2a7 View commit details
    Browse the repository at this point in the history

  3. try fix cache actions error

    @smk762
    smk762 committed Jan 10, 2024
    Configuration menu
    Copy the full SHA
    9a8c542 View commit details
    Browse the repository at this point in the history

Commits on Jan 20, 2024

  1. Merge pull request #2407 from KomodoPlatform/dev 

    v0.7.1 Release candidate
    @smk762
    smk762 authored Jan 20, 2024
    Configuration menu
    Copy the full SHA
    2547e1e View commit details
    Browse the repository at this point in the history

  2. Merge branch 'dev' into firoorg-dev

    @smk762
    smk762 committed Jan 20, 2024
    Configuration menu
    Copy the full SHA
    a874e1b View commit details
    Browse the repository at this point in the history

Commits on Feb 23, 2024

  1. Merge pull request #2410 from KomodoPlatform/dev 

    v0.7.2 Release Candidate addendum
    @smk762
    smk762 authored Feb 23, 2024
    Configuration menu
    Copy the full SHA
    28dddc4 View commit details
    Browse the repository at this point in the history

Commits on Apr 10, 2024

  1. Merge pull request #2426 from KomodoPlatform/dev 

    v0.7.1 rc
    @smk762
    smk762 authored Apr 10, 2024
    Configuration menu
    Copy the full SHA
    1952847 View commit details
    Browse the repository at this point in the history

Commits on Jun 24, 2024

  1. Merge pull request #2459 from KomodoPlatform/dev 

    v0.7.2 Release Candidate
    @smk762
    smk762 authored Jun 24, 2024
    Configuration menu
    Copy the full SHA
    056f76f View commit details
    Browse the repository at this point in the history

Commits on Jul 3, 2024

  1. Merge branch 'master' into firoorg-dev

    @smk762
    smk762 committed Jul 3, 2024
    Configuration menu
    Copy the full SHA
    7e0837b View commit details
    Browse the repository at this point in the history

Commits on Aug 30, 2024

  1. Merge branch 'dev' into firoorg-dev

    @smk762
    smk762 committed Aug 30, 2024
    Configuration menu
    Copy the full SHA
    17394b4 View commit details
    Browse the repository at this point in the history