Permalink
Commits on Jul 19, 2018
  1. Merge pull request #1294 from csoler/v0.6-GXS-DistSync3-TurtleSearch

    csoler committed Jul 19, 2018
    V0.6 gxs dist sync3 turtle search
Commits on Jul 18, 2018
  1. Merge pull request #1302 from sehraf/pr_use_system_rapidjson

    G10h4ck committed Jul 18, 2018
    Add auto detection of installed rapidjson
Commits on Jul 17, 2018
Commits on Jul 16, 2018
Commits on Jul 15, 2018
  1. Merge pull request #1300 from PhenomRetroShare/Fix_ChangeLobbyToRoomI…

    csoler committed Jul 15, 2018
    …nCreateLobbyDialog
    
    Change Lobby text to Room in CreateLobbyDialog.
Commits on Jul 10, 2018
  1. Merge pull request #1227 from RetroPooh/openlocal

    csoler committed Jul 10, 2018
    bring back open local file on link click
Commits on Jul 9, 2018
  1. Merge pull request #1296 from chelovechishko/namespaces

    G10h4ck committed Jul 9, 2018
    fix ODR violations caused by same names for different things
Commits on Jul 8, 2018
  1. Merge pull request #1278 from sehraf/pr_improve-nogui-password-entry

    csoler committed Jul 8, 2018
    handle backspace when entering password
  2. Merge pull request #1293 from chelovechishko/chalod

    csoler committed Jul 8, 2018
    several fixes to chat gui
Commits on Jul 6, 2018
Commits on Jul 5, 2018
  1. merged upstream/master

    csoler committed Jul 5, 2018
Commits on Jul 4, 2018
Commits on Jul 3, 2018
Commits on Jul 2, 2018
  1. Merge pull request #1291 from G10h4ck/extra_locators_merge

    G10h4ck committed Jul 2, 2018
    Share extra locators via certificate
  2. gui: do not attempt to create context menu if idlist is empty

    chelovechishko committed Jul 2, 2018
    ...and other side effects