Code

Traders chat#3165

Code

Merged

ripcurlx merged 35 commits intobisq-network:masterbisq-network/bisq:masterfrom chimp1984:trade-chatchimp1984/bisq:trade-chatCopy head branch name to clipboardAug 30, 2019

+1,887-858

Commits

Commits on May 23, 2019

• Refactor Chat out of TraderDisputeView

  Show description for b5b126c
  sqrrm

  committed
  b5b126c

  Copy full SHA for b5b126c

Commits on May 25, 2019

• Send acks when capability found

  sqrrm

  committed
  390fc44

  Copy full SHA for 390fc44

• Separate most of Chat and arbitration

  Show description for b1362a9
  sqrrm

  committed
  b1362a9

  Copy full SHA for b1362a9

• Move close ticket button creation to arbitration

  Show description for 1a25678
  sqrrm

  committed
  1a25678

  Copy full SHA for 1a25678

• Handle Chat message subscription inside Chat

  sqrrm

  committed
  2d77f32

  Copy full SHA for 2d77f32

Commits on May 30, 2019

• Add ChatManager

  Show description for 1b1dce1
  sqrrm

  committed
  1b1dce1

  Copy full SHA for 1b1dce1

Commits on Jun 2, 2019

• Add trader chat

  Show description for b93e7ba
  sqrrm

  committed
  b93e7ba

  Copy full SHA for b93e7ba

Commits on Jun 3, 2019

• Make attachments optional

  sqrrm

  committed
  3b87045

  Copy full SHA for 3b87045

• Test trade chat UI

  sqrrm

  committed
  fb71c32

  Copy full SHA for fb71c32

Commits on Jun 5, 2019

• Add comments on BSQ trade fee calculation

  sqrrm

  committed
  0217c3d

  Copy full SHA for 0217c3d

• Change message box aid

  sqrrm

  committed
  2375880

  Copy full SHA for 2375880

• Add basic chat UI

  Show description for 13f2651
  sqrrm

  committed
  13f2651

  Copy full SHA for 13f2651

Commits on Aug 29, 2019

• Merge branch 'master_upstream' into sq-add-trader-chat

  Show description for 329572c
  chimp1984

  committed
  329572c

  Copy full SHA for 329572c

• Fix merge issues

  chimp1984

  committed
  5d338e6

  Copy full SHA for 5d338e6

• Update string

  chimp1984

  committed
  cb67376

  Copy full SHA for cb67376

• Add comments, cleanup, fix wrong param name

  chimp1984

  committed
  8e3a351

  Copy full SHA for 8e3a351

• Show chat in popup instead of tab (WIP)

  chimp1984

  committed
  2189cba

  Copy full SHA for 2189cba

• Add close handler to popup

  Show description for bfb111d
  chimp1984

  committed
  bfb111d

  Copy full SHA for bfb111d

• Merge branch 'master_upstream' into sq-add-trader-chat

  Show description for fa43f03
  chimp1984

  committed
  fa43f03

  Copy full SHA for fa43f03

• Apply changes from master

  chimp1984

  committed
  29e957a

  Copy full SHA for 29e957a

• Add missing allServicesInitialized check

  chimp1984

  committed
  855cb4f

  Copy full SHA for 855cb4f

• Add wasDisplayed field to chatMsg

  Show description for e0c1a85
  chimp1984

  committed
  e0c1a85

  Copy full SHA for e0c1a85

• Add onAllServicesInitialized call, rename method

  chimp1984

  committed
  81a93b5

  Copy full SHA for 81a93b5

• Add missing setWasDisplayed

  chimp1984

  committed
  a2cd808

  Copy full SHA for a2cd808

• Add badge for num new chat msg

  chimp1984

  committed
  6304c9e

  Copy full SHA for 6304c9e

• Fix wrong pubkey

  chimp1984

  committed
  5c1999f

  Copy full SHA for 5c1999f

• Add chat rules system msg; cleanups

  chimp1984

  committed
  663d859

  Copy full SHA for 663d859

• Handle nullables

  chimp1984

  committed
  5e267fa

  Copy full SHA for 5e267fa

Commits on Aug 30, 2019

• Fix positioning of badge

  ripcurlx

  committed
  964ca64

  Copy full SHA for 964ca64

• Use button instead of label to fix tooltip font size, use material design icon and add additional cleanup code

  ripcurlx

  committed
  8edd261

  Copy full SHA for 8edd261

• Update core/src/main/resources/i18n/displayStrings.properties

  Show description for fa30720
  

  chimp1984

  and

  Steve Jain

  authored
  fa30720

  Copy full SHA for fa30720

• Update core/src/main/resources/i18n/displayStrings.properties

  Show description for 16d3bc5
  

  chimp1984

  and

  Steve Jain

  authored
  16d3bc5

  Copy full SHA for 16d3bc5

• Update tradeChat.rules

  chimp1984

  committed
  c615780

  Copy full SHA for c615780

• Persist chat position. Improve listener handling.

  Show description for 57ec0db
  chimp1984

  committed
  57ec0db

  Copy full SHA for 57ec0db

• Close chat window if dispute gets closed

  chimp1984

  committed
  50baa9b

  Copy full SHA for 50baa9b