Code

[branded dex]: Firo#2403

Code

Closed

smk762 wants to merge 88 commits intodevKomodoPlatform/komodo-wallet:devfrom firoorg-devKomodoPlatform/komodo-wallet:firoorg-devCopy head branch name to clipboard

+259-239

Commits

Commits on Oct 11, 2021

• Geoblocking disabled by default

  firstcryptoman

  committed
  9e57daf

  Copy full SHA for 9e57daf

• Merge pull request #1 from firoorg/geoblocking

  Show description for d20ce6f
  levonpetrosyan93

  authored
  d20ce6f

  Copy full SHA for d20ce6f

• Merge branch 'KomodoPlatform:dev' into dev

  levonpetrosyan93

  authored
  7fa8fdd

  Copy full SHA for 7fa8fdd

Commits on Oct 19, 2021

• Set Firo, Bitcoin and Ethereum as default coins

  firstcryptoman

  committed
  52221bb

  Copy full SHA for 52221bb

• Merge pull request #2 from firoorg/default_coins_update

  Show description for b7e6e9c
  levonpetrosyan93

  authored
  b7e6e9c

  Copy full SHA for b7e6e9c

• Merge branch 'KomodoPlatform:dev' into dev

  levonpetrosyan93

  authored
  6bb2bc3

  Copy full SHA for 6bb2bc3

Commits on Nov 24, 2021

• Rebranding AtomicDex to FiroDex

  firstcryptoman

  committed
  eb6f9c2

  Copy full SHA for eb6f9c2

• Merge pull request #3 from firoorg/rebranding_atomicDex

  Show description for c8e6157
  levonpetrosyan93

  authored
  c8e6157

  Copy full SHA for c8e6157

Commits on Nov 26, 2021

• Mac os version signing temporarly disabled (#4)

  Show description for 7392efd
  

  levonpetrosyan93

  and

  firstcryptoman

  authored
  7392efd

  Copy full SHA for 7392efd

Commits on Nov 30, 2021

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

  firstcryptoman

  authored
  bdbd490

  Copy full SHA for bdbd490

Commits on Dec 6, 2021

• Merge upstream (#7)

  Show description for 2b0408a
  

  5 peopleauthored
  2b0408a

  Copy full SHA for 2b0408a

Commits on Dec 11, 2021

• feat(firodex): start firodex basis

  Milerius

  committed
  66030ce

  Copy full SHA for 66030ce

• feat(firodex): logos

  Milerius

  committed
  e00a0b0

  Copy full SHA for e00a0b0

Commits on Dec 12, 2021

• Merge branch 'dev' of https://github.com/KomodoPlatform/atomicDEX-Desktop into firodex

  Milerius

  committed
  ae3ba44

  Copy full SHA for ae3ba44

• Update themes

  

  Syl

  committed
  34a161e

  Copy full SHA for 34a161e

• Update dark theme

  

  Syl

  committed
  4e8587b

  Copy full SHA for 4e8587b

• Merge remote-tracking branch 'origin/dev' into firodex

  

  Syl

  committed
  eab19ee

  Copy full SHA for eab19ee

• Merge remote-tracking branch 'origin/firodex' into firodex

  

  Syl

  committed
  4825259

  Copy full SHA for 4825259

• Udpate light theme

  

  Syl

  committed
  6392c56

  Copy full SHA for 6392c56

• Merge branch 'dev' of https://github.com/KomodoPlatform/atomicDEX-Desktop into firodex

  Milerius

  committed
  654fa61

  Copy full SHA for 654fa61

• Merge branch 'dev' of https://github.com/KomodoPlatform/atomicDEX-Desktop into firodex

  Milerius

  committed
  e1d0710

  Copy full SHA for e1d0710

Commits on Dec 13, 2021

• feat(firodex): use smaller logo

  Milerius

  committed
  37b77cd

  Copy full SHA for 37b77cd

• Enable tests (#8)

  firstcryptoman

  authored
  ada9da1

  Copy full SHA for ada9da1

Commits on Dec 16, 2021

• Update light theme

  

  Syl

  committed
  39ca296

  Copy full SHA for 39ca296

Commits on Dec 20, 2021

• Merge branch 'dev' into firodex

  

  syl

  committed
  5d3b021

  Copy full SHA for 5d3b021

• Update themes

  

  syl

  committed
  ce27a1d

  Copy full SHA for ce27a1d

• Merge upstream dev branch

  firstcryptoman

  committed
  66ce83e

  Copy full SHA for 66ce83e

Commits on Dec 21, 2021

• Merge pull request #1527 from KomodoPlatform/dev

  Show description for 0c5f5bb
  tonymorony

  authored
  0c5f5bb

  Copy full SHA for 0c5f5bb

• Build Fix

  firstcryptoman

  committed
  4d3a4a7

  Copy full SHA for 4d3a4a7

• Update vcpkg version

  firstcryptoman

  committed
  b93b4bb

  Copy full SHA for b93b4bb

• Fixing build

  firstcryptoman

  committed
  cdd5373

  Copy full SHA for cdd5373

• Merge pull request #9 from firoorg/merge_upstream

  Show description for f643c8d
  levonpetrosyan93

  authored
  f643c8d

  Copy full SHA for f643c8d

Commits on Dec 22, 2021

• Updateing to new version of vcpkg

  firstcryptoman

  committed
  47c4e13

  Copy full SHA for 47c4e13

• Updating themes and installer icon

  firstcryptoman

  committed
  dfe4303

  Copy full SHA for dfe4303

• Merge pull request #10 from firoorg/vcpkg_update

  Show description for 3734ace
  levonpetrosyan93

  authored
  3734ace

  Copy full SHA for 3734ace

• Merge pull request #11 from firoorg/rebrand

  Show description for 9daa4cb
  levonpetrosyan93

  authored
  9daa4cb

  Copy full SHA for 9daa4cb

Commits on Dec 23, 2021

• fix disabled send button

  Show description for e8922f7
  smk762

  authored
  e8922f7

  Copy full SHA for e8922f7

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

  Show description for 9bbed1c
  tonymorony

  authored
  9bbed1c

  Copy full SHA for 9bbed1c

Commits on Dec 27, 2021

• Updating README

  firstcryptoman

  committed
  89d3dc9

  Copy full SHA for 89d3dc9

Commits on Jan 2, 2022

• Merge pull request #12 from firoorg/readme_update

  Show description for f4027a8
  levonpetrosyan93

  authored
  f4027a8

  Copy full SHA for f4027a8

• Merge branch 'master' of https://github.com/KomodoPlatform/atomicDEX-Desktop into master_upstream

  firstcryptoman

  committed
  5a26423

  Copy full SHA for 5a26423

• Merge pull request #13 from firoorg/master_upstream

  Show description for d00c836
  levonpetrosyan93

  authored
  d00c836

  Copy full SHA for d00c836

• Merge branch 'dev' of https://github.com/KomodoPlatform/atomicDEX-Desktop into firodex

  Milerius

  committed
  1c44e0c

  Copy full SHA for 1c44e0c

Commits on Jan 13, 2022

• Fixing conflict (#15)

  Show description for 3db54c0
  firstcryptoman

  authored
  3db54c0

  Copy full SHA for 3db54c0

• Company and repository name fixed

  levonpetrosyan93

  committed
  3051254

  Copy full SHA for 3051254

Commits on Jan 14, 2022

• Reverting some unneeded changes

  levonpetrosyan93

  committed
  fb18b6c

  Copy full SHA for fb18b6c

Commits on Feb 10, 2022

• feat(firodex): sync with dev

  Milerius

  committed
  e350932

  Copy full SHA for e350932

Commits on Feb 12, 2022

• Resolve conflicts and sync with upstream

  firstcryptoman

  committed
  ed698aa

  Copy full SHA for ed698aa

Commits on Feb 22, 2022

• Resolving conflicts

  firstcryptoman

  committed
  1a713d3

  Copy full SHA for 1a713d3

• Merge branch 'KomodoPlatform-firodex' into dev

  firstcryptoman

  committed
  dcabbda

  Copy full SHA for dcabbda

Commits on Mar 19, 2022

• Merge remote-tracking branch 'origin/dev' into firodex

  

  Syl

  committed
  611e4aa

  Copy full SHA for 611e4aa

Commits on Mar 21, 2022

• Merge branch 'firodex' of https://github.com/KomodoPlatform/atomicDEX-Desktop into merge_upstream

  firstcryptoman

  committed
  d2c5bee

  Copy full SHA for d2c5bee

• Merge pull request #18 from firoorg/merge_upstream

  Show description for 966bf39
  levonpetrosyan93

  authored
  966bf39

  Copy full SHA for 966bf39

Commits on Mar 28, 2022

• Trying to fix build fails

  firstcryptoman

  committed
  64ef3f6

  Copy full SHA for 64ef3f6

Commits on Mar 31, 2022

• Merge branch 'KomodoPlatform:dev' into dev

  firstcryptoman

  authored
  9bffe72

  Copy full SHA for 9bffe72

Commits on Apr 3, 2022

• Adding missing electrumx server (#20)

  firstcryptoman

  authored
  b8034f2

  Copy full SHA for b8034f2

Commits on Nov 20, 2022

• Merge pull request #2020 from KomodoPlatform/dev

  Show description for 3504b28
  ca333

  authored
  3504b28

  Copy full SHA for 3504b28

Commits on Mar 1, 2023

• Merge upstream and resolve conflicts

  firstcryptoman

  committed
  4304392

  Copy full SHA for 4304392

• Add default coins, replace STFIRO with KMD

  firstcryptoman

  committed
  f7f368a

  Copy full SHA for f7f368a

• Try fix build and fix prev version

  firstcryptoman

  committed
  75c4d87

  Copy full SHA for 75c4d87

• Try fix osx build

  firstcryptoman

  committed
  c46c160

  Copy full SHA for c46c160

• Fix osx

  firstcryptoman

  committed
  f0687e5

  Copy full SHA for f0687e5

Commits on Mar 4, 2023

• Try fix windows installer

  firstcryptoman

  committed
  f8ff32a

  Copy full SHA for f8ff32a

Commits on Mar 6, 2023

• merge upstream dev

  firstcryptoman

  committed
  d00d03d

  Copy full SHA for d00d03d

• Try Fix build

  firstcryptoman

  committed
  8aebcf7

  Copy full SHA for 8aebcf7

Commits on Mar 7, 2023

• Merge pull request #2159 from KomodoPlatform/dev

  Show description for 4af2a8a
  smk762

  authored
  4af2a8a

  Copy full SHA for 4af2a8a

Commits on Mar 19, 2023

• Config fixes

  firstcryptoman

  committed
  a6359a6

  Copy full SHA for a6359a6

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

  Show description for 1552444
  firstcryptoman

  authored
  1552444

  Copy full SHA for 1552444

Commits on Apr 14, 2023

• Merge pull request #2246 from KomodoPlatform/dev

  Show description for bea819c
  smk762

  authored
  bea819c

  Copy full SHA for bea819c

Commits on Jun 27, 2023

• Merge pull request #2296 from KomodoPlatform/dev

  Show description for 3b17aa4
  smk762

  authored
  3b17aa4

  Copy full SHA for 3b17aa4

Commits on Jul 10, 2023

• Merge pull request #2322 from KomodoPlatform/dev

  Show description for 23e0bf0
  smk762

  authored
  23e0bf0

  Copy full SHA for 23e0bf0

• Merge pull request #2328 from KomodoPlatform/dev

  Show description for 5f6101d
  tonymorony

  authored
  5f6101d

  Copy full SHA for 5f6101d

Commits on Sep 23, 2023

• Merge pull request #2363 from KomodoPlatform/dev

  Show description for 0ab9ce0
  smk762

  authored
  0ab9ce0

  Copy full SHA for 0ab9ce0

Commits on Sep 24, 2023

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

  smk762

  committed
  8c1aa2e

  Copy full SHA for 8c1aa2e

Commits on Oct 27, 2023

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

  Show description for ba47993
  levonpetrosyan93

  authored
  ba47993

  Copy full SHA for ba47993

Commits on Dec 22, 2023

• Merge pull request #2396 from KomodoPlatform/dev

  Show description for 5d802e3
  smk762

  authored
  5d802e3

  Copy full SHA for 5d802e3

• Merge pull request #2398 from KomodoPlatform/dev

  Show description for 0bfa58d
  smk762

  authored
  0bfa58d

  Copy full SHA for 0bfa58d

• Merge pull request #2399 from KomodoPlatform/dev

  Show description for bcc289a
  smk762

  authored
  bcc289a

  Copy full SHA for bcc289a

Commits on Jan 10, 2024

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

  smk762

  committed
  c963ef7

  Copy full SHA for c963ef7

• fix path for vcpkg

  smk762

  committed
  e0eb2a7

  Copy full SHA for e0eb2a7

• try fix cache actions error

  smk762

  committed
  9a8c542

  Copy full SHA for 9a8c542

Commits on Jan 20, 2024

• Merge pull request #2407 from KomodoPlatform/dev

  Show description for 2547e1e
  smk762

  authored
  2547e1e

  Copy full SHA for 2547e1e

• Merge branch 'dev' into firoorg-dev

  smk762

  committed
  a874e1b

  Copy full SHA for a874e1b

Commits on Feb 23, 2024

• Merge pull request #2410 from KomodoPlatform/dev

  Show description for 28dddc4
  smk762

  authored
  28dddc4

  Copy full SHA for 28dddc4

Commits on Apr 10, 2024

• Merge pull request #2426 from KomodoPlatform/dev

  Show description for 1952847
  smk762

  authored
  1952847

  Copy full SHA for 1952847

Commits on Jun 24, 2024

• Merge pull request #2459 from KomodoPlatform/dev

  Show description for 056f76f
  smk762

  authored
  056f76f

  Copy full SHA for 056f76f

Commits on Jul 3, 2024

• Merge branch 'master' into firoorg-dev

  smk762

  committed
  7e0837b

  Copy full SHA for 7e0837b

Commits on Aug 30, 2024

• Merge branch 'dev' into firoorg-dev

  smk762

  committed
  17394b4

  Copy full SHA for 17394b4