diff -Nru retroshare-0.6.4/debian/changelog retroshare-0.6.4/debian/changelog --- retroshare-0.6.4/debian/changelog 2018-05-03 13:56:59.000000000 +0000 +++ retroshare-0.6.4/debian/changelog 2018-06-01 20:36:25.000000000 +0000 @@ -1,4 +1,81 @@ -retroshare (0.6.4-1.20180503.676c0701~bionic) bionic; urgency=low +retroshare (0.6.4-1.20180601.6bb1d3c5~bionic) bionic; urgency=low + + f663600 csoler Fri, 1 Jun 2018 22:27:59 +0200 fixed makeSourcePackage.sh + 9b16e33 csoler Fri, 11 May 2018 20:53:29 +0200 removed conflicts to retroshare06 in debian control file + 57dde55 csoler Sat, 26 May 2018 11:23:33 +0200 Merge pull request #1269 from PhenomRetroShare/Add_NeverAskMeForExternalLinkActivated + 33fe823 csoler Sat, 26 May 2018 11:22:47 +0200 Merge pull request #1271 from sehraf/pr_compile-fix-unused-services + 65beb2c csoler Sat, 26 May 2018 11:09:41 +0200 Merge pull request #1275 from sehraf/pr_fix-IDdialog-chat-link + d8b3fc0 csoler Sat, 26 May 2018 11:08:46 +0200 Merge pull request #1274 from PhenomRetroShare/Fix_AppVeyorCompil + f53e5e8 sehraf Fri, 25 May 2018 23:59:02 +0200 Fix displayed chat link name in id dialog before (decimal): Message in chat room 5327517029776505601 after (proper id): Message in chat room LFD6E08C33A98C658 + 428b331 sehraf Fri, 25 May 2018 23:12:35 +0200 fix for Qt 5.11 + 7c77e93 Phenom Fri, 25 May 2018 17:32:36 +0200 Fix AppVeyor Compilation + de65cb6 csoler Tue, 22 May 2018 23:59:26 +0200 Merge pull request #1272 from G10h4ck/net_little_fixes + 1ad1fdc Gioacc Tue, 22 May 2018 19:17:37 +0200 p3NetMgrIMPL::checkNetAddress() notify if port change + 0bf02e2 Gioacc Tue, 22 May 2018 19:14:25 +0200 pqissludp::Initiate_Connection() check remote_addr to be IPv4 before use + 0c19a56 sehraf Mon, 21 May 2018 14:55:10 +0200 compile fix gxsphoto + 92b21d7 sehraf Mon, 21 May 2018 14:26:46 +0200 compile fix wikipoos + 8f107cc Phenom Sat, 19 May 2018 16:37:29 +0200 Add Never Ask Me For External Link Activated + 186617f Gioacc Thu, 17 May 2018 16:43:14 +0200 Fix missing include + 28981b6 csoler Wed, 16 May 2018 13:37:02 +0200 Merge pull request #1251 from PhenomRetroShare/Fix_Cppcheck(duplInheritedMember)InRsItem + d11f88c csoler Wed, 16 May 2018 13:33:25 +0200 Merge pull request #1252 from PhenomRetroShare/Fix_Cppcheck(duplInheritedMember)InbdNode + 2145911 csoler Wed, 16 May 2018 13:30:56 +0200 Merge pull request #1262 from PhenomRetroShare/Fix_PartialDirCheck + e232000 csoler Wed, 16 May 2018 13:28:23 +0200 Merge pull request #1266 from csoler/v0.6-FT + 3f88e3e csoler Wed, 16 May 2018 13:24:52 +0200 added check to avoid hashing files that are currently being modified + 8451550 csoler Wed, 16 May 2018 11:40:39 +0200 added missing licence to file_tree.h + 291c86e csoler Wed, 16 May 2018 11:17:22 +0200 Merge pull request #1265 from csoler/v0.6-GxsFix + 4661329 csoler Wed, 16 May 2018 11:15:18 +0200 fixed bug causing new forums and identities to not show up immediately + 9f37b63 G10h4c Wed, 16 May 2018 10:49:28 +0200 Merge pull request #1264 from G10h4ck/channel_json_api_v2 + 181d99e Gioacc Wed, 16 May 2018 10:38:47 +0200 Give proper error message if Qt version is too old + f12cd57 Phenom Sat, 12 May 2018 14:31:17 +0200 Fix Partial Dir Check + 57cff61 csoler Fri, 11 May 2018 20:28:53 +0200 fixed merge + ecbd115 csoler Fri, 11 May 2018 20:24:24 +0200 added missing include path for libretroshare/src in libresapi + fe5ea9e csoler Fri, 11 May 2018 17:37:15 +0200 additional fixes to debian packaging files + 2173aab csoler Fri, 11 May 2018 17:02:58 +0200 fixed rules file again + 84a02cb csoler Fri, 11 May 2018 16:39:49 +0200 added missing targets in rules file + 4b6304e csoler Fri, 11 May 2018 16:33:19 +0200 few fixes according to lintian complaints + c2492fe csoler Thu, 10 May 2018 23:10:16 +0200 fixed a few lintian errors in debian/control + 9f5409b csoler Thu, 10 May 2018 22:04:11 +0200 fixed email to match mentors login + 45fdbb4 csoler Thu, 10 May 2018 22:03:39 +0200 fixed email to match mentors login + b4ada80 csoler Wed, 9 May 2018 13:54:40 +0200 removed > 3.4.1 in debian/control, because pbuilder would not build + e81c82e csoler Wed, 9 May 2018 13:37:25 +0200 added notes file for debian release + 4d287d6 csoler Wed, 9 May 2018 13:27:16 +0200 fixed weird mistake in grouter which causes an issue only in gcc > 8 + 889c277 csoler Wed, 9 May 2018 10:15:32 +0200 fixed packaging script for debian release + f406d9a csoler Wed, 9 May 2018 10:15:02 +0200 updated debian/control to be the control file for stretch. Updated copyright notice + 186ff0f csoler Wed, 9 May 2018 10:12:34 +0200 created proper debian changelog using dch and updated project url + 6d67936 csoler Tue, 8 May 2018 15:34:44 +0200 Merge pull request #1253 from PhenomRetroShare/Add_LastPostColInGroupTreeWidget + 2ebacf3 Phenom Tue, 8 May 2018 12:08:08 +0200 Add Last Post Column in GroupTreeWidget. + 4d748bd Phenom Mon, 7 May 2018 18:05:07 +0200 Fix CppCheck duplInheritedMember warning in bdNode + f39fd06 Phenom Mon, 7 May 2018 17:29:11 +0200 Fix CppCheck duplInheritedMember warning in RsItem + 1352631 thunde Mon, 7 May 2018 06:42:52 +0200 Updated Windows build environment + 38ac234 thunde Mon, 7 May 2018 07:30:29 +0200 Fixed Windows compile with pre-compiled libraries Added new variable EXTERNAL_LIB_DIR to specify path of external libraries + d9a75a9 thunde Sun, 29 Apr 2018 20:40:05 +0200 Added RapidJSON to Windows build environment + 5b607ad csoler Sun, 6 May 2018 23:53:45 +0200 Merge pull request #1245 from PhenomRetroShare/AddContextMenuForGxsIdInTextChatBrowser + a6821f4 csoler Sun, 6 May 2018 23:02:18 +0200 Merge pull request #1249 from sehraf/pr_libsecret + c20436e csoler Sun, 6 May 2018 22:59:20 +0200 Merge pull request #1250 from PhenomRetroShare/Fix_CppCheckerWarningInFtController + d8dc2a8 csoler Sun, 6 May 2018 22:57:57 +0200 Merge pull request #1246 from PhenomRetroShare/Add_GxsIdInRestoredChatMsg + dca33da Phenom Sun, 6 May 2018 18:53:29 +0200 Fix CppCheck in ftcontroller.cc + c89e36a sehraf Fri, 4 May 2018 20:52:31 +0200 add auto selection of libsecret with fallback to libgnome-keyring + 1129bcb sehraf Fri, 4 May 2018 20:47:41 +0200 Add support for libsecret + 10badf5 sehraf Fri, 4 May 2018 20:43:40 +0200 fix retroshare-nogui.pro autologin + 676c070 csoler Thu, 3 May 2018 15:55:21 +0200 extended the rapid_json trick to plugins + 5f12b60 csoler Thu, 3 May 2018 15:22:39 +0200 added -lgnome-keyring to unix LIBS when rs_autologin is set + bfe8e40 csoler Thu, 3 May 2018 15:22:03 +0200 updated ubuntu changelog + 98f0052 Phenom Thu, 3 May 2018 15:04:22 +0200 Add GxsId in Restored Chat Message. + ecba4c2 Phenom Wed, 2 May 2018 20:31:52 +0200 Add Context Menu for GxsId in lobby textBrowser. + 91ed367 csoler Thu, 3 May 2018 13:45:44 +0200 added packaging for ubuntu bionic + 56e8134 cyril soler Thu, 3 May 2018 11:32:24 +0200 removed sqlite3 lib from ld when using sqlcipher. + 1366f61 csoler Wed, 2 May 2018 23:51:46 +0200 Merge pull request #1241 from RetroPooh/chatimgattprev1 + 8e111c2 csoler Wed, 2 May 2018 22:46:27 +0200 added rapidjson-1.1.0 code hard-coded in the source directory to allow everyone to compile without the need to tweak too much. When v1.1.0 is mainstream (espcially on ubuntu) we can revert back to an external dependency + 48c4b4c G10h4c Sat, 28 Apr 2018 09:34:14 +0200 Merge pull request #1242 from beardog108/master + ccede9d G10h4c Sat, 28 Apr 2018 09:33:14 +0200 Merge pull request #1243 from sehraf/pr_fix-make-install + 10daf3b sehraf Sat, 28 Apr 2018 09:06:10 +0200 Fix 'make install' + 82a00c2 KevinF Fri, 27 Apr 2018 15:34:43 -0500 added rapidjson to package installation command on Debian/OpenSUSE/Arch + be75e89 Gioacc Fri, 27 Apr 2018 20:55:38 +0200 Fix compialtion after merge + f3ae61b Gioacc Fri, 27 Apr 2018 18:17:09 +0200 Merge branch 'json_experiments' + + -- Retroshare Dev Team Thu, 03 May 2018 12:00:00 +0100 + +retroshare (0.6.4-1.20180503.676c0701~xenial) xenial; urgency=low 2dc69cb RetroP Fri, 27 Apr 2018 16:50:00 +0300 embed preview for images on file attach in chat c199199 Gioacc Sun, 8 Apr 2018 12:37:41 +0200 pqissl silence extra debug message @@ -4867,7 +4944,7 @@ -- Cyril Soler Sun, 21 Sep 2014 20:00:00 +0100 -retroshare (0.5.5-0.20180503.676c0701~bionic) bionic; urgency=low +retroshare (0.5.5-0.20180601.6bb1d3c5~bionic) bionic; urgency=low * Improvements - General @@ -6031,7 +6108,7 @@ -- Cyril Soler Wed, 24 May 2012 22:30:00 +0100 -retroshare (0.5.3-0.20180503.676c0701~bionic) bionic; urgency=low +retroshare (0.5.3-0.20180601.6bb1d3c5~bionic) bionic; urgency=low * Improvements - Added threaded loading of channels (GUI). diff -Nru retroshare-0.6.4/debian/compat retroshare-0.6.4/debian/compat --- retroshare-0.6.4/debian/compat 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/debian/compat 2018-06-01 20:36:00.000000000 +0000 @@ -1 +1 @@ -7 +10 diff -Nru retroshare-0.6.4/debian/rules retroshare-0.6.4/debian/rules --- retroshare-0.6.4/debian/rules 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/debian/rules 2018-06-01 20:36:00.000000000 +0000 @@ -7,11 +7,12 @@ touch $@ -build: build-stamp +build: build-arch build-indep + build-stamp: configure-stamp dh_testdir # Add here commands to compile the package. - # cd libssh-0.6.4 && mkdir -p build && cd build && cmake -DWITH_STATIC_LIB=ON .. && make + # cd libssh-0.6.4 && mkdir -p build && cd build && cmake -DWITH_STATIC_LIB=ON .. && make # cd sqlcipher && ./configure --disable-shared --enable-static --enable-tempstore=yes CFLAGS="-DSQLITE_HAS_CODEC" LDFLAGS="-lcrypto" && make # mkdir lib # cp -r libssh-0.6.4 lib/ @@ -20,18 +21,24 @@ cd src && $(MAKE) touch $@ +build-indep: build-stamp + +build-arch: build-stamp + clean: dh_testdir dh_testroot rm -f configure-stamp build-stamp # Add here commands to clean up after the build process. [ ! -f src/Makefile ] || (cd src && $(MAKE) distclean) + dh_prep dh_clean install: build dh_testdir dh_testroot - dh_clean -k + dh_prep + dh_clean #dh_installdirs cd src && $(MAKE) INSTALL_ROOT=$(CURDIR)/debian/tmp install Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/debian/.rules.swp and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/debian/.rules.swp differ diff -Nru retroshare-0.6.4/debian/source/format retroshare-0.6.4/debian/source/format --- retroshare-0.6.4/debian/source/format 1970-01-01 00:00:00.000000000 +0000 +++ retroshare-0.6.4/debian/source/format 2018-06-01 20:36:00.000000000 +0000 @@ -0,0 +1 @@ +1.0 diff -Nru retroshare-0.6.4/src/appveyor.yml retroshare-0.6.4/src/appveyor.yml --- retroshare-0.6.4/src/appveyor.yml 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/appveyor.yml 2018-06-01 20:36:00.000000000 +0000 @@ -63,7 +63,8 @@ environment: global: #Qt: https://www.appveyor.com/docs/installed-software#qt - QTDIR: C:\Qt\5.4\mingw491_32 + # (C:\Qt\5.10 mapped to C:\Qt\5.10.1 for backward compatibility) + QTDIR: C:\Qt\5.10\mingw53_32 MSYS2_ARCH: i686 TARGET: i686_32-pc-msys diff -Nru retroshare-0.6.4/src/build_scripts/AppImage/clean.sh retroshare-0.6.4/src/build_scripts/AppImage/clean.sh --- retroshare-0.6.4/src/build_scripts/AppImage/clean.sh 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/build_scripts/AppImage/clean.sh 1970-01-01 00:00:00.000000000 +0000 @@ -1,6 +0,0 @@ -#!/bin/sh - -rm -rf ./out -rm *~ -rm -rf ./retroshare - diff -Nru retroshare-0.6.4/src/build_scripts/AppImage/makeAppImage_retrotor.sh retroshare-0.6.4/src/build_scripts/AppImage/makeAppImage_retrotor.sh --- retroshare-0.6.4/src/build_scripts/AppImage/makeAppImage_retrotor.sh 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/build_scripts/AppImage/makeAppImage_retrotor.sh 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -#!/bin/sh -./Recipe retrotor.yml - diff -Nru retroshare-0.6.4/src/build_scripts/AppImage/makeAppImage.sh retroshare-0.6.4/src/build_scripts/AppImage/makeAppImage.sh --- retroshare-0.6.4/src/build_scripts/AppImage/makeAppImage.sh 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/build_scripts/AppImage/makeAppImage.sh 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -#!/bin/sh -./Recipe retroshare.yml - diff -Nru retroshare-0.6.4/src/build_scripts/AppImage/README.txt retroshare-0.6.4/src/build_scripts/AppImage/README.txt --- retroshare-0.6.4/src/build_scripts/AppImage/README.txt 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/build_scripts/AppImage/README.txt 1970-01-01 00:00:00.000000000 +0000 @@ -1,10 +0,0 @@ -In order to generate the appImage, just run makeAppImage.sh - -This app image recipe has been obtained from - - https://github.com/AppImage/AppImageKit/wiki/Creating-AppImages - -... using method 1. - -The script Recipe is https://raw.githubusercontent.com/probonopd/AppImages/master/recipes/meta/Recipe from https://github.com/probonopd/AppImages/blob/master/recipes/meta/RetroShare.yml which as been adapted to the newest naming conventions - diff -Nru retroshare-0.6.4/src/build_scripts/AppImage/Recipe retroshare-0.6.4/src/build_scripts/AppImage/Recipe --- retroshare-0.6.4/src/build_scripts/AppImage/Recipe 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/build_scripts/AppImage/Recipe 1970-01-01 00:00:00.000000000 +0000 @@ -1,418 +0,0 @@ -#!/usr/bin/env bash - -usage() { - echo "usage:" - echo " $0 [--no-di] META-NAME|YAMLFILE" - echo "" - echo "options:" - echo " --no-di disable desktop integration" - exit 1 -} - -if [ $# -eq 0 ] || [ "x${!#}" = "x--no-di" ] ; then - usage -fi -if [ $# -eq 2 ] && [ "x$1" != "x--no-di" ] ; then - usage -fi - -if [ "x$1" = "x--no-di" ] ; then - ENABLE_DI="no" -else - ENABLE_DI="yes" -fi - -# Halt on errors -set -e -set -x - -# Check dependencies -which wget >/dev/null 2>&1 || ( echo wget missing && exit 1 ) -which grep >/dev/null 2>&1 || ( echo grep missing && exit 1 ) -which sed >/dev/null 2>&1 || ( echo sed missing && exit 1 ) -which cut >/dev/null 2>&1 || ( echo cut missing && exit 1 ) - -# If the yaml file doesn't exist locally, get it from GitHub -if [ ! -f "${!#}" ] ; then - YAMLFILE=/tmp/_recipe.yml - rm -f "$YAMLFILE" - wget -q "https://github.com/probonopd/AppImages/raw/master/recipes/meta/${!#}.yml" -O "$YAMLFILE" -else - YAMLFILE=$(readlink -f "${!#}") -fi - -# Lightweight bash-only dpkg-scanpackages replacement -scanpackages() { - for deb in *.deb ; do - dpkg -I $deb | sed 's/^ *//g' | grep -i -E '(package|version|installed-size|architecture|depends|priority):' - echo "Filename: $(readlink -f $deb)" - echo "MD5sum: $(md5sum -b $deb | cut -d' ' -f1)" - echo "SHA1: $(sha1sum -b $deb | cut -d' ' -f1)" - echo "SHA256: $(sha256sum -b $deb | cut -d' ' -f1)" - echo - done -} - -# Function to parse yaml -# https://gist.github.com/epiloque/8cf512c6d64641bde388 -# based on https://gist.github.com/pkuczynski/8665367 -parse_yaml() { - local prefix=$2 - local s - local w - local fs - s='[[:space:]]*' - w='[a-zA-Z0-9_]*' - fs="$(echo @|tr @ '\034')" - sed -ne "s|^\($s\)\($w\)$s:$s\"\(.*\)\"$s\$|\1$fs\2$fs\3|p" \ - -e "s|^\($s\)\($w\)$s[:-]$s\(.*\)$s\$|\1$fs\2$fs\3|p" "$1" | - awk -F"$fs" '{ - indent = length($1)/2; - vname[indent] = $2; - for (i in vname) {if (i > indent) {delete vname[i]}} - if (length($3) > 0) { - vn=""; for (i=0; i/dev/null || true - generate_status - - # Some packages depend on packages which we do not want to bundle, - # in addition to the global excludes defined in excludedeblist. - # Use - # ingredients: - # exclude: - # - packagename - if [ ! -z "${_ingredients_exclude[0]}" ] ; then - for PACKAGE in "${_ingredients_exclude[@]}" ; do - printf "Package: $PACKAGE\nStatus: install ok installed\nArchitecture: all\nVersion: 9:999.999.999\n\n" >> status - done - fi - - # Some packages depend on an exact version of a dependency to be installed. - # Use - # ingredients: - # pretend: - # - packagename version_to_be_pretended - if [ ! -z "${_ingredients_pretend[0]}" ] ; then - for PRETEND in "${_ingredients_pretend[@]}" ; do - P_PKG=$(echo "$PRETEND" | cut -d " " -f 1) - P_VER=$(echo "$PRETEND" | cut -d " " -f 2) - cat status | tr '\n' '@' | sed -e 's|@@|\n\n|g' | sed -e 's|Package: '"$P_PKG"'@Status: install ok installed@Architecture: all@Version: 9:999.999.999|Package: '"$P_PKG"'@Status: install ok installed@Architecture: all@Version: '"$P_VER"'|g' | sed -e 's|@|\n|g' > status.temp - mv status.temp status - done - fi - - if [ -e sources.list ] ; then - rm sources.list - fi - for SOURCE in "${_ingredients_sources[@]}" ; do - echo "${SOURCE}" >> sources.list - done - for PPA in "${_ingredients_ppas[@]}" ; do - echo "deb http://ppa.launchpad.net/${PPA}/ubuntu ${_ingredients_dist} main" >> sources.list - done - # Use libcurl-slim to reduce AppImage size, thanks darealshinji - # Not really compiled on xenial but CentOS 6, https://github.com/AppImage/AppImages/issues/187 - echo "deb http://ppa.launchpad.net/djcj/libcurl-slim/ubuntu xenial main" >> sources.list -fi - -if [ ! -z "${_ingredients_script[0]}" ] ; then - # Execute extra steps defined in recipe - shell_execute $YAMLFILE _ingredients_script -fi - -if [ ! -z "${_ingredients_dist}" ] ; then - # Some projects provide raw .deb files without a repository - # hence we create our own local repository as part of - # the AppImage creation process in order to "install" - # the package using apt-get as normal - if [ ! -z "${_ingredients_debs[0]}" ] ; then - for DEB in "${_ingredients_debs[@]}" ; do - if [ ! -f $(basename "$DEB") ] ; then - wget -c $DEB - fi - done - fi - scanpackages | gzip -9c > Packages.gz - echo "deb file:$(readlink -e $PWD) ./" >> sources.list - - INSTALL=$LOWERAPP - if [ ! -z "${_ingredients_package}" ] ; then - INSTALL="${_ingredients_package}" - fi - if [ ! -z "${_ingredients_packages}" ] ; then - INSTALL="" - fi - - # If packages are specifically listed, only install these, not a package with the name of the app - if [ ! -z "${_ingredients_packages[0]}" ] ; then - INSTALL=${_ingredients_packages[@]} - fi - - apt-get $OPTIONS update || true - URLS=$(apt-get $OPTIONS -y install --print-uris $INSTALL | cut -d "'" -f 2 | grep -e "^http") - if which aria2c &>/dev/null; then - dltool=aria2c - else - dltool=wget - fi - - $dltool -c -i- <<<"$URLS" -fi - -mkdir -p ./$APP.AppDir/ -cd ./$APP.AppDir/ - -mkdir -p usr/bin usr/lib -find ../*.deb -exec dpkg -x {} . \; || true - -# Try to copy icons to standard locations where appimaged can pick them up -mkdir -p usr/share/icons/hicolor/{22x22,24x24,32x32,48x48,64x64,128x128,256x256,512x512}/apps/ -find . -path *icons* -path *22* -name "*$LOWERAPP*" -exec cp {} usr/share/icons/hicolor/22x22/apps/ \; || true -find . -path *icons* -path *24* -name "*$LOWERAPP*" -exec cp {} usr/share/icons/hicolor/24x24/apps/ \; || true -find . -path *icons* -path *32* -name "*$LOWERAPP*" -exec cp {} usr/share/icons/hicolor/32x32/apps/ \; || true -find . -path *icons* -path *48* -name "*$LOWERAPP*" -exec cp {} usr/share/icons/hicolor/48x48/apps/ \; || true -find . -path *icons* -path *64* -name "*$LOWERAPP*" -exec cp {} usr/share/icons/hicolor/64x64/apps/ \; || true -find . -path *icons* -path *128* -name "*$LOWERAPP*" -exec cp {} usr/share/icons/hicolor/128x128/apps/ \; || true -find . -path *icons* -path *256* -name "*$LOWERAPP*" -exec cp {} usr/share/icons/hicolor/256x256/apps/ \; || true -find . -path *icons* -path *512* -name "*$LOWERAPP*" -exec cp {} usr/share/icons/hicolor/512x512/apps/ \; || true - -get_icon - -if [ -z "${_union}" ] ; then - get_apprun -else -cat > AppRun <<\EOF -#!/bin/sh -HERE="$(dirname "$(readlink -f "${0}")")" -export UNION_PRELOAD="${HERE}" -export LD_PRELOAD="${HERE}/libunionpreload.so" -export PATH="${HERE}"/usr/bin/:"${HERE}"/usr/sbin/:"${HERE}"/usr/games/:"${HERE}"/bin/:"${HERE}"/sbin/:"${PATH}" -export LD_LIBRARY_PATH="${HERE}"/usr/lib/:"${HERE}"/usr/lib/i386-linux-gnu/:"${HERE}"/usr/lib/x86_64-linux-gnu/:"${HERE}"/usr/lib32/:"${HERE}"/usr/lib64/:"${HERE}"/lib/:"${HERE}"/lib/i386-linux-gnu/:"${HERE}"/lib/x86_64-linux-gnu/:"${HERE}"/lib32/:"${HERE}"/lib64/:"${LD_LIBRARY_PATH}" -export PYTHONPATH="${HERE}"/usr/share/pyshared/:"${PYTHONPATH}" -export PYTHONHOME="${HERE}"/usr/ -export XDG_DATA_DIRS="${HERE}"/usr/share/:"${XDG_DATA_DIRS}" -export PERLLIB="${HERE}"/usr/share/perl5/:"${HERE}"/usr/lib/perl5/:"${PERLLIB}" -export GSETTINGS_SCHEMA_DIR="${HERE}"/usr/share/glib-2.0/schemas/:"${GSETTINGS_SCHEMA_DIR}" -export QT_PLUGIN_PATH="${HERE}"/usr/lib/qt4/plugins/:"${HERE}"/usr/lib/i386-linux-gnu/qt4/plugins/:"${HERE}"/usr/lib/x86_64-linux-gnu/qt4/plugins/:"${HERE}"/usr/lib32/qt4/plugins/:"${HERE}"/usr/lib64/qt4/plugins/:"${HERE}"/usr/lib/qt5/plugins/:"${HERE}"/usr/lib/i386-linux-gnu/qt5/plugins/:"${HERE}"/usr/lib/x86_64-linux-gnu/qt5/plugins/:"${HERE}"/usr/lib32/qt5/plugins/:"${HERE}"/usr/lib64/qt5/plugins/:"${QT_PLUGIN_PATH}" -EXEC=$(grep -e '^Exec=.*' "${HERE}"/*.desktop | head -n 1 | cut -d "=" -f 2- | sed -e 's|%.||g') -exec ${EXEC} $@ -EOF -chmod a+x AppRun -fi - -get_desktop - -# Prevent Qt from loading plugins from the system -unset QTPATH -QTPATH=$(find usr/lib -type d -name qt4 -or -name qt5 | sed -e 's|usr/|../|g') -if [ ! -z $QTPATH ] ; then -cat > usr/bin/qt.conf < temp \; - # Remove all absolute paths - sed -i -E 's|target=\"\/(.*\/)([a-z0-9].*?)>|target=\"\2>|g' temp - SONAMES=$(cat temp | cut -d '"' -f 4 | grep ".so") - for SONAME in $SONAMES; do - find . -name "$SONAME" -exec mv {} usr/lib \; - done - rm temp - PATH_OF_THE_EXE="usr/lib/mono/exe" - mkdir -p "PATH_OF_THE_EXE" - # Force all dll files into PATH_OF_THE_EXE (or MONO_PATH which we would have to set) - find . -name "*.dll" -and -not -name "mscorlib.dll" -exec mv {} "$PATH_OF_THE_EXE" \; - # Edit all config files in place to remove absolute paths - find . -name "*.dll.config" -exec sed -i -E 's|target=\"\/(.*\/)([a-z0-9].*?)>|target=\"\2>|g' {} \; - # Force all config files into the PATH_OF_THE_EXE (or MONO_PATH which we would have to set) - find . -name "*.dll.config" -exec mv {} "$PATH_OF_THE_EXE" \; - # Remove gac, we are not using it since it is convoluted - rm -rf usr/lib/mono/gac/ -fi - -if [ -d "./usr/lib/x86_64-linux-gnu/gstreamer-1.0/" ] ; then - mv ./usr/lib/x86_64-linux-gnu/gstreamer-1.0/* ./usr/lib/x86_64-linux-gnu/ - rm -r ./usr/lib/x86_64-linux-gnu/gstreamer-1.0 -fi - -if [ -d "./usr/lib/x86_64-linux-gnu/pulseaudio/" ] ; then - mv ./usr/lib/x86_64-linux-gnu/pulseaudio/* ./usr/lib/x86_64-linux-gnu/ - rm -r ./usr/lib/x86_64-linux-gnu/pulseaudio -fi - -# Execute extra steps defined in recipe -if [ ! -z "${_script}" ] ; then - shell_execute $YAMLFILE _script -fi - -DESKTOP=$(find . -name '*.desktop' | sort | head -n 1) - -# desktop-file-validate complains about missing trailing semicolons for some -# keys although the format definition says that they are optional -fix_desktop "$DESKTOP" - -# Some non-distribution provided applications have an absolute -# path in the Exec= line which we remove for relocateability -if [ -z "$DESKTOP" ] ; then - echo "desktop file not found, aborting" - exit 1 -else - desktop-file-validate "$DESKTOP" || exit 1 - ORIG=$(grep -o "^Exec=.*$" "${DESKTOP}" | head -n 1| cut -d " " -f 1) - REPL=$(basename $(grep -o "^Exec=.*$" "${DESKTOP}" | head -n 1 | cut -d " " -f 1 | sed -e 's|Exec=||g')) - sed -i -e 's|'"${ORIG}"'|Exec='"${REPL}"'|g' "${DESKTOP}" -fi - -# Compile GLib schemas if the subdirectory is present in the AppImage -# AppRun has to export GSETTINGS_SCHEMA_DIR for this to work -if [ -d usr/share/glib-2.0/schemas/ ] ; then - ( cd usr/share/glib-2.0/schemas/ ; glib-compile-schemas . ) -fi - -if [ -f ../VERSION ] ; then - VERSION=$(cat ../VERSION) -else - get_version || true -fi - -# patch_usr -# Patching only the executable files seems not to be enough for some apps -if [ ! -z "${_binpatch}" ] ; then - find usr/ -type f -exec sed -i -e 's|/usr|././|g' {} \; - find usr/ -type f -exec sed -i -e 's@././/bin/env@/usr/bin/env@g' {} \; -fi - -# Don't suffer from NIH; use LD_PRELOAD to override calls to /usr paths -if [ ! -z "${_union}" ] ; then - mkdir -p usr/src/ - wget -q "https://raw.githubusercontent.com/mikix/deb2snap/master/src/preload.c" -O - | \ - sed -e 's|SNAPPY|UNION|g' | sed -e 's|SNAPP|UNION|g' | sed -e 's|SNAP|UNION|g' | \ - sed -e 's|snappy|union|g' > usr/src/libunionpreload.c - gcc -shared -fPIC usr/src/libunionpreload.c -o libunionpreload.so -ldl -DUNION_LIBNAME=\"libunionpreload.so\" - strip libunionpreload.so -fi - -delete_blacklisted - -if [ "$ENABLE_DI" = "yes" ] ; then - get_desktopintegration $LOWERAPP -fi - -# Fix desktop files that have file endings for icons -sed -i -e 's|\.png||g' *.desktop || true -sed -i -e 's|\.svg||g' *.desktop || true -sed -i -e 's|\.svgz||g' *.desktop || true -sed -i -e 's|\.xpm||g' *.desktop || true - -# Setting PYTHONHOME instead -# Fix Python imports, -# https://github.com/probonopd/AppImages/issues/172 -# SITECUSTOMIZEFILES=$(find . -name "sitecustomize.py") -# for SITECUSTOMIZEFILE in $SITECUSTOMIZEFILES ; do -# rm $SITECUSTOMIZEFILE # Remove symlinks, replace by files -# cat > $SITECUSTOMIZEFILE <<\EOF -# import sys,os -# if sys.version_info[0] < 3: -# prefix = os.path.dirname(os.path.dirname(os.path.dirname(os.path.dirname(sys.path[0])))) -# sys.path = [ prefix+s for s in sys.path if not s.startswith(prefix) ] -# EOF -# done - -# Execute extra steps defined in recipe -if [ ! -z "${_post}" ] ; then - shell_execute $YAMLFILE _post -fi - -# Go out of AppImage -cd .. - -generate_type2_appimage -ls -lh ../out/*.AppImage diff -Nru retroshare-0.6.4/src/build_scripts/AppImage/retroshare.yml retroshare-0.6.4/src/build_scripts/AppImage/retroshare.yml --- retroshare-0.6.4/src/build_scripts/AppImage/retroshare.yml 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/build_scripts/AppImage/retroshare.yml 1970-01-01 00:00:00.000000000 +0000 @@ -1,18 +0,0 @@ -app: retroshare -union: true - -ingredients: - dist: trusty - sources: - - deb http://archive.ubuntu.com/ubuntu trusty main restricted universe multiverse - - deb http://archive.ubuntu.com/ubuntu trusty-updates main restricted universe multiverse - ppas: - - retroshare/unstable - packages: - - libqt4-svg - - retroshare - -script: - - rm -rf usr/share/glib-2.0/schemas/ - - sed -i -e 's|/usr/share/pixmaps/||g' retroshare.desktop - - sed -i -e 's|/usr/bin/||g' retroshare.desktop diff -Nru retroshare-0.6.4/src/build_scripts/AppImage/retrotor.yml retroshare-0.6.4/src/build_scripts/AppImage/retrotor.yml --- retroshare-0.6.4/src/build_scripts/AppImage/retrotor.yml 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/build_scripts/AppImage/retrotor.yml 1970-01-01 00:00:00.000000000 +0000 @@ -1,20 +0,0 @@ -app: retroshare -union: true - -ingredients: - dist: trusty - sources: - - deb http://archive.ubuntu.com/ubuntu trusty main restricted universe multiverse - - deb http://archive.ubuntu.com/ubuntu trusty-updates main restricted universe multiverse - - deb http://deb.torproject.org/torproject.org/ trusty main - ppas: - - retroshare/testing - packages: - - libqt5svg5 - - tor - - retrotor - -script: - - rm -rf usr/share/glib-2.0/schemas/ - - sed -i -e 's|/usr/share/pixmaps/||g' retroshare.desktop - - sed -i -e 's|/usr/bin/||g' retroshare.desktop diff -Nru retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/changelog retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/changelog --- retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/changelog 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/changelog 1970-01-01 00:00:00.000000000 +0000 @@ -1,7045 +0,0 @@ -retroshare (ZZZZZZ-1.XXXXXX~YYYYYY) YYYYYY; urgency=low - - 2dc69cb RetroP Fri, 27 Apr 2018 16:50:00 +0300 embed preview for images on file attach in chat - c199199 Gioacc Sun, 8 Apr 2018 12:37:41 +0200 pqissl silence extra debug message - 8245d74 csoler Sat, 7 Apr 2018 14:33:58 +0200 Merge pull request #1230 from csoler/master - 2782494 csoler Sat, 7 Apr 2018 14:29:23 +0200 removed debug info - e2b0e27 csoler Sat, 7 Apr 2018 00:56:07 +0200 fixed costly polling in RsGenExchange - cc091cc Gioacc Sat, 7 Apr 2018 12:48:01 +0200 Fixed hidden nodes listening failure - 73c6dee csoler Tue, 27 Mar 2018 20:54:31 +0200 Merge pull request #1191 from G10h4ck/IPv6-v3 - 4be73b7 csoler Sat, 24 Mar 2018 10:18:37 +0100 Merge pull request #1216 from beardog108/security - 599c3d4 Kevin Fri, 23 Mar 2018 23:00:27 -0500 fixed clickjacking attack with x-frame-options - 24d1f5d csoler Sat, 17 Mar 2018 18:40:32 +0100 Merge pull request #1190 from PhenomRetroShare/Add_ShowEmptySubMenuRemoteTree - 09de680 csoler Sat, 17 Mar 2018 18:30:21 +0100 Merge pull request #1210 from PhenomRetroShare/Add_BackgroundInProgressBarText - 1432104 csoler Sat, 17 Mar 2018 18:25:47 +0100 Merge pull request #1214 from csoler/v0.6-FT - e1482dd Phenom Sat, 17 Mar 2018 00:00:05 +0100 Add Rounded and Gradient Background to xprogressbar text. - 7da73b3 Phenom Mon, 5 Mar 2018 20:31:39 +0100 Add differents views depends ProgressBar width - 311b190 Phenom Sun, 4 Mar 2018 20:06:33 +0100 Add Background to xprogressbar text for more readability. - e1ad21c csoler Thu, 15 Mar 2018 13:11:19 +0100 fixed wrong file count in RsCollectionDialog when downloading files - b3653d1 csoler Thu, 15 Mar 2018 11:32:55 +0100 enabled aggressive re-request of pending slices at end of transfer, thus fixing the long delay to finish files with mixed fast/slow sources - 6e8305a csoler Wed, 14 Mar 2018 20:56:30 +0100 Merge pull request #1211 from PhenomRetroShare/Fix_AvatarStatusOverlay - c7549a2 csoler Wed, 14 Mar 2018 20:49:42 +0100 Merge pull request #1208 from PhenomRetroShare/Fix_ChangeChatTextColorWhenChangeStyle - 11cfa7b csoler Wed, 14 Mar 2018 20:34:52 +0100 Merge pull request #1209 from PhenomRetroShare/Add_DescriptionGxsGroupToolTip - 3fc6314 csoler Wed, 14 Mar 2018 20:33:34 +0100 Merge pull request #1206 from PhenomRetroShare/Fix_AboutIcon - 0e6d27a csoler Tue, 13 Mar 2018 20:25:38 +0100 fixed bug in FT causing transfer lines to only update when the mouse moves over the widget - 91634ba thunde Thu, 8 Mar 2018 17:45:24 +0100 Added build of Retrotor to Windows build environment - e9b49e1 Gioacc Mon, 12 Mar 2018 17:06:01 +0100 Update Android quirks documentation - ce56a20 Gioacc Mon, 12 Mar 2018 16:22:42 +0100 Added sources verification in android toolchain - e7078b5 Gioacc Mon, 12 Mar 2018 14:27:59 +0100 Update Android documentation - 514b31e Gioacc Sun, 11 Mar 2018 20:46:07 +0100 Add Qt installation in android preparation script - 6f30aa2 Gioacc Sun, 11 Mar 2018 20:45:40 +0100 Merge branch 'master' of git://github.com/RetroShare/RetroShare - 13b18e3 csoler Sat, 10 Mar 2018 16:05:52 +0100 added missing decoration icon on transfer sources - 4dd2776 Gioacc Sat, 10 Mar 2018 13:15:53 +0100 Remove android JNI .class from source - 2b300eb Gioacc Sat, 10 Mar 2018 00:44:24 +0100 Update version in Android Manifest - f5a3b26 Gioacc Fri, 9 Mar 2018 20:26:29 +0100 More omogeneous variable naming in android build tools - c92b860 thunde Sun, 4 Mar 2018 20:08:15 +0100 Windows build environment: - Updated external libraries - Added compile of plugins to build.bat - Added copy of Qt style DLL to pack.bat and Windows Installer - Removed "CONFIG=console" for release build - 8b42873 Phenom Sun, 4 Mar 2018 22:45:11 +0100 Fix Friend Avatar status overlay no depends size scale. - 6877589 Phenom Sun, 4 Mar 2018 18:19:18 +0100 Add description in GroupTreeWidget tooltip. - 51cc94b Phenom Sun, 4 Mar 2018 17:31:40 +0100 Fix ChatWidget current text edit color when changing appearance style. - 4e6f2ae Phenom Sun, 4 Mar 2018 14:31:16 +0100 Fix Icon for About page. - a89ab8f Phenom Sat, 24 Feb 2018 14:07:32 +0100 Add ShowEmpty sub menu in Tree Remote SharedFilesDialog. - - -- Retroshare Dev Team Thu, 03 May 2018 12:00:00 +0100 - -retroshare (0.6.4-1.20180313.0e6d27ad~xenial) xenial; urgency=low - - 919417a csoler Sat, 3 Mar 2018 19:04:54 +0100 make sure tor executable from config path can be reached - b587ac8 csoler Sat, 3 Mar 2018 16:06:49 +0100 Merge pull request #1192 from PhenomRetroShare/Add_WarningMaxFlatViewFile - 9bcff07 csoler Sat, 3 Mar 2018 15:58:11 +0100 Merge pull request #1203 from PhenomRetroShare/Fix_SharedFileDialogShowColumn - ead2aea csoler Sat, 3 Mar 2018 15:56:51 +0100 Merge pull request #1204 from csoler/v0.6-FT - dcb3f79 csoler Sat, 3 Mar 2018 15:55:52 +0100 removed some debug info in RSLink - 1a1dc64 csoler Sat, 3 Mar 2018 15:49:45 +0100 fixed transfers list bug causing ghost entries to appear - 58d418d Phenom Sat, 3 Mar 2018 12:08:21 +0100 Fix SharedFilesDialog show old hidden column. - ab45a97 Phenom Sat, 3 Mar 2018 12:05:13 +0100 Revert "Fix SharedFilesDialog show old hidden column." - 57f87a6 csoler Fri, 2 Mar 2018 22:58:50 +0100 Merge pull request #1201 from csoler/v0.6-SecurityFixes - 9386bb9 csoler Fri, 2 Mar 2018 22:57:14 +0100 tried to fix FT list bug. - 952ff03 csoler Fri, 2 Mar 2018 21:28:09 +0100 Merge pull request #1200 from csoler/v0.6-SecurityFixes - e88eebf csoler Fri, 2 Mar 2018 21:26:38 +0100 attempt to fix wrong number of rows in DL list - f2a737e csoler Fri, 2 Mar 2018 18:13:09 +0100 fixed font size compilation error - ca402c2 csoler Fri, 2 Mar 2018 18:05:11 +0100 fixed column sizing in FT dialog - efa5827 csoler Fri, 2 Mar 2018 18:01:56 +0100 fixed missing peer availability maps in FT dialog - e5edea3 csoler Thu, 1 Mar 2018 14:10:30 +0100 removed precise and zesty which are obsolete - 3d7be85 csoler Thu, 1 Mar 2018 11:46:47 +0100 Merge pull request #1199 from csoler/v0.6-SecurityFixes - 026951f csoler Thu, 1 Mar 2018 11:45:54 +0100 added consistency check in getGroupMeta so that ADMIN/PUBLISH flags always correspond to what the key set reflects - 028a246 csoler Thu, 1 Mar 2018 09:44:59 +0100 Merge pull request #1197 from csoler/v0.6-SecurityFixes - ac64d2a csoler Thu, 1 Mar 2018 09:42:47 +0100 Merge pull request #1195 from PhenomRetroShare/Fix_NoTrIconInChatWidget - 0651f4a csoler Thu, 1 Mar 2018 09:42:06 +0100 Merge pull request #1198 from G10h4ck/master - 0c8b3ed Gioacc Wed, 28 Feb 2018 23:32:13 +0100 Set default Mac OS X version only if macx - 5d58943 csoler Wed, 28 Feb 2018 23:18:50 +0100 forced notification of type RECEIVE when creating a new group so that the GxsIFaceHelper updates the group list - 29ab0e9 csoler Wed, 28 Feb 2018 22:40:04 +0100 fixed bug that would erase private publish key when a group update is received - 165b241 csoler Tue, 27 Feb 2018 23:19:27 +0100 made add of publish key a meta group change, to force reload the list of groups - 3bc5b45 csoler Tue, 27 Feb 2018 22:42:48 +0100 added a FeedItem to warn when publish permissions are received for a channel - aad9397 csoler Mon, 26 Feb 2018 23:37:19 +0100 fixed memory leak in p3GxsTunnel - 23c389c Phenom Mon, 26 Feb 2018 23:29:06 +0100 Remove non translatable text ChatWidget.ui - dd9f67a csoler Sun, 25 Feb 2018 17:52:49 +0100 fixed version number problem - 3e700ab csoler Sun, 25 Feb 2018 16:12:46 +0100 Merge pull request #1194 from G10h4ck/fixAndroidCompilation - 9f0421c csoler Sun, 25 Feb 2018 14:39:29 +0100 attempt to fix large size in ConnectFriendDialog.ui - f9896a0 csoler Sun, 25 Feb 2018 11:46:18 +0100 updated ppa_upload.sh to 0.6.4 - 5c029c5 csoler Sun, 25 Feb 2018 11:43:30 +0100 fixed typo in changelog - 31ab87c csoler Fri, 23 Feb 2018 14:06:49 +0100 added rs plugins into rules for ubuntu packaging - 681f543 csoler Sat, 24 Feb 2018 22:04:26 +0100 Merge pull request #1183 from csoler/v0.6.4 - 05613a2 csoler Sat, 24 Feb 2018 21:58:58 +0100 Merge pull request #1193 from csoler/v0.6-SecurityFixes - 39e70ed csoler Sat, 24 Feb 2018 21:51:18 +0100 ignore unknown ptags in certificates instead of causing an error, for future backward compatibility - 062e00d csoler Sat, 24 Feb 2018 18:05:26 +0100 Merge pull request #1189 from csoler/v0.6-SecurityFixes - 13441ff csoler Fri, 23 Feb 2018 15:13:13 +0100 removed debug info in rsgenexchange.cc - 49b321d csoler Fri, 23 Feb 2018 14:39:08 +0100 fixed the text in invitation system - d8e950c csoler Fri, 23 Feb 2018 14:28:22 +0100 removed debug output from rsdataservice - 5a4d0f5 csoler Fri, 23 Feb 2018 14:26:23 +0100 made the invite system non automatic, because it was confusing and could generate unwanted emails - fa84d1c csoler Fri, 23 Feb 2018 14:01:43 +0100 Merge pull request #1185 from G10h4ck/disablePluginByDefault - ff7633f csoler Fri, 23 Feb 2018 14:00:39 +0100 Merge pull request #1184 from G10h4ck/linkLocalFallback - 8d5cd8a Gioacc Thu, 22 Feb 2018 15:38:20 +0100 Increase size of list of ip shared via discovery2 - 9dd1aef Gioacc Fri, 23 Feb 2018 01:05:35 +0100 Discovery do not distribute addresses to hidden nodes - e7facc1 Gioacc Fri, 23 Feb 2018 01:05:04 +0100 Prevent discovery to share local addresses if hidden - 4fa6bdc Gioacc Wed, 21 Feb 2018 17:38:31 +0100 Improve discovery - 385f44b csoler Thu, 22 Feb 2018 23:03:48 +0100 Merge pull request #1188 from PhenomRetroShare/Fix_SharedFileDialogShowColumn - c141eae Phenom Thu, 22 Feb 2018 18:54:14 +0100 Fix SharedFilesDialog show old hidden column. - 2044a2c Gioacc Wed, 21 Feb 2018 04:24:12 +0100 Use retrocompatible iterators - 4dfeab2 csoler Tue, 20 Feb 2018 23:30:52 +0100 Merge pull request #1187 from csoler/master - 73d11e1 Phenom Thu, 15 Feb 2018 19:04:55 +0100 Fix Gcc Warning in nxsmsgsync_test.cc - 737a2b4 Phenom Thu, 15 Feb 2018 18:57:16 +0100 Fix Gcc Warning in nxstesthub.cc - cfcdec4 Phenom Thu, 15 Feb 2018 18:44:03 +0100 Fix Gcc Warning in support.h - aadb9ac Phenom Fri, 8 Dec 2017 19:47:00 +0100 Fix Gcc Warning in NetworkDialog.cpp - e3d8d86 csoler Tue, 20 Feb 2018 23:03:33 +0100 updated translation files - 4d7997b csoler Tue, 20 Feb 2018 21:08:09 +0100 Merge pull request #1186 from csoler/v0.6-FT - a1b378e csoler Tue, 20 Feb 2018 21:07:02 +0100 fixed ghost rows in TransfersDialog - c897962 csoler Tue, 20 Feb 2018 20:26:33 +0100 merged - 11d607e csoler Tue, 20 Feb 2018 20:19:10 +0100 Merge pull request #1179 from PhenomRetroShare/Add_ChangeAddIconForChannelForum - 35b54bb csoler Tue, 20 Feb 2018 20:18:31 +0100 Merge pull request #1180 from PhenomRetroShare/Add_ClearGxsGroupFrameWhenNoSelection - fec2b2e csoler Tue, 20 Feb 2018 19:20:02 +0100 Merge pull request #1182 from PhenomRetroShare/Add_SplitFileNbSize - b2217fc Gioacc Tue, 20 Feb 2018 15:56:16 +0100 Build plugin only if requested - 0c99975 Gioacc Mon, 19 Feb 2018 23:23:15 +0100 Use link local address only if necessary - 5667763 csoler Mon, 19 Feb 2018 21:49:06 +0100 switched version to 0.6.4 - 798ad15 Phenom Mon, 19 Feb 2018 20:13:38 +0100 Split Number of Files and Size in RemoteDirModel. - afc43d0 G10h4c Mon, 19 Feb 2018 15:33:28 +0100 Merge pull request #1181 from Kcchouette/patch-1 - 8492a40 Kcchou Mon, 19 Feb 2018 15:17:59 +0100 Update markdown to be visible on github - 71e1a46 Phenom Sun, 18 Feb 2018 23:12:59 +0100 Clear GxsGroupFrame When No Selection - 8710761 Phenom Sun, 18 Feb 2018 19:15:01 +0100 Change Add Channel/Forum post by Add.png - 51f5d19 csoler Sun, 18 Feb 2018 18:00:24 +0100 merged uptream/master - 2bc0629 csoler Sun, 18 Feb 2018 17:59:00 +0100 Merge pull request #1178 from PhenomRetroShare/Fix_BugsInRsCollectionDialog - 2511934 csoler Sun, 18 Feb 2018 17:58:06 +0100 Merge pull request #1177 from csoler/v0.6-FT - 7a84492 csoler Sun, 18 Feb 2018 17:57:42 +0100 Merge pull request #1176 from csoler/v0.6-SecurityFixes - 7cda064 csoler Sun, 18 Feb 2018 17:56:51 +0100 merged uptream/master - 931fdd0 Phenom Sun, 18 Feb 2018 17:30:01 +0100 Fix bug in processSettings in RsCollectionDialog.cpp - d87061d Phenom Sun, 18 Feb 2018 09:18:44 +0100 Fix bug when adding new items when hashing in RsCollectionDialog - 6d0945f Phenom Sun, 18 Feb 2018 08:53:31 +0100 Fix bug when removing root item in RsCollectionDialog - 6fe1413 csoler Sat, 17 Feb 2018 23:37:25 +0100 added limiter in number of responses forwarded back by turtle search, which should avoid bursts of bandwidth for popular requests - 8708dd9 csoler Sat, 17 Feb 2018 12:04:13 +0100 fixed bug due to wrong service ID in serializer - d57f933 csoler Fri, 16 Feb 2018 23:51:43 +0100 added load/save of known channels to avoid re-displaying it in the NewsFeed after then have been deleted. - 252626f csoler Fri, 16 Feb 2018 23:24:01 +0100 added load/save of known forums to avoid re-displaying it in the NewsFeed after then have been deleted. - 63ddccd csoler Fri, 16 Feb 2018 13:22:19 +0100 Merge pull request #1175 from PhenomRetroShare/Fix_NewChatInvite - 83b6205 Phenom Fri, 16 Feb 2018 10:22:59 +0100 Fix New Chat Invite - 5e34467 csoler Thu, 15 Feb 2018 00:06:13 +0100 Merge pull request #1174 from csoler/v0.6-SecurityFixes - 47f9a49 csoler Thu, 15 Feb 2018 00:02:08 +0100 improved cost of reseting search in SharedFileDialog by saving hidden indexes list - 9c60ff7 csoler Wed, 14 Feb 2018 22:10:11 +0100 Merge pull request #1172 from csoler/v0.6-SecurityFixes - 72124bb csoler Wed, 14 Feb 2018 22:08:07 +0100 hide advanced mode option since it is not used anywhere in the software - ede51ab csoler Wed, 14 Feb 2018 22:02:20 +0100 Merge pull request #1171 from csoler/v0.6-SecurityFixes - cf33221 csoler Wed, 14 Feb 2018 22:00:46 +0100 removed dead code in previous commit - ddb2c45 csoler Wed, 14 Feb 2018 21:56:12 +0100 disable and hide signature checkbox when key is already signed in ConnectWizard - 42b8ecc csoler Wed, 14 Feb 2018 21:48:56 +0100 prevent RS from making friends with your own location - 558bb9f csoler Mon, 12 Feb 2018 23:17:29 +0100 fixed retro-tor build on master branch - 3f9c72e csoler Mon, 12 Feb 2018 22:42:22 +0100 Merge pull request #1170 from csoler/v0.6-FT - d8b193c csoler Mon, 12 Feb 2018 22:40:15 +0100 fixed merge with master - 01cc232 csoler Mon, 12 Feb 2018 22:39:11 +0100 fixed appearing false line in Transfers - 8afa127 csoler Mon, 12 Feb 2018 20:30:01 +0100 fixed crash in RsCollection creation - 0491e43 csoler Sun, 11 Feb 2018 21:28:43 +0100 Merge pull request #1169 from csoler/v0.6-FT - 7a2d874 csoler Sun, 11 Feb 2018 20:49:45 +0100 Merge pull request #1153 from csoler/v0.6-TorOnly - a2eb145 csoler Sun, 11 Feb 2018 20:40:38 +0100 fixed option in .pri for retrotor configuration - 5f106c4 csoler Sat, 10 Feb 2018 15:42:24 +0100 fixed compilation on ubuntu precise - 4beadfe csoler Sat, 10 Feb 2018 14:28:15 +0100 updated changelog - fc3beca csoler Fri, 9 Feb 2018 23:02:27 +0100 fixed performance issue (patch from sss) - faf4517 csoler Thu, 8 Feb 2018 15:26:21 +0100 proper error handlign when Tor is not available - 644fce8 csoler Thu, 8 Feb 2018 11:14:12 +0100 fixed download menu from Messages - - -- Retroshare Dev Team Sun, 25 Feb 2018 12:00:00 +0100 - -retroshare (0.6.3-1.20180210~4beadfe4) xenial; urgency=low - - 9352a7c csoler Thu, 8 Feb 2018 10:34:46 +0100 Merge pull request #1168 from PhenomRetroShare/Add_ConnFilterInFriendSel - bf8bd4b Phenom Wed, 7 Feb 2018 19:00:08 +0100 Add Only Connected in FriendSelectionWidget. - 7bb8eb0 csoler Wed, 7 Feb 2018 16:06:54 +0100 Merge pull request #1166 from PhenomRetroShare/Add_ChatRoomRSLink - 02b61b2 csoler Wed, 7 Feb 2018 15:58:12 +0100 Merge pull request #1164 from aral/patch-1 - a496e6f Phenom Sun, 4 Feb 2018 17:51:26 +0100 Add Chat Room RSLink - ed88b34 Aral B Sun, 4 Feb 2018 10:37:45 +0100 Fix typo in Mac install guide - b662e66 Gioacc Fri, 2 Feb 2018 00:20:14 +0100 Qml app fix disappearing sidebar buttons - 6c85075 csoler Thu, 1 Feb 2018 21:35:54 +0100 lobby->room in Identities dialog - 36e20db Gioacc Thu, 1 Feb 2018 21:26:36 +0100 Fix some glitches in qml app menu - 6e093c7 Gioacc Thu, 1 Feb 2018 14:59:08 +0100 Qml token manager removed unuseful debug message - 2d00532 Gioacc Thu, 1 Feb 2018 14:42:46 +0100 Qml app fix sidebar buttons hiding behaviour - 1c698bf Gioacc Thu, 1 Feb 2018 14:31:07 +0100 Qml App add option to control DHT behaviour - 9a9fcca Gioacc Thu, 1 Feb 2018 14:22:33 +0100 Qml App token manager offer unregister token API - 1e3d2c2 csoler Tue, 30 Jan 2018 20:55:01 +0100 Merge pull request #1160 from G10h4ck/android_service_cleaning - 6f91b93 Gioacc Tue, 30 Jan 2018 20:07:51 +0100 Add some sanity check in libresapiclient - 4d60850 Gioacc Tue, 30 Jan 2018 18:25:04 +0100 More cleanup of .pro files - 0012586 Gioacc Tue, 30 Jan 2018 18:24:03 +0100 Add support for SQLCipher on Android - ebfe50f Gioacc Tue, 30 Jan 2018 18:11:31 +0100 Make .pro files compiler agnostic on Android - da2fc01 Gioacc Tue, 30 Jan 2018 18:04:24 +0100 Cleanup a bit libresapi.pro - 180a5b1 Gioacc Tue, 30 Jan 2018 18:02:55 +0100 Remove unnecessary dependencies in android-notify-service - feae9f5 Gioacc Tue, 30 Jan 2018 00:36:19 +0100 Fix some compiler warnings - fc5ed14 Gioacc Mon, 29 Jan 2018 22:44:04 +0100 Android toolchain builder libraries update - fa71ed2 Gioacc Mon, 29 Jan 2018 13:26:43 +0100 Install bdboot.txt in Android - 2d8493f Gioacc Mon, 29 Jan 2018 10:56:12 +0100 Add link on how help confused gdb to give stacktrace - efe78f5 csoler Sun, 28 Jan 2018 21:54:56 +0100 slight optimization to showEvent() and save/restore visible items in file lists - d598a01 Gioacc Sun, 28 Jan 2018 11:38:14 +0100 ApiLocalListener do some sanity check on listen - 5a63ce8 Gioacc Sun, 28 Jan 2018 11:36:51 +0100 Android service avoid shouldexit timer using all CPU available - 3e5ed6a Gioacc Fri, 26 Jan 2018 00:18:31 +0100 Update Androig gdb debug instructions - c39b3e5 Gioacc Thu, 25 Jan 2018 16:20:25 +0100 Better debug messages for Android app - ac9a843 Gioacc Thu, 25 Jan 2018 15:50:12 +0100 Gracefully handle signals in retroshare-android-service - 8c21bfc Gioacc Thu, 25 Jan 2018 15:18:12 +0100 Avoid crash on stop in ApiServerLocal - c1d8d6a Gioacc Thu, 25 Jan 2018 15:14:09 +0100 Properly run Qt event loop - d80a806 csoler Thu, 25 Jan 2018 09:37:31 +0100 Merge pull request #1159 from csoler/v0.6-FileLists - 11eef05 csoler Wed, 24 Jan 2018 22:02:49 +0100 fixed bug causing hidden/expanded items to be reset by show() event in SharedFilesDialog - 1fbd9d1 csoler Wed, 24 Jan 2018 21:26:35 +0100 fixed hiding of top level items when searching - f139685 csoler Wed, 24 Jan 2018 21:14:26 +0100 added a fair limit to search in FL in order to avoid crazy costs - d93e259 csoler Wed, 24 Jan 2018 00:26:22 +0100 fixed expanding/collapsing of items on search - 1ee353c csoler Tue, 23 Jan 2018 22:18:35 +0100 improved efficiency of search in tree visualization mode. Re-enabled the search for testing purpose. - 725abad csoler Tue, 23 Jan 2018 22:18:02 +0100 fixed a bug in filterItems that caused searched files to generate an error in the console - 9b286c4 Gioacc Tue, 23 Jan 2018 11:13:03 +0100 add to README that DHT is not working on android - 000bbbd Gioacc Tue, 23 Jan 2018 10:33:00 +0100 Add link to Android debugging documentation - 7afa19e csoler Sun, 21 Jan 2018 22:23:08 +0100 removed search from tree view in file lists, until I find some way to do it more efficiently - 7448ff4 csoler Sun, 21 Jan 2018 19:07:37 +0100 re-enabled search in file lists tree view - d21a5e5 csoler Sat, 20 Jan 2018 19:25:52 +0100 Merge pull request #1157 from PhenomRetroShare/Fix_IconCacheInFilesDefs - f74ee5c Phenom Sat, 20 Jan 2018 17:21:37 +0100 Move File Icon Cache in FilesDefs - 7652821 Phenom Sat, 20 Jan 2018 17:18:50 +0100 Revert "patch from sss to cache TransfersDialog QIcons" - 4c626e0 csoler Mon, 15 Jan 2018 23:17:09 +0100 Merge pull request #1152 from csoler/v0.6-SecurityFixes - 841fee6 csoler Mon, 15 Jan 2018 23:13:42 +0100 fixed possible crash due to accessing deleted memory in database cache access - 7cac367 csoler Sun, 14 Jan 2018 22:39:50 +0100 removed warnign about bad service string when the service string is actually empty - 388b2c2 csoler Fri, 12 Jan 2018 22:47:42 +0100 patch from sss to cache TransfersDialog QIcons - 783e918 csoler Fri, 12 Jan 2018 22:19:52 +0100 Merge pull request #1151 from csoler/v0.6-SecurityFixes - bbd8afe csoler Thu, 11 Jan 2018 18:14:20 +0100 Merge pull request #1150 from chelovechishko/unfocus_chat_text_edit - 173336e csoler Thu, 11 Jan 2018 18:12:22 +0100 Merge pull request #1148 from chelovechishko/qdarkstyle_fix - b4ff14c csoler Thu, 11 Jan 2018 18:06:48 +0100 Merge pull request #1144 from PhenomRetroShare/Fix_DisableYesButtonOnInvite - bb9dcbb Phenom Fri, 5 Jan 2018 14:45:29 +0100 Disable Yes button on chat room invitation if no Id selected. - add9c1e chelov Wed, 10 Jan 2018 20:53:43 +0900 chatwidget: do not set focus to edit when it is not necessary - 4eea5a8 csoler Wed, 10 Jan 2018 00:10:08 +0100 removed consts in GrpMetaCache pointers, and made it possible to always re=use cache entries, possibly updating them - 553ab93 csoler Tue, 9 Jan 2018 22:18:01 +0100 Merge pull request #1149 from csoler/v0.6-SecurityFixes - 506190a csoler Tue, 9 Jan 2018 22:11:11 +0100 fixed bug causing failure of flag actions on groups - ed81b4c csoler Tue, 9 Jan 2018 21:49:15 +0100 removed delete causing read of deleted memory - 51c7942 csoler Mon, 8 Jan 2018 19:08:10 +0100 Merge pull request #1146 from csoler/v0.6-SecurityFixes - e261d45 chelov Mon, 8 Jan 2018 16:16:10 +0900 gui: fix networkdialog colors once more in qdarkstyle.qss - f8f61cc chelov Mon, 8 Jan 2018 16:02:40 +0900 gui: fix colors for idtree of people in qdarkstyle.qss - 884bbb4 chelov Mon, 8 Jan 2018 15:58:04 +0900 gui: make friendlist more readable in some places in qdarkstyle.qss - 622316a chelov Mon, 8 Jan 2018 15:49:05 +0900 gui: improve readability of sharemanager for qdarkstyle.qss - 5e57cb4 csoler Sun, 7 Jan 2018 23:02:22 +0100 fixed gxs unit tests - 85b94d7 csoler Sun, 7 Jan 2018 22:36:49 +0100 fixed test compilation - 89c538d csoler Sun, 7 Jan 2018 22:36:38 +0100 fixed double deletion problem causing crashes - b42b8e3 csoler Sun, 7 Jan 2018 21:41:41 +0100 moved memory ownership of RsGxsGrpMetaData down into RsGxsDataAccess. Avoids many copy-constructors of RsTlvSecurityKey. Will probably spare a lot of CPU on windows - c3e300e Gioacc Sat, 6 Jan 2018 22:53:26 +0100 Merge pull request #1140 from Emotyco/libresapi_small_corrections - 67fc6a3 Konrad Sat, 6 Jan 2018 19:29:56 +0100 Fixed in Libresapi: Double declaration of StateToken in FileSharingHandler - 575a416 Konrad Sat, 6 Jan 2018 19:09:44 +0100 Changed in Libresapi: Used Doxigen style comments - d53993c Konrad Sat, 6 Jan 2018 18:39:47 +0100 Changed in Libresapi: Pointer to RsNotify object into reference - 57f41d9 csoler Fri, 5 Jan 2018 21:27:18 +0100 Merge pull request #1145 from PhenomRetroShare/Fix_ClearPersonDetailIfNoSelection - 4026040 Konrad Fri, 5 Jan 2018 20:44:48 +0100 Libresapi: Extended ChatInfo class to contain own identity used in chat - 4f902bb Phenom Fri, 5 Jan 2018 17:48:18 +0100 Clear Person Detail when no selection - 0078b9c csoler Wed, 3 Jan 2018 20:33:25 +0100 Merge pull request #1143 from csoler/v0.6-SecurityFixes - 98d1d08 csoler Wed, 3 Jan 2018 20:32:37 +0100 removed extra links from chat widget, since normal links can be used now to DL through encrypted tunnels - ee81eef csoler Wed, 3 Jan 2018 18:42:04 +0100 Merge pull request #1142 from csoler/v0.6-SecurityFixes - ab60f49 csoler Wed, 3 Jan 2018 18:37:43 +0100 prevent sending/receiving of IP addresses to/at hidden nodes - 0a92710 csoler Wed, 3 Jan 2018 15:03:23 +0100 Merge pull request #1141 from csoler/v0.6-SecurityFixes - 0f6006d csoler Wed, 3 Jan 2018 15:01:04 +0100 prevent subscribing to a signed chat room without a signed identity - eea0c64 csoler Wed, 3 Jan 2018 14:05:13 +0100 require signed identity to respond to a signed chat room invite. Avoids "god mode" bug. - 96e7507 Konrad Mon, 1 Jan 2018 23:38:07 +0100 Added in Libresapi: Short comment to FileSharingHandler - 9bb6adc Konrad Mon, 1 Jan 2018 23:27:46 +0100 Added in Libresapi: Missing mutex locking in TransfersHandler - 6a61e0a Konrad Mon, 1 Jan 2018 23:20:26 +0100 Changed in Libresapi: Locking mutex using macro instead of RsStackMutex object creation - 74a56f6 Konrad Fri, 29 Dec 2017 16:07:39 +0100 Changed in Libresapi: Closing distant connection (chat) requires now ChatId that is used in other functions, instead of DistantCharPeerId - 4b25684 Konrad Fri, 29 Dec 2017 16:03:45 +0100 Added in Libresapi: Functions to get and set default identity for lobby - b24d772 Konrad Wed, 27 Dec 2017 22:38:04 +0100 Added in Libresapi: Getting node name in PeersHandler - 2db25d4 Konrad Wed, 27 Dec 2017 22:37:14 +0100 Added in Libresapi: StateToken refreshing to TransferHandler - 53118e5 Konrad Wed, 27 Dec 2017 22:35:51 +0100 Added in Libresapi: Missing bracket in ChatHandler - 92df847 Konrad Wed, 27 Dec 2017 22:33:23 +0100 Added in Libresapi: StateTokens to FileSharingHandler - 55385d7 Konrad Wed, 27 Dec 2017 22:31:17 +0100 Added in Libresapi: Marking particular message as read - 49cacc4 csoler Sun, 24 Dec 2017 12:04:15 +0100 fixed compilation on ubuntu precise - 122f6af csoler Sun, 24 Dec 2017 11:06:03 +0100 fixed compilation on ubuntu precise - 72d64c7 csoler Sun, 24 Dec 2017 10:36:08 +0100 updated changelog - - -- Retroshare Dev Team Sat, 10 Feb 2018 14:00:00 +0100 - -retroshare (0.6.3-1.20171224.72d64c7d~artful) precise; urgency=low - - c2d5579 csoler Thu, 21 Dec 2017 17:06:32 +0100 storage of chat room icons in local variables to avoid re-reading them from qrc everytime (patch from sss) - acd8355 Gioacc Wed, 20 Dec 2017 18:24:28 +0100 Add some documentation on how to debug retroshare on android - c0d8333 csoler Mon, 18 Dec 2017 16:10:52 +0100 Merge pull request #1136 from csoler/v0.6-FT - ed0e280 csoler Mon, 18 Dec 2017 16:01:27 +0100 Merge pull request #1135 from PhenomRetroShare/Fix_DontSetMacOsTargetIfNotMacOs - 4950ffb Phenom Fri, 15 Dec 2017 10:01:30 +0100 Don't Set Target and SDK if not MacOS - 0895b3d csoler Sun, 17 Dec 2017 13:55:50 +0100 Merge pull request #1134 from PhenomRetroShare/Fix_TravisCI_MacOS_Compil - 3007fec csoler Sat, 16 Dec 2017 17:46:44 +0100 fixed colors in keyring with new ModelIndex based view (patch from sss) - 99e35b1 csoler Sat, 16 Dec 2017 15:04:16 +0100 rename file in partials into real name before moving it; check for destination directory before moving file - a3acd58 Phenom Fri, 8 Dec 2017 19:00:34 +0100 Fix TravisCI on MacOS compilation. - acbcba8 csoler Thu, 7 Dec 2017 17:20:27 +0100 attempt to fix icon sizes in identity dialog - d2c8ba1 csoler Mon, 4 Dec 2017 16:33:45 +0100 Merge pull request #1117 from chelovechishko/qdarkstyle_fix - 22292fc csoler Mon, 4 Dec 2017 16:32:37 +0100 Merge pull request #1118 from RetroPooh/net_settings_antifreeze - 621ed71 csoler Mon, 4 Dec 2017 16:31:48 +0100 Merge pull request #1120 from sehraf/pr_fixForumDownloadAll - 0503f42 csoler Mon, 4 Dec 2017 16:30:29 +0100 Merge pull request #1119 from RetroPooh/chan-fix-cyr - 49b4057 sehraf Sat, 2 Dec 2017 15:00:24 +0100 fix 'download all' button for forum. Now all file links are opened in one collection dialog instead of each link in one separate dialog. - 98d2772 chelov Sat, 2 Dec 2017 17:10:15 +0900 gui: make forums_dialog slightly more readable sometimes - 8ec69df RetroP Wed, 29 Nov 2017 19:23:52 +0300 fix cyrillic text sent wrong in channel post - a88c2ef RetroP Wed, 29 Nov 2017 17:17:49 +0300 fix freezes in network settings - b99a1a5 defnax Tue, 28 Nov 2017 19:36:39 +0100 fixed the emote file for unshown emotes on gui - d1cdba8 Chelov Mon, 27 Nov 2017 14:48:14 +0900 gui: fix probably mistake with names in qdarkstyle.qss - 8c34a50 Chelov Mon, 27 Nov 2017 11:16:37 +0900 gui: fix default color of some text in friends list in qdarkstyle.qss - d566a2a Chelov Mon, 27 Nov 2017 10:54:19 +0900 gui: fix keyring background color in qdarkstyle.qss - c05dd30 Chelov Mon, 27 Nov 2017 10:40:24 +0900 gui: fix doubled semicolons in qdarkstyle.qss - 63b3acb csoler Thu, 23 Nov 2017 21:27:03 +0100 Merge pull request #1113 from csoler/v0.6-SSL110Fix - 1faa274 csoler Wed, 22 Nov 2017 23:46:57 +0100 simplified memory management in certificate signature verification code - 669f2ba csoler Wed, 22 Nov 2017 22:56:40 +0100 fixed a few bugs in signature verification code accross versions - c8c90ab csoler Wed, 22 Nov 2017 20:31:49 +0100 Merge pull request #1115 from PhenomRetroShare/Add_CopyComment - f6d69e0 csoler Wed, 22 Nov 2017 00:02:11 +0100 ensured maximum backward compatibility for crypto changes that will occur in future v0.7 - 6d4c942 Gioacc Tue, 21 Nov 2017 13:28:24 +0100 Removed unnecessary executable flag on some files - 49d2366 csoler Tue, 21 Nov 2017 09:29:52 +0100 fixed windows compilation - ea241f6 csoler Tue, 21 Nov 2017 09:27:21 +0100 restored plugins removed by previous commit - d905144 csoler Mon, 20 Nov 2017 23:18:53 +0100 Merge pull request #1114 from PhenomRetroShare/Fix_DisableReplyToSystemMessage - d1d66bb csoler Mon, 20 Nov 2017 23:17:16 +0100 Merge pull request #1079 from csoler/v0.6-Keyring - e2c1661 csoler Mon, 20 Nov 2017 22:44:34 +0100 fixed compilation with v0.7 defines - cd51afb csoler Mon, 20 Nov 2017 22:26:14 +0100 fixed small bug in signature and compilation - 9367aa0 csoler Sun, 19 Nov 2017 20:15:36 +0100 changed #ifs into #ifdefs because it us more robust, and moved the definition of variables to retroshare.pri - ef1a613 csoler Sun, 19 Nov 2017 19:57:38 +0100 added proper debug output for signature verification - 863e625 csoler Sun, 19 Nov 2017 19:34:54 +0100 centralized the defines into a single file - e72bd9f csoler Sun, 19 Nov 2017 18:38:46 +0100 fixed bug causing certificate rejection - b4fdd4e csoler Sun, 19 Nov 2017 18:21:56 +0100 added two additional non packward compatible changes for future version 0.7, and improvements of verifications of certificate signatures - 46a6bdc Phenom Sat, 18 Nov 2017 19:48:38 +0100 Add Copy action for Gxs Comments. - 71efb9f Phenom Sat, 18 Nov 2017 18:49:42 +0100 Disable ReplyTo if System Message. - 7472f78 csoler Wed, 15 Nov 2017 23:24:43 +0100 added sha256 calculation functions, and non backward compatible SSL Id computation code to active later (0.7) - ce14219 csoler Tue, 14 Nov 2017 21:39:46 +0100 merged with upstream/master - 9f8f0e9 csoler Tue, 14 Nov 2017 21:36:04 +0100 fixed column names in keyring - ba7cf49 csoler Tue, 14 Nov 2017 20:53:24 +0100 Merge pull request #1037 from RetroPooh/searchspy - 556f93c csoler Tue, 14 Nov 2017 20:51:25 +0100 Merge pull request #1108 from RetroPooh/smallfixes2 - 2f6517a csoler Tue, 14 Nov 2017 20:50:57 +0100 Merge pull request #1112 from RetroPooh/coll_name_as_dir - fdced92 csoler Tue, 14 Nov 2017 20:41:48 +0100 Merge pull request #1111 from RetroPooh/searstr - 1f207ba RetroP Tue, 14 Nov 2017 19:52:48 +0300 create collection dialog filename as dir name - 919d650 RetroP Tue, 14 Nov 2017 16:09:05 +0300 in search strings change comma to space for better look - 9aa6dd3 Pooh Tue, 14 Nov 2017 14:34:22 +0300 Update rsturtleitem.h - 8368a76 csoler Mon, 13 Nov 2017 23:38:25 +0100 Merge pull request #1110 from csoler/v0.6-FT - 5fab053 csoler Mon, 13 Nov 2017 23:37:53 +0100 added toStdString() method to search strings so as to display what is searched - 7304c48 csoler Mon, 13 Nov 2017 22:32:30 +0100 Merge pull request #1109 from csoler/v0.6-Links2 - 5d6225a RetroP Tue, 14 Nov 2017 00:14:16 +0300 sort by time, nicer look - 1669cd4 csoler Mon, 13 Nov 2017 22:08:05 +0100 use "download..." menu with RsCollectionDialog with multiple files and directories - f369ac1 RetroP Mon, 13 Nov 2017 19:05:16 +0300 fix mail fields stretching with CC BCC - 45c8e9e csoler Mon, 13 Nov 2017 11:01:48 +0100 Merge pull request #1107 from csoler/v0.6-Links2 - 5997c10 csoler Sun, 12 Nov 2017 22:46:29 +0100 fixed bug causing RsCollection to fail on remote files. Now using RsCollectionDialog when downloading directories from friend shared files - c0951b3 csoler Sun, 12 Nov 2017 21:33:21 +0100 Merge pull request #1040 from RetroPooh/searchmultinames2 - 240d3a6 csoler Sat, 11 Nov 2017 16:33:30 +0100 Merge pull request #1104 from RetroPooh/linkaddrtooltips - cb77243 csoler Sat, 11 Nov 2017 16:31:33 +0100 Merge pull request #1105 from RetroPooh/smallfixes1 - 9b66e7e RetroP Fri, 10 Nov 2017 18:32:18 +0300 fix non-latin peer name display in bw stats - 792f7ff RetroP Fri, 10 Nov 2017 18:31:41 +0300 fix status led icons for distant chat - df244fd RetroP Fri, 10 Nov 2017 16:01:11 +0300 add tooltips with address to urls - 7feb630 csoler Wed, 8 Nov 2017 20:11:26 +0100 Merge pull request #1102 from csoler/v0.6-Links2 - 6a8bc8b csoler Wed, 8 Nov 2017 18:11:46 +0100 use of RsCollectionDialog for processing single file links. Only "extra" links still require the older processing system because RsCollections cannot have sources for each entry - - -- Retroshare Dev Team Thu, 24 Dec 2017 10:00:00 +0100 - -retroshare (0.6.3-1.20171107.c67143d4~wily) wily; urgency=low - - 68b35f3 Phenom Tue, 15 Aug 2017 19:45:26 +0200 Fix CppCheck in notifytxt.cc - 0b8d684 Phenom Tue, 15 Aug 2017 19:11:32 +0200 Fix CppCheck in framecatcher.cpp - deb6693 Phenom Tue, 15 Aug 2017 19:00:17 +0200 Fix CppCheck in idle.cpp - 589e61f Phenom Sun, 13 Aug 2017 20:44:34 +0200 Fix CppCheck in rsettings.cpp - 5554f4a Phenom Sun, 13 Aug 2017 19:47:16 +0200 Fix CppCheck in MimeTextEdit.h - 8438d70 Phenom Sun, 13 Aug 2017 18:47:36 +0200 Fix CppCheck in GroupTreeWidget.h - f82ec64 Phenom Fri, 28 Jul 2017 09:38:24 +0200 Fix CppCheck in rsrttitems.h - 7e47be5 Phenom Thu, 27 Jul 2017 20:41:17 +0200 Fix CppCheck rsitem.h - 4780713 Phenom Thu, 27 Jul 2017 20:27:02 +0200 Fix CppCheck in rsgxsrecognitems.h - 732898a Phenom Thu, 27 Jul 2017 20:29:03 +0200 Fix CppCheck in rsgxsupdateitems.h - 942eba3 Phenom Thu, 27 Jul 2017 19:33:31 +0200 Fix CppCheck in rsconfigitems.h - a1fb8f7 Phenom Thu, 27 Jul 2017 16:56:10 +0200 Fix CppCheck in rswire.h - a248ee7 Phenom Thu, 27 Jul 2017 16:54:56 +0200 Fix CppCheck in rsservicecontrol.h - 1c862de Phenom Thu, 27 Jul 2017 12:56:12 +0200 Fix CppCheck in rsposted.h - ba75294 Phenom Thu, 27 Jul 2017 12:53:47 +0200 Fix CppChecker in rsidentity.h - fee7d45 Phenom Wed, 26 Jul 2017 11:43:11 +0200 Fix CppCheck in rsgxsforums.h - 10c46ee Phenom Thu, 27 Jul 2017 12:54:57 +0200 Fix CppChecker in rsphoto.h - dd4ed2a Phenom Wed, 26 Jul 2017 11:39:54 +0200 Fix CppCheck in rsgxschannels.h - 6219b31 Phenom Wed, 26 Jul 2017 10:52:40 +0200 Fix CppCheck in pqiqos.h - 87947b1 Phenom Wed, 26 Jul 2017 10:35:57 +0200 Fix CppCheck in pqiindic.h - 225058a csoler Sun, 5 Nov 2017 19:37:03 +0100 Merge pull request #1100 from hunbernd/feature/image-embed3 - 5d03ceb hunber Sun, 5 Nov 2017 18:58:07 +0100 Fixed resize bug - 2046249 Phenom Wed, 26 Jul 2017 10:33:55 +0200 Fix CppCheck in pqihandler.cc - b77d027 Phenom Wed, 26 Jul 2017 10:30:33 +0200 Fix CppCheck in p3linkmgr.cc - 73e1ddc Phenom Wed, 26 Jul 2017 10:29:17 +0200 Fix CppCheck in pqi_base.h - 50a9d8a Phenom Fri, 21 Jul 2017 19:08:38 +0200 Fix CppCheck in p3servicecontrol - d21b41f Phenom Fri, 21 Jul 2017 19:02:34 +0200 Fix CppCheck in p3netmgr.cc - 6a0fd11 Phenom Fri, 21 Jul 2017 18:59:59 +0200 Fix CppCheck in p3historymgr.cc - bd56035 Phenom Fri, 21 Jul 2017 18:42:42 +0200 Fix CppCheck in p3cfgmgr.h - 0a82ff0 Phenom Fri, 21 Jul 2017 18:40:43 +0200 Fix CppCheck in authssl.cc - 4fc7787 Phenom Fri, 21 Jul 2017 18:12:59 +0200 Fix CppCheck in authgpg - cd040f6 Phenom Fri, 21 Jul 2017 18:09:54 +0200 Fix CppCheck in pluginmanager.h - 60d4762 Phenom Fri, 21 Jul 2017 18:03:35 +0200 Fix CppCheck in rscertificate.h - f91756a Phenom Fri, 21 Jul 2017 17:57:15 +0200 Fix CppCheck in pgphandler.h - aeb7b33 csoler Sun, 5 Nov 2017 17:00:26 +0100 Merge pull request #1099 from csoler/v0.6-PRTest - 722d98e Phenom Fri, 21 Jul 2017 17:30:26 +0200 Fix CppCheck in rsgxstunnelitems.h - 4ed663a Phenom Fri, 21 Jul 2017 17:23:02 +0200 Fix CppCheck in p3gxstunnel.h - 242cc9d Phenom Fri, 21 Jul 2017 17:22:16 +0200 Fix CppCheck in p3gxstransitems.h - 3702cf2 Phenom Fri, 21 Jul 2017 17:20:11 +0200 Fix CppCheck in p3gxstrans.h - 77c1ab4 Phenom Fri, 21 Jul 2017 16:31:17 +0200 Fix CppCheck in rsgxsdataaccess.h - 718c09e Phenom Fri, 21 Jul 2017 16:29:49 +0200 Fix CppCheck in rsgixs.h - eb7655c Phenom Fri, 21 Jul 2017 16:18:09 +0200 Fix CppCheck in rsgenexchange.cc - 344bc27 Phenom Fri, 21 Jul 2017 15:55:40 +0200 Fix CppCheck in gxstokenqueue.h - f81c6ae Phenom Fri, 21 Jul 2017 15:54:29 +0200 Fix CppCheck in p3grouter - 1072194 Phenom Fri, 21 Jul 2017 14:01:20 +0200 Fix CppCheck in grouteritems.h - 10233ef Phenom Fri, 21 Jul 2017 13:53:44 +0200 Fix CppCheck in groutertypes.h - 5dbefc5 csoler Sun, 5 Nov 2017 16:36:49 +0100 Merge pull request #1098 from csoler/v0.6-PRTest - a622194 Phenom Fri, 21 Jul 2017 13:46:38 +0200 Fix CppCheck in ftturtlefiletransferitem.h - edfd2ad Phenom Fri, 21 Jul 2017 13:36:10 +0200 Fix CppCheck in fttransfermodule - c8548b2 Phenom Fri, 21 Jul 2017 13:33:11 +0200 Fix CppCheck in ftserver.cc - 51ed032 Phenom Fri, 21 Jul 2017 13:13:48 +0200 Fix CppCheck ftfilecreator.cc - 6893449 Phenom Fri, 21 Jul 2017 13:00:03 +0200 Fix CppCheck in ftchunkmap.h - f8d4d6c Phenom Fri, 21 Jul 2017 12:57:17 +0200 Fix CppCheck in p3filelists.h - 0d5b1ed Phenom Fri, 21 Jul 2017 12:47:04 +0200 Fix CppCheck in rsfilelistitems.h - 0e014d6 Phenom Fri, 21 Jul 2017 12:43:06 +0200 Fix CppCheck in p3filelists.cc - d9965ac Phenom Fri, 21 Jul 2017 12:39:05 +0200 Fix CppCheck in hash_cache.h - f18a842 Phenom Fri, 21 Jul 2017 12:27:45 +0200 Fix CppCheck in directory_storage.h and directory_storage.cc - 1456bdd Phenom Fri, 21 Jul 2017 12:18:42 +0200 Fix CppCheck in dir_hierarchy.h and dir_hierarchy.cc - b426941 csoler Sun, 5 Nov 2017 13:57:31 +0100 Merge pull request #1086 from PhenomRetroShare/Fix_SpeedQueuePositionSorting - 8a4c1bd csoler Sun, 5 Nov 2017 13:56:39 +0100 Merge pull request #1097 from PhenomRetroShare/Add_MoveFixedColorToQss - f27d312 Phenom Sat, 4 Nov 2017 23:37:02 +0100 Move some Fixed Color to Qss files - 8072d24 Phenom Sat, 4 Nov 2017 13:57:55 +0100 Use macro for priority values instead of constants. - c5c406b Phenom Sun, 29 Oct 2017 16:45:45 +0100 Fix Speed/Queue Position column sorting - 37f6e7e csoler Fri, 3 Nov 2017 23:49:30 +0100 Merge pull request #1064 from PhenomRetroShare/Fix_OpModeRestore - 1bcebb8 defnax Fri, 3 Nov 2017 13:26:51 +0100 attempt to fix - fc26ebc defnax Fri, 3 Nov 2017 13:04:38 +0100 Fixed one Emojione icon - eb6bc79 defnax Fri, 3 Nov 2017 03:02:40 +0100 reorder the main people emoticons - 48bd151 csoler Thu, 2 Nov 2017 23:16:30 +0100 removed useless root item in RsCollection dialog - 2d18335 csoler Thu, 2 Nov 2017 22:52:30 +0100 added tool button to choose DL directory in rscollection dialog - 6381608 csoler Thu, 2 Nov 2017 22:46:53 +0100 remove filename field in RsCollectionDialog when downloading a collection of links - aa4c209 csoler Thu, 2 Nov 2017 22:20:43 +0100 fixed formula to compute score based on up/dn votes in comments - 42c720f csoler Wed, 1 Nov 2017 20:36:57 +0100 Merge pull request #1082 from RetroPooh/forumoptsimagescb - 1a01181 csoler Wed, 1 Nov 2017 20:35:29 +0100 Merge pull request #1063 from PhenomRetroShare/Fix_BlankPageWhenClearLobbyInWebInterface - d8c4f88 csoler Wed, 1 Nov 2017 20:34:35 +0100 Merge pull request #1094 from PhenomRetroShare/Add_HideFileLabelInChannelPost - 2d8e9d5 csoler Wed, 1 Nov 2017 20:33:54 +0100 Merge pull request #1090 from csoler/v0.6-DHT - a9c4362 csoler Wed, 1 Nov 2017 20:31:49 +0100 removed debug info. Added explaination about the new method - fe5dd00 Gioacc Wed, 1 Nov 2017 14:34:01 +0100 Add context to debug message - 346d5c1 Gioacc Wed, 1 Nov 2017 14:13:04 +0100 Merge pull request #1087 from Emotyco/libresapilocal_debug - f409e8e defnax Wed, 1 Nov 2017 00:24:03 +0100 Update to Emojione 3.0 - a4eedf7 Phenom Mon, 30 Oct 2017 18:35:56 +0100 Hide zero File Label (size) in channel post. - 69278e6 csoler Mon, 30 Oct 2017 11:07:36 +0100 only print non empty buckets - 9f9c34c csoler Mon, 30 Oct 2017 10:58:48 +0100 tried to improve DHT size estimation code - b77e895 csoler Sun, 29 Oct 2017 21:31:10 +0100 Merge pull request #1084 from csoler/v0.6-Links2 - 337980e csoler Sun, 29 Oct 2017 21:28:12 +0100 Merge pull request #1088 from csoler/v0.6-FileLists - 3bb694f csoler Sun, 29 Oct 2017 21:24:34 +0100 added display of hashing speed. Changed hashing buffer size to 10MB to improve performance - 9ad635a csoler Sun, 29 Oct 2017 20:33:56 +0100 added post into forum menu entry in SharedFilesDialog - c41f6a2 Konrad Sun, 29 Oct 2017 19:40:37 +0100 Added: Debug output in Android app of callback functions - 0c97d5b csoler Fri, 27 Oct 2017 22:03:42 +0200 added sorting of channels to push to, and auto-fill of channel subject - 2e9f520 csoler Thu, 26 Oct 2017 19:41:13 +0200 fixed compilation - 299d0b6 csoler Thu, 26 Oct 2017 19:40:12 +0200 added missing test for subscribed channels in share-on-channel menu - 0c3fc05 Gioacc Thu, 26 Oct 2017 08:18:30 +0200 Merge pull request #1066 from Emotyco/libresapi_filesharing - 54d49f1 RetroP Thu, 26 Oct 2017 00:05:45 +0300 friendlist - hide id column by default - f8fca19 RetroP Wed, 25 Oct 2017 23:07:34 +0300 removed wrong tooltip for hidden node in options - 5296641 RetroP Wed, 25 Oct 2017 20:50:34 +0300 fix saving of forum options checkbox for load images - 0931779 csoler Wed, 25 Oct 2017 18:51:16 +0200 Merge pull request #1081 from Artistic-Cabbage/close-fd-after-blacklist - 3975999 Arthur Wed, 25 Oct 2017 17:42:09 +0200 Add missing close after blacklisted connection attempt. - 1c2d17b csoler Tue, 24 Oct 2017 18:47:34 +0200 Merge pull request #1077 from hunbernd/feature/image-embed3 - cd5eb5c hunber Tue, 24 Oct 2017 18:23:22 +0200 Got rid of QMath - 06f489e csoler Mon, 23 Oct 2017 22:14:06 +0200 Merge pull request #1065 from csoler/v0.6-Links2 - 603ea7e csoler Mon, 23 Oct 2017 22:12:52 +0200 removed debug info from RsCollection - f4fae15 csoler Mon, 23 Oct 2017 21:15:40 +0200 Merge pull request #1078 from RetroPooh/addfr-cb - ead8cb2 csoler Mon, 23 Oct 2017 21:13:56 +0200 Merge pull request #1076 from RetroPooh/chatsearchbut - 7af436d csoler Mon, 23 Oct 2017 21:12:26 +0200 Merge pull request #1075 from Kcchouette/patch-1 - e441cae csoler Mon, 23 Oct 2017 21:11:08 +0200 Merge pull request #1074 from RetroPooh/sett-nodiscocb - b275039 csoler Mon, 23 Oct 2017 21:09:54 +0200 Merge pull request #1073 from RetroPooh/hid1 - 1d7d53a csoler Mon, 23 Oct 2017 21:07:23 +0200 Merge pull request #1070 from RetroPooh/posted-descr - e2bbbad RetroP Mon, 23 Oct 2017 20:01:35 +0300 fix checkboxes state for already accepted/signed keys on add friend dialog - 64481de hunber Mon, 23 Oct 2017 17:04:20 +0200 Set the proper size limits - b968974 RetroP Mon, 23 Oct 2017 17:51:39 +0300 fix chat search button position - f434e65 hunber Sun, 11 Jun 2017 00:31:20 +0200 Use binary search to find the right file size - c17a8e7 hunber Sat, 10 Jun 2017 01:43:02 +0200 Optimalizations - af48173 hunber Fri, 9 Jun 2017 23:29:39 +0200 Convert image into 4 bit color table format - 9af2730 hunber Thu, 8 Jun 2017 23:00:33 +0200 Downscale image automatically - e24febf Kcchou Mon, 23 Oct 2017 14:52:10 +0200 Fix some markdown checkbox - 4a1ddcc RetroP Mon, 23 Oct 2017 12:24:56 +0300 removed show discovery checkbox from network options, it is in appearance now - 4594c1a Pooh Mon, 23 Oct 2017 11:51:22 +0300 Update MainWindow.cpp - 1cc6506 Pooh Mon, 23 Oct 2017 11:49:05 +0300 Update ServerPage.cpp - a0f6a74 Pooh Mon, 23 Oct 2017 11:46:39 +0300 Merge branch 'master' into hid1 - 78037a6 RetroP Mon, 23 Oct 2017 11:42:03 +0300 disable nat/dht indicators for hidden mode, hide irrelevant network options elements - 0359795 csoler Sun, 22 Oct 2017 20:08:22 +0200 fixed regression preventing context menu to open in destination directory for RsCollection - 01c82c3 csoler Sun, 22 Oct 2017 20:02:27 +0200 Merge pull request #1072 from hunbernd/fix/html-in-forum-title - a81956c csoler Sun, 22 Oct 2017 20:01:49 +0200 Merge pull request #1071 from hunbernd/fix/crash-at-startup-removed-buttons - 0c39b5c hunber Sun, 22 Oct 2017 19:44:14 +0200 Fix bug causing RS to crash at startup when some icons were removed from toolbar For example: disabled plugins - 4e16042 hunber Sun, 22 Oct 2017 19:11:52 +0200 Part of the forum title is not displayed when it is enclosed in < > - 723016e RetroP Sun, 22 Oct 2017 19:39:44 +0300 fix descriptions display in Posted - 6a0ccc4 csoler Sun, 22 Oct 2017 18:28:36 +0200 added means to select download directory in RsCollectionDialog - ee2120a csoler Sun, 22 Oct 2017 17:36:19 +0200 fixed bug causing FileTree links to open empty - f503510 csoler Sun, 22 Oct 2017 16:00:08 +0200 Merge pull request #1069 from RetroPooh/postbuttonlabels - 34eb971 csoler Sun, 22 Oct 2017 15:57:24 +0200 Merge pull request #1068 from RetroPooh/winsize - 9cc09d6 csoler Sun, 22 Oct 2017 15:55:48 +0200 Merge pull request #1067 from PhenomRetroShare/Fix_SecurityIpItemIsSame - 749a34d RetroP Sun, 22 Oct 2017 15:55:08 +0300 add text labels to post buttons in forums and channels; fix version selector placement - b48916c RetroP Sun, 22 Oct 2017 13:49:38 +0300 add windows size/pos saving - ef13e03 Phenom Sun, 22 Oct 2017 11:52:00 +0200 Fix SecurityIpItem isSame - b6aeacb csoler Sat, 21 Oct 2017 23:48:27 +0200 fixed share on channel code - 770add8 csoler Sat, 21 Oct 2017 21:23:40 +0200 added code to share a file/dir on channel - edffbc3 csoler Sat, 21 Oct 2017 18:09:26 +0200 fixed bug in removing top dirs when creating file hierarhies - cbcf402 csoler Sat, 21 Oct 2017 17:42:17 +0200 setup proper title in RsCollectionEditor when in download mode - 2cfa866 csoler Sat, 21 Oct 2017 17:35:06 +0200 merge of trees and single files before paste in DL queue so that all use the CollectionEditor - fe516c6 csoler Sat, 21 Oct 2017 16:16:23 +0200 fixed pasting of FileTree links in download queue - 6581fa0 csoler Sat, 21 Oct 2017 15:44:45 +0200 code cleaning - b6f102c Gioacc Sat, 21 Oct 2017 13:00:36 +0200 Fix TokenManager.qml JSON API request - fca10c2 Konrad Fri, 20 Oct 2017 21:24:52 +0200 Removed in libresapi unused code that caused compilation error - ef52e09 Konrad Fri, 20 Oct 2017 20:57:37 +0200 Added in Libresapi: Handlers to interact with shared files - 0ebe885 Konrad Fri, 20 Oct 2017 20:55:56 +0200 Added in Libresapi: Handler to get uploading files - 2293b60 Konrad Fri, 20 Oct 2017 20:49:59 +0200 Added in Libresapi: Handler to get search result - 0fbcf01 csoler Thu, 19 Oct 2017 22:20:23 +0200 code cleaning. Removed comments at end of conditional - 74d5069 csoler Thu, 19 Oct 2017 22:14:04 +0200 renamed RsCollectionEditor into RsCollection. Added download of FileTree links - 32be006 csoler Thu, 19 Oct 2017 10:19:56 +0200 various improvements to collection links - 9206dac csoler Wed, 18 Oct 2017 23:20:19 +0200 fixed up collection link display - e1d5014 csoler Wed, 18 Oct 2017 22:32:15 +0200 added copy links from file hierarchy - f98edd4 csoler Wed, 18 Oct 2017 00:04:04 +0200 added FileTree class to implement a compact representation of file hierarchies - 847c1b2 csoler Sun, 15 Oct 2017 21:10:29 +0200 renamed RsCollectionFile into RsCollectionEditor - 68763f5 csoler Sun, 15 Oct 2017 20:52:21 +0200 added links machinery to handle file hierarchies - e63217e Phenom Tue, 17 Oct 2017 15:39:25 +0200 Fix OpMode Restore - 130e3d6 Phenom Tue, 17 Oct 2017 14:57:09 +0200 Fix Blank Page When Clear Lobby in Web Interface - 034d88c Gioacc Mon, 16 Oct 2017 20:07:52 +0200 Fix android compilation with newer Qt - ebf99a4 csoler Sat, 14 Oct 2017 18:10:55 +0200 removed vivid in defautl ubuntu distr list - f161aa8 csoler Sat, 14 Oct 2017 14:57:20 +0200 updated changelog - - -- Retroshare Dev Team Thu, 07 Nov 2017 22:00:00 +0100 - -retroshare (0.6.3-1.20171014.1f624042~trusty) trusty; urgency=low - - d61a5cd csoler Mon, 2 Oct 2017 22:23:26 +0200 attempt at fixing the re-hash bug. Now only using canonicalized filenames in hash cache - 22942dc csoler Sun, 1 Oct 2017 20:20:26 +0200 fixed bug causing suffix/prefix lists to contain an empty string - bc05aaa csoler Sat, 30 Sep 2017 18:58:31 +0200 switched tokenQueue speed to 10 calls/sec, thus improving loading speeds. Still need to test for CPU load - 65977c0 csoler Sat, 30 Sep 2017 18:29:29 +0200 Merge pull request #1054 from PhenomRetroShare/Fix_GccWarningd - 06ebaa5 csoler Sat, 30 Sep 2017 18:28:24 +0200 Merge pull request #1055 from felisucoibi/master - 06063c5 felisu Sat, 30 Sep 2017 11:34:18 +0200 removed extra space - b84c898 felisu Sat, 30 Sep 2017 00:29:07 +0200 Removed ... from text - ef6fd38 felisu Thu, 28 Sep 2017 22:42:30 +0200 Changed prefixes and sifixes for startign with and ending with to be understandable. - 7f851f6 Phenom Thu, 28 Sep 2017 19:24:26 +0200 Fix Gcc Warning in p3banlist - e66c0d1 csoler Wed, 27 Sep 2017 22:26:14 +0200 removed updateTotals() method. Replaced it with costless on-the-fly update of totals - a00d2c9 csoler Tue, 26 Sep 2017 21:12:17 +0200 changed lobby to char room in chat system msgs - 8eae374 csoler Mon, 25 Sep 2017 22:14:34 +0200 Merge pull request #1053 from csoler/v0.6-FT - 0d9b6e7 csoler Mon, 25 Sep 2017 22:09:35 +0200 fixd broken layout - cbeefda csoler Mon, 25 Sep 2017 21:35:59 +0200 Merge pull request #744 from RetroPooh/tunnel-names - f98f16f Pooh Mon, 25 Sep 2017 22:31:49 +0300 Update TransfersDialog.cpp - 5970ff2 csoler Mon, 25 Sep 2017 21:14:30 +0200 Merge pull request #1052 from csoler/v0.6-FT - 40cda11 csoler Mon, 25 Sep 2017 21:05:42 +0200 removed delay when calling forceUpdate() on directories - b969f31 csoler Mon, 25 Sep 2017 20:59:32 +0200 Merge pull request #1050 from csoler/v0.6-FT - d8cb3fe csoler Mon, 25 Sep 2017 20:56:35 +0200 fixed not rehashing files that already exist in a different directory pointed by a symlink - 72dc1c7 Pooh Mon, 25 Sep 2017 21:50:12 +0300 Update TransfersDialog.cpp - c47e6f6 Pooh Mon, 25 Sep 2017 21:43:41 +0300 Merge branch 'master' into tunnel-names - 4766a89 csoler Sun, 24 Sep 2017 23:51:47 +0200 added an additional hard limit to directory depth, just in case - f497905 csoler Sun, 24 Sep 2017 23:43:52 +0200 fixed limitation of directory depth when indexing files - abd7e25 csoler Sun, 24 Sep 2017 18:14:45 +0200 added checks for mMaxShareDepth and mIgnoreDuplicates - 2a99df4 csoler Sun, 24 Sep 2017 17:53:06 +0200 added UI and parameters for two new options in shared files: max share depth and ignore duplicates - 932eb49 csoler Sat, 23 Sep 2017 13:49:53 +0200 Merge pull request #1049 from Steve-V/minor-spelling-fix - 82c9c95 Steve- Fri, 22 Sep 2017 19:58:13 -0500 spelling fix ommitted -> omitted - 73cbf6c csoler Thu, 21 Sep 2017 23:47:11 +0200 Merge pull request #1047 from csoler/v0.6-FT - a2ccf97 csoler Wed, 20 Sep 2017 22:57:32 +0200 removed the 4M files limit on 64bits systems - 308f8ca defnax Tue, 19 Sep 2017 18:34:58 +0200 update qrc file - 58ccf0b csoler Mon, 18 Sep 2017 22:50:35 +0200 Merge pull request #1045 from csoler/v0.6-FT - bc2c9d5 csoler Mon, 18 Sep 2017 22:49:51 +0200 adding pending transfers 100 at a time instead of 1 at a time when loading - 52ca6d0 defnax Mon, 18 Sep 2017 20:49:40 +0200 Added Crystall Ball to emote file - bf7d346 csoler Sun, 17 Sep 2017 20:27:44 +0200 Merge pull request #1043 from csoler/v0.6-FT - e21dec4 csoler Sun, 17 Sep 2017 20:26:46 +0200 Merge pull request #1038 from PhenomRetroShare/Add_UploadUserColumn - d8f621e csoler Sun, 17 Sep 2017 20:14:45 +0200 make forceDirectoryCheck() to desactivate the pause, in case it was left activated - - -- Retroshare Dev Team Sat, 14 Oct 2017 15:00:00 +0100 - -retroshare (0.6.3-1.20170917.c2f321d7~trusty) trusty; urgency=low - - 46d26bf csoler Tue, 12 Sep 2017 21:05:59 +0200 updated ubuntu packagign script - f3c627d csoler Sat, 16 Sep 2017 22:13:53 +0200 Merge pull request #1042 from csoler/v0.6-FT - 8189d66 csoler Sat, 16 Sep 2017 22:13:15 +0200 fixed bug causing anon FT to not resume when restarting RS when the server enforces encryption - 195127f Gioacc Fri, 15 Sep 2017 16:23:38 +0200 Merge pull request #965 from PhenomRetroShare/Fix_GccWarning - 6ad2306 Gioacc Fri, 15 Sep 2017 16:19:48 +0200 Merge pull request #1039 from PhenomRetroShare/Fix_WinCompil - f416686 Phenom Fri, 15 Sep 2017 15:04:43 +0200 Fix Windows Build - 62eefa4 Gioacc Fri, 15 Sep 2017 09:33:01 +0200 Remove cruft from PeersHandler::handleGetInactiveUsers - 341c94e Gioacc Fri, 15 Sep 2017 09:03:50 +0200 PeersHandler::handleRemoveNode only remove location - 7888ec6 Gioacc Fri, 15 Sep 2017 08:56:54 +0200 Remove extra cruft - 016cafd Gioacc Fri, 15 Sep 2017 08:25:30 +0200 Merge branch 'master' of https://github.com/myfingerhurt/RetroShare into myfingerhurt-webui-PR1014 - 331cdd0 csoler Thu, 14 Sep 2017 22:10:25 +0200 Merge pull request #1031 from PhenomRetroShare/Fix_UninitializedStatusInPeersHandler - d5eac2c csoler Thu, 14 Sep 2017 22:06:01 +0200 Merge pull request #1033 from PhenomRetroShare/Add_UploadExpColAll - d7dae0e csoler Thu, 14 Sep 2017 22:02:39 +0200 Merge pull request #1034 from csoler/v0.6-FT - 1d231e6 csoler Thu, 14 Sep 2017 22:01:52 +0200 fixed bug causing file lists to not refresh/show until a friend makes a change - 5511a0b csoler Thu, 14 Sep 2017 21:28:34 +0200 added tooltip for file ignore list - dff0d50 Phenom Thu, 14 Sep 2017 19:22:37 +0200 Add Expand/Collapse All in Upload List - a0ebddb Phenom Fri, 28 Jul 2017 20:00:29 +0200 Fic Gcc warnings: - 4b1161d csoler Tue, 12 Sep 2017 21:03:44 +0200 updated changelog - 762d025 csoler Tue, 12 Sep 2017 17:40:54 +0200 Merge pull request #1027 from PhenomRetroShare/Fix_UninitializedPeerMaxRates - 8884a32 Phenom Mon, 11 Sep 2017 20:18:06 +0200 Fix Uninitilized Peer Max Rates. - 66bf188 csoler Mon, 11 Sep 2017 22:20:27 +0200 Merge pull request #1029 from PhenomRetroShare/Fix_UninitValueInLocalDirUpd - cf90867 Phenom Mon, 11 Sep 2017 21:50:08 +0200 Fix unitialized value in LocalDirectoryUpdater. - 3b7809a csoler Mon, 11 Sep 2017 20:49:11 +0200 Merge pull request #1028 from csoler/v0.6-FT - 551ef63 csoler Mon, 11 Sep 2017 19:36:06 +0200 added default ignore list on linux - c5f91e3 csoler Mon, 11 Sep 2017 19:05:19 +0200 Merge pull request #1026 from csoler/v0.6-FT - 0ca0b72 csoler Mon, 11 Sep 2017 19:02:07 +0200 moved file ignore test to a more appropriate place - eff5c5d csoler Sun, 10 Sep 2017 22:07:36 +0200 added pause to file hashing - ea25d4b csoler Sun, 10 Sep 2017 20:22:17 +0200 improved update of ignore list - 884b3a6 csoler Sun, 10 Sep 2017 19:58:57 +0200 added infrastructure to add a ignore list in shared files - b3e1597 csoler Sat, 9 Sep 2017 18:34:25 +0200 Merge pull request #1025 from Ppjet6/master - c85664e Maxime Sat, 9 Sep 2017 13:54:30 +0100 Typo in GenCertDialog - 1e2a227 csoler Sat, 9 Sep 2017 14:48:35 +0200 Merge pull request #1023 from Ppjet6/master - 1bc9ef6 csoler Sat, 9 Sep 2017 14:48:02 +0200 Merge pull request #1022 from PhenomRetroShare/Fix_MoveSharedFilesDialog - 64d0290 Maxime Sat, 9 Sep 2017 03:47:38 +0100 Typo in GenCertDialog - 4336a4a Phenom Thu, 7 Sep 2017 19:37:53 +0200 Move SharedFilesDialog to /gui/FileTransfer/ - 54ee650 csoler Thu, 7 Sep 2017 18:54:04 +0200 Merge pull request #1021 from PhenomRetroShare/Fix_ProgressSorting - d81f9a3 Phenom Thu, 7 Sep 2017 18:09:21 +0200 Fix File Transfert Progress Sorting. - 1dc6bef csoler Thu, 7 Sep 2017 18:08:34 +0200 Merge pull request #1019 from PhenomRetroShare/Add_GroupedUpLoadItem - 3b4e84c Phenom Wed, 6 Sep 2017 19:57:33 +0200 Regroup Upload Items by file in TransfersDialog. - f9102e5 csoler Tue, 5 Sep 2017 20:59:16 +0200 Merge pull request #1001 from PhenomRetroShare/Add_OnlyHiddenNodeCF - 9ceba80 csoler Tue, 5 Sep 2017 20:46:33 +0200 Merge pull request #1015 from PhenomRetroShare/Fix_TravisCI_MacOS - 671b418 csoler Tue, 5 Sep 2017 20:46:05 +0200 Merge pull request #1008 from PhenomRetroShare/Add_FilterInDownloadList - 32888f0 Phenom Tue, 5 Sep 2017 16:18:47 +0200 Fix Travis CI build for MacOS - bc6ea65 csoler Mon, 4 Sep 2017 16:52:59 +0200 Merge pull request #1000 from PhenomRetroShare/Fix_RemovePngPng - c6ffe07 csoler Mon, 4 Sep 2017 16:48:17 +0200 Merge pull request #1009 from csoler/v0.6-FT - 160ab7b csoler Sun, 3 Sep 2017 23:32:48 +0200 added missing code for remote search by hash, fixing the bug of direct sources not added - 8d14603 csoler Sun, 3 Sep 2017 22:52:31 +0200 fixed bug preventing search by hash to be called on own files - 063783a csoler Sun, 3 Sep 2017 14:59:14 +0200 Merge pull request #1004 from digitigrafo/master - a73ea43 Phenom Sat, 2 Sep 2017 17:57:04 +0200 Add a filter to DownLoad list - e1e1fb4 cri Thu, 24 Aug 2017 15:31:17 +0200 revert build orange skin - 4fc91be cri Thu, 24 Aug 2017 15:08:29 +0200 rwd style - d845a3e cri Thu, 24 Aug 2017 14:32:22 +0200 orange css skin >48em - ea4495f cri Wed, 23 Aug 2017 11:16:26 +0200 added new orange skin - 7f8386f csoler Sun, 20 Aug 2017 21:17:19 +0200 Merge pull request #998 from myfingerhurt/master - 5d59d56 Phenom Sun, 20 Aug 2017 13:17:28 +0200 Add Only Hidden Node configure flag - cb7cfb4 Phenom Sat, 19 Aug 2017 23:55:39 +0200 Remove *.png.png duplicated Files - 130099f ben Fri, 18 Aug 2017 16:27:30 +0900 add new keys for WebUI api peers handling, distinguishable hidden node and clear node when examining certificate - 32f43b9 Gioacc Fri, 18 Aug 2017 01:37:39 +0200 Merge branch 'GSoC2017-evaluation-final' - 106f03d csoler Wed, 16 Aug 2017 22:26:48 +0200 Merge pull request #993 from PhenomRetroShare/Fix_OpenMessageForAllFile - 526d8e7 csoler Wed, 16 Aug 2017 22:26:13 +0200 Merge pull request #990 from PhenomRetroShare/Fix_RelaySettingLayoutMargin - 06158a9 csoler Wed, 16 Aug 2017 22:25:41 +0200 Merge pull request #992 from PhenomRetroShare/Fix_MailFromText - 291bddb csoler Wed, 16 Aug 2017 22:24:17 +0200 Merge pull request #995 from PhenomRetroShare/Fix_AppVeyor - 2a0b9ee csoler Wed, 16 Aug 2017 22:23:15 +0200 Merge pull request #991 from PhenomRetroShare/Fix_TravisMacCompil - 79f09f1 Angela Wed, 16 Aug 2017 14:09:38 +0200 Merge branch 'qml_app_ui_improvements' into GSoC2017-evaluation-final - 18f7733 Angela Wed, 16 Aug 2017 14:09:26 +0200 Merge branch 'qml_app_face_generator' into GSoC2017-evaluation-final - 73a6fee Phenom Sun, 13 Aug 2017 14:34:28 +0200 Fix AppVeyor build by disabling SQLCipher - a87c31f Angela Sun, 13 Aug 2017 13:04:54 +0200 Fix canvas face displaced down - 5a1a84f Angela Sun, 13 Aug 2017 13:02:49 +0200 Refactor use better variable names - 16856ca csoler Sat, 12 Aug 2017 22:32:46 +0200 fixed yml script for AppImage - 041447b Phenom Sat, 12 Aug 2017 15:10:07 +0200 Add "No to All" for RSLink Open message. - 6b2bc7d Phenom Sat, 12 Aug 2017 13:40:28 +0200 Fix From text in Mail - 5a1c316 Phenom Sat, 12 Aug 2017 11:49:33 +0200 Fix Travis MacOs Compilation - 55bb105 Phenom Sat, 12 Aug 2017 11:21:14 +0200 Fix Relay Setting Layout Margin - 03d6751 csoler Fri, 11 Aug 2017 19:33:23 +0200 fixed branching problem in makeSOurcePackage.sh - c3460c3 csoler Fri, 11 Aug 2017 19:27:49 +0200 merged previsous revisions - b8a556a csoler Fri, 11 Aug 2017 19:00:15 +0200 added qt-svg as a dependency - c331f66 csoler Fri, 11 Aug 2017 11:07:59 +0200 added appImage generation system - 545bcde csoler Thu, 10 Aug 2017 10:36:30 +0200 added info for building/packaging on debian stretch - 3ae85db thunde Sun, 6 Aug 2017 14:10:23 +0200 Fixed version number in rsversion.in - 529eabe Gioacc Sun, 6 Aug 2017 11:47:57 +0200 Merge pull request #986 from ngleb/fix-cpp-comment - b686771 Gleb N Sun, 6 Aug 2017 14:27:26 +0700 fix C++ comment to avoid compilation error - 52dbd91 thunde Wed, 2 Aug 2017 10:18:58 +0200 Removed Windows specific hack to get commandline arguments. - ee86768 thunde Sat, 5 Aug 2017 14:19:49 +0200 Fixed name of executable for autostart in Windows Installer - 3e25d96 csoler Fri, 4 Aug 2017 21:38:44 +0200 fixed unix -> linux-* target in .pri, as qt4 doesnt seem to recognise unix - 27ee9ca csoler Thu, 3 Aug 2017 22:55:27 +0200 Merge pull request #982 from csoler/v0.6.3 - 11832e3 csoler Thu, 3 Aug 2017 22:51:40 +0200 updated version number - 4e02c5f csoler Thu, 3 Aug 2017 21:29:52 +0200 Merge pull request #979 from PhenomRetroShare/Fix_LobbyAutoSubscribe - 4b820a0 csoler Thu, 3 Aug 2017 21:08:54 +0200 Merge pull request #981 from csoler/v0.6.3 - 84b32f0 csoler Thu, 3 Aug 2017 20:09:48 +0200 removed newline that comes with debug info - c0f28f5 Angela Thu, 3 Aug 2017 18:31:05 +0200 Set transparent background color - 785bd65 Angela Thu, 3 Aug 2017 18:20:14 +0200 Add shadow to the toolbar - 9f52ffb Angela Thu, 3 Aug 2017 17:29:18 +0200 Increase toolbar size - c790a5b Angela Thu, 3 Aug 2017 16:48:47 +0200 Merge branch 'qml_app_ui_improvements' into GSoC2017-evaluation-II - 83f8860 Angela Thu, 3 Aug 2017 16:48:37 +0200 Merge branch 'qml_app_emoji_font' into GSoC2017-evaluation-II - d70293c Angela Thu, 3 Aug 2017 16:48:27 +0200 Merge branch 'qml_app_notify_unread' into GSoC2017-evaluation-II - 54c8e26 Angela Wed, 2 Aug 2017 18:09:40 +0200 Set emoji font declaration global for all app - 0a5b350 Angela Wed, 2 Aug 2017 17:34:29 +0200 Set RS emoji font as default if no emoji native font is detected - 1cdb3db Angela Wed, 2 Aug 2017 16:51:29 +0200 Add OpenSansEmoji font - beed9be Angela Wed, 2 Aug 2017 15:16:15 +0200 Set bigger row height - e6a3b35 Angela Wed, 2 Aug 2017 12:46:58 +0200 Set image PreserveAspectFit - bf3a230 Angela Wed, 2 Aug 2017 12:34:19 +0200 Fix partially bug: incomplete toDataURL - 6190efe Angela Tue, 1 Aug 2017 16:59:15 +0200 Improve code - 27bedf8 Phenom Tue, 1 Aug 2017 10:15:42 +0200 Fix Lobby auto-subscribe. - 7d5f601 csoler Mon, 31 Jul 2017 19:22:15 +0200 Merge pull request #978 from G10h4ck/cxx11_comp - 541b1ea Gioacc Mon, 31 Jul 2017 18:26:51 +0200 Introduce C++11 compatibility macro for gcc < 4.6 - e39b310 Angela Mon, 31 Jul 2017 17:42:45 +0200 Open chat when click notification of one chat new message - c86b7c7 Angela Mon, 31 Jul 2017 16:52:03 +0200 Open contacts view on click unread notification - 93d778a Angela Mon, 31 Jul 2017 16:11:21 +0200 Show info from message sender when is in only one conversation - c6f562b Angela Mon, 31 Jul 2017 15:34:29 +0200 Fix reset text area with a preedit text message - a041584 csoler Mon, 31 Jul 2017 01:10:35 +0200 Merge pull request #976 from csoler/v0.6.3 - 7ad0ec1 csoler Mon, 31 Jul 2017 01:10:01 +0200 reduced size of GenCertDialog window (guess) and fixed username - 0636142 csoler Sun, 30 Jul 2017 21:29:37 +0200 Merge pull request #973 from PhenomRetroShare/Fix_DontShowAnonIconWhenImageDisabled - 2588068 csoler Sun, 30 Jul 2017 21:29:14 +0200 Merge pull request #953 from PhenomRetroShare/Fix_NewWindowForPassword - 39436f3 csoler Sun, 30 Jul 2017 18:45:56 +0200 Merge pull request #974 from PhenomRetroShare/Fix_WebUI_SettingSaving - c2a3e46 Phenom Sun, 30 Jul 2017 18:29:03 +0200 Fix WebUI Setting Saving. - eb75946 Phenom Sun, 30 Jul 2017 15:30:56 +0200 Fix Don't show Anonymous Icon when Images are disabled in ChatWidget - a2f8b5e csoler Sun, 30 Jul 2017 14:42:28 +0200 Merge pull request #972 from csoler/v0.6.3 - c5fc8f8 csoler Sun, 30 Jul 2017 14:40:53 +0200 replaced images in homepage with the logo without flares - cd6c9cf csoler Sun, 30 Jul 2017 14:38:17 +0200 simplified text on homepage - e82b6fc csoler Sun, 30 Jul 2017 14:31:52 +0200 improved GenCertDialog with small indicator text, and hide location by default - 5dc25e3 Phenom Wed, 19 Jul 2017 19:39:21 +0200 Fix Ask Password in new window if wrong in StartDialog. - b387f15 csoler Sun, 30 Jul 2017 10:36:44 +0200 fixed compilation on qt5 - f5c4561 csoler Sat, 29 Jul 2017 23:41:45 +0200 Merge pull request #968 from csoler/v0.6.3 - 2e1bd2d csoler Sat, 29 Jul 2017 23:39:48 +0200 improved text on cert creation button - 09faa60 csoler Sat, 29 Jul 2017 23:16:47 +0200 Merge pull request #967 from csoler/v0.6.3 - e8415c4 csoler Sat, 29 Jul 2017 23:12:56 +0200 made RS not to ask for plugin confirmation on first load - 345f24e csoler Sat, 29 Jul 2017 22:37:14 +0200 fixed clearing of PGP passphrase after creation of default identity - 6f7e656 csoler Sat, 29 Jul 2017 21:48:12 +0200 Defautl GXS nickname was built from location. Changed it to use profile name - - -- Retroshare Dev Team Tue, 12 Sep 2017 22:00:00 +0100 - -retroshare (0.6.3-1.20170811.03d67515~trusty) trusty; urgency=low - - a16220e csoler Sat, 29 Jul 2017 20:24:13 +0200 switched to RC2 - d10dbf1 csoler Sat, 29 Jul 2017 20:20:53 +0200 Merge pull request #966 from csoler/v0.6.3 - b8260e5 csoler Fri, 28 Jul 2017 18:41:34 +0200 fixed wording in GenCertDialog - 4fdbf39 csoler Fri, 28 Jul 2017 18:32:47 +0200 fixed image replication in profile creation window - c6b6835 csoler Thu, 27 Jul 2017 20:43:08 +0200 exclude own friends from key removal pre-selection - e861f87 csoler Wed, 26 Jul 2017 21:44:24 +0200 removed unused msg item class that caused aliasing warnings (serialisation of time_t as uint32_t) - 286e7e0 csoler Wed, 26 Jul 2017 14:01:28 +0200 Merge pull request #961 from csoler/v0.6.3 - 34ddf71 csoler Wed, 26 Jul 2017 13:54:44 +0200 Merge pull request #957 from PhenomRetroShare/Fix_CppCheckerError - 1792273 csoler Wed, 26 Jul 2017 13:50:21 +0200 Merge pull request #946 from PhenomRetroShare/Fix_GuiAutoLogin - ea72c58 csoler Wed, 26 Jul 2017 12:27:38 +0200 fixed unnecessary () - b0483a0 csoler Wed, 26 Jul 2017 10:23:18 +0200 fixed bug in removeDeleteExistingMsgs() - 3ba0256 csoler Tue, 25 Jul 2017 22:23:09 +0200 Merge pull request #955 from PhenomRetroShare/Fix_CopyRSLinkWhenOnlyPlainTextInLobby - 7820c1e csoler Tue, 25 Jul 2017 22:10:20 +0200 Merge pull request #960 from PhenomRetroShare/Add_ConfigFlagMacOSVersion - 9881b61 csoler Tue, 25 Jul 2017 22:06:18 +0200 cleanup code in RsGenExchange - 181a824 csoler Tue, 25 Jul 2017 21:56:20 +0200 fixed memory leak in BWGraphSource due to missing destructor - a382a0f csoler Tue, 25 Jul 2017 21:52:09 +0200 fixed memory leak in p3peermgr config load - 041f989 csoler Tue, 25 Jul 2017 21:21:24 +0200 rewrote processRecvdMessages() and processRecvdGroups() in RsGenExchange. Removed mReceivedGrps and mReceivedMsgs, cleaned-up terrible branching and memory management - cbec818 Phenom Tue, 25 Jul 2017 18:08:37 +0200 Add qmake CONFIG flag for MacOS version. - 461ccf3 csoler Tue, 25 Jul 2017 00:07:53 +0200 removed aliasing in storeMessages/storeGroups, removed several memory leaks in unittests, improved auto-delete structures in rsgxsutil, added deletion for members of RsGenExchange, removed shared pointers from unittests (they cause a memory leak and are only used in unittests) - ef24459 csoler Mon, 24 Jul 2017 18:48:13 +0200 fixed memory leak in gxssecurity test - 79779b8 csoler Mon, 24 Jul 2017 18:45:24 +0200 fixed memory leaks in GxsSecurity - 70f72db csoler Mon, 24 Jul 2017 18:20:21 +0200 fixed memory leak in GxsSecurity - bcaafc2 csoler Mon, 24 Jul 2017 14:29:30 +0200 improved template class naming for temporary Gxs grp data structures - df691bd csoler Mon, 24 Jul 2017 12:16:06 +0200 improved tests to avoid memory leak - 3b1606c Gioacc Mon, 24 Jul 2017 11:52:23 +0200 Remove misguiding if - 03cc2e6 Gioacc Mon, 24 Jul 2017 10:16:24 +0200 Remove miguiding if before delete - 764fadf csoler Sun, 23 Jul 2017 22:58:01 +0200 suppressed memory leak in serialisation test code - 880eb58 csoler Sun, 23 Jul 2017 22:56:27 +0200 suppressed memory leak in serialisation test code - 0242424 csoler Sat, 22 Jul 2017 12:08:28 +0200 reverting last commit that causes crashes - 9e2241a csoler Fri, 21 Jul 2017 23:15:50 +0200 attempt to fix memory leak in RsGenExchange. To be tested. - 8ce10ea Phenom Fri, 21 Jul 2017 15:31:53 +0200 Fix past commit for p3idservice.cc - 733f812 Phenom Fri, 21 Jul 2017 15:20:04 +0200 Fix CppCheck Error in utility_functions.c - 36e3772 Phenom Fri, 21 Jul 2017 15:19:17 +0200 Fix CppCheck Error in advancedsearchdialog.cpp - 145ce6b Phenom Fri, 21 Jul 2017 15:11:55 +0200 Fix CppCheck Error in ChatPage.cpp - 2afc1bf Phenom Fri, 21 Jul 2017 15:04:10 +0200 Fix CppCheck Error in contentvalue.cc - e576743 Phenom Fri, 21 Jul 2017 14:57:43 +0200 Fix CppCheck Error in p3idservice.cc - 8d82640 Phenom Fri, 21 Jul 2017 10:58:19 +0200 Fix copy of RSLink when on Only plain text mode in chat lobby. (sss find) - aa471e5 csoler Fri, 21 Jul 2017 10:25:20 +0200 fixed uninitialized memory read in GxsTrans - f370f59 csoler Thu, 20 Jul 2017 22:12:57 +0200 fixed typo in ppa upload script - 581c11d csoler Thu, 20 Jul 2017 22:11:35 +0200 fixed various problems with 06 suppression in package control files - baac33d csoler Thu, 20 Jul 2017 21:18:07 +0200 updated revision number - f9d6a78 csoler Thu, 20 Jul 2017 18:19:10 +0200 Merge pull request #954 from PhenomRetroShare/Fix_ShowAuthorInPeopleTabAtStartUp - 5b86f44 Phenom Thu, 20 Jul 2017 14:29:31 +0200 Fix Show Author In People Tab at startup - d60bb78 csoler Wed, 19 Jul 2017 18:37:23 +0200 Merge pull request #952 from PhenomRetroShare/Fix_LobbyAutoSubscribe - cbbc392 Phenom Wed, 19 Jul 2017 13:38:26 +0200 Fix Lobby auto-subscribe. - 0d681b1 csoler Wed, 19 Jul 2017 18:26:32 +0200 Merge pull request #924 from PhenomRetroShare/Fix_retroshare06_case - 71810e8 csoler Wed, 19 Jul 2017 18:18:32 +0200 Merge pull request #950 from PhenomRetroShare/Add_ChatServerFlag - 833787e csoler Tue, 18 Jul 2017 23:02:54 +0200 Merge pull request #949 from PhenomRetroShare/Add_AnonIconBeforeName - bb8f93e csoler Tue, 18 Jul 2017 21:19:38 +0200 Merge pull request #951 from PhenomRetroShare/Fix_BadServMntorRegister - 5bbb99a Phenom Tue, 18 Jul 2017 19:24:32 +0200 Fix Bad Service Monitor registering. - 3a6bcf5 Phenom Tue, 18 Jul 2017 16:34:56 +0200 Add flag for ChatServer - b8f742d Phenom Tue, 18 Jul 2017 14:30:31 +0200 Add :/icons/anonymous_blue_128.png before name for unsigned GxsId - e56340e csoler Mon, 17 Jul 2017 23:12:06 +0200 Merge pull request #386 from PhenomRetroShare/Add_AbilityToChangeOpModeInCmdLine - d39b05c csoler Mon, 17 Jul 2017 22:49:44 +0200 Merge pull request #948 from PhenomRetroShare/Add_FilterIdInFriendList - f4aec11 csoler Mon, 17 Jul 2017 22:48:12 +0200 suppressed warning in p3dhtmgr.cc - 4374264 Phenom Sat, 15 Jul 2017 15:07:05 +0200 Fix clang warning: unused variable 'pqiservicezone' - 1f39789 Phenom Sat, 15 Jul 2017 18:32:53 +0200 Fix clang warning: 'RSGraphWidget::sizeHint' hides overloaded virtual function - 3003598 Phenom Mon, 17 Jul 2017 11:48:08 +0200 Fix clang warning: 'p3ChatService' defined as a struct here but previously declared as a class - 91c526f Phenom Mon, 17 Jul 2017 11:43:41 +0200 Fix clang warning: 'p3MsgService' defined as a struct here but previously declared as a class - 896ed3e Phenom Mon, 17 Jul 2017 11:38:53 +0200 Fix clang warning: class 'p3Config' was previously declared as a struct - 8dbb0d6 Phenom Sat, 15 Jul 2017 10:57:05 +0200 Fix warning: this statement may fall through - 7d8b379 csoler Mon, 17 Jul 2017 22:18:53 +0200 Merge pull request #941 from PhenomRetroShare/Add_UnsignedInChatName - b6731ed Gioacc Mon, 17 Jul 2017 16:04:52 +0200 Better naming and doc for warning suppression CONFIG - f888913 Phenom Sat, 13 Aug 2016 14:34:31 +0200 Set Operating Mode in RsInit::InitRetroShare so noGUI could use it. - 8563957 Phenom Mon, 16 May 2016 12:10:04 +0200 Add the ability to change OpMode in command line. - c74c865 Phenom Mon, 17 Jul 2017 14:10:26 +0200 Add new Filter by ID in FriendList. - 1491a05 csoler Mon, 17 Jul 2017 11:16:48 +0200 fixed deadlock situation in FT causing multiple bugs: lock when DLing from a file list a file that is already being downloaded, and lock when a FT module find a direct source among friends - 5bf056c Phenom Mon, 17 Jul 2017 10:44:27 +0200 Rename retroshare06 to retroshare - b12fd11 Phenom Wed, 5 Jul 2017 18:11:52 +0200 Change RetroShare06 to lower case - 65326d9 csoler Sun, 16 Jul 2017 22:08:07 +0200 removed DEPRECATED warnings by default - e2fa57d Phenom Sat, 15 Jul 2017 19:03:17 +0200 Fix clang warning: unused variable 'INTERVAL_BETWEEN_DEBUG_DUMP' - a50c4ca Phenom Sat, 15 Jul 2017 18:54:21 +0200 Fix clang warning: unused variable 'kRecognTagClass_DEVELOPMENT' - f2fb05d Phenom Sat, 15 Jul 2017 18:50:32 +0200 Fix clang warning: unused variables 'PARTIAL_VIEW_SIZE', ... - 6ee65bc Phenom Sat, 15 Jul 2017 18:42:19 +0200 Fix clang warning: using floating point absolute value function 'fabsf' when argument is of integer type - a0ac6b7 Phenom Sat, 15 Jul 2017 18:40:03 +0200 Fix clang warning: unused variable 'MAX_TUNNEL_REQUESTS_DISPLAY' - 64899e4 Phenom Sat, 15 Jul 2017 18:36:14 +0200 Fix clang warning: unused variable 'SFI_DEFAULT_PERIOD' - b31c812 Phenom Sat, 15 Jul 2017 18:35:11 +0200 Fix clang warning: unused variable 'NEWSFEED_CHANNELMSGLIST' - 69060f8 Phenom Sat, 15 Jul 2017 18:24:55 +0200 Modify #warning to get author and date. - 26397d7 Phenom Sat, 15 Jul 2017 18:22:16 +0200 Fix clang warning: unused variables 'LOWER_LIMIT', ... - 903f875 Phenom Sat, 15 Jul 2017 18:17:00 +0200 Fix clang warning: unused variable 'MAX_SERIALIZED_ARRAY_SIZE' - d83a962 Phenom Sat, 15 Jul 2017 16:45:19 +0200 Fix clang warning: unused variables 'GIXS_CUT_OFF', ... - 51fa7a5 Phenom Sat, 15 Jul 2017 16:39:24 +0200 Fix clang warning: unused variable 'p3facestartupzone' - 13220ec Phenom Sat, 15 Jul 2017 16:33:04 +0200 Fix clang warning: unused variable 'MAX_TIME_KEEP_LOCATION_WITHOUT_CONTACT' - fea1b83 Phenom Sat, 15 Jul 2017 16:32:11 +0200 Fix clang warning: unused variable 'p3facemsgzone' - 5a64996 Phenom Sat, 15 Jul 2017 15:04:56 +0200 Fix clang warning: unused variables 'RS_NET_NEEDS_RESET', ... - 4152a46 Phenom Sat, 15 Jul 2017 14:58:55 +0200 Fix clang warning: unused variable 'P3CONNMGR_UDP_DEFAULT_DELAY' - 5b1323e Phenom Sat, 15 Jul 2017 14:53:04 +0200 Fix clang warning: unused variables 'PQI_HANDLER_NB_PRIORITY_LEVELS', ... - 9148fa6 Phenom Sat, 15 Jul 2017 14:38:17 +0200 Fix clang warning: unused variables 'RS_NET_DOWN', ... - e4616c0 Phenom Sat, 15 Jul 2017 14:31:21 +0200 Fix clang warning: unused variable 'STORE_KEY_TIMEOUT' - 0479ec0 Phenom Sat, 15 Jul 2017 14:30:06 +0200 Fix clang warning: unused variable 'MAX_MESSAGES_PER_SECONDS_NUMBER' - 80ea4de Phenom Sat, 15 Jul 2017 14:28:29 +0200 Fix clang warning: unused variable 'ftserverzone' - 8a270af Phenom Sat, 15 Jul 2017 14:27:19 +0200 fixed merging problem - 35186c4 Phenom Sat, 15 Jul 2017 14:22:48 +0200 Fix clang warning: unused variable 'res' - 7f1e230 Phenom Sat, 15 Jul 2017 14:21:53 +0200 Fix clang warning: unused variable 'FT_TM_CRC_MAP_MAX_WAIT_PER_GIG', ... - 8b99c80 Phenom Sat, 15 Jul 2017 14:04:56 +0200 Fix clang warning: 'p3GxsTrans' defined as a class here but previously declared as a struct - fd24ef5 Phenom Sat, 15 Jul 2017 13:35:50 +0200 Fix warning: comparison between signed and unsigned integer expressions and misleading-indentation - 431b564 Phenom Sat, 15 Jul 2017 13:32:04 +0200 Fix warning: unused variable ‘popLimit’ - 2444e6e Phenom Sat, 15 Jul 2017 13:29:33 +0200 Fix warning: this statement may fall through - dcb8a35 Phenom Sat, 15 Jul 2017 13:28:05 +0200 Fix warning: unused variable ‘self’ and misleading-indentation - ca9357c Phenom Sat, 15 Jul 2017 13:25:14 +0200 Fix warning: this ‘if’ clause does not guard... - b5c503a Phenom Sat, 15 Jul 2017 13:24:07 +0200 Fix warning: unused variable ‘prev_index’ - 3a22c6d Phenom Sat, 15 Jul 2017 13:20:46 +0200 Fix warning: comparison between signed and unsigned integer expressions - 6fd0308 Phenom Sat, 15 Jul 2017 13:19:08 +0200 Fix warning: this statement may fall through - f27ce82 Phenom Sat, 15 Jul 2017 13:18:00 +0200 Fix warning: comparison between signed and unsigned integer expressions , misleading-indentation and unused-variable - 15bc9c1 Phenom Sat, 15 Jul 2017 13:10:41 +0200 Fix warning: this statement may fall through - f23c84f Phenom Sat, 15 Jul 2017 13:06:19 +0200 Fix warning: this statement may fall through - 9a4ed80 Phenom Sat, 15 Jul 2017 13:01:39 +0200 Fix warning: comparison between signed and unsigned integer expressions and unused variables - 8455adf Phenom Sat, 15 Jul 2017 12:50:50 +0200 Fix warning: unused parameter ‘type’ and ‘req’ - c866bf9 Phenom Sat, 15 Jul 2017 12:49:27 +0200 Fix warning: unused parameter ‘req’ and ‘resp’ - 9d4967c Phenom Sat, 15 Jul 2017 12:48:04 +0200 Fix warning: unused parameter ‘req’ - c97269b Phenom Sat, 15 Jul 2017 12:44:55 +0200 Fix warning: this statement may fall through - 1813948 Phenom Sat, 15 Jul 2017 11:48:37 +0200 Fix warning: unused parameter ‘grpItem’ and unused debug variables - e1ea92d Phenom Sat, 15 Jul 2017 11:42:02 +0200 Fix warning: unused parameter ‘n’ - f193af2 Phenom Sat, 15 Jul 2017 11:40:38 +0200 Fix warning: unused parameter ‘size’ - d8b0b52 Phenom Sat, 15 Jul 2017 11:39:03 +0200 Fix warning: variable ‘it’ set but not used - b11022a Phenom Sat, 15 Jul 2017 11:35:18 +0200 Fix warning: this statement may fall through - 0e302e2 Phenom Sat, 15 Jul 2017 11:30:08 +0200 Fix warning: this statement may fall through - 7b4d3c5 Phenom Sat, 15 Jul 2017 11:25:54 +0200 Fix warning: this statement may fall through - 476b581 Phenom Sat, 15 Jul 2017 11:23:51 +0200 Fix warning: this statement may fall through - 7bd7c57 Phenom Sat, 15 Jul 2017 11:21:36 +0200 Fix warning: variable ‘pgpNameFound’ set but not used - a0506c1 Phenom Sat, 15 Jul 2017 11:19:28 +0200 Fix warning: this statement may fall through - b9d4651 Phenom Sat, 15 Jul 2017 11:17:02 +0200 Fix warning: this statement may fall through - e12f51b Phenom Sat, 15 Jul 2017 11:14:53 +0200 Fix warning: variable ‘peerIt1’ set but not used - 78cfde9 Phenom Sat, 15 Jul 2017 11:11:51 +0200 Fix warning: this statement may fall through - 3a6ad82 Phenom Sat, 15 Jul 2017 11:03:58 +0200 Fix warning: this statement may fall through - 635246c Phenom Sat, 15 Jul 2017 11:01:16 +0200 Fix warning: this statement may fall through - e718070 Phenom Sat, 15 Jul 2017 10:51:17 +0200 Fix warning: this statement may fall through - 714f9bb Phenom Sat, 15 Jul 2017 10:46:32 +0200 Fix warning: this statement may fall through - 987c105 csoler Sun, 16 Jul 2017 20:16:31 +0200 Merge pull request #945 from PhenomRetroShare/Add_RSLinkCreateAsStatic - e40dbe8 csoler Sun, 16 Jul 2017 17:03:37 +0200 Merge pull request #947 from csoler/v0.6-ImprovedGUI - 1e98de7 csoler Sun, 16 Jul 2017 16:56:23 +0200 fixed filtering for channels when loading items on the fly - 82addce Phenom Sun, 16 Jul 2017 13:11:47 +0200 Change RetroShareLink creation methodes as static - 2d5e1d6 csoler Sun, 16 Jul 2017 10:08:33 +0200 fixed last update missing commits - - -- Retroshare Dev Team Wed, 20 Jul 2017 22:00:00 +0100 - -retroshare06 (0.6.2-1.20170716.2d5e1d63~zesty) zesty; urgency=low - - 4718125 csoler Sun, 16 Jul 2017 10:05:33 +0200 updated changelog - 991049d csoler Sat, 15 Jul 2017 22:20:43 +0200 Merge pull request #944 from csoler/v0.6-ImprovedGUI - 08faa3f csoler Sat, 15 Jul 2017 22:16:45 +0200 fixed p3Gxstunnel so that it sends the data packets in the same order it received them. This fixes the bug in distant chat causing images to not transfer correctly in some cases - 9c391cb csoler Sat, 15 Jul 2017 22:15:51 +0200 added an additional param to BinToHex so as to limit the size of the output - 6a8b74c csoler Sat, 15 Jul 2017 22:00:35 +0200 fixed compilation for computers where qreal is a float - 5ffb549 csoler Thu, 13 Jul 2017 21:49:47 +0200 Merge pull request #930 from myfingerhurt/master - 3912118 csoler Thu, 13 Jul 2017 21:42:05 +0200 Merge pull request #925 from PhenomRetroShare/Fix_ChannelCommentLineWrap - 98b0585 csoler Thu, 13 Jul 2017 21:23:14 +0200 Merge pull request #937 from csoler/v0.6-ImprovedNoGUI - 69aa5b6 Gioacc Thu, 13 Jul 2017 13:00:32 +0200 Clean some garbage from the code - fd452af csoler Wed, 12 Jul 2017 23:03:17 +0200 removed some debut output that perturbated the passwd command line - 00c1a9a csoler Wed, 12 Jul 2017 22:53:35 +0200 fixed autologin - 66268c8 csoler Wed, 12 Jul 2017 18:48:06 +0200 fixed variable shadowing a parameter - 1cdb971 csoler Tue, 11 Jul 2017 23:47:51 +0200 fixed compilation pb due to qtcreator bug - 4cfdef5 csoler Tue, 11 Jul 2017 23:39:04 +0200 do not display auto-login option when software is compiled without autologin - a5e0b1c csoler Tue, 11 Jul 2017 23:32:22 +0200 fixed -U option in rs-nogui. Removed debug output that would ruin the terminal interface - 3e3ee1a csoler Sun, 9 Jul 2017 22:12:01 +0200 little improvement to command line help display - 2c6f11e csoler Sun, 9 Jul 2017 21:59:02 +0200 restored terminal output control class - 5465e11 csoler Sun, 9 Jul 2017 21:37:39 +0200 fixed debug output - 5dfbce7 csoler Sun, 9 Jul 2017 21:16:41 +0200 fixed Terminal Api Client logic - decbd35 csoler Sat, 8 Jul 2017 17:38:09 +0200 improved the login in the interaction between terminal api client and main - 7ee527e csoler Sat, 8 Jul 2017 17:35:34 +0200 removed comments - b5976e1 csoler Sat, 8 Jul 2017 16:48:24 +0200 fixed message when passphrase is empty - 4f887ff csoler Sat, 8 Jul 2017 16:47:50 +0200 commented out unused line - 36a2053 NeverE Sat, 8 Jul 2017 00:20:09 +0900 add new functions to chat - 75c8b71 NeverE Sat, 8 Jul 2017 00:18:51 +0900 add new functions for chat - fcec555 Gioacc Fri, 7 Jul 2017 11:57:17 +0200 Merge pull request #927 from Emotyco/libresapi_lobbies_invitation - fc396dd Gioacc Fri, 7 Jul 2017 11:56:12 +0200 Merge pull request #929 from Emotyco/libresapi_empty_cert - e46d91e Gioacc Fri, 7 Jul 2017 11:35:16 +0200 Merge branch 'android_share_intent' - f5912a3 csoler Thu, 6 Jul 2017 22:52:30 +0200 Merge pull request #928 from PhenomRetroShare/Fix_MultiDownload - f0ad687 Konrad Thu, 6 Jul 2017 22:44:45 +0200 Fixed: Libresapi was throwing exception when requested to add new cert which was empty - 54047cd Phenom Thu, 6 Jul 2017 22:35:54 +0200 Fix multi download of same file. - 42bf6b2 csoler Thu, 6 Jul 2017 20:57:38 +0200 improved display of password request - a778128 csoler Thu, 6 Jul 2017 20:50:59 +0200 fixed multi-digit numbers in terminal account selection - c630f1f Gioacc Thu, 6 Jul 2017 16:28:59 +0200 Fix unused warning in gxstokenqueue - b935bac Gioacc Thu, 6 Jul 2017 16:28:00 +0200 Add missing break in p3IdService::handleResponse - 11d02f4 Konrad Thu, 6 Jul 2017 14:08:50 +0200 Added: Handling requests to answer invitation to lobby - c9bfe4b Konrad Thu, 6 Jul 2017 14:07:33 +0200 Added: Handling requests to get lobbies invitations - aca6233 Konrad Thu, 6 Jul 2017 14:05:48 +0200 Added: Handling requests to invite peers to lobby - dad6abd Phenom Wed, 5 Jul 2017 19:30:31 +0200 Fix channel comments line wrap - 8e62a8b csoler Wed, 5 Jul 2017 22:32:54 +0200 updated tooltip for opinion in People - 141277b csoler Wed, 5 Jul 2017 22:16:14 +0200 removed debug info - c1e18c7 csoler Wed, 5 Jul 2017 22:12:56 +0200 fixed bug causing an infinite subscribe/unsubscribe loop in GxsTrans - 370d50b csoler Wed, 5 Jul 2017 21:36:00 +0200 cleaned a bit the code in rsinit.cc - 7ee0b45 csoler Tue, 4 Jul 2017 23:27:43 +0200 Merge pull request #922 from csoler/v0.6-ImprovedGUI - 5f7df7c csoler Tue, 4 Jul 2017 23:26:57 +0200 update call to notifySettingsChanged() when changing the thread loading of channels - 2aac675 csoler Tue, 4 Jul 2017 23:15:09 +0200 merged upstream/master into v0.6-ImprovedGUI - 931ddae csoler Tue, 4 Jul 2017 23:13:03 +0200 set load thread to false for channels on default. Fixed missing () in connect - dafaa56 Gioacc Tue, 4 Jul 2017 16:27:12 +0200 Qml App: better Android interaction on URL export - a97ba80 Gioacc Tue, 4 Jul 2017 16:41:14 +0200 Fix missing include - 5b1def1 csoler Tue, 4 Jul 2017 10:25:40 +0200 Merge pull request #912 from Emotyco/libresapi_avatar_handlers - 3274852 csoler Tue, 4 Jul 2017 10:24:43 +0200 Merge pull request #913 from Emotyco/libresapi_participants_refresh - ee25722 csoler Tue, 4 Jul 2017 10:24:05 +0200 Merge pull request #915 from PhenomRetroShare/Add_AlwaysAllowFriendTimeOffsetFeed - d7f0141 csoler Tue, 4 Jul 2017 10:23:30 +0200 Merge pull request #916 from PhenomRetroShare/Add_WarningToDirectDonwloadCheckBox - d876bb7 csoler Mon, 3 Jul 2017 23:21:31 +0200 fixing async loading of channels. To be tested. - 1dea00d csoler Mon, 3 Jul 2017 23:09:17 +0200 attempt to fix channel post auto-size by limiting the number of lines from message to display in summary depending on available size - 719b414 csoler Mon, 3 Jul 2017 22:32:08 +0200 fixed merging of comments in channel post with async-ed loading system - f0ed0dd csoler Mon, 3 Jul 2017 22:07:23 +0200 Merge pull request #918 from RetroShare/revert-917-v0.6-ImprovedGUI - 9a5e46d csoler Mon, 3 Jul 2017 22:07:06 +0200 Revert "attempt to delay channel post loading on demand when displayed" - f5abf54 csoler Mon, 3 Jul 2017 21:54:22 +0200 Merge pull request #917 from csoler/v0.6-ImprovedGUI - b6d5c55 csoler Mon, 3 Jul 2017 21:48:17 +0200 attempt to delay channel post loading on demand when displayed - 3987f75 Phenom Mon, 3 Jul 2017 17:14:16 +0200 Always allow Friend Time Offset Feed item. - 2192a43 Phenom Mon, 3 Jul 2017 18:36:47 +0200 Add a warning to Direct download checkbox depends general setting. - f413433 csoler Mon, 3 Jul 2017 11:25:12 +0200 removed zeroing of preferred group causing a bug in GxsTrans - e9f9856 csoler Sun, 2 Jul 2017 10:42:22 +0200 fixed naming in friend groups in GroupChooser - 77b064b csoler Sat, 1 Jul 2017 17:24:58 +0200 fixed translation of built-in group names in GxsGroupDialog - c61536e csoler Sat, 1 Jul 2017 16:21:22 +0200 fixed RsGraphWidget by adding an extra data point in the lower right corner, and fixed typo that caused an invalid point to be drawn - f136210 csoler Sat, 1 Jul 2017 16:20:39 +0200 fixed layout in GxsTrans stats - 1323a97 csoler Sat, 1 Jul 2017 15:38:57 +0200 updated changelog - - -- Retroshare Dev Team Sun, 16 Jul 2017 12:00:00 +0100 - -retroshare06 (0.6.2-1.20170716.1323a974~trusty) trusty; urgency=low - - 244e8a8 csoler Sat, 1 Jul 2017 15:29:48 +0200 fixed display of GxsTrans statistics - 27774ba csoler Thu, 29 Jun 2017 22:13:04 +0200 Merge pull request #911 from csoler/v0.6-GxsTransport - b294b4b csoler Thu, 29 Jun 2017 22:11:44 +0200 changed sorting of popular forums w.r.t. time of last post rather than number of supplier friends - a864cf7 csoler Thu, 29 Jun 2017 21:12:42 +0200 Merge pull request #910 from csoler/v0.6-GxsTransport - 4b94b2e csoler Thu, 29 Jun 2017 21:12:02 +0200 improved display of GxsTrans statistics - 1b4e8a4 csoler Thu, 29 Jun 2017 18:38:10 +0200 Merge pull request #909 from csoler/v0.6-GxsTransport - 64e3fc9 csoler Thu, 29 Jun 2017 18:37:39 +0200 fixed bug preventing correct subscribe in GxsTrans - 700d114 csoler Thu, 29 Jun 2017 18:27:00 +0200 fixed bug causing failure of group autosubscribe in GxsTrans - cb31a92 csoler Thu, 29 Jun 2017 18:03:31 +0200 Merge pull request #907 from PhenomRetroShare/Add_GeneralDirectDLSetting - b4071d1 Phenom Mon, 26 Jun 2017 23:35:01 +0200 Add General Direct Download setting. - a3e8b96 csoler Thu, 29 Jun 2017 13:50:41 +0200 Merge pull request #908 from csoler/v0.6-GxsTransport - 37edcc1 csoler Thu, 29 Jun 2017 13:44:40 +0200 fixed subscribe policy to GxsTrans groups as a function of last available post and group usage - dc605c0 csoler Thu, 29 Jun 2017 13:15:39 +0200 added a last modif TS in GrpNetworkStats, that is inited from network Grp statistics, and used to provide a value for unsubscribed groups - 533e2a8 csoler Wed, 28 Jun 2017 23:23:27 +0200 added check to fix existing wrong storage time value in GxsTrans - f37ba83 csoler Wed, 28 Jun 2017 23:12:33 +0200 moved msg keep period settings to netService and made the initialisation obei the default settings of the service - b96effb csoler Wed, 28 Jun 2017 22:37:50 +0200 Merge pull request #895 from PhenomRetroShare/Add_HelpInRelayTab - 3550971 csoler Wed, 28 Jun 2017 22:37:05 +0200 Merge pull request #902 from Emotyco/libresapi_avatar_handlers - 12b5628 csoler Tue, 27 Jun 2017 22:21:35 +0200 added more debug info in GxsUtil - 51c7e18 csoler Tue, 27 Jun 2017 19:56:21 +0200 added last msg time in GxsTrans stats. Added mutex to protect non atomic mPreferredGroup - 579c944 csoler Sun, 25 Jun 2017 21:50:51 +0200 Merge pull request #903 from sehraf/improve-server-page - 3c54beb sehraf Sun, 25 Jun 2017 19:19:07 +0200 hide hidden service port for I2P instead of just disabling it (it's not used for I2P) - e128fcb Konrad Sun, 25 Jun 2017 15:35:23 +0200 Added: Creating identity with avatar in libresapi - 54166ce Konrad Sun, 25 Jun 2017 14:30:38 +0200 Added: Handling requests to set and get identity avatar - c3a78ce csoler Sat, 24 Jun 2017 13:14:24 +0200 Merge pull request #900 from csoler/v0.6-GxsTransport - 8c4396c csoler Sat, 24 Jun 2017 12:54:06 +0200 Merge pull request #899 from Emotyco/libresapi_wrong_password_notification - 66a9dad Konrad Sat, 24 Jun 2017 12:05:32 +0200 Fixed: Information about wrong password - 2aac999 Konrad Sat, 24 Jun 2017 12:02:28 +0200 Fixed: Duplication of handler declaration - 332fedd csoler Sat, 24 Jun 2017 11:38:48 +0200 fixed mismatched free/delete[] in AvatarDefs - 2bb49f6 csoler Fri, 23 Jun 2017 21:58:54 +0200 Merge pull request #898 from csoler/v0.6-GxsTransport - 0f99647 csoler Fri, 23 Jun 2017 21:58:17 +0200 fixed memory leak in GxsTrans - 25a71c9 csoler Fri, 23 Jun 2017 21:24:37 +0200 Merge pull request #897 from PhenomRetroShare/Fix_ChannelPostButton - adfc594 Phenom Fri, 23 Jun 2017 20:33:43 +0200 Fix GxsChannelPostItem button, like "download" or "Play" never shown. - c415e11 Phenom Thu, 22 Jun 2017 18:52:03 +0200 Add help in Relay setting tab. - 07ecbec csoler Thu, 22 Jun 2017 18:05:39 +0200 fixed bug in makeSourcePackage which would always grab the release branch - - -- Retroshare Dev Team Sat, 01 Jul 2017 16:00:00 +0100 - -retroshare06 (0.6.2-1.20170623.07ecbec6~precise) precise; urgency=low - - c34165e csoler Wed, 21 Jun 2017 08:08:29 +0200 pushed new changelog to force update of the date... - 8950acc csoler Thu, 22 Jun 2017 00:39:03 +0200 Merge pull request #892 from PhenomRetroShare/Add_MoveRelayPageToNetwork - ea8af8a Phenom Wed, 21 Jun 2017 17:57:14 +0200 Move Relay setting page to network one. - 8cc82f9 csoler Wed, 21 Jun 2017 18:32:51 +0200 Merge pull request #891 from PhenomRetroShare/Fix_MessageToHeight - 812e606 csoler Tue, 20 Jun 2017 23:40:58 +0200 fixed changelog for typo - 1f9320c csoler Tue, 20 Jun 2017 21:17:21 +0200 updated changelog - 310c848 csoler Wed, 21 Jun 2017 07:42:15 +0200 Merge pull request #890 from G10h4ck/qml_app_identity_avatar - c46c747 Phenom Wed, 21 Jun 2017 06:35:29 +0200 Fix To, Cc & Bcc height in MessageWidget. - 1d03191 Gioacc Tue, 20 Jun 2017 17:16:27 +0200 Created a dedicated component for avatar image - 8c62c2a Gioacc Tue, 20 Jun 2017 15:35:05 +0200 Qml app: show contact avatar in details if available - b206015 Gioacc Tue, 20 Jun 2017 15:33:28 +0200 libresapi: expose identity avatar in JSON API - 0133be7 csoler Sat, 17 Jun 2017 23:07:10 +0200 Merge pull request #887 from csoler/v0.6-GxsTransport - 12a4529 csoler Sat, 17 Jun 2017 23:02:28 +0200 added ifdef for comments on GxsTrans - eb4bb5b csoler Sat, 17 Jun 2017 21:42:00 +0200 fixed bug in gxs trans stats counting - 43dcddc csoler Fri, 16 Jun 2017 12:37:09 +0200 Merge pull request #880 from PhenomRetroShare/Add_GxsCircleNotify - a29bc44 csoler Fri, 16 Jun 2017 12:24:45 +0200 Merge pull request #874 from G10h4ck/silent_initiate_distant_chat_api - 12eed8e csoler Fri, 16 Jun 2017 12:22:57 +0200 Merge pull request #884 from sehraf/pr-fix-bob-settings - 25565a7 csoler Thu, 15 Jun 2017 23:58:29 +0200 merged upstream/master - 6633b04 csoler Thu, 15 Jun 2017 23:57:02 +0200 changed constants for GxsTransport anti-spam - 26bb865 csoler Thu, 15 Jun 2017 19:32:31 +0200 added code to reject messages based on existing per-user statistics - 65ab68b sehraf Thu, 15 Jun 2017 07:20:24 +0200 fix stop button being wrongly disabled - fe5ec8b sehraf Thu, 15 Jun 2017 07:06:52 +0200 reduce BOB log level - 09ff94c csoler Wed, 14 Jun 2017 23:19:52 +0200 added new virtual method to refuse incoming msgs (similar to groups) in RsGenExchange, and used it in p3GxsTrans to refuse msgs from peers who send too much - c451d3a csoler Mon, 12 Jun 2017 22:18:34 +0200 Merge pull request #873 from RetroPooh/tunnstats - 1e7feec csoler Mon, 12 Jun 2017 22:16:46 +0200 Merge pull request #882 from topcat/iss879 - 79825eb csoler Mon, 12 Jun 2017 20:36:02 +0200 fixed thread issue in RsGxsCleanupThread that caused random crashes - 80ec9b7 Jeetu Mon, 12 Jun 2017 15:51:26 +0530 Included QStringList header in ApiServerLocal.cpp [Issue 879] - aa64c4d Phenom Tue, 30 May 2017 22:23:31 +0200 Add Circle Feed Item. - 1766087 csoler Wed, 7 Jun 2017 23:10:59 +0200 fixed update notification and display in GxsTransStatistics - 9853b53 csoler Wed, 7 Jun 2017 23:10:24 +0200 fixed debug output in GxsNetService - 7691a8e csoler Wed, 7 Jun 2017 21:41:20 +0200 removed debug info - 4cb7522 csoler Wed, 7 Jun 2017 21:41:00 +0200 added deleted gxs messages to the reject list of GxsNetService to avoid re-downloading them right away - edd82d0 Gioacc Wed, 7 Jun 2017 21:37:03 +0200 libresapi: stop assuming first chat message is own - 318ea31 csoler Sat, 3 Jun 2017 10:30:22 +0200 fixed layout of GxsTrans stats - 23156ab csoler Sat, 3 Jun 2017 10:30:02 +0200 fixed malloc problem when chat avatar is missing - e726bd1 csoler Wed, 7 Jun 2017 13:37:38 +0200 attempt to fix the crash in DataStore by not calling deleteMsgs directly - 39f003f csoler Tue, 6 Jun 2017 22:00:08 +0200 Merge pull request #875 from csoler/v0.6-GxsTransport - 528317d Gioacc Tue, 6 Jun 2017 18:57:32 +0200 libresapi: silent /chat/initiate_distant_chat - f62028b csoler Tue, 6 Jun 2017 00:15:06 +0200 moved metadata info to members of OutgoingRecord, so that the un-serialized meta is not lost when saved. Ensured backward compatibility when reloading old items. - 1e652d6 csoler Mon, 5 Jun 2017 22:27:54 +0200 reduced number of calls to indicateConfigChanged(), and renamed mIngoingQueue into mIncomingQueue in GxsTrans - 0098433 csoler Mon, 5 Jun 2017 21:51:59 +0200 Merge pull request #871 from Emotyco/changed_socket_path_windows - b7c09bd csoler Mon, 5 Jun 2017 21:15:42 +0200 added calls to indicateConfigChanged() to force saving GxsTrans outgoing records when updated - 2d8fd07 RetroP Mon, 5 Jun 2017 14:25:09 +0300 stats tunnels rearranged columns for better readablilty - ca1dc9d Konrad Sun, 4 Jun 2017 22:10:41 +0200 Changed: Unified socket path across systems. - 318b2cb csoler Sun, 4 Jun 2017 20:38:20 +0200 Merge pull request #870 from BabushkaRetroShare/master - 7fb0419 Babush Sun, 4 Jun 2017 20:34:10 +0200 Typo fixes - 458e180 csoler Sun, 4 Jun 2017 18:44:26 +0200 Merge pull request #869 from csoler/v0.6-GxsTransport - 1967204 csoler Sun, 4 Jun 2017 18:43:12 +0200 restored GXS trans cleanign delay - 831b560 csoler Sun, 4 Jun 2017 18:37:38 +0200 moved deletion of msgs in GxsTransport inside the service thread - 5eaab25 csoler Sat, 3 Jun 2017 20:00:54 +0200 Merge pull request #833 from Emotyco/libresapi_network_configuration - 861dab3 csoler Sat, 3 Jun 2017 13:27:21 +0200 Merge pull request #863 from G10h4ck/qmlapp_pex_alpha - e3cd3b6 csoler Fri, 2 Jun 2017 23:26:24 +0200 fixed bug causing display of null group in GxsTransportStatistics - fb7ac7a csoler Fri, 2 Jun 2017 23:10:43 +0200 fixed mismatched free/delete (free is used in rschatitems.cc to delete avatars) - efdfa46 Gioacc Fri, 2 Jun 2017 10:39:42 +0200 Merge branch 'libresapi_attempt_connection' into qmlapp_pex_alpha - 8b72c9c Gioacc Fri, 2 Jun 2017 10:26:15 +0200 libresapi expose connection attempt method - 8e7e700 csoler Thu, 1 Jun 2017 10:16:30 +0200 fixed compilation for windows - 59b77da Gioacc Wed, 31 May 2017 12:11:15 +0200 Merge branch 'master' into qmlapp_pex_alpha - 1ebcc60 csoler Tue, 30 May 2017 22:22:06 +0200 Merge pull request #861 from RetroShare/v0.6-GxsTransport - d7797f1 csoler Tue, 30 May 2017 21:42:29 +0200 Merge pull request #856 from G10h4ck/GxsTransOptionalChat - eacf23d csoler Tue, 30 May 2017 21:40:41 +0200 Merge pull request #860 from csoler/v0.6-GxsTransport - 832ba69 csoler Tue, 30 May 2017 21:38:59 +0200 fixed up cleanup for GxsTransport - a7eb167 csoler Tue, 30 May 2017 20:57:20 +0200 fixed a bug in RsThread which made finished threads unaware of their state - 32ad43a csoler Tue, 30 May 2017 20:46:49 +0200 Merge pull request #859 from PhenomRetroShare/Fix_StartDialogMargin - 5410c51 csoler Tue, 30 May 2017 20:45:39 +0200 added cleanup thread for GxsTransport - 34fbee2 Phenom Tue, 30 May 2017 20:34:12 +0200 Fix StartDialog margins. - 5c71d52 Gioacc Tue, 30 May 2017 15:43:43 +0200 async chat disabled by default in GUI - f4c167c csoler Tue, 30 May 2017 13:57:11 +0200 improved display of GXS Transport stats - 2e3f62a csoler Mon, 29 May 2017 23:06:31 +0200 added msg ids to GxsTransport statistics. - bd1edbc csoler Sun, 28 May 2017 22:50:34 +0200 Merge pull request #850 from csoler/v0.6-GxsTransport - 0868b64 csoler Sun, 28 May 2017 22:49:07 +0200 fixed uninitialized memory read in GxsTrans msg Id - 4c07050 csoler Sun, 28 May 2017 22:02:14 +0200 Merge pull request #841 from sehraf/pr-minor-fix - 048045a csoler Sun, 28 May 2017 22:01:28 +0200 Merge pull request #849 from PhenomRetroShare/Fix_logo_web_nobackground - 54e91e3 csoler Sun, 28 May 2017 22:00:49 +0200 Merge pull request #840 from felisucoibi/master - 9121ff6 csoler Sun, 28 May 2017 21:59:48 +0200 Merge pull request #848 from PhenomRetroShare/Fix_WindowsCompil - 9d2e0d7 Phenom Sun, 28 May 2017 15:19:27 +0200 Fix Appveyor - 5c99297 Phenom Sun, 28 May 2017 13:19:22 +0200 Fix logo_web_nobackground - 28119b5 Phenom Sun, 28 May 2017 12:57:36 +0200 Fix Windows Compilation - 6d76624 csoler Sat, 27 May 2017 23:16:20 +0200 fixed uninitialized memory read in grouter - e0498ba csoler Sat, 27 May 2017 22:37:14 +0200 Merge pull request #846 from csoler/v0.6-GxsTransport - eea63ac csoler Sat, 27 May 2017 22:19:52 +0200 minor code cleaning in p3GxsTrans (struct->class for consistency, sendMail->sendData), added popularity+subscribed status display in statistics - 753867e csoler Sat, 27 May 2017 15:22:32 +0200 Merge pull request #845 from csoler/v0.6-GxsTransport - 6da8b2a csoler Sat, 27 May 2017 15:13:23 +0200 fixed up icons in statistics window - e06bd9b csoler Sat, 27 May 2017 14:48:08 +0200 added icon for GxsTransport - 4fef4d6 csoler Sat, 27 May 2017 14:23:16 +0200 added display of the various GxsTrans groups and their respective sizes - 7c43998 csoler Fri, 26 May 2017 22:04:33 +0200 Merge pull request #842 from csoler/v0.6-GxsTransport - 541b42a sehraf Fri, 26 May 2017 20:29:43 +0200 minor fix - a3096f2 csoler Fri, 26 May 2017 20:28:44 +0200 added data hash to GxsTrans display - 95b0273 felisu Fri, 26 May 2017 18:54:02 +0200 small fix removed ... from text login screen. - 4fa6cbe csoler Fri, 26 May 2017 18:42:52 +0200 fixed display in GxsTrans stats widget - 95f1719 felisu Fri, 26 May 2017 18:37:05 +0200 Changed login screen add Profile/Node text. - 1e8df12 felisu Fri, 26 May 2017 18:19:06 +0200 Final step to change again size and design of start up login screen. 4/4 - 7281222 felisu Fri, 26 May 2017 18:15:14 +0200 Login screen 3 / 4 - 2dbe3a1 felisu Fri, 26 May 2017 18:13:57 +0200 Start login 2/4 - 0fa3b9e felisu Fri, 26 May 2017 18:12:24 +0200 smaller login screen and less blue 1 - 873131f csoler Thu, 25 May 2017 22:20:18 +0200 Merge pull request #836 from sehraf/pr-add-i2p-bob-v2.1 - 14b9a54 csoler Thu, 25 May 2017 16:56:29 +0200 added group data retrieval to GxsTransStatistics - a3ee85a sehraf Sun, 9 Oct 2016 14:32:52 +0200 Add I2P BOB support to libretroashare and RetroShare GUI - 9ff81b9 csoler Tue, 23 May 2017 22:06:46 +0200 Merge pull request #835 from felisucoibi/master - 483d538 defnax Tue, 23 May 2017 18:46:50 +0200 fit the background image to the login page - a136fb6 csoler Mon, 22 May 2017 23:54:55 +0200 added display of ongoing record status for GxsTrans. Unfinished. - ac66ee7 felisu Mon, 22 May 2017 15:21:06 +0200 Improved GUI gencert - 9b67e93 Konrad Sun, 21 May 2017 19:51:52 +0200 Added: Network configuration to libresapi. - fbeb6ff csoler Sun, 21 May 2017 15:57:10 +0200 added infrastructure for gathering statistics about GxsTransport. Unfinished. - 8c1babe csoler Sun, 21 May 2017 15:12:49 +0200 Merge pull request #832 from felisucoibi/master - 2adde95 felisu Sun, 21 May 2017 15:08:07 +0200 fixed bad uploading of previous pr - dbc2396 csoler Sun, 21 May 2017 14:52:20 +0200 Merge pull request #830 from Gottox/fix-libressl - 6bc72dd felisu Sun, 21 May 2017 14:51:43 +0200 restored start dialog and fixed - 33ab7fa csoler Sun, 21 May 2017 14:49:13 +0200 Merge pull request #831 from Gottox/fix-musl - b341fea csoler Sun, 21 May 2017 13:49:41 +0200 merged upstream/master - a5cebb9 felisu Sun, 21 May 2017 12:35:43 +0200 simplified and upgraded gui logo added - ecf3fc5 felisu Sun, 21 May 2017 12:34:52 +0200 simplified gui - d83c42d felisu Sun, 21 May 2017 12:33:40 +0200 Add files via upload - a578acd Enno B Sun, 21 May 2017 10:54:19 +0200 fix building with musl libc - 2046d9e Enno B Sun, 21 May 2017 10:48:58 +0200 fix building with libressl - 95c9b37 defnax Sun, 21 May 2017 04:12:34 +0200 update background image resolution - a439fbf csoler Sat, 20 May 2017 23:01:56 +0200 fixed bug (due to new serializer) that caused a wrong hash to be computed when sending distant messages - ef59a60 csoler Sat, 20 May 2017 22:39:53 +0200 Merge pull request #828 from csoler/v0.6-EditPosts - 162095b csoler Sat, 20 May 2017 22:37:31 +0200 fixed count of unread/new posts by not counting older versions - 8b079f8 csoler Sat, 20 May 2017 18:34:07 +0200 Merge pull request #827 from csoler/v0.6-EditPosts - 0321037 csoler Sat, 20 May 2017 18:15:57 +0200 fixed centering of comments - 7a2807a defnax Sat, 20 May 2017 18:06:23 +0200 added missed icon - 9da1e1c csoler Sat, 20 May 2017 17:53:25 +0200 fixed proper comment number in channels feeds - 51710c1 csoler Sat, 20 May 2017 17:33:05 +0200 merge comments between channel item versions - bda7a50 defnax Sat, 20 May 2017 15:14:43 +0200 Improved look & feel for Generate and Login Window - d79c117 csoler Fri, 19 May 2017 22:12:02 +0200 Merge pull request #826 from PhenomRetroShare/Fix_ChatFontSetting - 7acefda Phenom Fri, 19 May 2017 18:40:17 +0200 Fix Chat Font setting saving. - 6b09fa0 csoler Thu, 18 May 2017 22:31:52 +0200 allow GxsFeedItems to have versions. Unfinished (does not compile) - db3dad3 Gioacc Thu, 18 May 2017 21:57:24 +0200 Local API binary output support + qml image example - e59366d Gioacc Wed, 17 May 2017 15:49:26 +0200 Qml app: made contact sorting case insensitive - 97a0e00 Gioacc Wed, 17 May 2017 15:34:29 +0200 Qml Better debugging for token manager - c1c1d5d Gioacc Wed, 17 May 2017 15:33:10 +0200 Qml app: fixed unread messages count displaying - d5ec641 csoler Tue, 16 May 2017 19:45:27 +0200 changing background color as a function of commenter ID (needs to be further adapted to all styles) - 86118d9 csoler Tue, 16 May 2017 10:26:03 +0200 Merge pull request #823 from csoler/v0.6-EditPosts - fd136c1 csoler Tue, 16 May 2017 10:24:23 +0200 made gxs comments multi-lines - b9d19c2 csoler Mon, 15 May 2017 22:17:26 +0200 Merge pull request #822 from csoler/v0.6-EditPosts - 2bc36bc csoler Mon, 15 May 2017 22:13:36 +0200 properly merge new version feed items in channels when some items are already present - 84e588b csoler Mon, 15 May 2017 21:37:22 +0200 switch file to REMOTE state in subfileitem if the attachment has already been checked in the past but the file is not here anymore - 635918e csoler Mon, 15 May 2017 20:09:58 +0200 Merge pull request #821 from G10h4ck/v0.6-GxsTransport - de9a44f Gioacc Mon, 15 May 2017 19:16:08 +0200 Merge branch 'v0.6-GxsTransport' into qmlapp_pex_alpha - 10ec527 Gioacc Mon, 15 May 2017 15:00:21 +0200 Fix GxsTrans related serialization regressions - 745462a Gioacc Mon, 15 May 2017 15:05:07 +0200 Merge branch 'v0.6-GxsTransport' into qmlapp_pex_alpha - 93a6b7d Gioacc Mon, 15 May 2017 15:00:21 +0200 Fix serialization regression in async chat - d335d45 thunder2 Mon, 15 May 2017 09:43:47 +0200 Fixed build script for Windows - 32b7003 csoler Sun, 14 May 2017 21:44:08 +0200 Merge pull request #820 from csoler/v0.6-EditPosts - 18e37de csoler Sun, 14 May 2017 21:41:26 +0200 hide download buttons when the file is local in sub file item - 1824da1 csoler Sun, 14 May 2017 21:29:04 +0200 Merge pull request #819 from csoler/v0.6-EditPosts - f832f3d csoler Sun, 14 May 2017 21:26:45 +0200 added delete button to channel attached files - af57545 csoler Sun, 14 May 2017 20:59:43 +0200 removed unused button in GxsChannelPostsWidget - 9077d80 csoler Sun, 14 May 2017 17:52:40 +0200 Merge pull request #817 from csoler/v0.6-EditPosts - 2f43927 csoler Sat, 13 May 2017 21:13:24 +0200 Merge pull request #698 from G10h4ck/gxs_mail_experiments - c0c5cc5 csoler Sat, 13 May 2017 21:08:16 +0200 Merge branch 'master' into gxs_mail_experiments - 01bb4b0 csoler Sat, 13 May 2017 20:41:56 +0200 added ifdefs around debug info and fixed a few bugs in channel post edit - 6859e0d csoler Sat, 13 May 2017 17:13:05 +0200 fixed post replacement algorithm in channel editing - 022c545 Gioacc Sat, 13 May 2017 12:52:45 +0200 Qml app: show contact details when avater clicked - 0b82b73 Gioacc Sat, 13 May 2017 11:43:31 +0200 Qml app: fixed import/export of plain certificate - 659e3c9 csoler Fri, 12 May 2017 23:55:09 +0200 merged upstream/master - 305c5d6 csoler Fri, 12 May 2017 23:54:02 +0200 added collapsing of new versions of channel posts - 2f17a80 defnax Fri, 12 May 2017 21:39:50 +0200 added missed icons - 837fcd7 defnax Fri, 12 May 2017 18:29:39 +0200 Added Placeholder text for Password field, removed "Password:" label. - 5044ac1 csoler Thu, 11 May 2017 23:44:57 +0200 moved the edit button from top bar to each channel post - 5406da9 csoler Thu, 11 May 2017 23:21:13 +0200 first part of channel post editing - 38d0743 csoler Thu, 11 May 2017 18:46:40 +0200 used more saturated colors in stats graph - 7a19dee csoler Thu, 11 May 2017 14:52:26 +0200 small fix to statistics view - eb30af5 csoler Thu, 11 May 2017 14:42:06 +0200 improved display in bw statistics - d73e850 defnax Thu, 11 May 2017 18:14:21 +0200 look n feel improvements - 7eb5e8e csoler Wed, 10 May 2017 21:37:06 +0200 added warning when switching opmode status to non turtle for the first time - 1ff1b89 Phenom Sun, 7 Feb 2016 11:45:55 +0100 Save last state of OpMode status bar droplist and restore it at start. - 3cc79fb csoler Wed, 10 May 2017 20:00:42 +0200 Merge pull request #774 from PhenomRetroShare/Fix_LobbyTopic - af18e4c csoler Wed, 10 May 2017 19:34:53 +0200 Merge pull request #816 from PhenomRetroShare/Fix_StartPasswordFocus - 6ffae36 Phenom Wed, 10 May 2017 19:06:03 +0200 Fix Start page password focus. - 11708c8 csoler Tue, 9 May 2017 22:44:00 +0200 Merge pull request #814 from csoler/v0.6-ImprovedGUI - bd9a8ae csoler Tue, 9 May 2017 22:39:15 +0200 prevent to remove old forum messages that have follow-ups. - 5d7d8c0 csoler Tue, 9 May 2017 21:56:22 +0200 Merge pull request #813 from csoler/v0.6-ImprovedGUI - 52a0aea csoler Tue, 9 May 2017 21:33:02 +0200 fixed bug causing edited posts to turn into missing messages when they have submessages - 0edbc26 csoler Tue, 9 May 2017 19:34:48 +0200 Merge pull request #812 from PhenomRetroShare/Fix_TextColorGrayForumThread - a5386eb Phenom Tue, 9 May 2017 19:19:13 +0200 Fix text's color gray in Forum thread when selected. - 0af05d2 csoler Tue, 9 May 2017 19:06:31 +0200 patch to avoid re-asking for rejected plugins when the executable is upgraded. - 88525e4 csoler Tue, 9 May 2017 18:55:28 +0200 Merge pull request #811 from PhenomRetroShare/Add_OpenCertFileInHomeAddFriend - 237db96 Phenom Mon, 8 May 2017 17:26:12 +0200 Add Open Cert File in Home Add Friend wizard. - 34dd68d csoler Mon, 8 May 2017 23:05:16 +0200 Merge pull request #809 from csoler/v0.6-FT - e0cb0f4 csoler Mon, 8 May 2017 23:04:04 +0200 fixed previous commit - 9a0df3f csoler Mon, 8 May 2017 22:21:28 +0200 Merge pull request #804 from PhenomRetroShare/Fix_Warnings - 9a7f78f csoler Mon, 8 May 2017 22:18:51 +0200 Merge pull request #805 from PhenomRetroShare/Fix_Commit_#77adc82 - caa36b4 csoler Mon, 8 May 2017 22:17:09 +0200 Merge pull request #807 from PhenomRetroShare/Fix_ToasterPositionSetting - d74bb2a csoler Mon, 8 May 2017 22:16:39 +0200 Merge pull request #806 from PhenomRetroShare/Fix_LobbySoundNotification - 4a2f5f0 csoler Mon, 8 May 2017 22:02:38 +0200 Merge pull request #808 from csoler/v0.6-FT - 8a86b9e csoler Mon, 8 May 2017 22:00:51 +0200 added a per-friend upload slots limit in FT. Default is 0=unlimited - 39646f3 Gioacc Mon, 8 May 2017 20:44:15 +0200 qml app removed unused icon - d0b881f Gioacc Mon, 8 May 2017 20:35:15 +0200 Added view to show/edit contact details - 52a04e1 csoler Mon, 8 May 2017 18:24:32 +0200 updated ubuntu changelog - f67617a Gioacc Mon, 8 May 2017 16:57:37 +0200 Add override and final placeolders for old GCC compatibility - d02cba5 Phenom Sun, 16 Apr 2017 17:53:37 +0200 Fix Lobby Topic not send on invite. - 594ab53 Phenom Mon, 8 May 2017 15:37:18 +0200 Fix Toaster Position Setting. - a869a37 Phenom Mon, 8 May 2017 15:29:11 +0200 Fix Lobby's sound notification. - 79bbe0e Phenom Mon, 8 May 2017 14:53:53 +0200 Fix Commit #77adc82 - ccaf488 Gioacc Mon, 8 May 2017 13:38:29 +0200 Merge branch 'master' into qmlapp_pex_alpha - 4a2f688 Phenom Mon, 8 May 2017 13:01:34 +0200 Fix Windows Compilation: - 8f30634 Gioacc Mon, 8 May 2017 12:33:40 +0200 Merge branch 'gxs_mail_experiments' into qmlapp_pex_alpha - 5022ef0 Phenom Mon, 8 May 2017 12:26:37 +0200 Fix Warnings: this ‘if’ clause does not guard... - f352939 Phenom Mon, 8 May 2017 12:25:29 +0200 Fix Warnings: - bf47edf Phenom Mon, 8 May 2017 12:22:46 +0200 Fix Warnings: - 523730f Phenom Mon, 8 May 2017 12:21:08 +0200 Fix Warnings: unused parameter ‘resp’, 'req' & 'resp' - a6acc72 Phenom Mon, 8 May 2017 12:18:51 +0200 Fix Warnings: this ‘if’ clause does not guard... - 58c812a Phenom Mon, 8 May 2017 12:17:01 +0200 Fix Warnings: unused parameter ‘s’ - ee7e92d Phenom Mon, 8 May 2017 12:15:45 +0200 Fix Warnings: this ‘if’ clause does not guard... - 9b1209d Phenom Mon, 8 May 2017 12:14:04 +0200 Fix Warnings: unused parameter ‘s’ & 'n' - 91e3cc3 Phenom Mon, 8 May 2017 12:08:29 +0200 Fix Warnings: variable ‘p’ set but not used - ca291b7 Phenom Mon, 8 May 2017 12:05:58 +0200 Fix Warnings: warning: unused variable ‘i2d’ - 9021609 Phenom Mon, 8 May 2017 11:55:23 +0200 Fix Warnings: unused variable ‘p’ - 7892004 Phenom Mon, 8 May 2017 11:53:16 +0200 Fix Warnings: unused parameter ‘member_name’ - 381aca4 Phenom Mon, 8 May 2017 11:49:39 +0200 Fix Warnings: unused parameter ‘j’, 'ctx' & 'name' - dd089a9 Phenom Mon, 8 May 2017 11:46:54 +0200 Fix Warnings: this ‘if’ clause does not guard - 5050d4f Phenom Mon, 8 May 2017 11:42:49 +0200 Fix Warnings: unused parameter ‘indent’ warning: unused parameter ‘indent’ [-Wunused-parameter] virtual std::ostream& print(std::ostream &out, uint16_t indent = 0) { return out; } // derived from RsItem, but should be removed - 8e9b3c9 Gioacc Mon, 8 May 2017 12:03:42 +0200 Fix missing include - add529f csoler Mon, 8 May 2017 11:41:34 +0200 Merge pull request #803 from PhenomRetroShare/Fix_UnitTest - 4e2db2f Phenom Mon, 8 May 2017 11:30:54 +0200 Fix UnitTest - - -- Retroshare Dev Team Mon, 20 Jun 2017 22:00:00 +0100 - -retroshare06 (0.6.2-1.20170508.52a04e1f~precise) precise; urgency=low - - 9714409 csoler Mon, 8 May 2017 10:57:00 +0200 Merge pull request #802 from csoler/v0.6-ImprovedGUI - de0f8b9 csoler Mon, 8 May 2017 10:51:15 +0200 moved passphrase box into start dialog, and removed blank logo, replaced it by RS splash logo - 6cb4990 csoler Mon, 8 May 2017 10:06:40 +0200 fixed compilation with qt4 - 84c8158 csoler Mon, 8 May 2017 09:38:33 +0200 disabled show OpMode status on default - 24eca4a defnax Sun, 7 May 2017 19:39:20 +0200 Moved status icon column to the last position - b18a186 csoler Sat, 6 May 2017 18:20:48 +0200 fixed ftExtraList to accept e2e encrypted transfers in addition to direct transfers. This fixed the drag+drop of shared files in a distant chat - 59ac5a5 csoler Sat, 6 May 2017 16:51:38 +0200 added on-the-fly fix of group privacy flags, so that edited groups with old un-set flags will be set automatically. Also fixes the bug preventing to grant membership on old circles - 868c046 csoler Sat, 6 May 2017 13:23:26 +0200 fixed bug in serializer caused to not updating the size parameter. Also fixes unittests - f7f0d8d csoler Fri, 5 May 2017 23:10:07 +0200 Merge pull request #800 from sehraf/pr-openssl-chacha20 - 00c80b1 csoler Fri, 5 May 2017 23:06:25 +0200 Merge pull request #797 from PhenomRetroShare/Fix_WindowsCompilation - e4dde95 csoler Fri, 5 May 2017 23:04:28 +0200 Merge pull request #798 from PhenomRetroShare/Fix_TravisCompilation - 7371fdc sehraf Fri, 5 May 2017 18:50:40 +0200 add openssl chacha20 support - 96b4a1b sehraf Fri, 5 May 2017 15:40:02 +0200 add openssl chacha20-poly1305 support - e913f36 csoler Thu, 4 May 2017 21:40:32 +0200 fixed crash when trying to deserialize an empty buffer in rsrecogn - 2f2715b csoler Thu, 4 May 2017 21:23:21 +0200 Merge pull request #799 from csoler/v0.6-ImprovedGUI - 6484ea6 csoler Thu, 4 May 2017 21:19:23 +0200 improved graph widget - e6a7168 csoler Thu, 4 May 2017 16:41:02 +0200 merged upstream/master - 1c2b43b Phenom Thu, 4 May 2017 15:01:25 +0200 Fix UnitTest compilation - d31b80c Phenom Thu, 4 May 2017 11:31:36 +0200 Fix Windows Compilation - cac335e csoler Wed, 3 May 2017 23:05:50 +0200 Merge pull request #796 from csoler/v0.6-Serialization - 4f4240d csoler Wed, 3 May 2017 22:43:16 +0200 fixed bug in history serializer - 214aaa7 csoler Wed, 3 May 2017 22:20:58 +0200 added safety check for null chunks in TlvMemBlock_proxy deserialization - f006146 csoler Tue, 2 May 2017 22:41:01 +0200 merged upstream/master - 4bee52c csoler Tue, 2 May 2017 22:34:45 +0200 removed old unused serialization code - 861dc16 csoler Tue, 2 May 2017 22:05:54 +0200 switched VOIP to new serialization - c481186 csoler Tue, 2 May 2017 10:14:12 +0200 Merge pull request #793 from PhenomRetroShare/Fix_FriendListExport - 99d8b7d csoler Mon, 1 May 2017 21:23:34 +0200 switched service control items to new serialization - 07201e8 Phenom Mon, 1 May 2017 12:48:11 +0200 Fix FriendList Import/Export filename and error message. - 1f56db5 csoler Sun, 30 Apr 2017 22:45:18 +0200 Merge pull request #790 from PhenomRetroShare/Add_CreateGxsIdentityByDefault - 0c17570 csoler Sun, 30 Apr 2017 22:44:20 +0200 Merge pull request #792 from PhenomRetroShare/Add_DoubleClickOnTextBrowser - 3d17d31 csoler Sun, 30 Apr 2017 22:43:10 +0200 Merge pull request #789 from PhenomRetroShare/Add_FriendTimeOffsetNewsFeed - 8aa9be3 csoler Sun, 30 Apr 2017 22:39:07 +0200 Merge pull request #791 from PhenomRetroShare/Fix_MissingMessageMarkedRead - 40aff5d csoler Sun, 30 Apr 2017 22:37:54 +0200 Merge pull request #785 from PhenomRetroShare/Add_RelayBandwidthOnServerPage - 16b8947 csoler Sun, 30 Apr 2017 20:31:43 +0200 improved serializer documentation - cecd9a3 csoler Sun, 30 Apr 2017 20:14:23 +0200 merged upstream/master - 24c7c38 csoler Sun, 30 Apr 2017 20:08:30 +0200 removed old file rssrviceserialiser.h/cc - 14076de csoler Sun, 30 Apr 2017 19:17:44 +0200 moved code of rsservicerserialiser into rsserializer.h/cc and renamed it into RsRawSerializer - e401b90 csoler Sun, 30 Apr 2017 16:05:37 +0200 moved rsserializer and rstypeserializer to serialiser/ - 4f92f48 csoler Sat, 29 Apr 2017 23:02:44 +0200 dwicthed GxsTunnel items to new serialization - 4fbcc1e Phenom Sat, 29 Apr 2017 19:47:29 +0200 Add Double Click on Name for Chat to add their name in text writer. - 1159c86 csoler Sat, 29 Apr 2017 21:50:55 +0200 moved wiki and wire items to rsitems/ - d58c638 csoler Sat, 29 Apr 2017 21:46:54 +0200 switched wiki and wire items to new serialization - 77adc82 Phenom Sat, 29 Apr 2017 17:32:23 +0200 Fix Missing messages when mark all as read. - 5cba005 csoler Fri, 28 Apr 2017 23:32:47 +0200 moved recognitems to rsitems/ - 2349269 csoler Fri, 28 Apr 2017 23:28:56 +0200 switch rsrecognitems to new serialization - 8341c68 csoler Fri, 28 Apr 2017 18:54:07 +0200 removed old code - 688813f csoler Fri, 28 Apr 2017 18:51:35 +0200 moved photo items to rsitems/ - 634efb6 csoler Fri, 28 Apr 2017 18:42:11 +0200 switched rsphotoitems to new serialization - d3c960e csoler Fri, 28 Apr 2017 17:48:54 +0200 removed old code - 22e2416 csoler Fri, 28 Apr 2017 17:47:41 +0200 moved rsserviceinfo items to rsitems/ - 2d19783 csoler Fri, 28 Apr 2017 17:44:45 +0200 switched serviceinfo items to new serialization - c33c34b csoler Fri, 28 Apr 2017 16:44:04 +0200 moved rspluginitems to rsitems/ - d32a8ca csoler Fri, 28 Apr 2017 16:39:54 +0200 switched PluginItems to new serialization - 45eaf27 csoler Fri, 28 Apr 2017 16:30:33 +0200 moved rsgxsupdateitems to rsitems/ - 2e67665 csoler Fri, 28 Apr 2017 16:26:59 +0200 switched MsgUpdate items to new serialization - 5995e50 csoler Thu, 27 Apr 2017 21:24:27 +0200 moved rsstatusitem.h to rsitems/ - 87018ed csoler Thu, 27 Apr 2017 21:20:30 +0200 switched rsstatusitem to new serializer - 07a93be csoler Thu, 27 Apr 2017 21:11:10 +0200 moved heartbeatitem.h to rsitems/ - 9adbab3 csoler Thu, 27 Apr 2017 21:10:22 +0200 switched heartbeatitems to new serialization - 8a9edb2 Phenom Thu, 27 Apr 2017 17:03:53 +0200 Create a Gxs Identity by default. - 19b4fb8 Phenom Thu, 27 Apr 2017 16:42:25 +0200 Add Friend Time Offset news feed. - 349d14b csoler Thu, 27 Apr 2017 14:44:41 +0200 moved rsposteditems to rsitems/ - 35ecc19 csoler Thu, 27 Apr 2017 14:41:31 +0200 switched rsposteditems to new serialization - 22f6d15 csoler Thu, 27 Apr 2017 14:21:46 +0200 moved rsnxsitems.cc to rsitems/ - 3c20a85 csoler Thu, 27 Apr 2017 14:16:57 +0200 switched RsNxsItems to new serialization - f6e59f7 csoler Thu, 27 Apr 2017 11:59:18 +0200 moved gxsforumitems to rsitems/ - 449a420 csoler Thu, 27 Apr 2017 11:56:56 +0200 dwitched gxsforum items to new serialization - f50670f csoler Wed, 26 Apr 2017 20:59:59 +0200 moved circle items to rsitems/ - 559137d csoler Wed, 26 Apr 2017 20:57:28 +0200 switched gxscircleitems to new serialization - db64523 csoler Wed, 26 Apr 2017 20:15:54 +0200 moved rsgxschannel items to rsitems - 69729ad csoler Wed, 26 Apr 2017 18:55:23 +0200 switch Channel items to new serialization - 77c2e6d csoler Wed, 26 Apr 2017 18:14:10 +0200 improved error handlign in pqistore - 8f97647 csoler Wed, 26 Apr 2017 15:43:00 +0200 fixed bug in RsGxsId deserialization - c31396a csoler Wed, 26 Apr 2017 14:31:15 +0200 moved dsdv code to unused directory - 508a2e2 csoler Wed, 26 Apr 2017 14:28:25 +0200 moved gxs comment and Id items to rsitems/ - 97d0df0 csoler Wed, 26 Apr 2017 14:19:34 +0200 added comment about serialization hack - c0d8735 csoler Wed, 26 Apr 2017 14:17:38 +0200 switched RsGxsIdItems to new serialization - fb34fa1 csoler Wed, 26 Apr 2017 13:44:09 +0200 switch GxsComment item to new serialization - 9c610a7 csoler Wed, 26 Apr 2017 11:40:46 +0200 cleaned the hierarchy of serialization classes - 77e809e csoler Tue, 25 Apr 2017 21:21:46 +0200 switched GRouter to new serialization - 9e246c9 Phenom Tue, 25 Apr 2017 18:39:30 +0200 Add warning about relays bandwidth. - 4d7bd83 csoler Tue, 25 Apr 2017 10:14:50 +0200 Merge pull request #786 from PhenomRetroShare/Fix_RelaySettingValues - 540a8b9 csoler Tue, 25 Apr 2017 10:01:00 +0200 Merge pull request #788 from csoler/v0.6-PRTest - 078913f Phenom Fri, 21 Apr 2017 21:29:20 +0200 Fix GCC warnings: enumeration value ‘TYPE_IDENTITY’ not handled in switch - 3592d5b Phenom Fri, 21 Apr 2017 19:55:37 +0200 Fix GCC warnings: unused parameter ‘names’ - 593c0cb Phenom Wed, 19 Apr 2017 14:19:54 +0200 Fix CSA warnings: Called C++ object pointer is null - 90aaace Phenom Wed, 19 Apr 2017 14:18:35 +0200 Fix CSA warnings: Called C++ object pointer is null - 1f16f46 Phenom Wed, 19 Apr 2017 14:15:34 +0200 Fix CSA warnings: Called C++ object pointer is null - 30632dc Phenom Wed, 19 Apr 2017 14:06:56 +0200 Fix CSA warnings: Called C++ object pointer is null - 90cd623 Phenom Wed, 19 Apr 2017 14:04:50 +0200 Fix CAS warnings: Potential leak of memory pointed to by 'toaster' - b2b7d00 Phenom Wed, 19 Apr 2017 14:01:35 +0200 Fix CSA warnings: Called C++ object pointer is null - ff1908e Phenom Wed, 19 Apr 2017 11:50:24 +0200 Fix Clang Static Analyser: Undefined allocation of 0 bytes - f22dc0f Phenom Tue, 18 Apr 2017 12:02:34 +0200 Fix Clang warnings: unused variable 'action' - 490f8d2 Phenom Tue, 18 Apr 2017 12:00:00 +0200 Fix Clang warnings: 'TYPE_IDENTITY' not handled - 6e42cf4 Phenom Tue, 18 Apr 2017 11:56:25 +0200 Fix Clang warnings: field 'mPassword' will be initialized after field 'mPrevIsBad' - 0d7df56 csoler Mon, 24 Apr 2017 22:47:08 +0200 moved rsconfigitems and rshistoryitems to rsitems/ - f7338d4 csoler Mon, 24 Apr 2017 22:39:05 +0200 removed old code - 43b3b87 csoler Mon, 24 Apr 2017 22:36:03 +0200 fixed a few bugs in config items - fcabe63 csoler Mon, 24 Apr 2017 18:51:51 +0200 switch RsConfigItems to new serialization - be9f126 electr Mon, 24 Apr 2017 18:43:17 +0200 Merge pull request #781 from Sonetio/libresapi_requests - af4fcf7 csoler Mon, 24 Apr 2017 17:33:30 +0200 switched rshistoryitems to new serialization - 1327582 Phenom Mon, 24 Apr 2017 17:28:25 +0200 Fix Relay setting values - 8ae6541 csoler Mon, 24 Apr 2017 17:10:01 +0200 added two new classes for config/service serialisers and a base generic serialiser class - 8da5e15 Konrad Mon, 24 Apr 2017 16:00:23 +0200 Changed: difference time to absolute time. - dc2df07 csoler Mon, 24 Apr 2017 14:14:34 +0200 renamed RsSerializer into RsServiceSerializer - 976a80a csoler Mon, 24 Apr 2017 13:30:18 +0200 switch rsfilelistitems to new serialization - 26e9541 csoler Mon, 24 Apr 2017 11:06:51 +0200 moved RTT items to rsitems/ - f6aaee7 csoler Mon, 24 Apr 2017 11:01:45 +0200 converted RTT items to new serialization - 5071c4b csoler Mon, 24 Apr 2017 11:00:57 +0200 moved msgitems to rsitems/ - fc82b20 csoler Mon, 24 Apr 2017 10:36:22 +0200 removed old serialization code in msgs - 0886794 csoler Mon, 24 Apr 2017 10:29:57 +0200 fixed bug caused by wrong cast in lobby msg signature validation - 91b0409 csoler Mon, 24 Apr 2017 10:11:24 +0200 fixed two memory bugs in serialization code - 6313d89 defnax Mon, 24 Apr 2017 01:23:05 +0200 Improved look n feel of Profile Generation Window. - 31c07f4 csoler Sun, 23 Apr 2017 22:40:26 +0200 converted RsMsgItems to new serialization. Added format and flag members to RsSerialiser and used the later to handle signature and config serialization techniques - 63b4b3a csoler Sun, 23 Apr 2017 19:07:26 +0200 moved discovery2 items to rsitems/ - 9d9ff56 csoler Sun, 23 Apr 2017 19:02:12 +0200 switched discovery2items to new serialization - 190a638 csoler Sun, 23 Apr 2017 17:53:25 +0200 added zesty to ubuntu releases - 06e90e6 csoler Sun, 23 Apr 2017 17:49:07 +0200 added control file for zesty - c738026 csoler Sun, 23 Apr 2017 17:48:39 +0200 updated ubuntu changelog - 2e71270 csoler Sat, 22 Apr 2017 21:36:39 +0200 fixed previous file move - bef6db4 csoler Sat, 22 Apr 2017 21:32:57 +0200 moved files - 311f257 csoler Sat, 22 Apr 2017 21:10:55 +0200 converted GxsReputationItems to new serialization - 782c027 csoler Sat, 22 Apr 2017 16:00:01 +0200 added names for turtle sub items - f571b05 Konrad Sat, 22 Apr 2017 11:06:56 +0200 Added: Checking if the vector is empty; Changed: Grouped values into one member - 8c0b7ce Konrad Fri, 21 Apr 2017 23:44:00 +0200 Fixed: Responds sends now correct time difference - c9f618d Konrad Thu, 20 Apr 2017 19:09:57 +0200 Added: Notification about changed peer status - 9600359 Konrad Thu, 20 Apr 2017 18:09:19 +0200 Fixed: Password was not stored after creating a new location - 4a0b51c Konrad Wed, 19 Apr 2017 22:03:24 +0200 Added: to response information whether the identity is a contact - b43bedf Konrad Tue, 18 Apr 2017 23:00:59 +0200 Added: Handling requests to set opinion about identity - 120ca9d Konrad Tue, 18 Apr 2017 22:58:15 +0200 Added: Handling requests to set opinion about identity - 3f54568 Konrad Tue, 18 Apr 2017 22:56:35 +0200 Added: Handling requests to get details about identity - e2d9152 csoler Tue, 18 Apr 2017 21:11:37 +0200 moved converted serialisation files into new directory rsitems/, leaving serialiser/ for the serialisation classes - 76dd7fe Konrad Tue, 18 Apr 2017 14:02:14 +0200 Added: Handling requests to add and remove contact - 4a99000 Konrad Tue, 18 Apr 2017 14:00:30 +0200 Added: Handling requests to get and set node options - f8fc8b4 csoler Sun, 16 Apr 2017 20:16:59 +0200 removed old code in turtle serialiser - 2ca46ec csoler Sun, 16 Apr 2017 20:11:54 +0200 fixed bug in serialization of data chunks - 1211334 csoler Sun, 16 Apr 2017 19:59:22 +0200 fixed bug in serialization for turtle - 636450f csoler Sat, 15 Apr 2017 18:46:44 +0200 moved turtle and FT to new serialization - fd33315 Konrad Fri, 14 Apr 2017 17:44:17 +0200 Added: Handling requests to create lobby - 93aeae0 Konrad Fri, 14 Apr 2017 17:41:35 +0200 Added: Handling requests to delete identity - 3453a3e csoler Tue, 11 Apr 2017 23:05:27 +0200 switched FileTransfer items to new serialization - 80e8769 csoler Tue, 11 Apr 2017 21:37:35 +0200 added missign file and converted BW control items - 731e20d csoler Mon, 10 Apr 2017 22:09:56 +0200 switch BanListItem classes to new serialization system - 691ed8d csoler Mon, 10 Apr 2017 20:34:02 +0200 added new template for std::string with type id - 8b77388 csoler Wed, 5 Apr 2017 21:02:17 +0200 removed all chat serialization code - ae9d0b2 csoler Wed, 5 Apr 2017 20:49:32 +0200 fixed a few bugs in chat serialization - 03c31ce csoler Wed, 5 Apr 2017 18:27:29 +0200 fixed serialization test example - 6b4fdb4 csoler Wed, 5 Apr 2017 18:25:54 +0200 fixed bug in serialization - a941136 csoler Wed, 5 Apr 2017 18:09:45 +0200 fixed a few bugs in new serialization - 5b3e488 csoler Wed, 5 Apr 2017 16:53:20 +0200 fixed compilation - 48688ea csoler Wed, 5 Apr 2017 10:27:12 +0200 progress in converting chat items to new serialization - 9438d60 csoler Tue, 4 Apr 2017 22:53:50 +0200 progress in converting Chat items to new serialization model - f2fa70e csoler Tue, 4 Apr 2017 16:37:57 +0200 progress in converting Chat items to new serialization model - 32ce9ae csoler Tue, 4 Apr 2017 15:33:59 +0200 started converting rschatitems to new serialization - f7e3968 csoler Tue, 4 Apr 2017 14:01:33 +0200 added hability to print in the serialization process - 059dfcf csoler Tue, 4 Apr 2017 14:00:17 +0200 added hability to print in the serialization process - 75a3cf0 csoler Sun, 2 Apr 2017 15:04:03 +0200 fixed compilation in new serialization test code - ddbe2ef csoler Sun, 2 Apr 2017 14:48:17 +0200 created .cc files for serialization - b52071d csoler Sat, 1 Apr 2017 18:05:53 +0200 removed RsSerializable and merged it into RsItem - 1bc4fe5 csoler Sat, 25 Mar 2017 19:01:32 +0100 polished serialisation prototype - 369621f csoler Mon, 20 Mar 2017 23:31:04 +0100 simplified new serialization prototype - 4f24b95 csoler Sun, 19 Mar 2017 21:28:28 +0100 added new serialization code test example - - -- Retroshare Dev Team Mon, 8 May 2017 18:00:00 +0100 - -retroshare06 (0.6.2-1.20170423.190a638c~xenial) xenial; urgency=low - - 5b3b903 csoler Sun, 23 Apr 2017 17:33:21 +0200 added missing line for ubuntu zesty - 73bfc27 csoler Sun, 23 Apr 2017 17:33:50 +0200 Merge pull request #784 from PhenomRetroShare/Fix_RelaySettingsPage - 4c326f5 Phenom Sun, 23 Apr 2017 10:27:18 +0200 Fix Relay setting page. - 0e087db defnax Sat, 22 Apr 2017 17:32:59 +0200 Fixed to use right icons for context menu actions - 8b9c447 electr Sat, 22 Apr 2017 10:13:23 +0200 fixed possible crash and return value in rsGetHostByName(), thanks to Kotyara for reporting this - 4ab6021 csoler Fri, 21 Apr 2017 19:45:30 +0200 Merge pull request #782 from PhenomRetroShare/Fix_MacOSX_Compilation - 936dcba Phenom Fri, 21 Apr 2017 18:50:36 +0200 Fix UnitTest compilation. - 969b5ce Phenom Fri, 21 Apr 2017 15:57:57 +0200 Fix MacOSX compilation. - 7400a8d csoler Thu, 20 Apr 2017 20:59:12 +0200 Merge pull request #780 from csoler/v0.6-ImprovedGUI - 5f8bf03 csoler Thu, 20 Apr 2017 20:54:51 +0200 added mechanism to allow services to document the names of their items, and improved bandwidth graph to show names for GXS services. Other services still need to supply their own names - ccfd12b csoler Wed, 19 Apr 2017 18:53:49 +0200 Merge pull request #778 from csoler/v0.6-ImprovedGUI - f406b81 csoler Wed, 19 Apr 2017 18:46:58 +0200 removed all FFT code and cleaned up deleted code in graphwidget.cpp - 1da89dd csoler Wed, 19 Apr 2017 17:16:30 +0200 changed FFT code in graph widget into a more efficient one, with free licence - e95ddb9 csoler Tue, 18 Apr 2017 20:28:36 +0200 Merge pull request #767 from PhenomRetroShare/Fix_CommentWithLineReturn - 5f969e7 csoler Tue, 18 Apr 2017 20:27:20 +0200 Merge pull request #776 from PhenomRetroShare/Fix_ClangWarnings - 3ab39c6 csoler Tue, 18 Apr 2017 20:26:14 +0200 Merge pull request #777 from PhenomRetroShare/Fix_EncodeRadixInRSLinks - 3c5e61a Phenom Tue, 18 Apr 2017 17:36:43 +0200 Encode Radix in RSLinks. - 3733137 Phenom Tue, 18 Apr 2017 11:25:41 +0200 Fix Clang warnings: implicit conversion - 7d9a803 Phenom Tue, 18 Apr 2017 11:18:10 +0200 Fix Clang warnings: bdnet_inet_ntoa C-linkage - 4faaaf7 csoler Mon, 17 Apr 2017 22:03:48 +0200 Merge pull request #775 from csoler/v0.6-PRTest - 87dd614 Phenom Fri, 7 Apr 2017 19:32:19 +0200 Fix Clang Warnings: private field 'encoding_debug_file' is not used - 4f939b2 Phenom Fri, 7 Apr 2017 19:29:27 +0200 Fix Clang warnings: unused function 'set_item_background' - 76f7573 Phenom Fri, 7 Apr 2017 18:48:40 +0200 Fix Clang warnings: comparison of array != a null pointer is always true - 0bbd149 Phenom Fri, 7 Apr 2017 18:42:22 +0200 Fix Clang warnings: comparison of integers of different signs - a476a81 Phenom Fri, 7 Apr 2017 18:40:02 +0200 Fix Clang warnings: function 'update_children_background' is not needed - d8a7313 Phenom Fri, 7 Apr 2017 18:32:55 +0200 Fix Clang warnings: implicit conversion from 'double' to 'int' - 19196e2 Phenom Fri, 7 Apr 2017 18:21:49 +0200 Fix Clang warnings: ariable 'status' is used uninitialized - a3a53b9 Phenom Fri, 7 Apr 2017 18:19:42 +0200 Fix Clang warnings: unused parameter 'req' - 94ac821 Phenom Wed, 29 Mar 2017 18:13:17 +0200 Fix Clang warnings: Unused variable Pi - fd92bca Phenom Tue, 28 Mar 2017 21:18:25 +0200 Fix Clang warnings: variable 'layout' is used uninitialized - 8d85cf5 Phenom Tue, 28 Mar 2017 21:16:05 +0200 Fix Clang warnings: 'xxxWidget::sizeHint' hides overloaded vf - 6f2d7bb Phenom Sun, 19 Mar 2017 10:51:48 +0100 Fix Clang warnings: implicit conversion from 'double' to 'int' - 07b67e9 Phenom Sun, 19 Mar 2017 10:40:34 +0100 Fix Clang warnings: 'PopupDistantChatDialog::init' hides overloaded virtual function - eea49d9 Phenom Sat, 18 Mar 2017 11:56:11 +0100 Fix Clang warnings: change ChatDialog::init definition - 9319caf Phenom Sat, 18 Mar 2017 11:32:56 +0100 Fix Clang warnings: 'Node::advance' hides overloaded virtual function - 13c8f7d Phenom Sat, 18 Mar 2017 11:28:29 +0100 Fix Clang warnings: Infinite recursion - e0225ef Phenom Sat, 18 Mar 2017 11:19:42 +0100 Fix Clang warnings: 'ChatLobbyDialog::init' hides overloaded virtual function - de4f6c0 Phenom Sat, 18 Mar 2017 10:42:38 +0100 Fix Clang warnings: Z-order assignment to spacer - 32eeb95 Phenom Sat, 18 Mar 2017 10:25:23 +0100 Fix Clang warnings: unused private field - 4ac3b3f Phenom Sat, 18 Mar 2017 10:20:57 +0100 Fix Clang warnings: implicit conversion of NULL to bool - e83104e Phenom Sat, 18 Mar 2017 10:19:31 +0100 Fix Clang warnings: Add author and date to #warning - 039908b Phenom Thu, 16 Mar 2017 22:58:06 +0100 Fix Clang warnings: private field not used - 872f42b Phenom Thu, 16 Mar 2017 22:55:18 +0100 Fix Clang warnings: Overloaded vf hide in pluginmanager - 2204309 Phenom Thu, 16 Mar 2017 22:11:33 +0100 Fix Clang warnings: extraneous parentheses - dc533b1 Phenom Thu, 16 Mar 2017 22:01:22 +0100 Fix Clang warnings: private field not used - 6532150 Phenom Thu, 16 Mar 2017 21:04:38 +0100 Fix Clang warnings: Overloaded vf hide in p3dhtmgr - 5bc6558 Phenom Thu, 16 Mar 2017 18:28:48 +0100 Fix Clang warnings: explicitly assigning value to itself - 6fecac5 Phenom Thu, 16 Mar 2017 17:50:25 +0100 Fix Clang warnings: Overloaded vf hide - cf963c0 Phenom Wed, 15 Mar 2017 20:41:39 +0100 Fix Clang warnings: struct declared as class - 105840a Phenom Wed, 15 Mar 2017 19:03:39 +0100 Fix Clang Warning: Overloaded vf hide - da4b168 Phenom Wed, 15 Mar 2017 18:55:24 +0100 Fix Clang warnings: mFns is not used - cbc264f Phenom Wed, 15 Mar 2017 18:53:30 +0100 Fix clang warning:Implicit conversion from enumeration - b2e37fe csoler Sat, 15 Apr 2017 20:24:06 +0200 Merge pull request #773 from csoler/v0.6-Identity - 273aae7 csoler Sat, 15 Apr 2017 19:01:13 +0200 fixed sharing of own identity - 98e1a6d electr Thu, 13 Apr 2017 14:12:46 +0200 Merge pull request #770 from Sonetio/fix_reselecting_accounts - 144d570 Konrad Thu, 13 Apr 2017 13:40:30 +0200 Fixed: Thread safe access to RsControlModule member variables - dcc8c6e Konrad Thu, 13 Apr 2017 13:31:32 +0200 Changed: Using PeersHandler::mRsPeers instead of rsPeers - a382d68 electr Thu, 13 Apr 2017 09:22:19 +0200 Merge pull request #769 from electron128/fix-gui-multiinstance - aa81cc1 Konrad Wed, 12 Apr 2017 20:24:18 +0200 Added: Functions for handling PGP account details requests - 9402b8e Konrad Mon, 10 Apr 2017 23:42:22 +0200 Fixed: mFixedPassword remained empty after logging - e1350a0 Konrad Mon, 10 Apr 2017 22:58:23 +0200 Fixed: Re-selecting accounts via RsControlModule; Added: Sending feedback about incorrect password - 3130ec9 csoler Mon, 10 Apr 2017 20:02:14 +0200 added GUI async call to ID serialised data. Allows to copy+paste identities. - 4c9b620 electr Sun, 9 Apr 2017 10:26:18 +0200 fixed --base-dir command line argument in rs-gui when running multiple instances. Only forward "link" and "rsfile" arguments to a running instance. Start a new instance if other arguments are present. - 7f12ca2 electr Sun, 9 Apr 2017 09:57:48 +0200 fixed name of local socket where RS waits for rslinks etc. - d66e653 csoler Sat, 8 Apr 2017 23:39:05 +0200 fixed bug in deserialisation of group informaiton - 54cd402 csoler Sat, 8 Apr 2017 21:43:07 +0200 fixed a few bugs in latest identity link code - 6d29038 csoler Sat, 8 Apr 2017 21:12:48 +0200 added RSLink for GXS identities - 4f5da86 csoler Sat, 8 Apr 2017 19:07:33 +0200 added method to serialise/deserialise groups to/from memory and export of GxsIdentities to memory chunk in radix format - f175533 Phenom Sat, 8 Apr 2017 14:06:47 +0200 Fix comment view when they have line return. - 4067c95 electr Wed, 5 Apr 2017 18:49:32 +0200 Merge pull request #760 from Sonetio/windows_service - 6e65fcd Konrad Sat, 1 Apr 2017 14:32:49 +0200 Removed: Unused #include statement - 8543525 Konrad Sat, 1 Apr 2017 14:28:55 +0200 Fixed: Linker problem - fbc1bb4 Konrad Wed, 29 Mar 2017 16:06:39 +0200 Added: function for handling autosubscribing lobbies - 22956be Konrad Tue, 28 Mar 2017 11:24:16 +0200 Deleted: functions for hadling particular lobbies types in ChatHandler - 6e53002 Konrad Tue, 28 Mar 2017 11:20:51 +0200 Added: tokens in PeersHandler - efd6ce3 Konrad Tue, 28 Mar 2017 11:19:50 +0200 Changed: Simplified asking for deferred self signature - 5694581 Konrad Tue, 28 Mar 2017 11:18:27 +0200 Changed: Qt dependecies are optional - 4031e49 Konrad Mon, 27 Mar 2017 16:11:04 +0200 Deleted: unused stateTokens - c33107c Konrad Sun, 26 Mar 2017 19:12:04 +0200 Fixed: backward comptiblity - bef7540 Konrad Sun, 26 Mar 2017 15:11:07 +0200 Fixed building on Travis CI - dbcf2d2 csoler Sat, 25 Mar 2017 20:27:18 +0100 Merge pull request #756 from RetroPooh/guistuff - 04af39f csoler Sat, 25 Mar 2017 20:24:40 +0100 Merge pull request #754 from PhenomRetroShare/Fix_WinNoSQLCipherCompil - ccb632a csoler Sat, 25 Mar 2017 19:26:12 +0100 Merge pull request #749 from PhenomRetroShare/Fix_WindowsHeightAtFirstStart - 8624c93 Konrad Sat, 25 Mar 2017 18:33:35 +0100 Added functions for hadling particular lobbies types to ChatHandler - 194878a Konrad Sat, 25 Mar 2017 18:31:13 +0100 Added functions for handling own and not own identities to IdentityHandler - cb32f30 Konrad Sat, 25 Mar 2017 18:28:31 +0100 Added states handling to PeersHandler - 28d37c2 Konrad Sat, 25 Mar 2017 18:25:26 +0100 Added password storing to RsControlModule for GUI benefits - 39967b7 Konrad Sat, 25 Mar 2017 18:23:28 +0100 Added name of requests to be used by GUI - ae95b49 Konrad Sat, 25 Mar 2017 18:20:53 +0100 Added SettingsHandler to handle response to settings requests - cb04134 Konrad Sat, 25 Mar 2017 18:15:47 +0100 Added Windows support to libresapi when working with retroshare_android_service - b0d2249 Konrad Sat, 25 Mar 2017 18:12:39 +0100 Added Windows support to retroshare-android-service - f5e7217 RetroP Tue, 21 Mar 2017 17:24:59 +0300 statistics - router - fix bold marking for tunnel speeds over 1mbs - 85cfda1 RetroP Tue, 21 Mar 2017 16:52:40 +0300 add tree item counters for channels,forums,posted - 50c81d7 RetroP Tue, 21 Mar 2017 16:41:39 +0300 chat lobby list - mark signed lobbies with color - 000dabf RetroP Tue, 21 Mar 2017 15:02:46 +0300 chat lobby list - add tree item counters - 19bd51d RetroP Tue, 21 Mar 2017 14:57:06 +0300 searchdialog - mark current downloads green - 5efa8e3 Phenom Fri, 17 Mar 2017 22:14:14 +0100 Fix Windows Compilation with CONFIG+=no_sqlcipher - ca0521c csoler Thu, 16 Mar 2017 21:01:27 +0100 allowed to edit subject hen editing forum posts. Only the latest subject is visible - 107d48f Phenom Wed, 15 Mar 2017 22:50:51 +0100 Fix windows height at first start. - 2046dbe csoler Wed, 15 Mar 2017 20:53:01 +0100 merged latest fixes from official 0.6.2 release branch - e4fad45 csoler Wed, 15 Mar 2017 20:51:40 +0100 fixed layout in ConfCertDialog, removed overnumerous tabs - 2114374 csoler Wed, 15 Mar 2017 19:26:07 +0100 fixed update of Tor proxy address in hidden nodes server page - 44f2971 csoler Tue, 14 Mar 2017 20:04:22 +0100 Merge pull request #682 from csoler/v0.6-EditPosts - a0d1089 csoler Sat, 11 Mar 2017 18:15:35 +0100 added branch parameter to makeSourcePackage script - fdab480 csoler Sat, 11 Mar 2017 18:10:14 +0100 added minimum version number for debian stretch - 733b114 thunde Fri, 10 Mar 2017 15:57:40 +0100 Updated languages from Transifex - ed5779f csoler Fri, 10 Mar 2017 15:39:22 +0100 Merge pull request #743 from mestaritonttu/patch-22 - 69c3df6 csoler Fri, 10 Mar 2017 15:36:50 +0100 fixed bug in total item size estimation in pqiqosstreamer due to item slicing - c377bf3 csoler Fri, 10 Mar 2017 15:12:10 +0100 fixed debug output for groups with no data - fd84639 csoler Fri, 10 Mar 2017 15:05:41 +0100 removed some debug info - c87de3e csoler Fri, 10 Mar 2017 10:48:40 +0100 fixed mistake in pointer handling - cf2edb5 csoler Thu, 9 Mar 2017 22:47:06 +0100 fixed memory leak in deleteGroup and removed unnecessary pointer in the functions called below - a545481 csoler Thu, 9 Mar 2017 22:05:06 +0100 fixed memory leak when receving multi-chunk file lists - 5b819eb csoler Thu, 9 Mar 2017 20:59:01 +0100 added missing virtual destructor causing a memory leak - 1f8fd95 csoler Thu, 9 Mar 2017 20:48:26 +0100 fixed uninitialised memory read in chacha20 test code - d5f2ae8 csoler Thu, 9 Mar 2017 20:39:12 +0100 fixed memory leak recently introduced with openssl-1.1.0 changes - f76454d csoler Thu, 9 Mar 2017 13:05:03 +0100 updated full pipeline packaging script for debian - 999e845 mestar Wed, 8 Mar 2017 13:17:34 +0200 Fix grammar - e6cf628 csoler Tue, 7 Mar 2017 21:58:59 +0100 Merge pull request #740 from RetroPooh/trstats - 283a2ee csoler Tue, 7 Mar 2017 21:54:56 +0100 Merge pull request #717 from PhenomRetroShare/Fix_SettingListWidth - b3b2a4b csoler Tue, 7 Mar 2017 21:54:10 +0100 Merge pull request #726 from mestaritonttu/patch-8 - bbc27b2 csoler Tue, 7 Mar 2017 21:53:21 +0100 Merge pull request #736 from mestaritonttu/patch-18 - 3d0c28d csoler Tue, 7 Mar 2017 21:52:19 +0100 Merge pull request #724 from mestaritonttu/patch-6 - ed22b48 csoler Tue, 7 Mar 2017 21:51:51 +0100 Merge pull request #738 from mestaritonttu/patch-20 - 376be42 csoler Tue, 7 Mar 2017 21:51:13 +0100 Merge pull request #739 from mestaritonttu/patch-21 - b3578f6 csoler Tue, 7 Mar 2017 21:50:20 +0100 Merge pull request #734 from mestaritonttu/patch-16 - d9c084b csoler Tue, 7 Mar 2017 21:49:52 +0100 Merge pull request #730 from mestaritonttu/patch-12 - 5bad326 csoler Tue, 7 Mar 2017 21:49:14 +0100 Merge pull request #725 from mestaritonttu/patch-7 - ec21698 csoler Tue, 7 Mar 2017 21:48:30 +0100 Merge pull request #727 from mestaritonttu/patch-9 - 7d8e06b csoler Tue, 7 Mar 2017 21:47:43 +0100 Merge pull request #732 from mestaritonttu/patch-14 - f3e29bd csoler Tue, 7 Mar 2017 21:47:00 +0100 Merge pull request #731 from mestaritonttu/patch-13 - 17c44db csoler Tue, 7 Mar 2017 21:46:21 +0100 Merge pull request #733 from mestaritonttu/patch-15 - 5f9f061 csoler Tue, 7 Mar 2017 21:45:50 +0100 Merge pull request #735 from mestaritonttu/patch-17 - 8881a44 csoler Tue, 7 Mar 2017 21:45:11 +0100 Merge pull request #737 from mestaritonttu/patch-19 - 160c289 csoler Tue, 7 Mar 2017 21:44:42 +0100 Merge pull request #728 from mestaritonttu/patch-10 - 22308bc csoler Tue, 7 Mar 2017 21:44:14 +0100 Merge pull request #729 from mestaritonttu/patch-11 - fedffd7 csoler Tue, 7 Mar 2017 21:43:36 +0100 Merge pull request #723 from mestaritonttu/patch-5 - d3f0f9d RetroP Tue, 7 Mar 2017 17:50:13 +0300 router stats - mark active tunnels bold - 87f9dba mestar Tue, 7 Mar 2017 14:05:21 +0200 Improvements and typo fixes in strings - 222cf48 mestar Tue, 7 Mar 2017 14:03:05 +0200 Various improvements and fixes to strings - 83283d9 mestar Tue, 7 Mar 2017 13:58:43 +0200 Remove extra your - 7005126 mestar Tue, 7 Mar 2017 13:57:10 +0200 Added whitespace to strings - 6ec5415 mestar Tue, 7 Mar 2017 13:55:02 +0200 ASCII uppercase - 28d2e27 mestar Tue, 7 Mar 2017 13:53:08 +0200 Remove whitespace from string - 931531b mestar Tue, 7 Mar 2017 13:51:28 +0200 Fix typo - 65c7ca7 mestar Tue, 7 Mar 2017 13:49:57 +0200 Clarify sorting by posts - 21b7861 mestar Tue, 7 Mar 2017 13:48:14 +0200 Fix grammar - ba18fcd mestar Tue, 7 Mar 2017 13:45:31 +0200 Fix grammar - a4c2015 mestar Tue, 7 Mar 2017 13:41:45 +0200 Fix typos - 6b4f7e3 mestar Tue, 7 Mar 2017 13:39:39 +0200 Removed extra "to" - b444567 mestar Tue, 7 Mar 2017 13:34:53 +0200 Added period - 400dde9 mestar Tue, 7 Mar 2017 13:09:04 +0200 Added whitespace - c9a4a55 mestar Tue, 7 Mar 2017 13:06:22 +0200 Fix grammar - 86e7243 mestar Tue, 7 Mar 2017 12:56:25 +0200 Fix typos - d7dc9cc mestar Tue, 7 Mar 2017 12:53:18 +0200 Whitespace inside

- a518225 csoler Tue, 7 Mar 2017 11:27:17 +0100 Merge pull request #716 from felisucoibi/master - 6a6bcf7 thunde Mon, 6 Mar 2017 21:46:42 +0100 Fixed Windows compile of VOIP - dc65d3f Phenom Sun, 5 Mar 2017 13:22:30 +0100 Fix Setting list width. - 0316c8c thunde Mon, 6 Mar 2017 06:34:06 +0100 Added workaround for crash on Windows 7 for Qt versions with gcc 5.3.0. The call to GetProcAddress in openssl (cryptlib.c) finds an function pointer to the not existing function _OPENSSL_isservice in the executable running on Windows 7. - 313e1b3 csoler Sun, 5 Mar 2017 20:08:53 +0100 updated translation files - 88a5c03 csoler Sun, 5 Mar 2017 20:08:36 +0100 removed some debug info - 94c9c94 thunde Sun, 5 Mar 2017 14:30:45 +0100 updated version number to 0.6.2 in rsversion.in - b71f475 csoler Sun, 5 Mar 2017 14:14:46 +0100 qick fix to allow re-advertising for known forums/channels during the same session. Will be reset at restart (probably best) - fbd72dd csoler Sun, 5 Mar 2017 13:57:49 +0100 fixed settings SoundPage - 15bb0ff felisu Sun, 5 Mar 2017 02:45:37 +0100 Update ChatPage.h - 951820f felisu Sun, 5 Mar 2017 02:45:07 +0100 Update ForumPage.h - 63174aa felisu Sun, 5 Mar 2017 02:44:18 +0100 Update PostedPage.h - ca75515 felisu Sun, 5 Mar 2017 02:43:40 +0100 Update MessagePage.h - d3cdd15 csoler Sat, 4 Mar 2017 21:20:34 +0100 fixed uninitialised memory read in GxsReputation - dec5c5c csoler Sat, 4 Mar 2017 21:13:34 +0100 suppressed uninitialised memory leak in LocalDirectoryStorage - b14e4d5 csoler Sat, 4 Mar 2017 21:08:10 +0100 removed memory leak due to missing delete for BWGraph - 0bd0056 csoler Sat, 4 Mar 2017 20:52:41 +0100 fixed memory leak in RsGxsNetService - 7111579 csoler Sat, 4 Mar 2017 20:52:06 +0100 fixed memory leak in config of msgService - 2302c46 csoler Sat, 4 Mar 2017 16:41:10 +0100 updated version number in changelog - 0024ddf csoler Sat, 4 Mar 2017 16:39:39 +0100 fixed utf8 bug in ShareManager - 3600905 csoler Sat, 4 Mar 2017 12:04:41 +0100 updated packaging files - c715b03 csoler Sat, 4 Mar 2017 11:56:51 +0100 updated version number to 0.6.2 - 5e2a253 csoler Sat, 4 Mar 2017 11:44:31 +0100 updated ubuntu changelog - bd8189c csoler Tue, 28 Feb 2017 18:05:44 +0100 added test to prevent msgs with a different name to be used as different version - 763f227 csoler Sun, 26 Feb 2017 20:39:40 +0100 merged upstream/master into v0.6-EditPosts branch - 22f2edb csoler Sat, 11 Feb 2017 10:45:30 +0100 removed debug info and added comment - ea82d26 csoler Thu, 9 Feb 2017 23:35:59 +0100 fixed signature verification bug for versionned messages - 5bf8376 csoler Thu, 9 Feb 2017 21:49:24 +0100 fixed a few more bugs in post version UI - 8deeec6 csoler Thu, 9 Feb 2017 18:45:55 +0100 fixed UI for post versions - b93130a csoler Thu, 9 Feb 2017 16:15:35 +0100 fixed a few bugs in post version collecting - f8056e5 csoler Thu, 9 Feb 2017 14:49:43 +0100 added collection of older posts versions. - 6681985 csoler Wed, 8 Feb 2017 20:40:47 +0100 merged upstream/master - dfcb66d csoler Fri, 3 Feb 2017 13:02:53 +0100 added spinbox to show older versions - 777a73e csoler Fri, 3 Feb 2017 12:48:51 +0100 added GUI for editing forum messages - - -- Retroshare Dev Team Dim, 23 Apr 2017 16:00:00 +0100 - -retroshare06 (0.6.2-1.931442~trusty) trusty; urgency=low - - 931442a csoler Sat, 4 Mar 2017 00:07:51 +0100 fixed compilation - b4e0a8f csoler Sat, 4 Mar 2017 00:04:52 +0100 removed unused file DirectoriesPage.{cpp,ui,h} - e257563 csoler Sat, 4 Mar 2017 00:01:21 +0100 merged Directories settings page into Transfers and renamed it Files - 8bdf4f3 csoler Fri, 3 Mar 2017 23:28:35 +0100 fixed sharing of sshfs mounted dirs by allowing files of type DT_UNKNOWN to be explored - b82a18e csoler Fri, 3 Mar 2017 22:41:32 +0100 hide add cert file button - 556aae6 csoler Fri, 3 Mar 2017 22:37:16 +0100 Merge pull request #711 from RetroPooh/test2 - 9716b92 csoler Fri, 3 Mar 2017 22:26:32 +0100 Merge pull request #715 from PhenomRetroShare/Fix_NatDisplayOptionSaving - d6870b4 RetroPooh Sat, 4 Mar 2017 00:12:36 +0300 homepage - add friend from cert file button - 1584b77 Phenom Fri, 3 Mar 2017 20:35:18 +0100 Fix NAT Display setting saving. - cb960a3 RetroPooh Fri, 3 Mar 2017 22:31:23 +0300 add webmail invite option to homepage dropmenu - c98e6c6 csoler Fri, 3 Mar 2017 18:54:54 +0100 Merge pull request #714 from RetroPooh/new1 - 76ab91f RetroPooh Fri, 3 Mar 2017 20:11:09 +0300 quick config on homepage hidden until rework - 47b836d RetroPooh Fri, 3 Mar 2017 19:49:56 +0300 people window fix layout compression on resize - d360968 RetroPooh Fri, 3 Mar 2017 16:59:18 +0300 forum post dialog - hide obsolete sign option - 711e38b csoler Fri, 3 Mar 2017 14:35:33 +0100 Merge pull request #713 from felisucoibi/master - c7115da felisucoi Fri, 3 Mar 2017 14:23:50 +0100 CHANGED ORDER IN SETTINGS - 303bc09 csoler Thu, 2 Mar 2017 23:18:12 +0100 fixed force check directories when auto check is disabled - cdb0c6e csoler Thu, 2 Mar 2017 22:35:21 +0100 fixed [No title] text in people - 1e1fe77 csoler Thu, 2 Mar 2017 22:30:51 +0100 fixed styles loading in chat. Added missing history/compact/colored style - d053400 csoler Thu, 2 Mar 2017 20:30:54 +0100 attempt to fix problems with chat styles - af1c22a csoler Thu, 2 Mar 2017 20:10:10 +0100 Merge pull request #712 from RetroPooh/test3 - 328168d RetroPooh Thu, 2 Mar 2017 20:03:16 +0300 add space after quoting sign - fc0cfc0 RetroPooh Thu, 2 Mar 2017 19:57:21 +0300 id edit dialog - tag functions hidden (unfinished) - c9ddd04 RetroPooh Thu, 2 Mar 2017 19:00:54 +0300 channel item display layout fix correct comments view - 939b5b4 RetroPooh Thu, 2 Mar 2017 18:08:35 +0300 fix channel item display layout - 132da5f thunder2 Thu, 2 Mar 2017 13:08:42 +0100 Updated Windows build script - speex-1.2.0 - libxml2-2.9.4 - curl-7.53.1 - libmicrohttpd-0.9.52 - ffmpeg-3.2.4 - e408751 RetroPooh Thu, 2 Mar 2017 15:49:12 +0300 newsfeed item layout for new channel made uniform with forums - 1eb22f8 thunder2 Thu, 2 Mar 2017 06:52:18 +0100 Updated Windows build to opencv-3.2.0 - ff5f3df defnax Thu, 2 Mar 2017 01:38:11 +0100 Fixed default Layout size, it was to big for small screens. - ea2c832 csoler Wed, 1 Mar 2017 22:54:25 +0100 attempt to sort out chat style config issus - f8b3194 csoler Wed, 1 Mar 2017 22:43:51 +0100 Merge pull request #705 from PhenomRetroShare/Fix_NewWarnings - b596791 csoler Wed, 1 Mar 2017 22:33:01 +0100 improved wording in keyring - 0fea0e0 csoler Wed, 1 Mar 2017 22:25:57 +0100 fixed sorting by last time used in keyring - 006e542 csoler Wed, 1 Mar 2017 21:18:16 +0100 fixed auto-expanding of nodes in friend list - 5618358 RetroPooh Wed, 1 Mar 2017 22:36:36 +0300 homepage quickstartwizard webhelp - e4dbc46 Phenom Mon, 27 Feb 2017 22:12:48 +0100 Fiw New Warnings - 91f2cf7 csoler Wed, 1 Mar 2017 19:12:32 +0100 fixed typo - 40c14db csoler Wed, 1 Mar 2017 19:10:45 +0100 fixed wrong passwd html text - e081567 csoler Wed, 1 Mar 2017 19:08:20 +0100 fixed empty names in header drop menu - a8adf8d csoler Tue, 28 Feb 2017 23:05:19 +0100 fixed names in FriendList for details - c078d93 RetroPooh Wed, 1 Mar 2017 00:21:42 +0300 people header fix layout so invite panel does not obstruct the name - b52c4b8 RetroPooh Tue, 28 Feb 2017 12:07:45 +0300 GenCertDialog fix min 3 letters length, fields rearrange for sequential display on advanced switch - d427182 RetroPooh Tue, 28 Feb 2017 10:14:08 +0300 fix gxs storage period 1year to 372 days to match old clients - 62a0ccd RetroPooh Wed, 25 Jan 2017 18:36:28 +0300 QuickStartWizard fixed reset hidden mode - da41343 RetroPooh Tue, 24 Jan 2017 22:56:55 +0300 add friend wizard - refinements for hidden nodes - 03b5fb6 RetroPooh Tue, 24 Jan 2017 17:51:57 +0300 add chatlobby splitter position saving - 53186ee csoler Tue, 28 Feb 2017 22:20:52 +0100 set proper default options in make friend dialog, and hide the frame showing own cert since it is not needed anymore - 4abf2c6 csoler Tue, 28 Feb 2017 21:41:45 +0100 hide the feed option button until we figure out how to do it properly. Also fixed the crash when showing network settings on hidden nodes - 9d3df7c csoler Tue, 28 Feb 2017 00:10:54 +0100 added signal blocking calls to a few last config pages - 6d67da5 csoler Tue, 28 Feb 2017 00:04:33 +0100 Merge pull request #709 from PhenomRetroShare/Fix_NotifyPageSignelBlocking - 8caeda9 Phenom Mon, 27 Feb 2017 23:41:31 +0100 Fix missing signals blocking calls in Notify config page. - 88afe51 csoler Mon, 27 Feb 2017 23:13:45 +0100 added missing signal blocking calls in several config pages - 58efbc2 csoler Mon, 27 Feb 2017 23:11:37 +0100 Merge pull request #708 from PhenomRetroShare/Fix_NotifySettings - 0642022 Phenom Mon, 27 Feb 2017 23:00:49 +0100 Fix Notify Settings - f70cbbe csoler Mon, 27 Feb 2017 22:37:27 +0100 prevent port values to go below 1024 in the backend - 30c4dfe csoler Mon, 27 Feb 2017 22:35:24 +0100 prevent port values to go below 1024 in the GUI - ee9fbef csoler Mon, 27 Feb 2017 22:29:01 +0100 added signal blockign trick for widgets, and fixed the bug causing wrong values to be displayed in server settings - e7a7c17 csoler Mon, 27 Feb 2017 21:10:20 +0100 fixed bug preventing circle creation. - 18cc77a csoler Sun, 26 Feb 2017 22:15:14 +0100 Merge pull request #704 from G10h4ck/master - c51ee19 Gioacchin Sun, 26 Feb 2017 21:41:45 +0100 Some consistence fixes in GUI - 99cf69a csoler Sun, 26 Feb 2017 20:14:34 +0100 Merge pull request #703 from RetroShare/v0.6-ImprovedGUI - eb817af csoler Sun, 26 Feb 2017 20:12:52 +0100 Merge pull request #689 from csoler/v0.6-SSL110Fix - 98eed2a csoler Sun, 26 Feb 2017 20:09:53 +0100 Merge pull request #702 from PhenomRetroShare/Fix_AppVeyorBuild - 3a2312d csoler Sun, 26 Feb 2017 18:38:42 +0100 Merge pull request #701 from csoler/v0.6-ImprovedGUI - 158d421 csoler Sun, 26 Feb 2017 18:27:39 +0100 fixed graphical bug in AboutWidget - b3fadf3 csoler Sun, 26 Feb 2017 18:22:36 +0100 Merge pull request #649 from jolavillette/jola_BW_Bursts - 5f8c57c csoler Sun, 26 Feb 2017 18:22:02 +0100 Merge pull request #697 from PhenomRetroShare/Add_ShiftEnterForNewLineInChatWidget - 9ebf0e1 Phenom Sun, 26 Feb 2017 18:15:14 +0100 Fix AppVeyor Build - 7028bb5 csoler Sun, 26 Feb 2017 17:54:51 +0100 Merge pull request #700 from PhenomRetroShare/Fix_LocalDirectoryUpdaterTakeCareIfEnabled - c3c2671 Phenom Sun, 26 Feb 2017 15:42:32 +0100 Fix LocalDirectoryUpdater to take care if is Enabled in option. - 3452821 Phenom Sun, 26 Feb 2017 11:31:43 +0100 Add Shift+Enter to create new line in chat widget when Ctrl+Enter option is disabled. Proposed by MMT1 - cae0668 csoler Sun, 26 Feb 2017 00:18:15 +0100 Merge pull request #695 from csoler/v0.6-ImprovedGUI - 3230e55 csoler Sun, 26 Feb 2017 00:16:36 +0100 added some delay in the showHelp() feature - 12246e3 csoler Sat, 25 Feb 2017 23:52:57 +0100 added settings variable to allow to always display the help of each tab the first time it is shown - e75487e csoler Sat, 25 Feb 2017 23:16:43 +0100 suppressed a few warnings (suggested by Phenom) - a531a41 csoler Sat, 25 Feb 2017 18:21:24 +0100 fixed recursive call to BIO_set_fd() - c313fb5 csoler Sat, 25 Feb 2017 14:09:39 +0100 removed compilation warning - e18cc3e csoler Fri, 24 Feb 2017 23:34:52 +0100 changed reset to cleanup for backward compatibility in EVP_CIPHER_CTX_cleanup call - d1bf977 csoler Fri, 24 Feb 2017 23:19:47 +0100 fixed bug causing decryption of group data to crash - 65a383a csoler Thu, 23 Feb 2017 19:16:48 +0100 fixed typo causing crash in openpgp-sdk - 753ebdd csoler Thu, 23 Feb 2017 18:29:02 +0100 Merge pull request #691 from PhenomRetroShare/Fix_UnitTestCompilation - 83195e1 csoler Wed, 22 Feb 2017 23:57:04 +0100 Merge pull request #692 from csoler/v0.6-ImprovedGUI - dc51911 csoler Wed, 22 Feb 2017 23:55:29 +0100 added welcome message to show on first start in HomePage - fe2059f csoler Wed, 22 Feb 2017 22:44:00 +0100 fixed update of GxsGroupWidget layout when changing options - 0e57874 csoler Wed, 22 Feb 2017 22:22:50 +0100 fixed loading of settings::Server page - 27db797 csoler Wed, 22 Feb 2017 22:06:00 +0100 fixed show/hide buttons in appearance settings page - 8325c72 Phenom Mon, 20 Feb 2017 16:15:31 +0100 Fix UnitTest Compilation and Travis Error. - 9371521 csoler Mon, 20 Feb 2017 23:19:29 +0100 fixed bug causing crash in openssl_crypto due to not zeroing a field that was not duplicated before delete - 8c3f553 csoler Mon, 20 Feb 2017 22:54:25 +0100 fixed compilation with openssl1.0.1 broken by previous commits - 4dac3b4 csoler Mon, 20 Feb 2017 22:36:35 +0100 removed compilation tweak - c3b4985 csoler Mon, 20 Feb 2017 21:44:48 +0100 compilation fix for openssl-1.1.0 (gxssecurity+gxstunnel part) - 5c95b88 csoler Sun, 19 Feb 2017 22:38:02 +0100 compilation fix for openssl-1.1.0 (pqissl+authssl part) - 57bbd15 csoler Sun, 19 Feb 2017 11:10:25 +0100 fixing compilation for openssl-1.1.0 (chacha20.cc, HMAC structure, part 2) - d7bfc32 csoler Sun, 19 Feb 2017 10:56:33 +0100 fixing compilation for openssl-1.1.0 (chacha20.cc, HMAC structure) - 175664e csoler Sat, 18 Feb 2017 23:58:47 +0100 fixing compilation for openssl-1.1.0 (part 12) - 0c77a10 csoler Sat, 18 Feb 2017 23:47:53 +0100 fixing compilation for openssl-1.1.0 (part 11) - 01e89bb csoler Sat, 18 Feb 2017 23:47:47 +0100 fixing compilation for openssl-1.1.0 (part 10) - fc1a792 csoler Sat, 18 Feb 2017 18:16:10 +0100 fixing compilation for openssl-1.1.0 (part 9) - d5e6792 csoler Sat, 18 Feb 2017 18:09:49 +0100 fixing compilation for openssl-1.1.0 (part 8) - deb3a49 csoler Sat, 18 Feb 2017 17:00:46 +0100 fixing compilation for openssl-1.1.0 (part 7) - 5951f46 csoler Sat, 18 Feb 2017 16:49:35 +0100 fixing compilation for openssl-1.1.0 (part 6) - 70e2a67 csoler Sat, 18 Feb 2017 16:40:38 +0100 fixing compilation for openssl-1.1.0 (part 5) - 13a8389 csoler Sat, 18 Feb 2017 16:21:17 +0100 fixing compilation for openssl-1.1.0 (part 4) - 262fa9c csoler Sat, 18 Feb 2017 15:45:45 +0100 fixing compilation for openssl-1.1.0 (part 3) - ba52b05 csoler Sat, 18 Feb 2017 15:28:27 +0100 fixing compilation for openssl-1.1.0 (part 2) - 63a2210 csoler Sat, 18 Feb 2017 14:40:44 +0100 fixing compilation with openssl-1.1.0 (part 1) - cda3c74 csoler Fri, 17 Feb 2017 09:17:22 +0100 attempt at fixing a bug that can cause a crash in p3filelists.cc - 2e7d952 csoler Thu, 16 Feb 2017 15:53:15 +0100 Merge pull request #687 from csoler/v0.6-ImprovedGUI - f9f79d4 csoler Thu, 16 Feb 2017 10:17:29 +0100 removed some mentions to PGP - dcab611 csoler Thu, 16 Feb 2017 09:53:54 +0100 improved layout of Home page - 6cc9468 csoler Wed, 15 Feb 2017 22:04:15 +0100 Merge pull request #686 from csoler/v0.6-ImprovedGUI - 3c75135 csoler Wed, 15 Feb 2017 21:50:53 +0100 pass over AppearancePage to fit to the removal of tool buttons - 7c8f8ef csoler Wed, 15 Feb 2017 21:30:49 +0100 pass over settings to improve layouts - 64d39d8 csoler Wed, 15 Feb 2017 19:28:26 +0100 Merge pull request #685 from csoler/v0.6-ImprovedGUI - 391ef3e csoler Wed, 15 Feb 2017 19:25:46 +0100 improved passphrase window - b817648 csoler Wed, 15 Feb 2017 19:17:41 +0100 fixed a few bugs in cert creation window - 59f428f csoler Sun, 12 Feb 2017 23:35:43 +0100 fixed the update of check icons in genCertDialog - 5069ba8 csoler Sun, 12 Feb 2017 21:45:22 +0100 improved style/layout of gen cert dialog - ccacba7 csoler Sun, 12 Feb 2017 15:27:13 +0100 added pgp passphrase temporary caching in order to avoid re-asking for password at location creation time - f3824f2 csoler Sat, 11 Feb 2017 10:46:51 +0100 merged upstream/master - c61ccda csoler Tue, 7 Feb 2017 22:04:07 +0100 fixed compilation problem caused by a bug in qtcreator global replace. Warning: always check the result of qtcreator global replace - 37f3e1a csoler Tue, 7 Feb 2017 20:15:55 +0100 fixed problem in ID creation code. - 9226ccc defnax Tue, 7 Feb 2017 17:01:36 +0100 Added invite info frame for Friend Request Messages. - 90594bc csoler Mon, 6 Feb 2017 23:59:18 +0100 Merge pull request #679 from csoler/v0.6-QtOptim - 32b2cda csoler Mon, 6 Feb 2017 23:57:50 +0100 Merge pull request #678 from PhenomRetroShare/Fix_DisableSysTrayToolTipOption - 266affe csoler Mon, 6 Feb 2017 23:56:43 +0100 Merge pull request #659 from hunbernd/fix/slow-emoticons - 6a9b697 csoler Mon, 6 Feb 2017 23:46:01 +0100 made RsReputation::overallReputationLevel() to also return the identity ownership flags so that we dont need to rely on async calls to p3IdService to get them - 013eb93 csoler Mon, 6 Feb 2017 00:11:26 +0100 rewrote forum loading method with the proper logarithmic containers - d1328f4 hunbernd Sat, 21 Jan 2017 22:53:56 +0100 Fix spaces between emoticons in message composer and forum - d0ab10c hunbernd Sun, 5 Feb 2017 19:13:40 +0100 Fix slow emoticons by using generic regex rules where possible. - 865a574 Phenom Sun, 5 Feb 2017 14:34:33 +0100 Fix DisableSysTrayToolTip Option - 80e6742 csoler Fri, 3 Feb 2017 11:45:00 +0100 teaking of the css file - 389eff0 csoler Thu, 2 Feb 2017 22:05:28 +0100 improved the qss and look of login window - a9b7ed3 csoler Thu, 2 Feb 2017 21:48:18 +0100 attempt to make the login creation window look better - 3baaae7 defnax Thu, 2 Feb 2017 17:58:48 +0100 Fixed People Header Text color Moved info frame for Invite to Top Header - bc8aac1 defnax Thu, 2 Feb 2017 17:15:32 +0100 Added warn messagebox before send invite - 89a27ae csoler Wed, 1 Feb 2017 23:08:57 +0100 finished new profile creation window - 2a36d6b csoler Wed, 1 Feb 2017 21:55:06 +0100 re-working on the node creation wizard (unfinished) - 873fbf9 csoler Wed, 1 Feb 2017 14:32:35 +0100 added 3 missing delete, responsible for small memory leaks - 0ad581a thunder2 Wed, 1 Feb 2017 13:03:16 +0100 Updated Windows build script to openssl-1.0.2k - 3eedf1b csoler Tue, 31 Jan 2017 23:24:09 +0100 Merge pull request #675 from csoler/v0.6-ImprovedGUI - 79ef403 csoler Tue, 31 Jan 2017 23:07:59 +0100 tested/fixed all option buttons - a357c52 csoler Tue, 31 Jan 2017 21:51:16 +0100 fixed a few things in options - deea1b5 csoler Tue, 31 Jan 2017 20:59:50 +0100 moved temporary GXS object structures into rsgxsutil.h and used them in p3gxscircles to remove a memory leak - 0a02419 csoler Tue, 31 Jan 2017 20:07:00 +0100 fixed a big memory leak in hash cache storage load code, and improved deletion of allocated memory if file reading fails - 66bbf4d csoler Mon, 30 Jan 2017 21:38:06 +0100 converted the last CONFIG pages to interactive mode - 60d9ea0 csoler Sun, 29 Jan 2017 21:47:13 +0100 changed more ConfigPages to not requiring calls to save() - 7861b09 defnax Sun, 29 Jan 2017 19:01:38 +0100 Fixed to display Avatars and nickname on news feeds Messages Item for Distant Messages. Added for Invite Message RS_MSG_USER_REQUEST flag & auto send invites to outbox. Optimized Messages Item for Invite Messages, display a Send Invite Button, to send back own rs cert link via Distant Message. - bd379e6 csoler Sat, 28 Jan 2017 18:13:38 +0100 changed a few pages to not requiring to call save() - 7327f1a csoler Sat, 28 Jan 2017 15:26:12 +0100 fixed deadlock caused by locking the mutex in p3Identity after the one in p3GxsReputation - f935d9f csoler Thu, 26 Jan 2017 22:48:25 +0100 Merge pull request #669 from csoler/v0.6-ImprovedGUI - 53a1993 csoler Thu, 26 Jan 2017 22:46:58 +0100 added missing files - 6321bc1 csoler Thu, 26 Jan 2017 22:43:44 +0100 Merge pull request #668 from csoler/v0.6-ImprovedGUI - 3395727 csoler Thu, 26 Jan 2017 22:42:24 +0100 keep quit button into toolbar - 67af166 csoler Thu, 26 Jan 2017 22:35:33 +0100 moved Options window into a new Preferences tab - f3caad9 csoler Thu, 26 Jan 2017 18:16:30 +0100 Merge pull request #667 from csoler/v0.6-ImprovedGUI - 883c4cc csoler Thu, 26 Jan 2017 09:19:18 +0100 improved AboutWidget a little bit - 1cd64ce csoler Wed, 25 Jan 2017 22:41:23 +0100 improved EE - 0774f08 csoler Wed, 25 Jan 2017 20:27:53 +0100 fixed display of about widget - 1cdb970 csoler Tue, 24 Jan 2017 22:39:28 +0100 moved the AboutDialog into Options - f90ebb1 defnax Tue, 24 Jan 2017 16:17:53 +0100 update Person details window used on Statistics. clean up look and feel of Friend Details to get more user friendly for normal users. - ca5fa7a csoler Mon, 23 Jan 2017 21:11:22 +0100 Merge pull request #653 from RetroPooh/master - 1d5c536 csoler Mon, 23 Jan 2017 21:04:41 +0100 Merge pull request #650 from PhenomRetroShare/Add_StatusBarHideOption - f7a1348 csoler Mon, 23 Jan 2017 19:13:50 +0100 made Accepted option in Transfers to send tunnel requests for both encrypted and clear tunnels - 8cf5abc RetroPooh Mon, 23 Jan 2017 21:10:06 +0300 options-network default tab opened changed to first - 9937513 Phenom Wed, 18 Jan 2017 20:18:12 +0100 Add StatusBar and its widgets show options. - 091ea05 RetroPooh Mon, 23 Jan 2017 19:58:31 +0300 fix previous - forgot .h file - 5dc5496 RetroPooh Mon, 23 Jan 2017 18:31:00 +0300 add friend dialog - hide email and trust strings if not in advanced mode - bcb1f19 RetroPooh Mon, 23 Jan 2017 15:09:40 +0300 friend add wizard - hide options checkboxes in collapsible panel, default on in advanced mode - e82b4fe RetroPooh Mon, 23 Jan 2017 00:34:02 +0300 friend connect wizard - add tooltips for checkboxes; hide 40peers warning if you have <30 friends; restored back own cert actions for advanced mode - 58c296c RetroPooh Mon, 23 Jan 2017 00:25:17 +0300 hide typing notification setting in chat options by default - 9268fd5 RetroPooh Mon, 23 Jan 2017 00:21:23 +0300 Merge branch 'master' of https://github.com/RetroShare/RetroShare - 297907e csoler Sun, 22 Jan 2017 21:48:48 +0100 Merge pull request #662 from csoler/v0.6-ImprovedGUI - 7da68ff csoler Sun, 22 Jan 2017 21:44:26 +0100 improved certificate parsing in Home so that corrupted certs never get accepted - 214fbc7 csoler Sun, 22 Jan 2017 21:06:11 +0100 added a friend recommendation menu entry in Home drop menu, and created the dialog to create/send the recommendations - aa62136 csoler Sun, 22 Jan 2017 19:47:50 +0100 Merge pull request #657 from PhenomRetroShare/Add_NoCppWarningFlag - dc43611 csoler Sun, 22 Jan 2017 18:52:30 +0100 changed Lobbies into Chat rooms in a few places - 73d9a48 csoler Sun, 22 Jan 2017 18:36:36 +0100 update client Grp TS even when friend peer is subscribed to no groups, so as to avoid the friend re-sendign an empty list indefinitly (fix suggested by jo) - baa9713 csoler Sat, 21 Jan 2017 21:38:10 +0100 partially changed lobby->chat room in displayed strings in the GUI - 3538b0a csoler Sat, 21 Jan 2017 20:56:00 +0100 merged upstream/pr/648 - 72493ad csoler Sat, 21 Jan 2017 17:31:06 +0100 Merge pull request #658 from PhenomRetroShare/Fix_Compilation - 1f5ef4c Phenom Sat, 21 Jan 2017 17:15:38 +0100 Fix Compilation - e07d6ff csoler Sat, 21 Jan 2017 17:26:44 +0100 removed debuginfo from PR 654 - 6f7f1c2 csoler Sat, 21 Jan 2017 17:16:56 +0100 Merge pull request #656 from PhenomRetroShare/Fix_UnitTestWarnings - eee2a7b Phenom Sat, 21 Jan 2017 16:51:37 +0100 Add no cpp #warning Config flag to better show other ones. - aa05d60 Phenom Sat, 21 Jan 2017 16:31:22 +0100 Fix all warnings in UnitTest - e3240de csoler Sat, 21 Jan 2017 15:06:46 +0100 Merge pull request #654 from csoler/v0.6-GXS-LimitedSync2 - 9a20160 csoler Sat, 21 Jan 2017 14:01:53 +0100 merged upstream/master - e95c131 felisucoi Sat, 21 Jan 2017 00:08:23 +0100 Merge branch 'master' of https://github.com/RetroShare/RetroShare - ee4d722 csoler Fri, 20 Jan 2017 23:27:18 +0100 fixed cache deletion of GXS grp meta that caused deleted groups to not come back when available - 7bbb993 csoler Fri, 20 Jan 2017 23:00:05 +0100 disabled emoticons from messages and toasters, since they significantly slow down the whole software - 0ca477d RetroPooh Fri, 20 Jan 2017 22:26:50 +0300 add chatlobby option to disable sending typing notifications - d1af2e0 csoler Fri, 20 Jan 2017 00:00:47 +0100 merged with upstream/master - b52ab0f csoler Thu, 19 Jan 2017 23:59:26 +0100 added auto-clean of unused groups when grpAutoSync is enabled (so it does not touch identities) - 39aaca9 felisuc oibi Thu, 19 Jan 2017 14:45:08 +0100 Merge branch 'master' of https://github.com/RetroShare/RetroShare - f3b3d2b csoler Thu, 19 Jan 2017 14:01:54 +0100 disabled emoticon replacement in GxsChannelPostItem and chat lobby toaster and chat toaster, where there are not needed as compare to how problematic they can be - 73f59c2 felisucoi Thu, 19 Jan 2017 13:58:36 +0100 Merge branch 'master' of https://github.com/RetroShare/RetroShare - cb61d58 csoler Thu, 19 Jan 2017 13:49:17 +0100 disabled emoticon replacement in channel title because it causes channels to load extremely slowly due to the enormous amount of emoticons - 410123b csoler Thu, 19 Jan 2017 11:16:47 +0100 added warning about consistency error in idservice group flags - 06265f2 csoler Thu, 19 Jan 2017 11:12:37 +0100 added consistency check in meta data in publishGroup() and updateGroup() in order to avoid bad data supplied from GXS services - 5f7327f felisucoi Wed, 18 Jan 2017 21:45:56 +0100 Merge branch 'master' of https://github.com/RetroShare/RetroShare - d2dc632 csoler Wed, 18 Jan 2017 21:27:27 +0100 Merge pull request #651 from csoler/v0.6-QtOptim - 34962c3 csoler Wed, 18 Jan 2017 21:22:38 +0100 added a checkbox to load emoticons in forums as an option, so as to avoid crazy loading times. Disabled by default until we fix the RsHtml code - 1b8de7b jolaville Wed, 18 Jan 2017 13:25:45 +0100 Attempt to reduce BW bursts - 717b455 felisucoi Wed, 18 Jan 2017 10:55:01 +0100 Merge pull request #13 from felisucoibi/0.6-buttons - 47a4ed5 felisucoi Wed, 18 Jan 2017 10:34:34 +0100 Update ChatLobbyWidget.ui - 837bb76 felisucoi Wed, 18 Jan 2017 10:31:50 +0100 Update CreateLobbyDialog.cpp - 2d764f4 felisucoi Wed, 18 Jan 2017 10:26:25 +0100 updated sectionnames chat lobbi - 1217a85 felisucoi Wed, 18 Jan 2017 10:15:07 +0100 change chat lobies t chat rooms strings - 07dd196 felisucoi Wed, 18 Jan 2017 09:54:32 +0100 changed friends to second flaces csoler agreed - 5646187 felisucoi Wed, 18 Jan 2017 00:48:00 +0100 Merge branch 'master' of https://github.com/RetroShare/RetroShare - bdc5680 csoler Tue, 17 Jan 2017 23:01:51 +0100 Merge pull request #647 from RetroPooh/master - e778b8c felisucoi Tue, 17 Jan 2017 17:01:37 +0100 Merge pull request #12 from felisucoibi/0.6-buttons - dc391c5 felisucoi Tue, 17 Jan 2017 17:00:41 +0100 Update ChatLobbyWidget.h - 8519b79 felisucoi Tue, 17 Jan 2017 16:56:17 +0100 Merge pull request #11 from felisucoibi/0.6-buttons - ce53a9d felisucoi Tue, 17 Jan 2017 16:55:14 +0100 Update FriendsDialog.h - 296903a felisucoi Tue, 17 Jan 2017 16:51:16 +0100 Update MainWindow.cpp - 66ab7c9 felisucoi Tue, 17 Jan 2017 16:49:36 +0100 Update ChatLobbyUserNotify.cpp - afd5e55 felisucoi Tue, 17 Jan 2017 16:38:18 +0100 Merge pull request #10 from felisucoibi/0.6-buttons - 982c837 felisucoi Tue, 17 Jan 2017 16:37:23 +0100 Update PostedDialog.h - d31cb0d felisucoi Tue, 17 Jan 2017 16:36:24 +0100 Update NewsFeed.h - 701868d felisucoi Tue, 17 Jan 2017 16:35:20 +0100 Update MessagesDialog.h - 0633744 felisucoi Tue, 17 Jan 2017 16:34:37 +0100 buttons - 02aec3d felisucoi Tue, 17 Jan 2017 16:32:56 +0100 button changes - f079e99 RetroPooh Tue, 17 Jan 2017 17:21:51 +0300 fix mute option in chatlobby id menu - 8568199 csoler Tue, 17 Jan 2017 12:39:54 +0100 fixed mistake that prevented GXS posts to propagate - e197117 csoler Mon, 16 Jan 2017 20:57:19 +0100 fixed last commit because of compilation - d5936a5 csoler Mon, 16 Jan 2017 20:49:30 +0100 removed debug msg - 967b85c csoler Mon, 16 Jan 2017 20:49:15 +0100 removed old call to rsIdentity in rsgxsnetservice and removed warning - c00caa9 csoler Sun, 15 Jan 2017 21:28:28 +0100 Merge pull request #644 from G10h4ck/ccleanup - e7a119f csoler Sun, 15 Jan 2017 21:13:27 +0100 added a warning and skip files with missing hash in copy link - f314e7d csoler Sun, 15 Jan 2017 20:56:44 +0100 simplified code in PR/630 - 7e750d3 csoler Sun, 15 Jan 2017 20:31:22 +0100 Merge pull request #630 from RetroPooh/master - 75d717c RetroPooh Sun, 15 Jan 2017 20:29:59 +0300 fix - - -- Retroshare Dev Team Sat, 04 Mar 2017 12:00:00 +0100 - -retroshare06 (0.6.1-1.20170117~5c296b9~trusty) trusty; urgency=low - - 5c296b9 csoler Sun, 15 Jan 2017 09:57:06 +0100 removed warning when peer list is empty in cache_load of identities - 233c38d csoler Sat, 14 Jan 2017 20:45:53 +0100 Merge pull request #641 from csoler/v0.6-Reputations - dd40877 csoler Sat, 14 Jan 2017 19:08:14 +0100 removed debug info - 318a372 csoler Sat, 14 Jan 2017 19:04:14 +0100 fixed reloading of distribution icons when opinion is changed over an ID in forums. Improved efficiency of forum loading in general - 25680d5 csoler Sat, 14 Jan 2017 17:29:37 +0100 removed quadratic cost in forum thread fill - 7308695 csoler Sat, 14 Jan 2017 11:02:02 +0100 fixed reloading of GXS id icon when banned/unbanned in forums - 57f22e9 csoler Sat, 14 Jan 2017 10:51:14 +0100 removed costly size() call in QList - 1435222 csoler Sat, 14 Jan 2017 10:19:31 +0100 fixed compilation in tests - c4695e3 csoler Fri, 13 Jan 2017 22:41:54 +0100 fixed compilation of unittests - df94de9 csoler Fri, 13 Jan 2017 18:31:50 +0100 disallow to ban your own identity in forums, and make opinions show up as a function ofwhat the ID opinion already is - 17cf660 csoler Fri, 13 Jan 2017 16:35:42 +0100 improved settings->People text fields and tooltip - e4960e0 csoler Fri, 13 Jan 2017 10:24:28 +0100 Merge pull request #642 from G10h4ck/ccleanup - 3c800c4 csoler Thu, 12 Jan 2017 22:54:38 +0100 fixed enabled 0 in settings->People fields - cdd3973 Gio. Mazzurco Thu, 12 Jan 2017 22:28:58 +0100 Documentation and code cleanup - 19819b9 csoler Thu, 12 Jan 2017 22:14:41 +0100 removed debug info - d7e0682 csoler Thu, 12 Jan 2017 21:59:44 +0100 fixed sorting by reputation in IdDialog - 3c07d50 csoler Thu, 12 Jan 2017 21:27:02 +0100 set auto-reset of banned nodes to "never" by default - 70a92a1 csoler Thu, 12 Jan 2017 21:14:36 +0100 various small fixes in reputation/identity cleaning - bd7f6ac csoler Thu, 12 Jan 2017 20:39:49 +0100 added to parameters in options to fix the time banned ids are kept in list and prevented to re-download - a7f0fff csoler Tue, 10 Jan 2017 23:05:00 +0100 made sure reputations are not stamped when requested for debugging/printing - e329815 csoler Tue, 10 Jan 2017 21:59:27 +0100 Merge pull request #621 from G10h4ck/ccleanup - a810ae9 csoler Tue, 10 Jan 2017 21:44:37 +0100 use rsReputations instead of rsIdentity for reputation calls. Suspended reputation vetting code which is not needed anymore - 2f1d907 csoler Tue, 10 Jan 2017 20:10:28 +0100 removed debug info - 3057533 csoler Tue, 10 Jan 2017 20:06:40 +0100 Merge pull request #608 from PhenomRetroShare/Add_NoDeprecatedWarningFlag - 4838916 csoler Tue, 10 Jan 2017 19:24:51 +0100 Merge pull request #622 from G10h4ck/android_quircks - 8d8453f csoler Mon, 9 Jan 2017 23:47:51 +0100 removed the reputation calls through rsIdentity. Improved the logic of updating static identity flags in p3gxsreputations - 2ed9830 csoler Mon, 9 Jan 2017 15:49:12 +0100 fixed 2 comments in GXS net service - 2fc8d22 csoler Sun, 8 Jan 2017 22:00:54 +0100 changed cleaning strategy of p3gxsreputations to be based on last activity of the reputation system rather than the identity system - b6a3f53 csoler Sun, 8 Jan 2017 11:14:18 +0100 changed the needsUpdate flag so that unset/default needs update, and added code to read old reputation set item class - 0dd3a31 csoler Sun, 8 Jan 2017 11:10:33 +0100 added last used TS in reputation items - e895b6b csoler Thu, 5 Jan 2017 23:32:27 +0100 Merge pull request #626 from csoler/v0.6-Reputations - d631758 csoler Thu, 5 Jan 2017 23:07:59 +0100 added hashstream class to hash content of RsIdentityUsage and fix duplication of identity usage statistics - - -- Retroshare Dev Team Sun, 15 Jan 2017 12:00:00 +0100 - -retroshare06 (0.6.1-1.20170103.f79706a1~trusty) trusty; urgency=low - - 5469eb1 defnax Tue, 3 Jan 2017 16:43:31 +0100 Added display labels to show positive and negative votes - 0ba28a2 defnax Tue, 3 Jan 2017 01:37:16 +0100 Removed Column text for Votes, Distribution replaced by icon. Set column header to "ResizeToContents" to not use much space Added new Bio hazard icons to look same like other ones - 00613d4 csoler Mon, 2 Jan 2017 14:00:23 +0100 made sure we have the public keys for msg validation, as only the private key is available when we are admin/publisher of a group - a962330 csoler Sun, 1 Jan 2017 21:28:14 +0100 fixed compilation in GxsSecurity with debug flags - e883a32 csoler Sun, 1 Jan 2017 21:10:14 +0100 added more debug info in msg validation code - bb7d829 csoler Sun, 1 Jan 2017 20:54:00 +0100 fixed compilaiton in debug mode for rsgenexchange - a261094 csoler Sun, 1 Jan 2017 20:22:54 +0100 removed debug output form p3idservice - 1a9f191 csoler Sun, 1 Jan 2017 18:22:01 +0100 Merge pull request #617 from csoler/v0.6-Circles2 - a6ec626 csoler Sun, 1 Jan 2017 18:07:02 +0100 fixed wrong icon in GxsIdChooser - f07ebbf csoler Sun, 1 Jan 2017 17:51:03 +0100 fixed circle authentication policy - e312848 csoler Sun, 1 Jan 2017 17:50:09 +0100 added documentation of flags in GXS msg authentication policy - fcf8a35 csoler Sun, 1 Jan 2017 17:49:34 +0100 check that author id is not null before complaining that it does not exist - c71cf7a csoler Sun, 1 Jan 2017 17:47:24 +0100 removed timestamping of key that was in the wrong place - 97957bd csoler Sat, 31 Dec 2016 18:20:28 +0100 fixed update problem due to forgetting that delay=0 means no time constraints - b1923dd csoler Sat, 31 Dec 2016 17:47:15 +0100 fixed compilation - 6c49b3d csoler Sat, 31 Dec 2016 16:43:52 +0100 Merge pull request #616 from PhenomRetroShare/Fix_SomeNewWarnings - 41386c6 Phenom Sat, 31 Dec 2016 15:17:51 +0100 Fix some new warnings - e2dfadf csoler Sat, 31 Dec 2016 14:23:37 +0100 started documentation of GXS flags. Fixed a bug in p3gxscircles authentication policy - 85e6f61 csoler Sat, 31 Dec 2016 13:48:17 +0100 Merge pull request #612 from csoler/v0.6-Reputations - f8ac391 csoler Sat, 31 Dec 2016 13:42:29 +0100 better documentation of anti-spam policy - 924e3bf csoler Thu, 29 Dec 2016 21:54:50 +0100 changed anti-spam policy to require a minimum of NEUTRAL to forward posts of trusted people - 057e3eb csoler Thu, 29 Dec 2016 18:10:21 +0100 extended GXS sync limit to sending instead of just requesting, in order to make backward compatibility less painful - 9d82a3f csoler Thu, 29 Dec 2016 15:24:31 +0100 replace mNbAttempts in signature and validation of posts by a timeout, which allows to wait for missing keys more robustly - 3a45bac csoler Thu, 29 Dec 2016 15:12:58 +0100 removed unused autoBanIdentitiesLimit variable - f3f0fce csoler Thu, 29 Dec 2016 10:34:57 +0100 added load/save of new thresholds in p3gxsreputation. Removed some unused variables - fb73391 csoler Wed, 28 Dec 2016 18:58:49 +0100 added two fields in settings/people to setup the thresholds to decide between neutral and remotely positive/negative reputation - da881e1 csoler Tue, 27 Dec 2016 21:13:37 +0100 fixed setting of author reputation from forum thread menu - 3a92124 csoler Tue, 27 Dec 2016 20:42:47 +0100 added method to show a given post author into the people tab - 6473782 csoler Tue, 27 Dec 2016 17:17:23 +0100 added an icon for when information is missing for an ID in forum distribution - 5ed879c csoler Mon, 26 Dec 2016 17:00:21 +0100 added small debug output in GxsForumThreadWidget - d8233bb csoler Mon, 26 Dec 2016 16:59:52 +0100 merged updatream/master - 742a764 csoler Mon, 26 Dec 2016 15:59:53 +0100 added display of warning for non forwarded posts - 811d084 csoler Sun, 25 Dec 2016 23:43:29 +0100 only show distribution column if anti-spam is enabled - c80d3ec csoler Sun, 25 Dec 2016 23:12:07 +0100 added check for reputation before sending message ids - b34ab44 csoler Sat, 24 Dec 2016 17:29:53 +0100 added menu entries to vote for/against a forum poster - d423745 csoler Sat, 24 Dec 2016 15:04:08 +0100 added column to show distribution data and moved ReputationItemDelegate to GxsIdDetails - c100775 defnax Sat, 24 Dec 2016 14:40:56 +0100 Changed Share icon on Home View - 873c0e6 csoler Sat, 24 Dec 2016 14:13:02 +0100 added display of reputation in forums - e5e5909 csoler Fri, 23 Dec 2016 22:53:57 +0100 added proper display of reputation as an icon in IDDialog - 72fb8f1 csoler Fri, 23 Dec 2016 17:52:02 +0100 changed the reputation system to output a level that differentiate your own opinion to your friends opinion - 36453dd csoler Thu, 22 Dec 2016 22:20:07 +0100 Merge pull request #609 from G10h4ck/android_debug - 8647761 defnax Thu, 22 Dec 2016 17:10:51 +0100 Changed Paste icon - 1b032e0 Gio Thu, 22 Dec 2016 13:49:13 +0100 qml-app: remove deprecated usage of LibresapiLocalClient in ChatView - 2c10e20 Gio Thu, 22 Dec 2016 13:47:44 +0100 qml-app: Added button to deny friendship - 3de3bec Gio Thu, 22 Dec 2016 13:47:08 +0100 Cleanup #ifdef mess in RsAccountsDetail::PathDataDirectory() - 06a1020 Gio Thu, 22 Dec 2016 00:33:34 +0100 Add workaround to see debug messages from native code in android service - 8b9038a csoler Thu, 22 Dec 2016 11:21:49 +0100 improved display/wording of usage statstics in People - 0a3ec97 csoler Thu, 22 Dec 2016 00:14:16 +0100 added statistics info for key requests - 83302e0 csoler Wed, 21 Dec 2016 23:19:20 +0100 Merge pull request #607 from PhenomRetroShare/Fix_Compilation - 40cf768 Phenom Wed, 21 Dec 2016 21:23:54 +0100 Fix compilation and some new warnings. - aca36a3 defnax Wed, 21 Dec 2016 19:07:57 +0100 Improving the Certificate Page for Connect Wizard: Added place holder text for Cert Field renamed some strings Improved layout for easy paste key and display the errors. - d3051ef csoler Wed, 21 Dec 2016 00:34:07 +0100 added display of usage statistics for GXS identities - f3e699a csoler Tue, 20 Dec 2016 14:08:47 +0100 fixed typo causing publishTest to fail in some cases - 8de9ee8 csoler Mon, 19 Dec 2016 23:28:57 +0100 made friendly time unit returns empty string when time is 0. Fixes 46y display in search dialog - 9d8690b csoler Mon, 19 Dec 2016 21:46:55 +0100 Merge pull request #606 from csoler/v0.6-GXS-LimitedSync2 - 948b88b csoler Mon, 19 Dec 2016 21:40:04 +0100 fixed bug caused by calling clear in constructor which would reset the TS in GXS when saving... - c9511c4 defnax Mon, 19 Dec 2016 20:52:24 +0100 update emotes strings - ef0850e csoler Mon, 19 Dec 2016 20:44:15 +0100 added recording system for usage cases of GXS ids - 0cbe83e thunder2 Sun, 18 Dec 2016 12:30:27 +0100 Added auto-login as default in Windows build script - ed61d72 csoler Sat, 17 Dec 2016 19:10:13 +0100 fixed compilaiton - 330cc98 csoler Sat, 17 Dec 2016 18:14:44 +0100 fixed test of max age when receiving posts - 4dc284a csoler Sat, 17 Dec 2016 14:15:51 +0100 added auto-login default on ubuntu - - -- Retroshare Dev Team Tue, 03 Jan 2017 23:00:00 +0100 - -retroshare06 (0.6.1-1.20161217.4dc284a3~vivid) vivid; urgency=low - - f8f040b csoler Fri, 16 Dec 2016 10:03:23 +0100 fixed deadlock due to cross-locking RsGxsNetService and RsGxsGenExchange (reported by sss) - 1ef11a2 csoler Thu, 15 Dec 2016 23:21:11 +0100 Merge pull request #599 from G10h4ck/qml_app_chat - b857d9a csoler Thu, 15 Dec 2016 23:10:09 +0100 Merge pull request #605 from csoler/v0.6-FileListsOptim - 8637cfa csoler Thu, 15 Dec 2016 23:07:40 +0100 added detection of flag change so that new TS is set on root of hierarchy and changes are made visible to friends at next update - c3443df csoler Thu, 15 Dec 2016 12:36:27 +0100 Merge pull request #603 from G10h4ck/master - 3662a36 Gio Thu, 15 Dec 2016 11:20:13 +0100 Coherent behaviour of general config with auto-login compile option - 31b1583 csoler Thu, 15 Dec 2016 09:31:20 +0100 Merge pull request #601 from csoler/v0.6-FileListsOptim - 08294de csoler Wed, 14 Dec 2016 22:58:49 +0100 removed unused updateHash() functions in directory_storage. Fixed a bug that caused H(H(F)) to not be recomputed at start, causing e2e encryption to fail in some cases. - 81dffbe csoler Wed, 14 Dec 2016 16:45:45 +0100 Merge pull request #591 from G10h4ck/split_autologin - 96b6cd3 defnax Wed, 14 Dec 2016 15:20:03 +0100 Added "Add friends Certificate" Button for Home View, for call easy the Text Page for Paste friends Cert faster. - f618abe Gio Wed, 14 Dec 2016 14:25:43 +0100 Change the auto-login warning message accordign to Cyril suggestion - f3c4de2 csoler Wed, 14 Dec 2016 10:06:41 +0100 Merge pull request #598 from csoler/v0.6-GXS-LimitedSync2 - a842202 csoler Wed, 14 Dec 2016 09:59:20 +0100 fixed compilation and set the default storage to 1year to comply with forum default - 1202339 csoler Wed, 14 Dec 2016 00:09:54 +0100 Merge pull request #592 from csoler/v0.6-GXS-LimitedSync2 - cbc8287 csoler Tue, 13 Dec 2016 22:46:30 +0100 used item disable to show current choice in sync/store menu since some systems dont show the menu icons - fca8d6f csoler Tue, 13 Dec 2016 21:52:11 +0100 added display of storage/sync in forum summary - 5953e56 csoler Tue, 13 Dec 2016 21:12:34 +0100 added auto-consistency between store/sync periods - dd2a3c2 csoler Mon, 12 Dec 2016 22:52:55 +0100 fixed serialisation bug in new UpdateMap code, and removed debug info from RsGxsNetService - 2e717d3 defnax Mon, 12 Dec 2016 21:16:56 +0100 Added Home Page View for easy see own Cert to Copy and Share to Friends Fixed Share Manager Label layout Update emotes file Set radio items font size to stylesheet file - 0d94b68 csoler Mon, 12 Dec 2016 21:01:24 +0100 removed duplicate peerID/grpId in msg/grp update maps - 4933cce csoler Sat, 10 Dec 2016 22:58:23 +0100 Merge pull request #595 from PhenomRetroShare/Add_UnreadColumnToGroupTreeWidget - f2898da csoler Sat, 10 Dec 2016 20:51:12 +0100 Merge pull request #596 from PhenomRetroShare/Fix_RSElidedItemDelegateTextColor - 6c6b437 Gio Sat, 10 Dec 2016 20:23:30 +0100 qml-app: Fix responsiveness of ChatView - 803d1b6 Phenom Sat, 10 Dec 2016 19:52:46 +0100 Fix RSElidedItemDelegate text color. - 8f452ee Phenom Sat, 10 Dec 2016 17:59:58 +0100 Add Unread column to GroupTreeWidget - 478746f csoler Thu, 8 Dec 2016 23:53:28 +0100 moved incoming msg time check to RsGenExchange validation method - 1fa20e1 Gio Thu, 8 Dec 2016 21:57:26 +0100 Added a dialog to create GXS Identities - 8b697eb csoler Thu, 8 Dec 2016 21:53:39 +0100 added check to prevent loading saving corrupted peer/grp ids in GXS update maps - c3aca0c Gio Thu, 8 Dec 2016 15:56:23 +0100 Implement a working Distant Chat prototype in Qml - ae2accd csoler Thu, 8 Dec 2016 14:30:47 +0100 fixed cmpilation of unittests - ae37787 csoler Thu, 8 Dec 2016 09:17:56 +0100 merged with upstream/master - 242338d csoler Thu, 8 Dec 2016 09:00:55 +0100 Merge pull request #593 from G10h4ck/libresapi_distant_chat - 6c4497a csoler Wed, 7 Dec 2016 22:41:05 +0100 improved debug output in rsgxsutil. Added disabled code for removing old unused groups - d9416d3 csoler Wed, 7 Dec 2016 22:00:50 +0100 added proper use of storage time parameter in group msg cleanup - 9eef412 Gio Wed, 7 Dec 2016 20:09:14 +0100 Expose libresapi for distant chat - b03fe3d csoler Tue, 6 Dec 2016 23:28:28 +0100 fixed computation of max update time for sync - 68f7fff csoler Tue, 6 Dec 2016 23:02:25 +0100 fixed saving bug in GrpConfigMap - a4c14c2 csoler Tue, 6 Dec 2016 22:17:03 +0100 improved serialisation methods in RsGxsNet items, and added serialisation for RsGrpConfigItem - 661038d csoler Mon, 5 Dec 2016 23:42:44 +0100 added a function to check keep/req times for consistency - 7afb91d csoler Mon, 5 Dec 2016 22:14:48 +0100 added machinery to allow to set/get sync and store periods for GXS groups - f8de12d csoler Mon, 5 Dec 2016 17:49:00 +0100 updated changelog - d2ef224 csoler Sun, 4 Dec 2016 23:26:48 +0100 added entry in rsgxsnetservice to change sync params - 5612647 csoler Fri, 11 Nov 2016 00:10:01 +0100 added new GrpServerConfigMap to store additional data on groups for net service. Removed pointers to simplify the code - 143829c csoler Wed, 9 Nov 2016 16:18:43 +0100 moved constants for GXS group management into rsgxs.h - f3a34bf csoler Sat, 29 Oct 2016 17:26:08 +0200 created a new item to hold/save per gxs group information (statistics, update delays) - c6d21e4 csoler Fri, 28 Oct 2016 22:55:01 +0200 changed old msg update default strategy to one month - bba1a71 csoler Fri, 28 Oct 2016 22:37:56 +0200 removed deprecated bandwidth recorder code in RsGxsNetService - 7c35411 Gio Sat, 3 Dec 2016 22:22:13 +0100 Suppress compiler warning about autologin parameter not used - - -- Retroshare Dev Team Sat, 17 Dec 2016 13:00:00 +0100 - -retroshare06 (0.6.1-1.20161205.f8de12d3~trusty) trusty; urgency=low - - cf8dac2 csoler Sat, 3 Dec 2016 21:00:16 +0100 fixed initialisation of random salt in directory updater when no config file is presen - eedeaeb csoler Sat, 3 Dec 2016 15:13:04 +0100 used light grey instead of read to show missing directories - 8adb91b csoler Sat, 3 Dec 2016 15:04:57 +0100 removed compilation of ShareDialog that is unused, and cleanup the editing in ShareMan - 6890669 defnax Fri, 2 Dec 2016 23:00:57 +0100 update emotes file - a005fa0 csoler Fri, 2 Dec 2016 19:36:34 +0100 display missing directories in red in share manager - ff271c6 csoler Fri, 2 Dec 2016 19:02:41 +0100 force recheck of existing files at start, to possibly re-hash files that were not alre - d986216 csoler Thu, 1 Dec 2016 23:27:15 +0100 remove non existing shared directories when not found on the disk - d7ef33e csoler Wed, 30 Nov 2016 22:51:18 +0100 Merge pull request #544 from PhenomRetroShare/Fix_SomeWarnings - 674b6de Phenom Sat, 22 Oct 2016 23:48:19 +0200 Fix Some gcc warnings 383 to 208 lines - 74aa55e defnax Wed, 30 Nov 2016 08:12:46 +0100 Merge pull request #587 from dimqua/patch-1 - d616df3 defnax Wed, 30 Nov 2016 08:12:38 +0100 Merge pull request #586 from hunbernd/fix/external-emoticons - 90abd2f dimqua Tue, 29 Nov 2016 19:05:02 +0300 bdboot update - 5fd1de0 hunbernd Mon, 28 Nov 2016 00:35:09 +0100 Fixed loading of external emoticons - path comparison was Linux specific, also it h - 137d71c csoler Sun, 27 Nov 2016 20:57:38 +0100 extended the window during which the GUI is told to tell that the update of shared di - 6937d87 csoler Sun, 27 Nov 2016 12:21:14 +0100 changed from std::string to RsPgpId to represent openned items in FriendList - f3d7948 csoler Sun, 27 Nov 2016 12:20:32 +0100 turned one error into a warning in p3filelists.cc when requesting an unexisting ref - 8b22924 defnax Sun, 27 Nov 2016 18:00:26 +0100 Merge branch 'master' of https://github.com/RetroShare/RetroShare - cfd4afd defnax Sun, 27 Nov 2016 17:59:15 +0100 Update emoticons file - 5216636 defnax Sun, 27 Nov 2016 16:42:45 +0100 Merge pull request #585 from PhenomRetroShare/Add_RSELidedItemDelegate - 486c113 defnax Sun, 27 Nov 2016 15:58:53 +0100 Changed smiley widget default width Update Emotes file - 0f63921 defnax Sun, 27 Nov 2016 00:11:21 +0100 Fixing icon size for smiley widget. - 2a758dd csoler Sat, 26 Nov 2016 19:19:15 +0100 changed shared files tree header when updating - aa4ecd7 csoler Sat, 26 Nov 2016 18:58:02 +0100 added limit to calls of PreMods() in SharedFilesDialog so as to keep CPU load minimal when updating dirs from friends. Disabled sorting when new data comes. - d01644c csoler Sat, 26 Nov 2016 11:26:02 +0100 added back the test for local/remote in SharedFilesDialog as it reduces the load anyway - 4ef1b08 csoler Sat, 26 Nov 2016 11:22:35 +0100 attempt to fix emoticons sizes on high DPI screens - 3386238 csoler Sat, 26 Nov 2016 11:03:31 +0100 improved preservation of directories when updating, and allow to temporarily disable sorting while an update is received - 7aaf330 defnax Sat, 26 Nov 2016 00:02:58 +0100 Added category icons for Smiley Groups Updated emotes file, sorted Emoticons. - c92c270 csoler Fri, 25 Nov 2016 22:30:47 +0100 Merge pull request #584 from mr-alice/v0.6-FileLists - 729c05a mr-alice Fri, 25 Nov 2016 21:09:34 +0100 merged with upstream code - d975a18 csoler Fri, 25 Nov 2016 21:06:40 +0100 added doubling of buffer size in checkSectionSize when missing space. Used 1024 instead of 1000 as start size - 2953957 mr-alice Fri, 25 Nov 2016 20:50:10 +0100 added full re-scan when symbolic links are (des)activated, since the directory time stamps will not trigger an update - 3f3efca mr-alice Fri, 25 Nov 2016 20:33:27 +0100 removed canonicalize_file_name from MacOS compilation - 5fbc263 csoler Fri, 25 Nov 2016 20:05:23 +0100 applied removal of realloc to other files in file_sharing/ directory - 0cb7778 csoler Fri, 25 Nov 2016 18:52:04 +0100 removed all calls to realloc causing major slow down on windows where its implementation is extremely inefficient - 5f69c9e mr-alice Thu, 24 Nov 2016 23:42:56 +0100 added an option to follow symbolic links or not, and anti-loop system during directories traversal - cf270d7 defnax Thu, 24 Nov 2016 08:04:00 +0100 Merge pull request #583 from PhenomRetroShare/Add_GroupedEmoticons - 1e1c19e csoler Wed, 23 Nov 2016 20:30:06 +0100 Merge pull request #582 from mr-alice/v0.6-DLQueue - 66c3259 mr-alice Wed, 23 Nov 2016 19:12:38 +0100 removed debug output - ae83651 Phenom Wed, 23 Nov 2016 17:48:35 +0100 Add grouped emoticons. - fb70cb2 mr-alice Tue, 22 Nov 2016 23:39:09 +0100 removed duplicate copy/rename file methods from ftController - 47b8258 mr-alice Tue, 22 Nov 2016 23:19:34 +0100 fixed the download queue, and allow queued files to start when sources get online and empty slots are present - 69f503e defnax Tue, 22 Nov 2016 13:26:29 +0100 Merge pull request #580 from sehraf/pr-improve-smiley - 2faefe8 csoler Mon, 21 Nov 2016 20:38:45 +0100 Merge pull request #581 from csoler/v0.6-FileListsOptim - 172b513 csoler Mon, 21 Nov 2016 16:14:11 +0100 added change in TS for shared directories when virtual name changes - 2ffe3e3 sehraf Mon, 21 Nov 2016 15:00:33 +0100 fix emoticons: make ':)' actually look like ':)' instead of ':D' - 5d1f479 csoler Mon, 21 Nov 2016 10:13:26 +0100 fixed bug preventing plugins loaded as symbolic links to be considered by folderIterator - 5af5425 csoler Mon, 21 Nov 2016 00:17:10 +0100 Merge pull request #579 from csoler/v0.6-FileListsOptim - da84b88 csoler Sun, 20 Nov 2016 20:42:14 +0100 fixed constant updating of flat dir model. Had to limit to at most 10000 files to keep it interactive. - 7b78a68 csoler Sat, 19 Nov 2016 23:42:07 +0100 Merge pull request #577 from PhenomRetroShare/Fix_AnchorOnChannelMessage - 9718385 csoler Sat, 19 Nov 2016 20:15:53 +0100 added missing mutex probably causing crashes when saving directory storage - 007825b Phenom Sat, 19 Nov 2016 16:44:12 +0100 Fix Anchor on Channel Message - 7a2f02e csoler Sat, 19 Nov 2016 15:16:03 +0100 added missing control file for xenial - 3c32bb6 csoler Sat, 19 Nov 2016 15:03:47 +0100 updated ubuntu changelog - - -- Retroshare Dev Team Sat, 26 Nov 2016 15:00:00 +0100 - -retroshare06 (0.6.1-1.20161119~87183853) xenial; urgency=low - - 5b9b63e csoler Sat, 19 Nov 2016 14:42:43 +0100 Merge pull request #575 from PhenomRetroShare/FixCrashOnCheckBigBigFileStorage - a8782f0 Phenom Fri, 18 Nov 2016 23:04:32 +0100 Fix Crash when checking a big-big file storage. - 4bdfc6e csoler Fri, 18 Nov 2016 17:56:42 +0100 removed unused old file - 6d0293c csoler Thu, 17 Nov 2016 22:10:57 +0100 Merge pull request #573 from csoler/v0.6-FileListsOptim - bdc8086 csoler Thu, 17 Nov 2016 21:27:37 +0100 added missing mChanged=true when removign a directory - deadb1f csoler Thu, 17 Nov 2016 21:01:01 +0100 small optimization of RemoteDirModel::data() - 5339e99 csoler Thu, 17 Nov 2016 21:00:34 +0100 force re-sweep of remote directory that has been updated with new dir content to 10 sec - 36755c4 csoler Thu, 17 Nov 2016 19:03:53 +0100 added load/save of own file hierarchy - ff4e6f3 csoler Thu, 17 Nov 2016 14:23:25 +0100 added missing time.h for windows compilation - 1b9fe3b csoler Thu, 17 Nov 2016 09:31:05 +0100 removed symbolic links handling from windows compilation - fe965d2 csoler Wed, 16 Nov 2016 22:12:55 +0100 Merge pull request #572 from csoler/v0.6-FileListsOptim - ba78007 csoler Wed, 16 Nov 2016 21:49:27 +0100 added parameter to disallow hashing files which time is in the future (as they severely perturbate the synchronisation process) - 6272856 csoler Wed, 16 Nov 2016 21:41:32 +0100 added param to folderIterator to skip/follow symbolic links - 188f345 csoler Wed, 16 Nov 2016 12:10:37 +0100 Merge pull request #571 from felisucoibi/master - 999ab0b felisucoibi Wed, 16 Nov 2016 12:07:38 +0100 fix sorting crashing with qt5 in shared files of friends rev3 - ee23c42 felisucoibi Wed, 16 Nov 2016 12:05:05 +0100 fix sorting crashing with qt5 in shared files of friends rev2 - 1757a7b felisucoibi Wed, 16 Nov 2016 12:02:54 +0100 fix sorting crashing with qt5 in shared files of friends - 176999d csoler Wed, 16 Nov 2016 11:47:02 +0100 Merge pull request #570 from felisucoibi/master - 628177c felisucoibi Wed, 16 Nov 2016 11:22:23 +0100 fix for windows compile - ddff9f5 felisucoibi Wed, 16 Nov 2016 11:03:02 +0100 Improved total file size and a small bug with a comma in TB string of file size 2 CLEANED CODE - e3d832c thunder2 Wed, 16 Nov 2016 10:47:34 +0100 Added missing include time.h for Windows compile - cc452ae csoler Tue, 15 Nov 2016 22:58:37 +0100 Merge pull request #569 from csoler/v0.6-FileListsOptim - 608d0d0 csoler Tue, 15 Nov 2016 21:33:39 +0100 auto-remove remote directories for friends offline for too long (depending on whether the dir is empty or not) and also remove unused dir files - 99860c1 csoler Tue, 15 Nov 2016 20:10:18 +0100 only allocate a remote directory entry if the peer is online, or the file already exists - de6f753 csoler Tue, 15 Nov 2016 09:18:51 +0100 fixed compilation due to previous commit - aeb6834 csoler Mon, 14 Nov 2016 22:03:47 +0100 Merge pull request #568 from csoler/v0.6-FileListsOptim - 8c8cc88 csoler Mon, 14 Nov 2016 21:58:58 +0100 fixed problems with negative time shifts in DirDetails causing multiple GUI bugs in File Lists and Search - d433713 csoler Mon, 14 Nov 2016 14:10:49 +0100 fixed possible uninitialised memory read in folderiterator for windows, and changed file folderiterator.cc to unix format - fb30200 csoler Mon, 14 Nov 2016 09:56:46 +0100 Merge pull request #567 from Reedych/patch-1 - 5fd11eb csoler Mon, 14 Nov 2016 09:56:05 +0100 Merge pull request #565 from G10h4ck/master - baaa82a Reedych Sun, 13 Nov 2016 01:39:54 +0700 Updated link for Qt - 1773803 csoler Sat, 12 Nov 2016 16:12:55 +0100 Merge pull request #562 from csoler/v0.6-FileListsOptim - c07dd83 csoler Sat, 12 Nov 2016 15:53:17 +0100 merged upstream/master - 5ef4e75 csoler Fri, 11 Nov 2016 20:25:11 +0100 added count of total number of files and total file isze on top of shared directories - 98183e1 Gio Thu, 10 Nov 2016 11:45:41 +0100 Add some documentation for QML app and link android readme in main README - ae8fc61 Thunder Wed, 9 Nov 2016 06:37:52 +0100 Merge pull request #564 from PhenomRetroShare/Fix_WindowsCompil - 2827233 Phenom Tue, 8 Nov 2016 19:47:17 +0100 Fix windows Compil with sys/socket.h - 61131e4 csoler Tue, 8 Nov 2016 19:56:07 +0100 simplified the remoteDirModel cache system a little bie - 644c41e csoler Mon, 7 Nov 2016 22:24:02 +0100 added a small trick to cache last request of RemoteDirModel::requestDirDetails - befeb44 csoler Mon, 7 Nov 2016 20:55:02 +0100 Merge pull request #550 from G10h4ck/android - 8ab3c7d Gio Mon, 7 Nov 2016 14:37:23 +0100 Merge branch 'master' into android - beaf479 Gio Mon, 7 Nov 2016 14:14:28 +0100 Remove rotten code in rsloginhandler autologin - 461975f csoler Mon, 7 Nov 2016 10:09:28 +0100 generally prevent threads to start twice, and fixed bug causing DirWatcher to be run twice - eb95c68 thunder2 Thu, 3 Nov 2016 08:32:15 +0100 Windows build environment: - Renamed folder build_libs to build-libs - Removed old file stripSVN.sh - Fixed some batch files - Switch from curl to wget - Added Qt environment - Added build.bat to build everything - 0008572 csoler Sun, 6 Nov 2016 19:15:05 +0100 Merge pull request #514 from PhenomRetroShare/Add_MacOSInTravisCI - 7a58a87 Phenom Sun, 4 Sep 2016 13:08:09 +0200 Add MacOS compilation test on Travis CI - c1b1e25 csoler Sun, 6 Nov 2016 12:32:36 +0100 updated ubuntu changelog and added control file for ubuntu 16.10 - 17fb682 csoler Sat, 5 Nov 2016 21:09:49 +0100 Merge pull request #559 from jolavillette/PacketSlicingGroupingFlags - - -- Cyril Soler Sat, 19 Nov 2016 15:00:00 +0100 - -retroshare06 (0.6.1-1.20161105.8cebb33d~xenial) xenial; urgency=low - - e4e3667 csoler Sat, 5 Nov 2016 17:32:40 +0100 fixed bug that caused hierarchies that contain files being hashed to not send updates when the hash is finished - 390bdfe csoler Sat, 5 Nov 2016 17:03:31 +0100 added request for sync on double click item for shared file lists - a97fa1e csoler Sat, 5 Nov 2016 16:07:30 +0100 fixed generation of pseudo-random request ids in p3filelists - 1e919a1 csoler Sat, 5 Nov 2016 15:30:07 +0100 set delay between directory sweep to 60 secs and a-synced sweeps for different friends. Set drop time to 600 for un-answered dir sync requests - ffcf44b csoler Fri, 4 Nov 2016 21:54:28 +0100 removing call to drand48(). RSRandom is safer - 2ef51ed csoler Fri, 4 Nov 2016 21:51:18 +0100 fixed wrong comment about RS_FILE_HINT_SEARCHABLE flag - 79632ed csoler Fri, 4 Nov 2016 21:48:58 +0100 fixed compilation on windows - f39272a csoler Thu, 3 Nov 2016 21:44:40 +0100 fixed compilation in debug mode for p3filelists.cc - 8c1a653 csoler Fri, 4 Nov 2016 20:02:14 +0100 Merge pull request #557 from mr-alice/v0.6-FTEncryption - 2bb9a87 mr-alice Fri, 4 Nov 2016 13:52:11 +0100 merged and fixed conflict with upstream/master - 30860b8 mr-alice Fri, 4 Nov 2016 13:46:20 +0100 removed ^M that polluted unittests.pro - 45cb442 csoler Fri, 4 Nov 2016 09:47:49 +0100 Merge pull request #558 from csoler/v0.6-FileListsOptim - 2bf2465 csoler Fri, 4 Nov 2016 09:18:34 +0100 Merge pull request #498 from PhenomRetroShare/Fix_ElCapitanCompil - 8dacb22 csoler Thu, 3 Nov 2016 22:32:27 +0100 reducing linear cost of allocateNewIndex to constant. Should improve huge lags when receiving big file lists for the first time - e324d7d mr-alice Thu, 3 Nov 2016 20:31:47 +0100 removed warning in ftserver for rejected non encrypted tunnels - 8653649 mr-alice Thu, 3 Nov 2016 20:26:35 +0100 fixed two bugs in ShareManager popup menu - 29b5bfe mr-alice Thu, 3 Nov 2016 08:50:13 +0100 attempt to fixed leading tabs - 2db8dbd Phenom Sat, 16 Jul 2016 23:10:00 +0200 Fix El Capitan OSX 10.11 Compil - 1c2cfb2 mr-alice Wed, 2 Nov 2016 21:32:14 +0100 removed debug info in ftServer - 5aef67d mr-alice Wed, 2 Nov 2016 21:31:14 +0100 fixed tooltips in ShareManager, and fixed anonymous search mechanism - d2118c5 mr-alice Wed, 2 Nov 2016 20:51:42 +0100 supressed deadlock in ftController due to calling ftServer from ftcontroller itself - 46dd5be csoler Tue, 1 Nov 2016 16:30:46 +0100 Merge pull request #554 from hunbernd/feature/paste-RS-link - 02f442a mr-alice Tue, 1 Nov 2016 14:28:00 +0100 changed naming for files visibility - 8c7c764 mr-alice Tue, 1 Nov 2016 14:23:13 +0100 fixed conflicts in merging upstream/master to v0.6-FTEncryption - 6a3610e mr-alice Tue, 1 Nov 2016 14:13:43 +0100 disallow double tunnels (encrypted+clear) in Accepted mode, since it is not needed - ffdac64 mr-alice Tue, 1 Nov 2016 11:57:25 +0100 fixed swarming with encrypted end-to-end tunnels - c6df59a mr-alice Tue, 1 Nov 2016 11:11:28 +0100 fixed bug in duplication of virtual dir names - 761d595 mr-alice Tue, 1 Nov 2016 10:46:29 +0100 fixed layout and names in ShareManager and SharedFilesDialog - 3430eec mr-alice Tue, 1 Nov 2016 10:30:36 +0100 fixed display of share flags as a proper nice icon set - 8fe85b9 mr-alice Mon, 31 Oct 2016 23:24:35 +0100 improved ShareManager a little bit more - 9d586bc mr-alice Mon, 31 Oct 2016 16:28:26 +0100 made a drastic simplification pass on the ShareManager, which now only needs a single window except for selecting files using a QFileDialog - e8e054e mr-alice Mon, 31 Oct 2016 14:26:01 +0100 addednew flag for anonymous search. Merged the two browsable flags in one single flag. - f934e88 csoler Mon, 31 Oct 2016 12:12:40 +0100 Merge pull request #555 from hunbernd/fix/random-emoji-order - 36dc532 hunbernd Mon, 31 Oct 2016 00:23:39 +0100 Automatically detect retroshare links when pasting text - 05b5c08 hunbernd Sat, 10 Sep 2016 21:59:45 +0200 Fixed emoticon order - 5b9ef04 mr-alice Sun, 30 Oct 2016 15:33:05 +0100 improved debug output in ftserver - def20a3 mr-alice Sun, 30 Oct 2016 15:11:22 +0100 encrypted FT works. Fixed last bugs in ftServer - 34dcb41 mr-alice Sun, 30 Oct 2016 11:36:00 +0100 fixed a few bugs in ftServer for encrypted tunnel management - 9a88161 mr-alice Sat, 29 Oct 2016 18:35:48 +0200 added record for H(H(F)) in LocalDirectoryStorage - d843c1c mr-alice Sat, 29 Oct 2016 18:18:02 +0200 put consts behind serial_size() and serialise() in turtle items and ft items - babc126 mr-alice Sat, 29 Oct 2016 17:59:03 +0200 added default encryption policy variable and GUI to change it - 8486346 mr-alice Wed, 26 Oct 2016 22:05:56 +0200 added new encryption/authentication format AEAD_chacha20_sha256 - c87ca67 mr-alice Wed, 26 Oct 2016 18:15:47 +0200 improved efficiency of AEAD - 88298b9 mr-alice Wed, 26 Oct 2016 14:45:21 +0200 added check for cleartext in AEAD test vector #1 - 42f6f26 mr-alice Wed, 26 Oct 2016 14:36:35 +0200 fixed bug in AEAD - 7e536ef csoler Wed, 26 Oct 2016 11:35:30 +0200 Merge pull request #549 from PhenomRetroShare/Fix_PR#536 - 177752e mr-alice Tue, 25 Oct 2016 23:16:36 +0200 fixed a few bugs in AEAD construction based on test results - 32e54e5 Phenom Tue, 25 Oct 2016 14:58:06 +0200 Fix PR#536 revealing of bad factor management in StyledElidedLabel. - 0570427 mr-alice Tue, 25 Oct 2016 14:09:39 +0200 added google test for chacha20 code - 0387a28 mr-alice Tue, 25 Oct 2016 00:08:27 +0200 added methods to get files from hash(hash) in directory_storage and ftServer - 5f5b0d4 csoler Mon, 24 Oct 2016 20:16:21 +0200 Merge pull request #548 from PhenomRetroShare/Fix_PR#540 - fd5a5cc Phenom Mon, 24 Oct 2016 20:11:47 +0200 Fix PR#540 - 2d72b88 mr-alice Mon, 24 Oct 2016 15:59:34 +0200 added code for AEAD construction - bd4c252 csoler Sun, 23 Oct 2016 23:30:56 +0200 Merge pull request #539 from RetroShare/md-fix - f3bebc0 csoler Sun, 23 Oct 2016 23:29:06 +0200 Merge pull request #540 from PhenomRetroShare/Fix_EmbedInHtmlAhref - c77d052 csoler Sun, 23 Oct 2016 23:25:53 +0200 Merge pull request #536 from PhenomRetroShare/Add_ElidedLabelToGroupTreeWidget - 04992c9 csoler Sun, 23 Oct 2016 23:15:32 +0200 Merge pull request #543 from PhenomRetroShare/Add_TooltipOnComments - e525461 csoler Sun, 23 Oct 2016 23:14:29 +0200 Merge pull request #542 from PhenomRetroShare/Add_PasteRsLinkInTextFields - 07564c7 csoler Sun, 23 Oct 2016 23:12:22 +0200 Merge pull request #541 from PhenomRetroShare/Fix_RsLinkCopyToClipBoard - 5ccdc28 csoler Sun, 23 Oct 2016 22:51:32 +0200 Merge pull request #547 from hunbernd/fix/upload - 54ba617 hunbernd Sun, 23 Oct 2016 20:42:59 +0200 Fix: unable to upload files on Windows Caused by multiple unneeded / character in file path. - 46cf25d Phenom Sat, 22 Oct 2016 15:17:49 +0200 Fix Copy RsLink in Clipboard. - a67cf92 Phenom Sat, 22 Oct 2016 16:15:29 +0200 Add Tooltip on comments column to see too long text. - 9eafdd3 Phenom Sat, 22 Oct 2016 16:02:38 +0200 Add ability to past RsLink in some more text fields. - 58a4d39 Phenom Sat, 22 Oct 2016 14:48:23 +0200 Fix handle of url in EmbedInHtmlAhref. - f20ee21 cave Fri, 21 Oct 2016 19:56:02 +0200 Update README.md - 9d32406 mr-alice Wed, 19 Oct 2016 22:49:51 +0200 added ft decryption routine - 3ad0a81 mr-alice Wed, 19 Oct 2016 21:30:37 +0200 added encryption routine for FT - b8b78dd csoler Wed, 19 Oct 2016 15:50:22 +0200 Merge pull request #538 from Hopetech/master - ecaea05 hopetech Wed, 19 Oct 2016 15:41:25 +0200 Fix some compilation warnings - 8483c0d Phenom Sun, 16 Oct 2016 15:48:50 +0200 Add ElidedLabel to GroupTreeWidget - 997154f mr-alice Thu, 13 Oct 2016 15:13:56 +0200 added preliminary implementation of chacha20/poly1305 - 0e1fad0 csoler Thu, 13 Oct 2016 13:48:32 +0200 Merge pull request #533 from PhenomRetroShare/Fix_MissingDesktopFileShow - 4db6d6b Phenom Thu, 13 Oct 2016 13:26:44 +0200 Fix the "Desktop file is missing" shown in option page. - 64129a7 csoler Thu, 13 Oct 2016 10:05:14 +0200 Merge pull request #532 from G10h4ck/less_warning - 8de0548 Gio Thu, 13 Oct 2016 00:09:53 +0200 Merge branch 'master' into less_warning - 633a6cf Gio Wed, 12 Oct 2016 20:43:38 +0200 Fixed a bunch of warnings in safe ways - 10c269e csoler Wed, 12 Oct 2016 23:31:32 +0200 removed warning when friend directory list cannot be found - bd9a464 csoler Wed, 12 Oct 2016 23:20:38 +0200 added deterministic but unredictable hash generation for dir hashes, which should be preserved accross reboots. Should fix the msg from friends sending requests for the "wrong" dir hashes. - 3c5e12a csoler Mon, 10 Oct 2016 11:29:03 +0200 fixed compilation on windows - 4e48005 csoler Sun, 9 Oct 2016 21:43:00 +0200 replaced explicit old code in cleanupDirectory() by new code based on FolderIterator - 957d48b csoler Sun, 9 Oct 2016 21:03:01 +0200 removed folderIterator::d_name() because it duplicates file_name() - 32816ed csoler Sun, 9 Oct 2016 18:23:25 +0200 Merge pull request #531 from PhenomRetroShare/Fix_AvatarOnEditCircle - 6e8e5d0 csoler Sun, 9 Oct 2016 18:20:00 +0200 Merge pull request #529 from cavebeat/rus_patch - 3d9fb60 Phenom Sun, 9 Oct 2016 12:37:09 +0200 Fix Missing ID-Avatars in Create Circle Menu - - -- Cyril Soler Sat, 5 Nov 2016 21:00:00 +0100 - -retroshare06 (0.6.1-1.20161008.9e1f21b9~xenial) xenial; urgency=low - - 9a3eb1c csoler Sat, 8 Oct 2016 14:30:58 +0200 Merge pull request #528 from sehraf/pr-drop-ssh-protobuf - c55fb0d csoler Sat, 8 Oct 2016 14:11:43 +0200 Merge pull request #524 from cavebeat/compile - 97f2589 csoler Sat, 8 Oct 2016 14:09:34 +0200 Merge pull request #513 from grennvyper/patch-1 - aa200bf csoler Sat, 8 Oct 2016 14:06:54 +0200 Merge pull request #526 from marcobarbosa16/master - 2591818 csoler Sat, 8 Oct 2016 14:04:31 +0200 Merge pull request #515 from PhenomRetroShare/Add_ContextMenuToShowImageInLobby - 9ed759d csoler Sat, 8 Oct 2016 13:38:18 +0200 Merge pull request #527 from PhenomRetroShare/Fix_DesktopFileName - ada1cee sehraf Sat, 8 Oct 2016 12:59:27 +0200 remove deprecated ssh/protobuf code - 4b0f82a Phenom Sat, 8 Oct 2016 12:12:26 +0200 Fix Desktop Filename for option page message. - 69ecca4 MarcoBarbosa Fri, 7 Oct 2016 23:12:40 -0300 add uninstall section in README.md - 7cd31aa csoler Wed, 5 Oct 2016 14:15:12 +0200 fixed bug preventign update of subdirs after last commit - fdfd2e9 Phenom Sat, 24 Sep 2016 16:12:44 +0200 Add context menu to show hidden image on lobby. - 854eebb csoler Wed, 5 Oct 2016 10:59:51 +0200 only update subfiles and subdirs list during dir watching sweep when the TS of the dir has changed. Greatly improve cost of regular directory watching process - d020d8d thunder2 Wed, 5 Oct 2016 06:40:02 +0200 Windows build environment: - Added automatic mode for creating git-log - Fixed filename of installer - 891e61e cave beat Tue, 4 Oct 2016 23:27:40 +0200 MacOS to .md, + README update - 9177c82 cave beat Tue, 4 Oct 2016 23:14:50 +0200 updated MSys2 Install Guide to .md - d367491 thunder2 Tue, 4 Oct 2016 21:45:59 +0200 Fixed env.bat for Windows build - 20cd123 csoler Tue, 4 Oct 2016 21:41:38 +0200 removed annoying ERROR output that is more a debug info than a real error, in p3filelists - e42dae8 csoler Tue, 4 Oct 2016 21:34:23 +0200 continue sending packet slicing probes in case the peer has restarted - b08a62a csoler Tue, 4 Oct 2016 21:25:48 +0200 restored delay between location cleaning to 5 mins - 133676f csoler Tue, 4 Oct 2016 21:24:53 +0200 simplified the code to remove old locations and fixed bug that in some situation would let a PGP key with no locations - a35985e thunder2 Tue, 6 Sep 2016 21:31:41 +0200 Windows build environment: - Added build script - Added build-installer script - Added pack script - Added gitlog script - Use shadow build - ebfc82c csoler Mon, 3 Oct 2016 21:44:34 +0200 save/restore selection in shared dir list tree view - ed8d786 csoler Mon, 3 Oct 2016 20:49:49 +0200 added missing mChanged=false that caused remote directories to save far too often - c968490 csoler Sat, 1 Oct 2016 22:14:50 +0200 switched to floating point time for bandwidth estimation in pqistreamer. Helps a lot RTTs since rounding to int prveviously caused packets to be delayed up to 1 sec (improvement by Jollavilette) - 20397c3 csoler Sat, 1 Oct 2016 18:09:39 +0200 Merge pull request #523 from bryongloden/patch-1 - 9ae0511 Bryon Gloden Sat, 1 Oct 2016 12:01:09 -0400 uninitialized variable: size - a751155 csoler Sat, 1 Oct 2016 15:46:32 +0200 do not send un-hashed files to friends, and allow to re-send the directory content when all files are hashed - 84341f2 csoler Thu, 29 Sep 2016 22:30:26 +0200 changed _outgoing_file_hashes into a new map that connects services to tunnel ID instead of file hash, hence avoiding to remove a hash on server side when a tunnel is closed (bug found by Jolavillette) - b62b66a csoler Thu, 29 Sep 2016 20:55:16 +0200 replace std::vector for std::set to represent _hashes_to_remove, so as to avoid duplicates (suggested by Jo) - 1fd624c csoler Thu, 29 Sep 2016 12:47:14 +0200 Merge pull request #519 from PhenomRetroShare/Fix_WinCompil - 0ea909d Phenom Thu, 29 Sep 2016 12:45:01 +0200 Fix Windows Compilation after 6e4ba76b - e185bcd csoler Wed, 28 Sep 2016 23:02:24 +0200 fixed removal of directory when removing a friend - c276165 csoler Wed, 28 Sep 2016 22:28:43 +0200 updated clean.sh script to 0.6.1 - - -- Cyril Soler Sat, 8 Oct 2016 15:00:00 +0100 - -retroshare06 (0.6.1-1.20160928.e185bcda~trusty) trusty; urgency=low - - Warning: new file list sharing system. - * Old list of shares is not preserved and should be re-defined. - * The hash cache however is imported from the old format, meaning that Retroshare should not re-hash new files that were already shared before. - * New system offers interactive browsing of shared dirs from online friends and background update of directory lists - * The old cachestrapper system is removed since it is now obsolete. - - 6e4ba76 csoler Wed, 28 Sep 2016 21:55:03 +0200 improved display of shared directories for friends with no update info - 1d977dd csoler Wed, 28 Sep 2016 16:39:48 +0200 Merge pull request #518 from PhenomRetroShare/Fix_InternalFileHierarchyStorage__check - 9672fe3 Phenom Wed, 28 Sep 2016 11:35:44 +0200 Fix InternalFileHierarchyStorage::check, error_string will never be shown as always return true. - bf0777f csoler Tue, 27 Sep 2016 23:13:59 +0200 fixed update of DirHash list and FileHash list when files and dirs are removed, while keeping the cost low - 5547d71 csoler Tue, 27 Sep 2016 21:09:13 +0200 fixed advanced search not closing - c26970f csoler Tue, 27 Sep 2016 20:20:12 +0200 fixed open folder from File Sharing dialog - 37a4e77 csoler Tue, 27 Sep 2016 20:13:02 +0200 removed debug info in directory_storage.cc - 2916c8b csoler Tue, 27 Sep 2016 10:13:51 +0200 removed debug output in folderiterator - 0bcb6c3 csoler Tue, 27 Sep 2016 09:59:51 +0200 Merge pull request #517 from sehraf/pr-filelist-fixes - 9d72b06 sehraf Tue, 27 Sep 2016 09:50:59 +0200 add thread names & remove some warnings - a2ff5d2 csoler Mon, 26 Sep 2016 22:06:30 +0200 simplified p3FileList code a little bit: removed mFriendIndexTab and made locked_getFriendIndex() create the remote directories on demand - fc1a350 csoler Mon, 26 Sep 2016 21:12:13 +0200 added automated import of old hash cache in order to avoid re-hashing everything when switching to the new system - 15f69b2 csoler Mon, 26 Sep 2016 11:11:22 +0200 fixed crash in debug output in p3filelists - b95fbe3 csoler Mon, 26 Sep 2016 10:49:59 +0200 added a few more missing checks for null entries in mRemoteDirectories - 3beaa97 csoler Mon, 26 Sep 2016 10:03:51 +0200 fixed potential crash when an entry in mRemoteDirectories is NULL - 1125dfe csoler Sun, 25 Sep 2016 23:42:20 +0200 fixed folder iterator to properly handle broken symbolic links - be6370e csoler Sun, 25 Sep 2016 21:34:18 +0200 added missing code for searchTerms in new p3filelists service - 93e70ca csoler Sun, 25 Sep 2016 21:01:03 +0200 fixed search on remote files - 068955d csoler Sun, 25 Sep 2016 18:51:33 +0200 fixed up a few debug messages in p3filelists - bb4b577 csoler Sun, 25 Sep 2016 18:44:28 +0200 prevent storage for hash of files that cannot be hashed - ddc870c csoler Sun, 25 Sep 2016 11:05:01 +0200 added some more debug info in DirectoryStorage class - 19b1c4f csoler Sun, 25 Sep 2016 11:04:42 +0200 fixed potential crash due to not checking if mRemoteDirectory[i] is empty in p3FileLists - cb4dc96 csoler Sat, 24 Sep 2016 17:12:38 +0200 removed debug info in p3filelists - ee54c02 csoler Sat, 24 Sep 2016 14:47:45 +0200 merged branch v0.6-FileLists locally into master - 52ee76e csoler Sat, 24 Sep 2016 14:14:32 +0200 removed annoying debug message in ID system - 34f1ebb csoler Sat, 24 Sep 2016 14:13:38 +0200 Merge pull request #507 from mr-alice/v0.6-FileLists - e03bd6c mr-alice Sat, 24 Sep 2016 13:56:02 +0200 fixed bug causing call to closedir on invalid handle - 96b333d Mr.Alice Sat, 24 Sep 2016 09:04:25 +0200 Merge pull request #1 from hunbernd/v0.6-FileLists - 8500b5e hunbernd Fri, 23 Sep 2016 21:56:41 +0200 Fixed inconsistency in integer sizes that caused segmentation fault while hashing files also broken message on the GUI - 71a5bff mr-alice Fri, 23 Sep 2016 20:07:57 +0200 added small hack against re-hashing due to stat64 depending on local time on windows - 70c8e14 hunbernd Fri, 23 Sep 2016 19:00:07 +0200 Fix folderiterator.cc:23: error: cannot convert '_stat64*' to '_stati64*' for argument '2' to 'int _wstati64(const wchar_t*, _stati64*)' - 529ab64 hunbernd Fri, 23 Sep 2016 18:43:48 +0200 Fixed missing time.h includes - ca281e4 hunbernd Fri, 23 Sep 2016 18:32:36 +0200 Fixed error with 32 bit GCC Both uint32_t and size_t are resolved to unsigned int, it makes 2 lines conflicted. This happens in filelist_io.cc, lines: 31-32, 36-37, 41-42 - 9ce4b13 mr-alice Fri, 23 Sep 2016 19:03:54 +0200 merged upstream/master - 9f76b76 mr-alice Fri, 23 Sep 2016 19:01:14 +0200 forced closedir in order to avoid leak of file descriptor in FolderIterator - 7bddd4b csoler Fri, 23 Sep 2016 13:18:55 +0200 removed call to exit causing the software to stop when local network interfaces are not ready - 0cc4ebd mr-alice Thu, 22 Sep 2016 21:47:58 +0200 added comments in the file lists code. Removed unused functions. Added a few missing mutexes. - e6e9582 csoler Thu, 22 Sep 2016 13:44:53 +0200 fixed bug in estimation of next FT rate that caused downloads to stuck for a while - 7f99bc2 mr-alice Thu, 22 Sep 2016 10:26:05 +0200 fixed compilation after removal of dbase/ - 1be5990 mr-alice Wed, 21 Sep 2016 22:31:39 +0200 disabled dbase from unittests.pro, which should be cnverted into proper tests for file_sharing. - 0f5cf56 mr-alice Wed, 21 Sep 2016 22:27:53 +0200 removed dbase directory - 0757fb3 mr-alice Tue, 20 Sep 2016 20:51:50 +0200 merged upstream/master - 7488ad4 mr-alice Sun, 18 Sep 2016 22:32:30 +0200 added display of files being hashed with green color and blue icon. This could be improved I suppose. - 0579fb0 mr-alice Sun, 18 Sep 2016 22:14:25 +0200 removed unused tickWatchers() - 9cf9504 mr-alice Sun, 18 Sep 2016 22:05:27 +0200 removed most of debug info in file list sharing code - ff4c438 mr-alice Sun, 18 Sep 2016 21:41:18 +0200 fixed reloading of ShareManager due to postModDirectories and made it reload after addign new share - e4568a8 mr-alice Sun, 18 Sep 2016 21:16:25 +0200 removed some unused code - de104d3 mr-alice Sun, 18 Sep 2016 18:34:39 +0200 fixed up GUI parameters in Directories. Removed HashCache duration handles since this is now automatic - 04c908e MrAlice Fri, 16 Sep 2016 09:35:03 +0200 fixed two bugs in dirlist chunking system causing checksum errors - 3f9acb5 mr-alice Thu, 15 Sep 2016 23:51:46 +0200 added item splitting and checksum checking in p3filelists - 2343c91 mr-alice Thu, 15 Sep 2016 21:40:53 +0200 added display of hash progress - d3b4622 mr-alice Thu, 15 Sep 2016 21:45:00 +0200 merged modifications from origin - ca30b0d MrAlice Thu, 15 Sep 2016 10:41:40 +0200 fixed terrible cost of calling requestDirDetails before createIndex - f58e9c1 mr-alice Wed, 14 Sep 2016 22:41:02 +0200 improved debug output of directory storage, and fixed bug causing loading error (previously crashing files should be removed) - ddc89a6 mr-alice Wed, 14 Sep 2016 21:52:16 +0200 fixed core dump in printout of empty slots. Improved dir sync-ing strategy - e985a2c mr-alice Wed, 14 Sep 2016 20:43:52 +0200 removed call to setDynamicSortFilter in SharedFilesDialog, as a workaround for the crash when sorting - afbb641 mr-alice Wed, 14 Sep 2016 20:41:22 +0200 fixed forceDirectoryCheck and inDirectoryCheck methods - 93818f6 mr-alice Tue, 13 Sep 2016 21:23:27 +0200 simplified a bit the code in Flat_Model, and tried to fix the crash when sorting items - 53c65ff mr-alice Tue, 13 Sep 2016 18:54:00 +0200 removed cache transfers from the GUI - 02d2fb4 mr-alice Tue, 13 Sep 2016 13:53:51 +0200 fixed search and filter for regular expressions and terms - 6ac9b27 mr-alice Tue, 13 Sep 2016 12:14:16 +0200 moved rsexpr.cc into util/ - a2e34f9 mr-alice Tue, 13 Sep 2016 12:05:22 +0200 moved regular expression classes into a separate namespace - e9418bb mr-alice Tue, 13 Sep 2016 00:01:26 +0200 added file headers with proper licence terms - 9f66c00 mr-alice Mon, 12 Sep 2016 23:37:19 +0200 moved rsexpr to file_sharing directory - 274f924 mr-alice Mon, 12 Sep 2016 20:55:20 +0200 fixed getFileInfo and transfer from new database - af69790 csoler Mon, 12 Sep 2016 10:15:13 +0200 added control file for debian jessie - c1e538f mr-alice Sun, 11 Sep 2016 17:52:12 +0200 added interactive update of dir entries when browsing files from an online friend - 3718e7e mr-alice Sat, 10 Sep 2016 20:47:51 +0200 fixed last bugs in hash-based dir list exchange. It works! - 88f8538 mr-alice Sat, 10 Sep 2016 17:25:29 +0200 fixed a few bugs in hash-based syncing - 384d001 mr-alice Sat, 10 Sep 2016 13:57:05 +0200 progress in hash-based sync. Not there yet. - 0ea695b mr-alice Thu, 8 Sep 2016 23:43:14 +0200 fixed a few bugs in hash-based sync. Not there yet. - fafe684 mr-alice Thu, 8 Sep 2016 21:34:53 +0200 finished implementing hash-based transactions. To be tested. - e3d12c4 csoler Thu, 8 Sep 2016 17:08:34 +0200 Merge pull request #491 from G10h4ck/warnings_cleanup - eaa8ad8 MrAlice Wed, 7 Sep 2016 22:31:12 +0200 half implemented the hash-based communication for dirs between friends - ea380b2 csoler Wed, 7 Sep 2016 21:29:48 +0200 Merge pull request #487 from AsamK/fix_wayland - 798ffd8 csoler Wed, 7 Sep 2016 21:28:28 +0200 Merge pull request #488 from sehraf/pr-stats-api - ad1ba7a mr-alice Tue, 6 Sep 2016 23:05:46 +0200 fixed loading/saving of remote directories - e9540d7 defnax Tue, 6 Sep 2016 17:45:42 +0200 Improved look and feel layout of Profile Generation Dialog - 679c53b mr-alice Mon, 5 Sep 2016 21:22:11 +0200 added load/save of directory hierarchies. Fixed bug in loading of hash cache (caused y non initialisation of dest string in GetRawString()) - 5f5ce4a thunder2 Tue, 17 May 2016 19:02:14 +0200 Fixed version_detail_bash_script with shadow build - ea6431e thunder2 Mon, 5 Sep 2016 14:03:39 +0200 Fixed Windows shadow build with Qt 5.6 or higher - 5b221c5 mr-alice Sat, 3 Sep 2016 18:46:03 +0200 moved encrypted data output/input to FileListIO - 371171f mr-alice Sat, 3 Sep 2016 13:29:23 +0200 moved InternalFileHierarchyStorage to separate file. Fixed loading/saving infrastructure (not working yet) - 153783a mr-alice Fri, 2 Sep 2016 22:08:27 +0200 fixed bug in saving hash cache - 7b566f2 mr-alice Fri, 2 Sep 2016 21:49:43 +0200 added load/save for hash cache in the proper place - 52ef7ad mr-alice Thu, 1 Sep 2016 21:41:12 +0200 fixed saving of config when diretory list is changed - 6fc02e0 mr-alice Thu, 1 Sep 2016 21:04:48 +0200 added load/save of configuration and shared dirs list - f191fe6 mr-alice Thu, 1 Sep 2016 20:02:47 +0200 fixed compilation with new RsNodeGroupId - ade6017 mr-alice Thu, 1 Sep 2016 19:52:31 +0200 merged with upstream/master - 1f3ea6f mr-alice Wed, 31 Aug 2016 22:47:05 +0200 added selection of subdirs to be seen for friends depending on permissions. Enabled dynamic update at friends - - -- Cyril Soler Wed, 28 Sep 2016 22:00:00 +0100 - -retroshare06 (0.6.1-1.20160831.53e26983~trusty) trusty; urgency=low - - Release of version 0.6.1. - * See detailed logs: https://github.com/RetroShare/RetroShare/blob/master/build_scripts/Debian%2BUbuntu/changelog - * Release blog post: https://retroshareteam.wordpress.com - * Website: https://github.com/Retroshare/Retroshare/releases - - -- Cyril Soler Wed, 31 Aug 2016 12:00:00 +0100 - -retroshare06 (0.6.0-1.20160818.b9ac4f87) xenial; urgency=low - - 9780f1f Phenom Mon, 15 Aug 2016 12:00:44 +0200 Add AutoHide to RSImageBlockWidget - 368a429 csoler Wed, 17 Aug 2016 09:40:16 +0200 fixed read_125Size and write_125Size according to RFC4880 - 4b11fb1 defnax Tue, 16 Aug 2016 22:26:48 +0200 update FeedReader icons - 6682a7a defnax Tue, 16 Aug 2016 22:02:30 +0200 added new mainwindow icons for RetroShare. - 4d5be7f csoler Tue, 16 Aug 2016 10:29:21 +0200 Merge pull request #476 from PhenomRetroShare/Add_FilterBannedInIdDialog - 4572dc6 csoler Tue, 16 Aug 2016 10:22:00 +0200 Merge pull request #475 from PhenomRetroShare/Fix_RSTextBrowser_loadRessource_OnWindows - 26cbb27 csoler Tue, 16 Aug 2016 10:20:30 +0200 Merge pull request #472 from PhenomRetroShare/Fix_ChangeImageBlockedIconOnRSTextBrowser - bb9f158 csoler Tue, 16 Aug 2016 10:05:38 +0200 Merge pull request #473 from PhenomRetroShare/Fix_RsCertificate_toStdString - 81cd2e9 thunder2 Tue, 16 Aug 2016 09:09:19 +0200 Fixed MSYS2 compile (use correct bracket in pro file) - accd3ca Phenom Mon, 15 Aug 2016 19:05:00 +0200 Fix RsTextBrowser::loadRessource on Windows. - dd2e4c3 Phenom Mon, 15 Aug 2016 12:11:56 +0200 Change Image Blocked Icon On RSTextBrowser - 38a9e10 Phenom Mon, 15 Aug 2016 14:19:29 +0200 Fix RsCertificate::toStdString by fixing PGPKeyParser::read_125Size. - df44f50 Phenom Mon, 15 Aug 2016 19:53:43 +0200 Add Banned Filter in IdDialog. - b8158a4 Thunder Mon, 15 Aug 2016 19:54:52 +0200 Merge pull request #474 from PhenomRetroShare/Fix_MSys2WindowsCompilation - 3200ea5 Phenom Mon, 15 Aug 2016 16:16:46 +0200 Fix MSys2 Windows Compilation after #f1847a9 commit. - 3640e32 thunder2 Mon, 15 Aug 2016 11:49:36 +0200 Updated build of external libraries for Windows compile - f1847a9 thunder2 Sun, 14 Aug 2016 14:11:01 +0200 Changed check for MSYS2 environment for Windows compile - b0b4320 defnax Sat, 13 Aug 2016 16:20:58 +0200 decrease chat bar widget icon size - c01f5a3 defnax Sat, 13 Aug 2016 13:16:35 +0200 Merge pull request #468 from PhenomRetroShare/Add_ChatLoadEmbeddedImagesOption - fcad9d9 Phenom Sat, 13 Aug 2016 10:42:42 +0200 Fix RSTextBrowser::loadResource if image comes from stylesheet. - f71aad4 Phenom Tue, 9 Aug 2016 23:32:25 +0200 Add Chat Load Embedded Images Option like forum and message. - 0e1c0c2 defnax Fri, 12 Aug 2016 22:19:44 +0200 Added search filter for participants list. - ab82c4a csoler Fri, 12 Aug 2016 15:24:40 +0200 added missing return in PGPKeyUtil, causing corruption of keys in some--possible rare--situations - 81d42f0 thunder2 Fri, 12 Aug 2016 14:14:09 +0200 Fixed MSYS2AUTOMAKE path in msys2_build_libs/Makefile - f3b8843 thunder2 Fri, 12 Aug 2016 10:03:47 +0200 Fixed QMAKE_PRE_LINK for Windows compile without MSYS2 - 1fe7dce defnax Wed, 10 Aug 2016 00:22:23 +0200 Set icons for the voting combo box - d1645e9 defnax Tue, 9 Aug 2016 19:38:56 +0200 moved auto-ban checkbox to a better position - aaf13eb csoler Tue, 9 Aug 2016 10:47:08 +0200 Merge pull request #466 from PhenomRetroShare/Fix_RsCollEditorCountUpdateWhenRemove - 32db280 csoler Tue, 9 Aug 2016 10:35:01 +0200 Merge pull request #459 from PhenomRetroShare/Add_CreateNewGXSIDInGenCertDialog - 275c47e Phenom Tue, 9 Aug 2016 01:22:14 +0200 Add Title when ask for password. - 6edd7bb Phenom Sat, 6 Aug 2016 17:15:56 +0200 Add possibility to create GXSId directly on GenCertDialog. - 6db747a csoler Mon, 8 Aug 2016 22:19:38 +0200 Merge pull request #467 from PhenomRetroShare/Fix_NATStatusLED - c2c8893 csoler Mon, 8 Aug 2016 22:18:32 +0200 Merge pull request #462 from PhenomRetroShare/Add_CaseSensitiveOptionForLobbyNotify - 0b1f08a csoler Mon, 8 Aug 2016 22:12:55 +0200 Merge pull request #461 from PhenomRetroShare/Add_CommentNumberOnButton - 723d96b csoler Mon, 8 Aug 2016 22:11:10 +0200 Merge pull request #460 from PhenomRetroShare/Fix_LobbyNotifyIcon - 9c601dc csoler Mon, 8 Aug 2016 22:10:01 +0200 Merge pull request #463 from PhenomRetroShare/Fix_ImageBlockOnRsTextBrowser - d59f7a0 Phenom Mon, 8 Aug 2016 21:59:12 +0200 Fix NAT Status LED - ee368ef Phenom Mon, 8 Aug 2016 20:45:35 +0200 Fix RsCollection Editor Count Update When Removing items. - c0c7ede csoler Mon, 8 Aug 2016 20:14:05 +0200 Merge pull request #464 from G10h4ck/libresapilocal - 600e2d6 csoler Mon, 8 Aug 2016 20:11:21 +0200 Merge pull request #465 from PhenomRetroShare/Fix_RsGxsNetService_handleRecvPublishKeys_grpMeta_NULL - 72d7435 Phenom Mon, 8 Aug 2016 19:05:42 +0200 Fix RsGxsNetService::handleRecvPublishKeys when grpMeta is NULL - 183ac22 Gio Mon, 8 Aug 2016 14:02:01 +0200 ApiServerLocal run on it's own thread to avoid stopping UI ApiLocalConnectionHandler can now handle both buffered (QLocalSocket based) and unbuffered (like ncat or simple scripts) clients - 88407e6 Phenom Sun, 7 Aug 2016 19:41:44 +0200 Fix Image Block on RSTextBrowser. - d048270 Phenom Sun, 7 Aug 2016 19:00:23 +0200 Add Case Sensitive option for Lobby Notify. - ea6bbac Phenom Sun, 7 Aug 2016 14:40:04 +0200 Add Comment Number On Button. - dea776a defnax Sat, 6 Aug 2016 18:35:07 +0200 Moved font menu to Settings menu - 776e404 Phenom Sat, 6 Aug 2016 17:52:12 +0200 Fix Lobby Notify Icon. - 9f14103 csoler Sat, 6 Aug 2016 15:47:23 +0200 Merge pull request #458 from PhenomRetroShare/Fix_QMessageBoxAddWidget - 329a7e7 csoler Sat, 6 Aug 2016 15:46:01 +0200 Merge pull request #456 from PhenomRetroShare/Fix_ForumItemSortOnLastView - 21bd8cd Phenom Sat, 6 Aug 2016 13:49:39 +0200 Fix QMessageBox layout addWidget. - beab81e Phenom Sat, 6 Aug 2016 11:57:20 +0200 Fix Forum Item sort on LastPost View. - f3d1a6c defnax Fri, 5 Aug 2016 19:13:59 +0200 Added missed notify icon - ac73fd9 defnax Fri, 5 Aug 2016 01:01:56 +0200 Merge branch 'master' of https://github.com/RetroShare/RetroShare - e2bb477 defnax Fri, 5 Aug 2016 01:00:53 +0200 Added new blue icon set for Chat Widget (icons by Beluga) svg ad png Format - 96e73b3 csoler Thu, 4 Aug 2016 22:38:59 +0200 Merge pull request #454 from csoler/v0.6-ContactList - cd433e8 csoler Thu, 4 Aug 2016 22:33:45 +0200 fixed bug causing uninitialised memory read in reputation changing - 5a55de5 csoler Thu, 4 Aug 2016 22:01:11 +0200 added missing DontUseNativeDialog flag in misc.cpp - 46d4863 defnax Thu, 4 Aug 2016 19:50:00 +0200 Merge branch 'master' of https://github.com/RetroShare/RetroShare - e2d29f6 defnax Thu, 4 Aug 2016 19:46:20 +0200 update icons - 3993fbf csoler Thu, 4 Aug 2016 16:10:00 +0200 fixed auto-positive opinions for contacts - c757630 csoler Thu, 4 Aug 2016 13:12:55 +0200 added callback in RsGenExchange subclasses to autorise new groups, to be used by p3GxsIdentity - 7545ad4 csoler Thu, 4 Aug 2016 11:43:35 +0200 simplied/improved reputation system. Now ids can be banned based on their owner node using a single checkbox in the Person tab, with immediate effect - 70228ee csoler Thu, 4 Aug 2016 11:02:12 +0200 fixed missign return, probably causing crashes - 48b2e05 csoler Wed, 3 Aug 2016 19:56:49 +0200 Merge pull request #453 from G10h4ck/libresapilocal - c4ef4d7 csoler Tue, 2 Aug 2016 23:57:11 +0200 saved owner node ID in GXS reputation item - 353308e Gio Wed, 3 Aug 2016 14:35:45 +0200 ApiLocalConnectionHandler class quit() at the end outside if - 60cf299 csoler Wed, 3 Aug 2016 08:46:15 +0200 Merge pull request #436 from G10h4ck/libresapilocal - e4e29c5 Gio Wed, 3 Aug 2 016 00:50:49 +0200 quit ApiLocalConnectionHandler after replying API query - 17003f1 csoler Tue, 2 Aug 2016 16:25:00 +0200 modified wrong comment in why mLastPost should not be used in rsgxsnetservice.cc, and added a call to clearing GrpMeta cache when new msg in that group are received - 3cd90ae csoler Mon, 1 Aug 2016 16:35:19 +0200 re-disabled the code to update the server TS to last post as it can severely perturbate the distribution of posts. Added a call to update msgServerUpdateMap when new messages received - d6be440 csoler Mon, 1 Aug 2016 15:38:51 +0200 re-enabled some code previously disabled in last commit - b1288bc csoler Mon, 1 Aug 2016 14:43:17 +0200 added missing time stamp of msgServerUpdateMap when posting a new message - 5fac5a8 csoler Sun, 31 Jul 2016 22:14:23 +0200 moved all getOpenFilename to use misc::getOpenFilename - c643d1e csoler Sun, 31 Jul 2016 22:07:43 +0200 Merge pull request #451 from PhenomRetroShare/Fix_ImportExportCertASC - d000d75 Phenom Sun, 31 Jul 2016 21:03:45 +0200 Fix Import and Export Cert file *.asc. - edce1e9 csoler Sun, 31 Jul 2016 17:47:50 +0200 Merge pull request #449 from PhenomRetroShare/Add_RemoveDuplicateCBInRSCollEditor - 6e25a30 csoler Sun, 31 Jul 2016 17:21:12 +0200 Merge pull request #450 from PhenomRetroShare/Fix_QFileDialogDontUseNativeDialog - 6935441 Phenom Sun, 31 Jul 2016 16:23:41 +0200 Fix other QFileDialog call in misc adding DontUseNativeDialog option. - 0317904 Phenom Sun, 31 Jul 2016 16:08:15 +0200 Add Remove Duplicate checkbox in RsCollection editor. - 64b5609 csoler Sun, 31 Jul 2016 11:52:23 +0200 Merge pull request #448 from PhenomRetroShare/Fix_IdDialogContextMenuShownAtStartUp - 998fede Phenom Sun, 31 Jul 2016 11:15:47 +0200 Fix IdDialog ContextMenu shown at startup. - 3721055 csoler Sat, 30 Jul 2016 21:15:08 +0200 Merge pull request #447 from PhenomRetroShare/Fix_IdChooserInSignedLobby - bef7db4 Phenom Sat, 30 Jul 2016 19:14:59 +0200 Fix IdChooser in Signed Lobby. - 2921d9e csoler Sat, 30 Jul 2016 15:26:27 +0200 Merge pull request #445 from PhenomRetroShare/Add_MergeDisplayMenuToHeaderContextMenu - 2126234 csoler Sat, 30 Jul 2016 15:25:30 +0200 Merge pull request #446 from PhenomRetroShare/Fix_FriendListSortGPGItem - 46e4b3b Phenom Sat, 30 Jul 2016 13:58:02 +0200 Fix FriendList sorting when expand PGPItem sorted by LastContact or IP - ae9ab64 Phenom Sat, 30 Jul 2016 13:27:23 +0200 Move Display button's menu to Header context menu on FriendList. - d62f8a4 defnax Fri, 29 Jul 2016 23:21:46 +0200 Fixed stylesheet - 032bcf7 defnax Fri, 29 Jul 2016 23:14:46 +0200 Fixed Stylesheets - b1dcd2f csoler Fri, 29 Jul 2016 22:02:57 +0200 Merge pull request #444 from PhenomRetroShare/Add_MergeFilterIdFilterToHeaderContextMenu - 1707c07 csoler Fri, 29 Jul 2016 21:58:31 +0200 added DontUseNativeDialog as default flag in file dialog in order to avoid some crashed when not using it - d3beccf Phenom Fri, 29 Jul 2016 20:54:26 +0200 Merge Filter ComboBox to Header Context Menu in IdDialog. - 431dd68 defnax Fri, 29 Jul 2016 17:29:54 +0200 Temporary solution for the Filter Combobox it takes to much space, no space more for search filter,moved under the ToolBar. - 7c2e2bd Gio Thu, 28 Jul 2016 17:24:17 +0200 take in account that QLocalSocket is of type STREAM so it doesn't emit readyRead event for each write() on the other side - fe7de83 Gio Thu, 28 Jul 2016 14:08:49 +0200 WebUI is now optional but enabled by default at compile time - c73be93 csoler Tue, 26 Jul 2016 16:06:03 +0200 removed anti-spam message that has become irrelevant - da8a520 csoler Mon, 25 Jul 2016 16:07:53 -0400 Merge pull request #442 from csoler/v0.6-ContactList - ed05ec7 csoler Mon, 25 Jul 2016 16:06:28 -0400 fixed text in People tab - f5e55e8 csoler Mon, 25 Jul 2016 16:04:30 -0400 fixed a few bugs in the People tab - 2189771 csoler Mon, 25 Jul 2016 15:45:49 -0400 added two new options to people page for handlign reputations: change the ban limit from friend opinions, and allow to auto-set positive opinions to contacts - efd503e csoler Mon, 25 Jul 2016 14:56:55 -0400 removed the possibility of GXS groups to keep track of post origin before release, as it is too intrusive as compared to the benefits - 35c01e5 csoler Fri, 22 Jul 2016 21:10:54 -0400 updated translation files - 1a4d400 csoler Fri, 22 Jul 2016 20:40:42 -0400 updated changlog - e5d9bd5 csoler Fri, 22 Jul 2016 20:39:55 -0400 Merge pull request #441 from PhenomRetroShare/Fix_PostedFeedItemWithComments - 7c7da7e Phenom Sat, 23 Jul 2016 01:48:23 +0200 Fix Posted Feed Item when received comment. - - -- Cyril Soler Wed, 18 Aug 2016 16:00:00 +0100 - -retroshare06 (0.6.0-1.20160722~daf54dff) precise; urgency=low - - daf54df csoler Fri, 22 Jul 2016 17:49:07 -0400 fixed missing RsGxsGrpMeta cache update when updating grp meta, which caused unstable group flags/name/perms update - 95edc5b csoler Fri, 22 Jul 2016 10:06:24 -0400 fixed variable name problem in ServerPage (with no consequences) - 713deac csoler Sat, 16 Jul 2016 18:39:36 -0400 time-stamping newly received GXS ids - 95202d6 csoler Sat, 16 Jul 2016 18:26:04 -0400 removed possible double free() of buf in parse_headers (suggestion by GuessWho) - 71168c7 csoler Fri, 15 Jul 2016 22:47:35 -0400 drop net ID request when peer list is empty - 8fdd255 csoler Fri, 15 Jul 2016 22:28:36 -0400 improved strategy for merging pending ID load requests, fixing bug in previous commit - 59d0859 csoler Fri, 15 Jul 2016 22:25:15 -0400 fixed compilation in tests - 9fd44a5 csoler Fri, 15 Jul 2016 19:28:54 -0400 Merge pull request #437 from PhenomRetroShare/Fix_UnitTests - 9126076 csoler Fri, 15 Jul 2016 17:09:22 -0400 removed debug info in p3IdService and RsGxsNetService - 90dfc6e csoler Fri, 15 Jul 2016 16:59:57 -0400 improved explicit requests of missing GXS ids, also fixing situations where empty peers lists would wipe out pe - 3152eca Phenom Fri, 15 Jul 2016 15:03:41 +0200 Fix UnitTests and run it in windows too. - 8ccfee2 csoler Tue, 12 Jul 2016 22:49:21 -0400 Merge pull request #434 from csoler/v0.6-LocalCircles - c555300 csoler Tue, 12 Jul 2016 22:45:23 -0400 fixed merging with upstream - c7e60d0 csoler Tue, 12 Jul 2016 22:42:19 -0400 removed debug info in rsgxsnetservice - ed523e8 csoler Mon, 11 Jul 2016 22:44:15 -0400 fixed backend for locl circles - 931c3df csoler Mon, 11 Jul 2016 21:33:09 -0400 fixed display of group node restriction in GxsGroupDialog and info - a7d82cf csoler Mon, 11 Jul 2016 18:44:52 -0400 delete GXS IDs with no TS - 45b189c csoler Mon, 11 Jul 2016 18:30:12 -0400 removed EXTERNAL/PERSONNAL options from GxsCircleChooser - 951f29f csoler Sun, 10 Jul 2016 23:00:47 -0400 removed debug info in rsDataService - 95915fa csoler Sun, 10 Jul 2016 22:46:37 -0400 removed cross deadlock between p3GxsReputation and p3IdService - d089e2e csoler Sat, 9 Jul 2016 18:06:59 -0400 added a GroupChooser class to choose groups of friend nodes - 0125f91 csoler Wed, 6 Jul 2016 22:36:59 -0400 fixed deserialise bug in FileItem - a69629c csoler Wed, 6 Jul 2016 22:16:05 -0400 added missing own id from group list, and removed possible duplicates in random group ids - 269f945 csoler Wed, 6 Jul 2016 22:02:56 -0400 fixed load/save of new group ids and backward compatibility with FriendList - 01c0d2f csoler Tue, 5 Jul 2016 23:49:43 -0400 finished conversion to RsNodeGroupId for file transfer and GUI - 1c277ab csoler Tue, 5 Jul 2016 23:47:55 -0400 Merge pull request #433 from csoler/v0.6-SqlCache - 4ee9eff csoler Mon, 4 Jul 2016 23:55:48 -0400 changed internal storage of groups of friend nodes so as to use an abstract ID instead of a string (phase 1 of l - 42f2210 csoler Sun, 3 Jul 2016 23:15:05 -0400 removed debug info in IdDialog - 218ca45 csoler Sun, 3 Jul 2016 23:12:56 -0400 removed some debug info in rsdataservice - 09ad539 csoler Sun, 3 Jul 2016 22:02:23 -0400 fixed red color in IdDialog - 9f9f021 csoler Sun, 3 Jul 2016 22:02:04 -0400 remved debug output in udlstck - c98416d csoler Sun, 3 Jul 2016 18:59:30 -0400 added auto-cleaning of reputation info for outdated/removed identities - bf28ea7 csoler Sun, 3 Jul 2016 18:49:02 -0400 removed debug info in udpstack.cc - 692293e csoler Sun, 3 Jul 2016 18:12:50 -0400 added red color to banned identities in IdDialog - e611b2b csoler Sun, 3 Jul 2016 18:06:01 -0400 moved isIdentitybanned from p3GxsReputations to p3IdService, so as to avoid calling back p3IdService from p3GxsR - 720c6fd csoler Sat, 2 Jul 2016 22:41:12 -0400 fixed bug causing TS update of some unused identities - 86d8f01 csoler Fri, 1 Jul 2016 23:38:10 -0400 added a local cache in rsdataservice to avoid calling sqlcipher on GrpMetaData - cdd2c1f csoler Thu, 30 Jun 2016 16:50:35 -0400 Merge pull request #432 from G10h4ck/master - da4c563 Gio Thu, 30 Jun 2016 22:03:22 +0200 Fix typo in libresapi documentation - 0206c65 csoler Thu, 30 Jun 2016 15:06:41 -0400 added missing else in display of forum anti-spam message - 2dfe116 csoler Thu, 30 Jun 2016 14:21:54 -0400 added compilation flag for profiling in GUI - ef95451 csoler Tue, 28 Jun 2016 21:16:31 -0400 updated changelog - 440390e csoler Thu, 30 Jun 2016 14:21:11 -0400 Merge pull request #431 from csoler/v0.6-SignedForums3 - ba50028 csoler Thu, 30 Jun 2016 14:16:45 -0400 added GXS distribution flag to defavor posts signed by key form unknown RS nodes, and updated UI in forums to u - - -- Cyril Soler Mon, 18 Jul 2016 22:00:00 -0500 - -retroshare06 (0.6.0-1.20160628~18eb34b8) trusty; urgency=low - - 9f7ef8b csoler Tue, 28 Jun 2016 20:59:56 -0400 fixed possible cross deadlocks between RsGxsGenExchange and RsGxsNetService - 00bdc50 csoler Tue, 28 Jun 2016 17:56:37 -0400 updated changelog - bb82b6e csoler Tue, 28 Jun 2016 14:35:59 -0400 Merge pull request #429 from PhenomRetroShare/Fix_StandardQSS - 456751a Phenom Tue, 28 Jun 2016 20:23:32 +0200 Fix ProgressBar Chunk with Standard.qss - 019ed12 csoler Tue, 28 Jun 2016 12:37:04 -0400 Merge pull request #428 from sehraf/pr-fix-udp - ea07a13 sehraf Tue, 28 Jun 2016 17:37:22 +0200 fix TcpPacket::readPacket - c15c979 csoler Mon, 27 Jun 2016 17:17:28 +0100 Merge pull request #426 from sehraf/pr-disable-dht-stunner - ff86678 csoler Sun, 26 Jun 2016 23:14:01 -0400 clear error queue before calling SSL_read()/SSL_write(), to avoid remaining errors to corrupt the next connection attempts and cause disconnections - 31089d7 csoler Sat, 25 Jun 2016 19:12:35 +0100 added auto-clean of pending data in pqistreamer after connection is closed, to avoid confusing the peer after re-connecting (probably not the cause of the SSL error) - 043c5b1 csoler Sat, 25 Jun 2016 13:01:36 -0400 Merge pull request #427 from PhenomRetroShare/Fix_TheRetroSharesDeskTopFileIsMissing - e6347d7 Phenom Sat, 25 Jun 2016 11:09:28 +0200 Fix "!!!The RetroShare's desktop file is missing or wrong!!!" message for Linux. - 5d96268 sehraf Tue, 21 Jun 2016 14:02:52 +0200 removed unused variable warnings - 4d2d825 sehraf Tue, 21 Jun 2016 13:55:23 +0200 add new option to qmake to enable dht stunner removed dht stunner code when option is not set - 37ae8bc csoler Tue, 21 Jun 2016 07:22:13 -0400 Merge pull request #424 from sehraf/pr-dht-banlist - 3bb03ff sehraf Mon, 20 Jun 2016 22:30:51 +0200 Added new (optional) callback to libbitdht to ask upper layer if an IP is banned. In case this callback is implemented it will be used in favour of the built-in... - ddce43b csoler Sat, 18 Jun 2016 20:43:42 -0400 Merge pull request #422 from PhenomRetroShare/Fix_ReadMe.md - 24eb88a csoler Sat, 18 Jun 2016 20:38:48 -0400 added explicit comparisons for tests on RsGxsGrpMetaData and RsGxsMsgMetaData - 0388162 Phenom Sun, 19 Jun 2016 01:37:50 +0200 Change Build AppVeyor State to RetroShare/RetroShare. - bc04f3c csoler Sat, 18 Jun 2016 17:43:50 -0400 Merge pull request #421 from PhenomRetroShare/Fix_UnitTestCompilation - 43f618f Phenom Sat, 18 Jun 2016 23:10:12 +0200 Fix UnitTest Compilation - 07bda26 csoler Sat, 18 Jun 2016 16:27:15 -0400 fixed permission matrix widget crash - 35da9cb csoler Sat, 18 Jun 2016 15:36:03 -0400 Merge pull request #419 from PhenomRetroShare/Fix_ChannelNewsFeedWhenComment - 90a27f4 csoler Sat, 18 Jun 2016 15:33:10 -0400 Merge pull request #418 from sehraf/pr-improve-debug - d84fdff Phenom Sat, 18 Jun 2016 20:03:55 +0200 Fix GxsChannelPostItem when received comment. - 3cf1968 sehraf Sat, 18 Jun 2016 18:04:18 +0200 fixed p3msgservice.cc - d8235c6 sehraf Sat, 18 Jun 2016 13:08:14 +0200 removed dead code and cleanup - 09afbbe sehraf Sat, 18 Jun 2016 13:00:15 +0200 switched to new rslog method - 7627bd9 csoler Fri, 17 Jun 2016 22:53:05 -0400 Merge pull request #417 from csoler/v0.6-SecurityKeys - f57f620 csoler Fri, 17 Jun 2016 22:27:00 -0400 reduced database testing/cleaning frequency to 31/59 mins. - eb05922 csoler Fri, 17 Jun 2016 22:21:06 -0400 added a tooltip and read color for unsecure GXS identities. These are still supported for a few weeks at most. So get rid of them - 4df4bb6 csoler Fri, 17 Jun 2016 20:46:58 -0400 fixed removal of messages in unsubscribed groups - 886d896 csoler Fri, 17 Jun 2016 20:46:24 -0400 fixed warning about old fingerprint for own keys. - f6c5a05 sehraf Fri, 17 Jun 2016 11:09:59 +0200 switched to caller providing all needed information instead of saving those on callee side - cc6ae74 csoler Thu, 16 Jun 2016 23:17:40 -0400 fixed color of admin circles (we cannot use a bullet, since bullets are kept for Membership property) - 4d452bf csoler Thu, 16 Jun 2016 18:34:33 -0400 removed annoying warning in avatar widget - c25b650 csoler Thu, 16 Jun 2016 23:10:13 -0400 removed check key debug info - 25c0c9d csoler Thu, 16 Jun 2016 23:06:07 -0400 added systematic consistency checking of public/private RSA keys at deserialisation time - b9ba51f csoler Thu, 16 Jun 2016 22:23:27 -0400 improved naming of publish/admin rights in GroupTreeWidget - 8d54603 csoler Thu, 16 Jun 2016 21:27:28 -0400 fixed bug in private key extraction - dbd78d2 csoler Thu, 16 Jun 2016 20:19:03 -0400 merged with upstream/master - e28e972 sehraf Thu, 16 Jun 2016 21:26:02 +0200 removed dead code - 70662cf defnax Thu, 16 Jun 2016 18:41:56 +0200 Fixed some layout spacing - 656e7eb csoler Wed, 15 Jun 2016 23:27:30 -0400 Merge pull request #415 from PhenomRetroShare/Add_BuildStatusInReadme.md - c7da734 csoler Wed, 15 Jun 2016 21:38:14 -0400 Merge pull request #416 from csoler/v0.6-ContactList - e63f936 csoler Wed, 15 Jun 2016 21:33:27 -0400 improved strategy for removal of unused GXS ids with proper constants for unknown/signed/known ids. Forbid the stamping of banned keys. - da11995 defnax Wed, 15 Jun 2016 23:32:01 +0200 Clean up the Chat Toolbar Buttons Fixed display of Info Text on PGg details - 631a29c Phenom Wed, 15 Jun 2016 20:53:56 +0200 Add Build Status in ReadMe.md file. And add AppVeyor File. - 6b74a8a csoler Tue, 14 Jun 2016 21:54:09 -0400 added missing call to ssl_pendign in pqissludp. - c3eba4a csoler Tue, 14 Jun 2016 21:53:48 -0400 added missing serialisation call for peer bandwidth limits - 8c44e69 csoler Tue, 14 Jun 2016 21:53:06 -0400 added output of items which doesnot serialise correctly in pqisslstore - ceecdb2 csoler Tue, 14 Jun 2016 20:31:38 -0400 Merge pull request #414 from PhenomRetroShare/Add_MessageWhenSendingArgToOtherInstance - cedce2e csoler Tue, 14 Jun 2016 20:30:06 -0400 Merge pull request #260 from PhenomRetroShare/Add_SendAsPlainText_And_NoEmoteIcon_Button - 69e98b8 defnax Wed, 15 Jun 2016 00:08:45 +0200 Added count Invited Members to Create Circles Dialog. Changed some context menu icons for People list and Circles tree. Added icon when im Cir - ddbcd21 Phenom Wed, 27 Jan 2016 20:27:44 +0100 Add buttons to send message in plain text and without EmoteIcon. - 9b09187 Phenom Tue, 14 Jun 2016 15:10:15 +0200 Add message, when sending arguments to other instance, to disable this option. - 56e0797 csoler Mon, 13 Jun 2016 23:06:10 -0400 Merge pull request #413 from csoler/v0.6-Circles - e03c5df csoler Mon, 13 Jun 2016 22:38:51 -0400 improved GUI layout in circle creation box. Added tooltips - 600607d csoler Mon, 13 Jun 2016 22:14:09 -0400 added warning for old peers in circles - 8b954a2 csoler Mon, 13 Jun 2016 18:08:05 -0400 added names to upnp redirects to avoid router confusion (patch from ET) - fa29dd7 csoler Sun, 12 Jun 2016 21:41:09 -0400 changed the way RsGxsSyncMsgReqItem are sent for circle-restricted groups, using a hash of the group ID instead of encrypting the whole item, - 972de42 csoler Sat, 11 Jun 2016 18:07:57 -0400 converted static variable to class member in pqihandler - 34f49d4 csoler Sat, 11 Jun 2016 18:07:07 -0400 removed compilation warning - 248d0c4 csoler Sat, 11 Jun 2016 17:58:08 -0400 Merge pull request #412 from csoler/v0.6-MaxUpRate - ef4455a csoler Sat, 11 Jun 2016 17:54:11 -0400 cleaned the MaxUpRate branch from unused code - 8e75185 csoler Sat, 11 Jun 2016 17:21:04 -0400 made avgReadCount and avgSendCound to be uint32_t instead of floats, since they count bytes. Changes kb to 1024 instead of 1000 - eb9025d csoler Sat, 11 Jun 2016 17:20:22 -0400 removed annoying warning when a circle is empty - 373d41b csoler Sat, 11 Jun 2016 14:11:21 -0400 added missing variable def after previous commit - 23e8e93 csoler Sat, 11 Jun 2016 09:50:22 -0400 added mutex proteciton around mAvgLastUpdate to avoid it being changed by the constructor - 0d1d31a csoler Sat, 11 Jun 2016 09:33:11 -0400 added mutex protection around pqistreamer::getRates, since float r/w are not necessarily atomic - eba90a8 csoler Sat, 11 Jun 2016 09:24:33 -0400 Merge pull request #411 from PhenomRetroShare/Add_SIGFPE_Debug_DEFINES - afe23e7 csoler Sat, 11 Jun 2016 09:22:53 -0400 Merge pull request #410 from PhenomRetroShare/Fix_SIGFPE_InQProgressBar_PrintEvent - d649659 Phenom Sat, 11 Jun 2016 14:38:31 +0200 Add SIGFPE debug DEFINES. - 08258ca Phenom Sat, 11 Jun 2016 14:23:26 +0200 Fix SIGFPE in QProgressBar::paintEvent - d1be3f3 defnax Fri, 10 Jun 2016 13:40:24 +0200 Set a minimum column width - 83a1434 csoler Thu, 9 Jun 2016 23:23:51 -0400 fixed bug in setting MaxRate values - f5ad8b4 csoler Thu, 9 Jun 2016 23:13:07 -0400 moved node-wide options to node details - a4931ed csoler Thu, 9 Jun 2016 20:51:09 -0400 fixed setting/getting maxrates using pgp id - a07805b csoler Thu, 9 Jun 2016 20:41:27 -0400 moved bandwidth limits to the pgp level - 38b86c3 csoler Thu, 9 Jun 2016 18:12:04 -0400 improved debug output for early address rejection - 6b78275 csoler Wed, 8 Jun 2016 22:54:40 -0400 fixed bug in loading config file to set max rates - 5a0fa66 csoler Wed, 8 Jun 2016 22:44:28 -0400 added proper talking between pqihandler and GUI for maxrates fixing - 226e85c csoler Wed, 8 Jun 2016 21:00:26 -0400 added dropmenu entry in circles to allow admin to grant/deny membership - 509266a csoler Tue, 7 Jun 2016 22:38:24 -0400 removed some dead code - a1bbcd8 csoler Tue, 7 Jun 2016 22:06:32 -0400 fixed a few small issues in new peer rates - 20b6745 csoler Tue, 7 Jun 2016 21:48:22 -0400 added GUI and storage for max up/dn rates per peer - 0e85709 csoler Tue, 7 Jun 2016 11:00:34 -0400 Merge pull request #409 from sehraf/pr-upnp-version - 2d5883c sehraf Tue, 7 Jun 2016 16:30:39 +0200 add UPnP lib version - 1c1b7ac csoler Mon, 6 Jun 2016 22:55:23 -0400 attempt at fixing the crash when quitting RS (due to operator new not being able to allocate memory from deleted allocator - 54a0ca4 csoler Sun, 5 Jun 2016 15:49:33 -0400 added line in circle tooltip for visibility. Re-worked tooltip text a little bit - ee25596 csoler Sun, 5 Jun 2016 15:20:48 -0400 updated tooltip and names for self-restricted circles to "private" - 195ad4e csoler Sun, 5 Jun 2016 15:15:40 -0400 use grey bullet as a placeholder for circles without pending operations - 456b57b csoler Sun, 5 Jun 2016 13:17:30 -0400 Merge pull request #205 from pztrn/master - 9f2d6bd csoler Sun, 5 Jun 2016 13:02:13 -0400 Merge pull request #259 from heini/rhel_fedora_qt5 - e2e9ede csoler Sun, 5 Jun 2016 11:51:47 -0400 fixed initialization of memebrs in peerDetails - f1d69ad csoler Sun, 5 Jun 2016 11:26:29 -0400 Merge pull request #351 from PhenomRetroShare/Add_WebUI_ClearButtonOnBradCast - f55b283 csoler Sun, 5 Jun 2016 11:05:52 -0400 second pass over compilation warnings - 927f782 csoler Sun, 5 Jun 2016 10:43:57 -0400 pass over compiler warnings - c2ae4fc csoler Sun, 5 Jun 2016 10:06:11 -0400 merged upstream/master - 2567feb csoler Sun, 5 Jun 2016 09:54:26 -0400 fixed compilation broken by using deprecated Qt method - a2ca038 csoler Sat, 4 Jun 2016 21:39:40 -0400 fixed compilation and several problems following separation of public/private keys - 0eb4e9e defnax Sat, 4 Jun 2016 21:27:20 +0200 - renamed label "restricted to group" to "restricted to circle" - changed icon - b2497cc csoler Sat, 4 Jun 2016 09:45:17 -0400 Merge pull request #406 from sehraf/pr-fixes-#2 - 24f619d csoler Sat, 4 Jun 2016 03:20:45 +0200 added missing include for debian squeeze - d8189d0 csoler Fri, 3 Jun 2016 21:11:12 -0400 moved placeholder text from .ui to .cpp to allow compilation with old Qt - 99f54a2 defnax Fri, 3 Jun 2016 19:16:59 +0200 Merge branch 'master' of https://github.com/RetroShare/RetroShare - 4300d87 defnax Fri, 3 Jun 2016 19:15:24 +0200 Set default Header Stylesheet for Circles - 814db7e csoler Fri, 3 Jun 2016 19:15:16 +0200 fixed possible uninitialised memory read - 4c986cd csoler Fri, 3 Jun 2016 19:03:10 +0200 attempt to fix the pthread_setname_np symbol issue. To be tested - 0d10603 sehraf Fri, 3 Jun 2016 09:02:19 +0200 fix build errors (return typ is a pointer and not boolean) - 590be09 csoler Thu, 2 Jun 2016 23:47:57 -0400 separated RsTlvSecurityKey into two incompatible classes to enforce the correct usage of private vs. public keys - 53eb4df csoler Thu, 2 Jun 2016 21:21:18 -0400 fixed compilation errors due to last merge operation - e2b5785 csoler Thu, 2 Jun 2016 21:15:51 -0400 merged PR403 with trunk - 10e0254 csoler Thu, 2 Jun 2016 20:23:22 -0400 fixed a few things to correct PR403 - 699b3cf csoler Thu, 2 Jun 2016 20:38:28 -0400 Merge pull request #402 from PhenomRetroShare/Fix_WindowsCompilationWithMksTemp - 5362fd3 csoler Thu, 2 Jun 2016 20:36:51 -0400 Merge pull request #401 from PhenomRetroShare/Fix_WindowsCompilationWithThreadName - 6f5693d csoler Thu, 2 Jun 2016 18:26:43 -0400 Merge pull request #405 from PhenomRetroShare/Fix_UnitTestsCompilation - 2c8d047 Phenom Thu, 2 Jun 2016 19:34:58 +0200 Fix UnitTests Compilation - 2f4f44e csoler Thu, 2 Jun 2016 09:36:50 -0400 added early discarding of incoming connection attempt (before SSL handshake) for blacklisted IPs - 6e38554 sehraf Thu, 2 Jun 2016 13:22:24 +0200 rename define UBUNTU to HAS_GNOME_KEYRING The name UBUNTU is misleading since it is only used to select the keyring backend (which is gnome key - 4f60c8c sehraf Thu, 2 Jun 2016 14:53:15 +0200 libretroshare: fix comparison between signed and unsigned integer - 8b788b2 sehraf Thu, 2 Jun 2016 14:44:33 +0200 libretroshare: fix member initialisation order - cfc0e70 sehraf Thu, 2 Jun 2016 14:42:32 +0200 libretroshare: remove unused variables - 005af47 Phenom Wed, 1 Jun 2016 22:37:05 +0200 Fix Compilation when mkstemp is not defined. - - -- Cyril Soler Mon, 20 Jun 2016 14:00:00 -0500 - -retroshare06 (0.6.0-1.20160601.1f8a6ee2~trusty) trusty; urgency=low - - cbef014 csoler Sun, 29 May 2016 16:09:56 -0400 added regular test of circle auto-subscribe from cache, and auto-subscribe w - 2bde81f csoler Sat, 28 May 2016 21:09:44 -0400 removed more debug info, improved tooltips - ccd72cb csoler Sat, 28 May 2016 20:58:28 -0400 removed some debug info. Added information tooltips on circles and ids in ci - 9a328f6 csoler Sat, 28 May 2016 20:25:15 -0400 extended auto-subscribe to circles with admin flag - d114b83 csoler Sat, 28 May 2016 20:17:19 -0400 extended auto-subscribe to circles with requested membership - 8b5e43f csoler Sat, 28 May 2016 17:18:25 -0400 remove subitems in circles member list when they are gone from cache - dafb2e6 csoler Fri, 27 May 2016 17:35:23 -0400 Merge pull request #396 from csoler/v0.6-Circles - cfdaa2c csoler Fri, 27 May 2016 17:09:13 -0400 removed debug info in p3gxscircles - d03d733 csoler Fri, 27 May 2016 12:44:14 -0400 Merge pull request #395 from hasufell/master - ed867c5 Julian Ospald Fri, 27 May 2016 18:07:28 +0200 Don't hardcode g++ in the toolchain settings - 74b4d66 csoler Thu, 26 May 2016 21:16:21 -0400 added ifdef to allow to remove the sorting of circles into member/not member. To be tested for final decision - 59aef8a csoler Thu, 26 May 2016 20:33:24 -0400 added packet slicing for large broadcast chat items, and output warning when chat of serialised item is too big. Als - ae5929e csoler Thu, 26 May 2016 18:58:48 -0400 fixed possible crash due to using a deleted item - a32bcba csoler Wed, 25 May 2016 21:17:09 -0400 changed Members to Invited members in circle creation dialog - d1f4e13 csoler Wed, 25 May 2016 19:04:45 -0400 removed display of circle members in left ID list - cfeed5c csoler Wed, 25 May 2016 18:47:06 -0400 fixed column width and titles in circles - 605763d csoler Wed, 25 May 2016 18:34:12 -0400 added all IDs in circle to display tree - 219dd01 csoler Wed, 25 May 2016 17:51:23 -0400 improved GUI display in circle list - 5b69fa0 csoler Tue, 24 May 2016 21:23:35 -0400 fixed re-draw of subitem in circle tree when flags changed - 2e91ab6 csoler Tue, 24 May 2016 21:07:50 -0400 added proper notify for subscription message reception in circles - 5bc83d9 csoler Mon, 23 May 2016 21:09:06 -0400 fixed unsubscription of external circles - 1b5d31f csoler Sun, 22 May 2016 21:15:18 -0400 attempt to fix the wrong display of uploaded size for files > 4Gb (to be confirmed) - 55cb15c csoler Sun, 22 May 2016 20:35:51 -0400 fixed updating of membership when loading circle cache entry - fac1fb8 csoler Sun, 22 May 2016 18:50:18 -0400 enabled message publish for circle subscription requests - 69573d1 csoler Sun, 22 May 2016 18:49:54 -0400 fixed serialisation of circle subscription requests - 68e618b csoler Sun, 22 May 2016 18:21:48 -0400 fixed GUI for circle invites - 6554832 csoler Sun, 22 May 2016 18:21:26 -0400 added isOwnId handle in rsidentity - be3be9f csoler Sun, 22 May 2016 18:21:00 -0400 put loading circles in cache as soon as we get the data for them. The cache entry might be incomplete. - d60e99e csoler Sat, 21 May 2016 16:50:50 -0400 added subwidgets for invited GXS ids in circles - 82ad7d6 csoler Sat, 21 May 2016 15:51:49 -0400 improved debugoutput in p3gxscircles - 4c5c09c csoler Thu, 19 May 2016 10:11:15 -0400 Merge pull request #390 from PhenomRetroShare/Fix_MutexInPqiPersonGrp - 3a2b9e8 csoler Wed, 18 May 2016 21:47:34 -0400 added some debug info in new circle code - abe0e02 anon tahoe Wed, 18 May 2016 14:46:42 +0200 replaced mktemp by mkstemp (cherry-picked from anontahoe repository) - 722609a csoler Wed, 18 May 2016 21:13:54 -0400 finished implementing the backend part for the subscription system - af5129c Phenom Wed, 18 May 2016 19:15:37 +0200 Fix Mutex in pqipersongrp for pqilistener by adding local Mutex. - 9f56069 csoler Tue, 17 May 2016 11:21:03 -0400 Merge pull request #389 from PhenomRetroShare/Fix_ClearWebAPIWhenClearChatHistory - 07191a7 Phenom Tue, 17 May 2016 16:50:59 +0200 Fix Clear WebAPI when clear chat history in GUI and server is not running. - f3aed81 csoler Tue, 17 May 2016 10:39:56 -0400 added test over signature size to avoid possible memory corruption (Anonymous source) - 89472d6 csoler Tue, 17 May 2016 00:00:15 -0400 put some notes and comments in the code for what is to be done - 116e742 csoler Mon, 16 May 2016 12:25:51 -0400 Merge pull request #388 from PhenomRetroShare/Fix_OpenExistingFileAsWarning - a2a0582 Phenom Mon, 16 May 2016 17:20:53 +0200 Change Open existing file link from Question to Warning. - 2064870 csoler Mon, 16 May 2016 10:29:58 -0400 Merge pull request #385 from PhenomRetroShare/Fix_RsCollectionFileLoadCall - 1f8f413 Phenom Mon, 16 May 2016 11:32:17 +0200 Fix RsCollectionFile::load(QString, bool) calls. - 5d69072 csoler Sat, 14 May 2016 18:53:57 -0400 Merge pull request #383 from PhenomRetroShare/Fix_FreeTcpPacketIfPeersUnknown - - -- Cyril Soler Sat, 28 May 2016 10:00:00 -0500 - -retroshare06 (0.6.0-1.20160514.4dc62d0e~trusty) trusty; urgency=low - - 5bb570e csoler Sat, 14 May 2016 10:57:52 -0400 Merge pull request #384 from PhenomRetroShare/Fix_RsAccountsDetailPrivateInit - 7fd84f2 Phenom Sat, 14 May 2016 16:50:17 +0200 Fix Initialisation of Private in RsAccountDetails - 52f488c csoler Fri, 13 May 2016 11:13:07 -0400 Merge pull request #382 from PhenomRetroShare/Fix_CorrectPR378 - d7efeb9 Phenom Fri, 13 May 2016 17:06:00 +0200 Move nDir->Files into condition nDir exists. - 4b8a1d2 csoler Thu, 12 May 2016 14:42:31 -0400 Merge pull request #380 from PhenomRetroShare/Fix_ContentValue - 1c5bcb8 csoler Thu, 12 May 2016 14:41:10 -0400 Merge pull request #379 from PhenomRetroShare/Fix_UninitializedVar - 2487f3e csoler Thu, 12 May 2016 14:40:37 -0400 Merge pull request #378 from PhenomRetroShare/Fix_CasenDirResetedBefore - 61e5a62 Phenom Thu, 12 May 2016 20:29:12 +0200 Fix ContentValue::ContentValue if GetAsxxx return false. - ed56707 Phenom Thu, 12 May 2016 20:14:59 +0200 Fix in case nDir was reset before - a1ece16 Phenom Thu, 12 May 2016 20:00:44 +0200 Fix uninitialized variables netsize, rsnetsize in p3netmgr.cc - 1d476de csoler Thu, 12 May 2016 10:26:38 -0400 fixed initialisation of semaphores in created thread object - 96012ef csoler Wed, 11 May 2016 22:18:02 -0400 new attempt to fix thread issues - 383e403 csoler Wed, 11 May 2016 12:42:59 -0400 tried to improve the RsSemaphore class to avoid and display more info about the - e891e2b csoler Wed, 11 May 2016 10:00:20 -0400 added missing check for ssl_connection that would cause crash when the ssl conne - 8fdf8f8 csoler Tue, 10 May 2016 09:46:33 -0400 fixed possible crash in rsnet.cc - 74bb3b6 csoler Mon, 9 May 2016 20:54:58 -0400 replaced deprecated gethostbyname by getaddrinfo. Only linux was using the re-entrant - f8e6937 csoler Sun, 8 May 2016 18:36:41 -0400 Merge pull request #373 from PhenomRetroShare/Fix_LibResAPI_MacOS - 4b81fb0 csoler Sun, 8 May 2016 10:42:20 -0400 Merge pull request #374 from PhenomRetroShare/Fix_MacOSVersion - ceb092c Phenom Fri, 6 May 2016 22:51:25 +0200 Fix preprocessor for MacOS version. - 61d2ab5 Phenom Fri, 6 May 2016 22:12:40 +0200 Fix compilation of LibResAPI for MacOS - 6a7bd90 csoler Fri, 6 May 2016 08:59:59 -0400 Merge pull request #372 from zeners/master - ae631a1 zeners Fri, 6 May 2016 10:34:13 +0200 Merge remote branch 'origin/master' - 08be19f zeners Fri, 6 May 2016 10:29:03 +0200 webui: rebuild files on qmake - 13dec7a zeners Fri, 6 May 2016 10:06:03 +0200 webui: reset file-date on touch to force build - 48bc31e csoler Thu, 5 May 2016 23:55:16 -0400 Merge pull request #371 from csoler/v0.6-Threads - 67e9760 csoler Thu, 5 May 2016 22:03:46 -0400 removed debug output from threads - b5ace40 csoler Thu, 5 May 2016 21:21:45 -0400 attempt to fix socket problem on 32bits/64bits windows, by using the proper SOCKET typ - 9847a7a csoler Thu, 5 May 2016 20:52:10 -0400 implemented a new semaphore class that should be cross plateform - 092345c csoler Thu, 5 May 2016 09:49:56 -0400 Merge pull request #363 from Nyfor/travis - ad2df86 csoler Thu, 5 May 2016 09:45:22 -0400 Merge pull request #370 from Nyfor/fix-segfault-on-close - dbd0418 Nyfor Wed, 4 May 2016 18:48:13 +0200 Fix segfault on shutdown. - 0817aad csoler Wed, 4 May 2016 22:51:33 -0400 improved debugging output of rsthreads.cc (part 3) - bb00e39 csoler Wed, 4 May 2016 22:34:03 -0400 improved debugging output of rsthreads.cc (part 2) - 2e02a89 csoler Wed, 4 May 2016 22:23:36 -0400 improved debugging output of rsthreads.cc - e50e686 csoler Wed, 4 May 2016 18:01:18 -0400 updated the debug message for incoming data with no registered tunnel - 40f8313 csoler Wed, 4 May 2016 15:32:17 -0400 Merge pull request #307 from hunbernd/fix/sqlcipher-version - ca003c5 csoler Tue, 3 May 2016 20:55:36 -0400 added missing initialisation of deleted memory before calling realloc - 0ff2941 csoler Tue, 3 May 2016 13:11:41 -0400 Merge pull request #365 from zeners/master - f4a4765 zeners Tue, 3 May 2016 19:04:42 +0200 Merge remote branch 'origin/master' - 962dd91 zeners Tue, 3 May 2016 19:02:07 +0200 webui: include files on first clean build - aec8b4d csoler Mon, 2 May 2016 18:10:39 -0400 fixed bug in counting of incoming data size for sliced packets - f3bc978 Nyfor Wed, 27 Apr 2016 18:32:59 +0200 Updated Travis file. - - -- Cyril Soler Sat, 14 May 2016 16:00:00 -0500 - -retroshare06 (0.6.0-1.20160424.0d84a558~trusty) trusty; urgency=low - - 7914aeb csoler Sat, 30 Apr 2016 17:33:47 -0400 use RsTemporaryMemory in signature verification - be7e87c csoler Sat, 30 Apr 2016 17:25:24 -0400 use RsTemporaryMemory in signature verification - 01605e5 csoler Sat, 30 Apr 2016 11:19:21 -0400 updated description f packet slicing in comments section of pqistreamer - 1f7a94d csoler Sat, 30 Apr 2016 11:13:51 -0400 fixed bug causing crash in pqistreamer - 0bd6670 csoler Sat, 30 Apr 2016 09:47:21 -0400 Merge pull request #362 from zeners/master - 0a6ae55 zeners Sat, 30 Apr 2016 14:21:09 +0200 webui: redefined building webui - baf9404 csoler Fri, 29 Apr 2016 20:09:48 -0400 Merge pull request #360 from csoler/v0.6-RTT3 - 4bdd464 csoler Fri, 29 Apr 2016 18:53:25 -0400 removed a few debug output and timer measurement - 6d2bfcf csoler Fri, 29 Apr 2016 18:52:58 -0400 restored average kicking rate to a more reasonnable value. To be tested (for to - 3bc3989 csoler Fri, 29 Apr 2016 18:41:10 -0400 removed debug info for pqistreamer - 5ab9aed csoler Fri, 29 Apr 2016 18:40:28 -0400 added placeholder service ID for packet slicing probe - 654e0fc csoler Fri, 29 Apr 2016 17:53:21 -0400 added missing call to SSL_pending, which caused decrypted data to wait in the S - a443064 csoler Tue, 26 Apr 2016 23:42:44 -0400 various changes to measure RTTs more accurately - 87764ab csoler Tue, 26 Apr 2016 21:23:19 -0400 removed debug info in pqistreamer - 153db5c csoler Tue, 26 Apr 2016 09:22:24 -0400 added on/off mechanism for packet slicing to ensure packward compatibility - 3b68585 csoler Mon, 25 Apr 2016 23:37:02 -0400 improved/simplified slicing protocol - dd81ce3 csoler Mon, 25 Apr 2016 22:50:41 -0400 using BinToHex to display mem blocks in pqistreamer debug - 18e9e1c csoler Sun, 24 Apr 2016 21:29:55 -0400 moerged with upstream/master - f629575 csoler Sun, 24 Apr 2016 21:18:44 -0400 fixed a few bugs in packet slicing in pqiQoS - a2c11f9 csoler Sun, 24 Apr 2016 13:43:34 -0400 added packet reconstruction and deserialising - - -- Cyril Soler Sat, 30 Apr 2016 18:00:00 -0500 - -retroshare06 (0.6.0-1.20160424.0d84a558~trusty) trusty; urgency=low - - 0dc43c3 csoler Sat, 23 Apr 2016 08:29:53 -0400 Merge pull request #338 from Nyfor/master - 5e94c77 Nyfor Mon, 4 Apr 2016 12:07:09 +0200 Fixed compilation for Clang. - d696f72 csoler Fri, 22 Apr 2016 20:38:07 -0400 fixed compilation - acd059b csoler Fri, 22 Apr 2016 18:49:42 -0400 removed potential memory leak in TransfersDialog - 52cf66a csoler Fri, 22 Apr 2016 17:55:15 -0400 fixed memory leak in SubscribeToolButton menu - 55e8087 csoler Fri, 22 Apr 2016 17:30:55 -0400 added missing free for public keys used in envelop encryption - 10230df csoler Fri, 22 Apr 2016 16:50:43 -0400 added missing SSL shutdown when replacing existing connection - 5261c3c csoler Thu, 21 Apr 2016 22:23:07 -0400 prevented turtle to not deleting a config item when it is not cast - e9fa9eb csoler Thu, 21 Apr 2016 22:07:50 -0400 removed tricky memory leak in chat lobbies due to handling of partial messages - 7aea6e5 csoler Thu, 21 Apr 2016 22:07:10 -0400 removed some debug info - eca83fd csoler Thu, 21 Apr 2016 19:54:50 -0400 removed some debug info - fba3d37 csoler Thu, 21 Apr 2016 19:47:34 -0400 fixed memory leak after receiving RsNxsItem deserialised from decrypted memory - 0d3ff0e csoler Thu, 21 Apr 2016 19:46:47 -0400 fixed possible uninitialised memory read in memory decryption return - 0c711a4 csoler Thu, 21 Apr 2016 19:41:21 -0400 added missing calls to EVP_CIPHER_CTX_cleanup() to release memory after decryption, causing memory - 3fae108 csoler Thu, 21 Apr 2016 12:58:48 -0400 removed div by zero in transfers dialog - 0572492 csoler Wed, 20 Apr 2016 21:20:47 -0400 severely reduced packet grouping, which limited the effectiveness of QoS - d6ae71e csoler Wed, 20 Apr 2016 20:21:29 -0400 removed pointer to QStringList in QHash, causing memory loss - aba3d2f csoler Wed, 20 Apr 2016 18:24:02 -0400 removed memory leak due to zeroing (on purpose!) a data chunk in GRouter before deleting it - d017771 csoler Wed, 20 Apr 2016 18:08:26 -0400 fixed missing sendTime in distant chat, causing inconsistent display in GUI - 80a9fec csoler Tue, 19 Apr 2016 22:18:25 -0400 Merge pull request #353 from crhode/master - 39553a6 csoler Tue, 19 Apr 2016 21:58:30 -0400 removed debug info - 5645e44 Manuel Davis Tue, 19 Apr 2016 11:32:56 -0500 Change regular expression(s) for identifying hotlinks in feral text. - 8be53dd Manuel Davis Tue, 19 Apr 2016 11:11:58 -0500 Improve inserting placemark in ChatLobby. - 26af7c9 csoler Sun, 17 Apr 2016 22:58:48 -0400 changed heart beat limit to a larger value. Apparently too tight a value causes disconnections due - c14c240 csoler Sun, 17 Apr 2016 00:51:45 -0400 fixed update of circles GUI using a timer. This is not optimal, and should be replaced by a proper - 3000f94 csoler Sat, 16 Apr 2016 22:44:06 -0400 separated subscribe status from wether we are part of a circle or not. Still needs update of GUI - b861aa9 csoler Sat, 16 Apr 2016 17:10:36 -0400 Merge pull request #352 from AsamK/trailing_semicolon - e7ec204 AsamK Sat, 16 Apr 2016 20:40:24 +0200 Add trailing semi-colon to MimeType in .desktop files - fa8a585 csoler Fri, 15 Apr 2016 18:25:53 -0400 removed some debug info - d642934 csoler Fri, 15 Apr 2016 18:25:41 -0400 increased frequency of update for banned PGP nodes - - -- Cyril Soler Sun, 24 Apr 2016 12:00:00 -0500 - -retroshare06 (0.6.0-1.20160415.26574fd9~trusty) trusty; urgency=low - - 2552b55 defnax Fri, 15 Apr 2016 20:32:00 +0200 Merge branch 'master' of https://github.com/RetroShare/RetroShare - 85942f4 defnax Fri, 15 Apr 2016 20:30:32 +0200 improving the create circle layout - cb6c2c9 csoler Thu, 14 Apr 2016 23:49:55 -0400 Merge pull request #350 from csoler/v0.6-Circles - 048192e csoler Thu, 14 Apr 2016 23:47:42 -0400 added mOriginator to CircleCache entry and auto-ask for unknown GXS ids to the friend who suppl - ba1a1b2 csoler Thu, 14 Apr 2016 23:09:59 -0400 fixed auto-subscribed of circles when some IDs are unknown - 47dd442 csoler Thu, 14 Apr 2016 18:26:47 -0400 merge upstream/master - 971f8e0 csoler Wed, 13 Apr 2016 18:41:49 -0400 fixed potential crash due to not updating mPendingDataIterator after deleting map entry - 92eb9c5 csoler Wed, 13 Apr 2016 18:15:56 -0400 Merge pull request #346 from PhenomRetroShare/Move_ChatNotifyButtonToToolBar - aad295d defnax Wed, 13 Apr 2016 21:00:07 +0200 Fixed layout margin - 45f77de Phenom Wed, 13 Apr 2016 20:42:12 +0200 Change Lobby Send button tooltip. - 718d6f9 Phenom Wed, 13 Apr 2016 20:26:36 +0200 Resize Chat Tool Bar Button for Hight DPI screen. - 42a2b37 Phenom Wed, 13 Apr 2016 19:21:18 +0200 Move SearchBar to Tool Bar and remove Show/Hide action. - c5873f3 Phenom Sun, 10 Apr 2016 16:42:15 +0200 Move Chat notify button from search bar to tool bar. - d512c4a csoler Tue, 12 Apr 2016 22:59:12 -0400 enabled new link type for posted (patch from Fanch) - cf746f1 csoler Tue, 12 Apr 2016 10:06:01 -0400 fixed possible crash in GxsIdDetails - d5ed84e csoler Mon, 11 Apr 2016 23:43:18 -0400 allow one to change the contact author of a circle - 8f9028d csoler Mon, 11 Apr 2016 23:30:42 -0400 fixed bug in GxsIdLabel due to not removign existing jobs for a given widget before setting it - 6b2de05 csoler Mon, 11 Apr 2016 22:42:02 -0400 added channel admin and distribution method in channel summary page - a52bd98 csoler Mon, 11 Apr 2016 10:10:10 -0400 fixed potential div by 0 in speed estimations. To be tested. - b148239 csoler Sun, 10 Apr 2016 21:09:47 -0400 always pass data accept test in distant chat when we are on the client side of the tunnel - c97f197 csoler Sun, 10 Apr 2016 20:39:08 -0400 removed depth obfucation of search results and replaced by 0 always, effectively removing any i - 123041a csoler Sun, 10 Apr 2016 18:55:05 -0400 skip circle vetting when sending message posts with no author - 0d5b9ae csoler Sun, 10 Apr 2016 18:55:05 -0400 fixed last commit - b8075d6 csoler Sun, 10 Apr 2016 18:53:49 -0400 skip circle vetting when sending message posts with no author - 4fe66d6 csoler Sun, 10 Apr 2016 10:53:21 -0400 removed Edit/New circles buttons, put them in context menu. Added header frame (needs a proper - c9c15e5 csoler Sun, 10 Apr 2016 09:49:31 -0400 Merge pull request #345 from PhenomRetroShare/Update_CircleGraphical - d727311 Phenom Sun, 10 Apr 2016 12:00:23 +0200 Fix Graphic Circles update. - 3eb9a5e electron128 Sun, 10 Apr 2016 11:14:32 +0200 Merge pull request #344 from Phenom: Fix Escaped charaters in WebUI - - -- Cyril Soler Sat, 09 Apr 2016 23:00:00 -0500 - -retroshare06 (0.6.0-1.20160409.33d32589~trusty) trusty; urgency=low - - 3b45fd8 csoler Sat, 9 Apr 2016 17:50:46 -0400 create new item "My own identities" to store own ids in IdDialog - a5044bd csoler Sat, 9 Apr 2016 14:48:05 -0400 improved calculation of speed in pqistreamer (was called before only when sending bytes), and prevented situation wher - 993d7d4 csoler Sat, 9 Apr 2016 14:46:12 -0400 removed debug info in rsgxsnetservice - 0853773 csoler Sat, 9 Apr 2016 12:51:15 -0400 merged and removed debug output in rsgxsnetservice.cc - 10a32d3 csoler Sat, 9 Apr 2016 11:38:07 -0400 Merge pull request #343 from csoler/v0.6-Circles - ca0f769 csoler Fri, 8 Apr 2016 21:08:22 -0400 removed warning that would show up too often when a GxsTunnel is down and message cannot be sent - 85c8274 csoler Fri, 8 Apr 2016 20:41:12 -0400 Merge pull request #342 from PhenomRetroShare/Fix_AllowOnlyOneInst - 08e5679 Phenom Fri, 8 Apr 2016 02:14:27 +0200 Fix Allow Only One Instance - 554251d csoler Thu, 7 Apr 2016 19:50:02 -0400 Merge pull request #341 from PhenomRetroShare/Add_WebUIClearButton - 24b3f0d Phenom Fri, 8 Apr 2016 01:31:36 +0200 Add a Clear button on WebUI - b90808d csoler Thu, 7 Apr 2016 18:26:18 -0400 changed update of server update TS in subscribeStatusChange from 0 to time(NULL) - c8cae4c csoler Thu, 7 Apr 2016 00:09:00 -0400 Merge pull request #297 from PhenomRetroShare/Add_AllowOnlyOneIntanceAndPassArg - 4ad3b11 csoler Wed, 6 Apr 2016 22:27:02 -0400 fixed compiler warning - 4bf9262 csoler Wed, 6 Apr 2016 22:26:34 -0400 merged with upstream/master - 60ffcd2 csoler Wed, 6 Apr 2016 22:23:10 -0400 fixed double item deletion in RsGxsNetService::handleRecvItem() - c79c9ba csoler Wed, 6 Apr 2016 21:12:54 -0400 added encryption of message sync requests for external circles-restricted groups, and verification that properly encry - 10bb542 Phenom Tue, 1 Mar 2016 13:08:33 +0100 Allow only one instance for useLocalServer option activated. If exists, pass to it arguments. - f26348b csoler Tue, 5 Apr 2016 18:09:02 -0400 fixed bug in grouter which caused sending of messages to some offline peers, hence wasting some routes, and causing " - 7817a54 csoler Tue, 5 Apr 2016 17:55:03 -0400 merged with trunk - 9871b37 csoler Mon, 4 Apr 2016 23:02:09 -0400 Merge pull request #305 from realityfabric/openssl_crypto_infinite_loop - 9217ec3 csoler Mon, 4 Apr 2016 21:36:37 -0400 added circle distribution info in forum summary page - ff4c360 csoler Mon, 4 Apr 2016 21:15:49 -0400 fixed display bug in bw statistics graph - b206317 csoler Mon, 4 Apr 2016 12:17:34 -0400 Merge pull request #339 from PhenomRetroShare/Fix_UnitTests_Compilation - f2b9957 Phenom Mon, 4 Apr 2016 17:18:42 +0200 Fix UnitTests Compilation - d34b2e8 csoler Sun, 3 Apr 2016 17:11:13 -0400 allow to change the author ID of a group during update. Set proper value in group author widget - 18dd7ee csoler Sun, 3 Apr 2016 11:42:45 -0400 moved "too many routing clues" message to debug output, since it can be caused by normal lobby operation - 3554e48 csoler Sun, 3 Apr 2016 11:38:53 -0400 output packet error with some details (inspired by Phenom-PR289) - a3890ad csoler Sun, 3 Apr 2016 11:00:03 -0400 added gathering of routing clues from lobbies - 9ced517 csoler Sat, 2 Apr 2016 16:54:30 -0400 improved tooltips in people list - 53dbc52 csoler Sat, 2 Apr 2016 16:50:22 -0400 removed mention of null PGP ids in People - f8639e5 csoler Sat, 2 Apr 2016 16:44:41 -0400 fixed bug considering null PGP ids in ban list - 5bbaa1e csoler Sat, 2 Apr 2016 16:14:08 -0400 added people settings page, removed debug output - 9d9b790 csoler Sat, 2 Apr 2016 14:04:08 -0400 exposed un-verified PGP signatures on GXS ids in GUI. Added auto-ban of GXS ids signed by a PGP ids that has already s - 9a6bcf8 csoler Sat, 2 Apr 2016 14:02:04 -0400 removed blue color for admin flag in forums, since admin flag is already indicated by position in "My Forums" list, an - 7c4d85d csoler Sat, 2 Apr 2016 14:00:04 -0400 fixed compilation for ubuntu xenial - 0350c1d csoler Fri, 1 Apr 2016 17:47:03 -0400 Merge pull request #335 from PhenomRetroShare/Add_ClearWebAPIWhenClearChatHistory2 - c6f1cc4 Phenom Thu, 31 Mar 2016 22:52:53 +0200 Clear WebAPI when clear chat history in GUI. - ab78825 thunder2 Thu, 31 Mar 2016 10:23:23 +0200 Enabled webui build script for Windows compile - 21421ab csoler Wed, 30 Mar 2016 14:03:50 -0400 Merge pull request #334 from zeners/master - 8def617 zeners Wed, 30 Mar 2016 19:50:11 +0200 webui: windows build-script - 741db13 csoler Wed, 30 Mar 2016 12:34:32 -0400 Merge pull request #333 from zeners/webui - f570477 zeners Wed, 30 Mar 2016 18:20:59 +0200 webui: patch init.sh like build.sh - cee3477 defnax Wed, 30 Mar 2016 17:06:34 +0200 Fixed the default splitter expanding of People Dialog - 351af47 csoler Tue, 29 Mar 2016 15:42:23 -0400 Merge pull request #332 from zeners/master - aca8830 zeners Tue, 29 Mar 2016 21:22:14 +0200 compatible to g++11 / QT5 - 5783c59 electron128 Tue, 29 Mar 2016 20:16:44 +0200 Merge pull request #318 from realityfabric/remove_empty_file - 475cb40 electron128 Tue, 29 Mar 2016 20:13:24 +0200 Merge pull request #328 from PhenomRetroShare/Fix_WebUI_MakeSrcBuild - 5b5504c electron128 Tue, 29 Mar 2016 19:42:07 +0200 Merge pull request #330 from zeners/webui - be328e2 zeners Tue, 29 Mar 2016 18:57:18 +0200 webui: include files in install - f5f27ed zeners Tue, 29 Mar 2016 18:56:00 +0200 Merge branch 'master' - a53fbad thunder2 Tue, 29 Mar 2016 08:13:28 +0200 Fixed Windows compile. - 7c288fc csoler Mon, 28 Mar 2016 23:24:50 -0400 added xenial as build target - - -- Cyril Soler Sat, 09 Apr 2016 23:00:00 -0500 - -retroshare06 (0.6.0-1.20160330.21421ab8~trusty) trusty; urgency=low - - 3701366 electron128 Mon, 28 Mar 2016 14:07:19 +0200 Merge pull request #327 from zeners/webui - dfa2cba zeners Mon, 28 Mar 2016 13:03:49 +0200 webui: menu in gui mode fixed - a11cd25 zeners Mon, 28 Mar 2016 11:35:44 +0200 Merge branch 'master' - bf374b3 zeners Mon, 28 Mar 2016 11:34:33 +0200 webui 4 windows build prepare - 68b4cd8 electron128 Mon, 28 Mar 2016 10:19:10 +0200 Merge pull request #323 from zeners/webui - 0482655 zeners Sun, 27 Mar 2016 20:29:48 +0200 webui: removed searchresult debug output - bbdb04f zeners Sun, 27 Mar 2016 20:13:47 +0200 webui: searchresult cross-checking with downloads - 3bbd370 zeners Sun, 27 Mar 2016 18:28:32 +0200 webui: windows creating batch-files - d96a8ef zeners Sat, 26 Mar 2016 23:38:18 +0100 Merge branch 'master' - 0c138d7 csoler Sat, 26 Mar 2016 18:36:52 -0400 moved discarding of banned identities from lobbies before signature checking, so as to avoid to time stamp their GXSI - 215402b zeners Sat, 26 Mar 2016 23:36:02 +0100 webui: add downloads: focus fixed - 922644f zeners Sat, 26 Mar 2016 23:24:29 +0100 Merge branch 'master' - 502b137 csoler Sat, 26 Mar 2016 17:51:51 -0400 Merge pull request #325 from csoler/v0.6-Circles - ebf54d1 csoler Sat, 26 Mar 2016 17:25:15 -0400 fixed unit tests - a67c1d7 zeners Sat, 26 Mar 2016 18:19:33 +0100 webui: paste RS-links for download - 1b8b9d4 csoler Fri, 25 Mar 2016 21:10:01 -0400 turned PeopleDialog to unix ff - 6c8737c csoler Fri, 25 Mar 2016 21:09:37 -0400 merged with upstream/master - 4831465 csoler Fri, 25 Mar 2016 21:03:09 -0400 fixed tiny bits in circles/people GUI - 9efc29f csoler Fri, 25 Mar 2016 20:58:10 -0400 improved display of circle creator ID - d1b09b9 csoler Fri, 25 Mar 2016 18:54:13 -0400 removed some debug info - 083dc62 csoler Fri, 25 Mar 2016 18:27:20 -0400 small code cleaning bits - 3d45947 csoler Fri, 25 Mar 2016 18:21:37 -0400 fixed small bug in debug output; cleanup debug output - 44cadc2 csoler Thu, 24 Mar 2016 19:46:08 -0400 cleaned debug info and disabled local circles before merge - 7d8001b csoler Thu, 24 Mar 2016 19:23:34 -0400 fixed display of warning in posting into forums without proper credentials - 9dc7328 csoler Thu, 24 Mar 2016 18:41:15 -0400 fixed async-ed circle loading in IdDialog - 30193fe zeners Thu, 24 Mar 2016 18:07:21 +0100 webui: switch from react to mithril - d33a1e8 csoler Thu, 24 Mar 2016 00:05:54 -0400 added disabling of combo elements in GxsIdChooser for creating forums posts with unautorised GXS ids. Still needs a b - 40d2350 csoler Wed, 23 Mar 2016 21:50:41 -0400 removed deadlock - 981f81d csoler Wed, 23 Mar 2016 20:54:45 -0400 added anon ids to offline vetting - cef07ff zeners Thu, 24 Mar 2016 00:33:22 +0100 webui: integrate new webui in unix build process - 57f4463 csoler Wed, 23 Mar 2016 18:23:10 -0400 fixed potential crash due to using deleted data (found by dimqua) - a19a068 zeners Wed, 23 Mar 2016 13:11:14 +0100 webui: options>settings, playing with colors - 585c43b zeners Tue, 22 Mar 2016 23:19:36 +0100 webui: RS-reboot / RS-reboot-detection improved - 60e9f0f zeners Tue, 22 Mar 2016 21:09:33 +0100 undo gitignore - a069db5 zeners Tue, 22 Mar 2016 16:37:48 +0100 webui: chat: display peer location - 4733523 zeners Tue, 22 Mar 2016 16:33:05 +0100 webui: view / change rights per user - - 83ff00e zeners Tue, 22 Mar 2016 12:08:23 +0100 webui: updated mithril to v0.2.3 - 1fb1f3e csoler Mon, 21 Mar 2016 23:21:26 -0400 update of groups up to the latest attached circle server update TS. Should re-send groups that depend on a circle whe - 51e0d83 zeners Mon, 21 Mar 2016 17:04:21 +0100 webui: options / rights (only defaults) - 1c94ff7 zeners Mon, 21 Mar 2016 16:41:21 +0100 Merge branch 'master' - b153c2e csoler Sun, 20 Mar 2016 22:23:32 -0400 updated TODO - c304a3a csoler Sun, 20 Mar 2016 22:21:09 -0400 fixed display of properties in restricted groups - 90347bd csoler Sun, 20 Mar 2016 12:51:30 -0400 Merge pull request #315 from dartraiden/master - c627e1b dartraiden Sun, 20 Mar 2016 19:27:28 +0300 Fix typo - c123761 csoler Sun, 20 Mar 2016 09:11:55 -0400 Merge pull request #314 from PhenomRetroShare/Fix_CppCheckerError - b13292b Phenom Sun, 20 Mar 2016 12:10:56 +0100 Fix error reported by CppChecker: - 2e9d22c csoler Sat, 19 Mar 2016 18:47:46 -0400 used RsTemporaryMemory to avoid memory leak in case of error in GxsTunnels - d1bb939 csoler Sat, 19 Mar 2016 17:14:00 -0400 Merge pull request #312 from PhenomRetroShare/AddPluginsPathForApple - 5061046 Phenom Sat, 19 Mar 2016 18:58:00 +0100 Add Plugins Path for Apple - 12c0efb zeners Sat, 19 Mar 2016 17:39:46 +0100 webui: pgp-linked identity disabled - ecf8e7f zeners Sat, 19 Mar 2016 17:39:34 +0100 Merge remote branch 'origin/master' - 24ba909 csoler Sat, 19 Mar 2016 11:39:53 -0400 fixed mixup between in/out bandwidth traffic info - 526a83a csoler Fri, 18 Mar 2016 22:11:07 -0400 fixed update of circle name in the GUI - 4e0ee29 csoler Thu, 17 Mar 2016 20:18:54 -0400 fixed creation/distribution of self-restricted circles - b6388d7 csoler Thu, 17 Mar 2016 18:17:58 -0400 fixed update of GUI when circles change - 36edde6 csoler Wed, 16 Mar 2016 23:30:23 -0400 fixed bug causing GUI to not auto-unsubscribe in circles - a2a9079 csoler Wed, 16 Mar 2016 23:03:46 -0400 fixed qt4 compilation - 31356ba csoler Wed, 16 Mar 2016 21:27:08 -0400 added reload of grp meta on update - b219295 csoler Wed, 16 Mar 2016 20:59:52 -0400 added update of GUI, instead of re-creating everything when a circle change - 5b00c03 csoler Wed, 16 Mar 2016 14:17:16 -0400 Merge pull request #4 from PhenomRetroShare/Fix_PictureFlowDeletion - 76fddb29 Phenom Wed, 16 Mar 2016 19:05:22 +0100 Fix delete in PictureFlow - b6e51b2 csoler Wed, 16 Mar 2016 09:56:36 -0400 Merge pull request #308 from dartraiden/master - 5ba4f42 dartraiden Wed, 16 Mar 2016 16:24:06 +0300 correct path to Hidden Service configuration panel - 384131a csoler Tue, 15 Mar 2016 22:41:59 -0400 added force reload of cache for circles that are modified - 6466209 csoler Tue, 15 Mar 2016 22:11:36 -0400 added test to only subscribe/unsubscribe circles when needed, hence avoiding an unnecessary TS update - 80aaf30 csoler Tue, 15 Mar 2016 00:00:39 -0400 fixed potential crash due to bad usage of updates - bdb326a csoler Mon, 14 Mar 2016 23:19:37 -0400 attempt at fixing circle cache loop. Renamed a few variables and fixed logic. Not yet fully working - 83e39d8 csoler Sun, 13 Mar 2016 17:29:38 -0400 fixed effect of selecting known/signed IDs in circle creation dialog - 4cf57d6 csoler Sun, 13 Mar 2016 17:19:14 -0400 set default value for circle distribution type - 9c649aa csoler Sun, 13 Mar 2016 12:08:03 -0400 improved debugDump(), showing the subscription status of each grp - 5fe390d csoler Sun, 13 Mar 2016 11:41:33 -0400 changed titles of tree root nodes in circles - 0518062 csoler Sun, 13 Mar 2016 11:29:21 -0400 fixed circle auto-subscribe - - 1b72d2c zeners Sat, 12 Mar 2016 23:38:39 +0100 webui: unsubscribe chat-lobby - 41a8e53 zeners Sat, 12 Mar 2016 23:28:27 +0100 webui: chat-layout fixed - 0afa2e3 zeners Sat, 12 Mar 2016 20:20:56 +0100 webui: unread chat message counter in menu - e9af179 zeners Sat, 12 Mar 2016 19:17:37 +0100 webui: need for master - b1286f0 zeners Sat, 12 Mar 2016 17:44:43 +0100 webui: route peer location to chat-lobby - a065dba csoler Sat, 12 Mar 2016 11:05:03 -0500 cleaned code a little bit - 61c7da7 csoler Sat, 12 Mar 2016 11:02:32 -0500 unselect all IDs when no circle is selected - b1da4ed zeners Sat, 12 Mar 2016 16:46:33 +0100 Merge branch 'master' - 456a882 csoler Sat, 12 Mar 2016 10:41:35 -0500 added highlighting of currently selected circle members - 5d2833f csoler Sat, 12 Mar 2016 09:25:28 -0500 improved one line of debug output in turtle - 670fb3d csoler Sat, 12 Mar 2016 09:25:00 -0500 merged - 4e2fd4e csoler Sat, 12 Mar 2016 09:22:28 -0500 Merge pull request #303 from PhenomRetroShare/Fix_CorrectColoredNameContrast - 16c59af Phenom Sat, 12 Mar 2016 13:25:10 +0100 Correct Colored Name Contrast in chat, same way than text. - 9e8a4cd csoler Fri, 11 Mar 2016 22:36:47 -0500 fixed auto-subscribe of circles when unsigned identities are locally owned - b97c5df csoler Fri, 11 Mar 2016 17:47:12 -0500 fixed culumn name in GR stats - 692b549 csoler Fri, 11 Mar 2016 17:27:40 -0500 fixing compilation problem - 232dba2 csoler Fri, 11 Mar 2016 17:21:27 -0500 allow non signature checking for GR message recepts at intermediate peers when key is missing. Should fix return rece - ecebace csoler Fri, 11 Mar 2016 14:26:27 -0500 Merge pull request #301 from PhenomRetroShare/Add_NewColumnInRsCollForPath - c0cf05c csoler Fri, 11 Mar 2016 14:25:18 -0500 Merge pull request #302 from PhenomRetroShare/Fix_RsLinkCopyForExtraFile - d62a205 Phenom Fri, 11 Mar 2016 20:08:28 +0100 Fix Paste RetroShare Link action when copy File link. - 7e76e28 Phenom Fri, 11 Mar 2016 17:26:18 +0100 Add a new column in RsColl Editor to get only name in first one. - 4136d09 csoler Thu, 10 Mar 2016 23:55:20 -0500 updated Circles TODO - 4e4980b csoler Thu, 10 Mar 2016 22:57:04 -0500 fixed display of info for non admin circles, and added readonly system to not allow editing them - 5361c85 csoler Thu, 10 Mar 2016 22:02:21 -0500 updated circles TODO - 0282c2a csoler Wed, 9 Mar 2016 21:49:24 -0500 added ban menu entry to chat lobby participant list - 3fc6f6b csoler Wed, 9 Mar 2016 20:53:49 -0500 updated TODO(circles), removed useless context menu, added tooltips for circle distribution options - 4eebe24 csoler Wed, 9 Mar 2016 20:23:33 -0500 disabled auto-sync for messages in GXS circles, while keeping Grp auto-sync - 76e7893 csoler Wed, 9 Mar 2016 20:18:19 -0500 updated circles TODO - 2017f92 csoler Tue, 8 Mar 2016 23:12:27 -0500 updated circles todo - cf75983 csoler Tue, 8 Mar 2016 23:01:43 -0500 added TODO file specific to circles - 7e31bda csoler Tue, 8 Mar 2016 23:00:24 -0500 fixed removal of peers from circles - cba4795 csoler Tue, 8 Mar 2016 00:02:16 -0500 improved circles GUI logic - 9b92f66 csoler Mon, 7 Mar 2016 22:51:23 -0500 added edit of existing circles - 49605a3 csoler Mon, 7 Mar 2016 22:10:18 -0500 fixed variable scope problem in introserver.cc - - -- Cyril Soler Mon, 28 Mar 2016 20:00:00 -0500 - -retroshare06 (0.6.0-1.20160306.ecf4a991~precise) precise; urgency=low - - bb26069 csoler Wed, 2 Mar 2016 19:00:51 -0500 attempt at fixing negative bw rates in GUI that may pop up when an erro - 20fcf63 electron128 Fri, 26 Feb 2016 18:13:20 +0100 Merge pull request #285 from PhenomRetroShare/Fix_SSGxsChannelGro - 1a110e4 Phenom Mon, 22 Feb 2016 19:07:49 +0100 Define empty service string as a valid case. - 3c3d23b Phenom Wed, 17 Feb 2016 19:27:28 +0100 Fix error "(EE) SSGxsChannelGroup::load() asked to load a null string. - 0bcf52c csoler Wed, 24 Feb 2016 16:51:25 -0500 added missing update of mRecvTS in database when updating a group meta - d1fd5d3 defnax Wed, 24 Feb 2016 21:51:34 +0100 update todo - 7b1460c defnax Wed, 24 Feb 2016 21:45:43 +0100 Merge branch 'master' of https://github.com/RetroShare/RetroShare - f5eb791 csoler Tue, 23 Feb 2016 23:04:04 -0500 added notification for modified metadata in group. Does not yet work o - b8c42a9 csoler Tue, 23 Feb 2016 22:43:13 -0500 added copy of previous subscription flags when group update is receive - fafe75d csoler Tue, 23 Feb 2016 22:20:40 -0500 added update of mServerUpdateTS up to last mRecvTS of each group, whic - a6f0b8d csoler Mon, 22 Feb 2016 16:57:13 -0500 Merge pull request #290 from sehraf/pr-improved-unused-location-c - dbdfdcd sehraf Mon, 22 Feb 2016 21:09:10 +0100 removed unused map lookups - 77166cb sehraf Mon, 22 Feb 2016 16:41:31 +0100 impoved cleanup of unused locations - cd4d743 csoler Mon, 22 Feb 2016 10:14:29 -0500 added missing -lpthread - 3446e20 csoler Sun, 21 Feb 2016 11:47:44 -0500 removed debug output from p3grouter.cc - 1222e82 electron128 Sun, 21 Feb 2016 11:23:33 +0100 fix format in readme - dcbd99f electron128 Sun, 21 Feb 2016 11:20:14 +0100 Merge pull request #202 from electron128/fixtests - 5a48070 csoler Fri, 19 Feb 2016 10:45:18 -0500 Merge pull request #281 from sehraf/pr-disc-increase-auto-clean-t - 4140969 sehraf Fri, 19 Feb 2016 16:32:57 +0100 added seperated limit for discovery (30 days) - 6695a38 Thunder Thu, 18 Feb 2016 17:21:15 +0100 Merge pull request #283 from PhenomRetroShare/Fix_ChatMsgItemAvatar_u - e639dc5 Phenom Wed, 17 Feb 2016 17:37:09 +0100 Fix connect for avatar updateAvatar in ChatMsgItem and MessengerWindow - b059a8e Thunder Wed, 17 Feb 2016 20:23:44 +0100 Merge pull request #284 from PhenomRetroShare/Fix_CannotUpdateAvatarE - dc2578b Phenom Wed, 17 Feb 2016 18:18:56 +0100 Fix "(EE) cannot update avatar. mId has unhandled type." error. - 697ef40 csoler Wed, 17 Feb 2016 09:38:36 -0500 added test against arbitrary large items in turtle search requests. - 51d90a4 csoler Wed, 17 Feb 2016 09:37:34 -0500 added test against arbitrary large items in turtle search requests. - c15e8b5 csoler Tue, 16 Feb 2016 17:46:34 -0500 Merge pull request #282 from PhenomRetroShare/Add_MinSizeForStack - d878334 csoler Tue, 16 Feb 2016 17:45:49 -0500 Merge pull request #206 from realityfabric/master - 3276790 Phenom Tue, 16 Feb 2016 23:15:33 +0100 Add minimal Size for stackPages in MainWindow for first start. - 841299d sehraf Tue, 16 Feb 2016 20:20:41 +0100 discovery: don't remove new added locations too soon - efadc7d csoler Sun, 14 Feb 2016 13:38:08 -0500 Merge pull request #270 from PhenomRetroShare/Fix_GxsChannelFilte - 44882b9 csoler Sun, 14 Feb 2016 13:35:32 -0500 Merge pull request #278 from PhenomRetroShare/Fix_bencode.c_Compi - 3ab7c89 csoler Sun, 14 Feb 2016 13:33:27 -0500 Merge pull request #279 from cavebeat/single_dh_op - 9843c83 cave beat Sun, 14 Feb 2016 18:49:37 +0100 added openSSL option SSL_OP_SINGLE_DH_USE regarding CVE-2016-0701 - 7d21666 Phenom Sun, 14 Feb 2016 17:40:10 +0100 Fix compilation of bencode.c for C compilator. - 821c144 electron128 Sun, 14 Feb 2016 12:48:52 +0100 remove dead code from RsNotify (old forum and channel read status - 63a8260 electron128 Sun, 14 Feb 2016 11:53:27 +0100 change RsNotify to use RsGxsId for chat lobby events - 36135d4 electron128 Sun, 14 Feb 2016 10:23:37 +0100 added info about tests to readme - 11dcbb7 electron128 Sun, 14 Feb 2016 10:23:26 +0100 remove wrong info about webui from readme (webui settings in gui - 68cd1f9 electron128 Sun, 14 Feb 2016 10:21:48 +0100 disabled gxs_grp_sync test, because it fails after rebase to mast - abf7a72 defnax Sat, 13 Feb 2016 17:38:01 +0100 increase default font size for the ListWidget. - 8637d3c defnax Sat, 13 Feb 2016 16:15:41 +0100 Fixed issue #263 - a031d1e electron128 Thu, 24 Dec 2015 12:57:52 +0100 disabled tlvrandom test because it is buggy and fails sometimes - b874167 electron128 Thu, 24 Dec 2015 11:58:57 +0100 give gxs grp sync test more time, because of sync and timestamp u - 8f64df0 electron128 Sun, 20 Dec 2015 17:24:13 +0100 fix compile for new gxs metadata serialisation - a6a3d66 electron128 Sun, 20 Dec 2015 14:32:11 +0100 exclude not serialised member from operator== for RsNxsTransac - a8b2bc7 electron128 Sun, 20 Dec 2015 14:31:26 +0100 fixed threading issue in NxsTestHub. NxsTesthub has to wait for i - 63c6629 electron128 Sun, 20 Dec 2015 14:29:24 +0100 added missing initialisation of local, not serialised msg meta da - dca7dec electron128 Wed, 16 Dec 2015 17:34:35 +0100 attempt to fix output redirect for unittests in travis - 218daa8 electron128 Sun, 13 Dec 2015 20:50:31 +0100 enabled RsNxsItem test - c03ce56 electron128 Sun, 13 Dec 2015 20:50:08 +0100 added missing mutex in nxstesthub - aa93505 electron128 Sun, 13 Dec 2015 20:49:44 +0100 added missing lock in RsSharedPtr destructor - 64b9e34 electron128 Sun, 13 Dec 2015 20:48:55 +0100 fixed uninitialised memory read in test libretroshare_gxs.gxs_grp - 7d0845e electron128 Sun, 13 Dec 2015 20:48:05 +0100 redirect travis testing output to /dev/null, because the logfile - 8d15f44 electron128 Sun, 13 Dec 2015 18:44:24 +0100 added CONFIG+=NO_SQLCIPHER support to unittests (travis wants thi - 9f92212 electron128 Sun, 13 Dec 2015 17:22:31 +0100 - make tests compile - added tests to travis.yml - excluded grout - 3e4c154 csoler Fri, 12 Feb 2016 23:08:59 -0500 Merge pull request #275 from PhenomRetroShare/Fix_GenCertDialogOn - 3ebb8c6 Phenom Fri, 12 Feb 2016 17:54:35 +0100 Fix GenCertDialog on Mac stay on. - 4033f35 defnax Mon, 8 Feb 2016 21:34:45 +0100 update todo - 5f0afb3 Phenom Mon, 8 Feb 2016 19:42:56 +0100 Fix Channel filter when loading big post. And fix "Not a GxsChannelPost - 7ded128 thunder2 Sat, 6 Feb 2016 19:18:22 +0100 Update rsversion.in - - -- Cyril Soler Sun, 06 Mar 2016 20:00:00 -0500 - -retroshare06 (0.6.0-1.20160206.4a8edee6~trusty) trusty; urgency=low - - a41d9df csoler Mon, 1 Feb 2016 09:59:13 -0500 fixed small bug in probability computation in grouter - 6d1a393 csoler Mon, 1 Feb 2016 00:33:11 -0500 fixed but in re-sending of failed grouter items - aa194ca csoler Sun, 31 Jan 2016 20:27:53 -0500 fixed bug preventing save of routage info in distant messaging - a85b5d2 csoler Sat, 30 Jan 2016 20:35:08 -0500 re-enabled GRouter tunnels (disabled for testing). Removed debug output. - f0a49a4 csoler Sat, 30 Jan 2016 20:27:56 -0500 changed global router routing strategy. Should be more effective now. - 59d4c2c csoler Sat, 30 Jan 2016 20:27:27 -0500 removed some compilation warnings - 3cfd976 thunder2 Fri, 29 Jan 2016 16:23:28 +0100 Added Windows installer script for Qt5. - 58e59d1 csoler Thu, 28 Jan 2016 20:19:44 -0500 added sounds to chat lobbies (patch fromManuel Davis) - 8dde723 thunder2 Thu, 28 Jan 2016 16:20:11 +0100 Added security hardening flags for ASLR and DEP protection for Windows compile. - 85cdfcc csoler Thu, 28 Jan 2016 10:44:37 -0500 fixed bug causing multi-tunneling not to be used (found by jo) - b1f165f csoler Thu, 28 Jan 2016 10:22:32 -0500 added sound event to lobbies (patch from Manuel Davis) - 3bc444b csoler Tue, 26 Jan 2016 23:00:10 -0500 removed some debug info - af770fd csoler Tue, 26 Jan 2016 22:46:07 -0500 fixed messagebox to remember which from ID was used last time - 749ca08 csoler Tue, 26 Jan 2016 22:30:04 -0500 slightly improved message shown over lobby names - f063e5b csoler Tue, 26 Jan 2016 22:16:45 -0500 Allow main window to resize to much smaller size when needed. Should help people with - 2072ca4 csoler Tue, 26 Jan 2016 22:08:17 -0500 fixed bug in getPeerDetails causing callstacks to be displayed for non initialised IP - b70057a csoler Tue, 26 Jan 2016 18:50:33 -0500 removed sending probability in GXS since it is not justified anymore. This should fix - 39b3df9 csoler Mon, 25 Jan 2016 22:39:10 -0500 fixed bug causing net reset when closing config - 49e2ee1 csoler Mon, 25 Jan 2016 21:45:58 -0500 Merge pull request #247 from heini/stretch_qt5 - 2f3350f electron128 Sun, 24 Jan 2016 19:56:53 +0100 Merge pull request #248 from heini/sqlcipher_needs_fpic - f13c81b csoler Sat, 23 Jan 2016 13:17:12 -0500 Merge pull request #258 from PhenomRetroShare/Fix_QuoteLinesWithImage - 9b64b96 csoler Sat, 23 Jan 2016 13:03:29 -0500 fixed potential crash in pqisslstore - 1d2be23 Phenom Sat, 23 Jan 2016 18:17:49 +0100 Fix Quote Lines With Image - 70bf938 defnax Sat, 23 Jan 2016 13:37:08 +0100 reduced the default width & height reorder in MessagePage, move Distant Message box to the top. - fc0067f csoler Fri, 22 Jan 2016 22:06:31 -0500 fixed bug in network graph search sizes - c428739 csoler Fri, 22 Jan 2016 21:32:35 -0500 cleaned the network graph a little bit. Removed text, updated bounding boxes, removed background - b362544 csoler Fri, 22 Jan 2016 09:31:40 -0500 fixed compilation - b3df4c1 csoler Thu, 21 Jan 2016 23:55:22 -0500 made the Global router stats widget more efficient/compact/explicit - 449aba9 csoler Thu, 21 Jan 2016 22:44:48 -0500 fixed compilation of SearchDialog.cpp - 94b5868 csoler Thu, 21 Jan 2016 21:49:52 -0500 moved SearchDialog into FileTransfer/ - 6a32da2 csoler Thu, 21 Jan 2016 21:40:48 -0500 removed explicit size constraint on listview for config page (screws up the view in HDPI screens - 55d0a21 csoler Thu, 21 Jan 2016 21:19:40 -0500 added cache of latest GXS tunnel data items for the last 10 minutes in order to avoid replays of - 9347b86 csoler Thu, 21 Jan 2016 11:48:41 -0500 new simple solution for sound on linux based on using system sound player. To be tested. - 9999742 csoler Thu, 21 Jan 2016 11:32:17 -0500 reverted commit for phonon since phonon is deprecated. Will be replaced by qtmultimedia in - 7488ba1 csoler Wed, 20 Jan 2016 23:56:22 -0500 removed feedback from messages to mGrpServerUpdateTS, which is now only updated when the subscri - c473200 csoler Wed, 20 Jan 2016 23:34:25 -0500 moved getCurrentTS() inside RTT packet sending loop (suggestion from Jo) - e25787b csoler Wed, 20 Jan 2016 23:25:08 -0500 fixed sound on linux using phonon. This should be extensible to all unix systems - fc3606c csoler Wed, 20 Jan 2016 14:02:13 -0500 fixed DHT icon size problem - 9063612 csoler Wed, 20 Jan 2016 11:19:36 -0500 fixed utf8 issue in ChatWidget. To be tested. - c597c8c csoler Tue, 19 Jan 2016 23:19:46 -0500 removed explicit spacing sizes in plugins page - 3203249 csoler Tue, 19 Jan 2016 22:59:11 -0500 fixed size of help icons in MainPage class - 597f541 csoler Tue, 19 Jan 2016 22:44:27 -0500 added 2 icons - 3d58f9b csoler Tue, 19 Jan 2016 22:35:58 -0500 added correct icons in ToasterStatus - b382c3e csoler Tue, 19 Jan 2016 22:16:25 -0500 fixed icon sizes in peerstatus/statusbar - a2d8cc8 csoler Tue, 19 Jan 2016 22:01:26 -0500 fixed DHT status icon sizes and added tooltip - 37204d7 csoler Tue, 19 Jan 2016 21:46:22 -0500 fixed icon in NewsFeed, added missing spacer in IdDialog - 49c1d56 csoler Tue, 19 Jan 2016 21:45:55 -0500 increased GXS post size limit to just below 200K - 1471979 csoler Tue, 19 Jan 2016 18:08:47 -0500 added a few tooltips in Tor configuration panel - 43ee506 csoler Tue, 19 Jan 2016 10:13:24 -0500 added automatic GXS message rejection when item size exceeds 200K. Should fix the forums that go - dedd6d4 csoler Mon, 18 Jan 2016 23:53:54 -0500 disabled debug info - 68a0395 csoler Mon, 18 Jan 2016 23:53:06 -0500 fixed a few bugs in existing msg fragmentation code. Signature checking still not working, not N - 2b52456 defnax Mon, 18 Jan 2016 13:36:38 +0100 Added new iconset for Voip, by Beluga - 39e6a9b csoler Sat, 16 Jan 2016 20:44:52 -0500 fixed up People context menu so as to handle actions for multiple persons at once - 1edfcf9 csoler Sat, 16 Jan 2016 13:41:24 -0500 do not time stamp banned GXS ids - 8296fa9 csoler Sat, 16 Jan 2016 11:30:15 -0500 added checkbox to toggle logscale in statistics - 63b88ec defnax Sat, 16 Jan 2016 14:50:12 +0100 correct sorting for "Reputation" in People, patch by Eugene Tooms - - -- Cyril Soler Mon, 01 Feb 2016 20:00:00 +0100 - -retroshare06 (0.6.0-1.20160115.a34f66aa~trusty) trusty; urgency=low - - 0ff6349 thunder2 Fri, 15 Jan 2016 12:01:37 +0100 Fixed possibility of XXE injection in FeedReader plugin. - 748147f thunder2 Fri, 15 Jan 2016 12:00:02 +0100 Fixed Windows compile. - b5f6059 Cyril Soler Fri, 15 Jan 2016 10:07:21 -0500 deprecated updateClientSyncTS() which is not needed anymore - c24447f csoler Thu, 14 Jan 2016 20:11:26 -0500 fixed update of mGrpClientUpdateMap when no new group is available, avoiding unnecessary GXS grp list traffic (patch from jolavillette) - 3b18c43 csoler Wed, 13 Jan 2016 20:25:18 -0500 removed [dos] LF from rsgxsnetservice (causes merging rampage) - 086b076 csoler Wed, 13 Jan 2016 12:22:55 -0500 fixed a few serialisation issues - 96f3446 csoler Wed, 13 Jan 2016 11:13:23 -0500 added size limit to packet grouping - b56881e csoler Wed, 13 Jan 2016 10:23:21 -0500 fixed windows compilation - 4916496 csoler Wed, 13 Jan 2016 10:20:51 -0500 Merge pull request #253 from csoler/v0.6-SecurityReview - 2c019d9 csoler Wed, 13 Jan 2016 00:39:22 -0500 added load image option in forum posts when images are to be displayed - 60408b3 csoler Wed, 13 Jan 2016 00:13:16 -0500 fixed a bug in GRouterGenericDataItem::duplicate() - 2a8fc7f csoler Wed, 13 Jan 2016 00:08:27 -0500 hardened the restriction to image loading to avoid external resources in RSTextBrowser - d55993d csoler Tue, 12 Jan 2016 21:43:04 -0500 removed two instances of malloc(0) captured by new rs_malloc funtion - d13526f csoler Tue, 12 Jan 2016 21:10:11 -0500 added a new method rs_malloc that checks its arguments and prints a stacktrace on error/weird call. - Changed the code everywhere to use this instead of malloc. Removed some mallocs and replaced with RsTemporaryMemory - 9c6e7df csoler Mon, 11 Jan 2016 23:49:00 -0500 added checks after mallocs in several files - 46520b0 csoler Mon, 11 Jan 2016 20:49:26 -0500 fixed potential integer overflow / Out of bounds read in gxstunnelitems.cc - 8e666fc csoler Mon, 11 Jan 2016 20:40:57 -0500 fixed potential integer overflow / Out of bounds read in rsturtleitems.cc - 6e9d96e csoler Mon, 11 Jan 2016 20:26:19 -0500 fixed potential integer overflow / Out of bounds read in RsVOIPDataItem.cc - 98f0c10 csoler Mon, 11 Jan 2016 19:26:54 -0500 fixed potential integer overflow / Out of bounds read in GRouterItems.cc - 3094b52 csoler Mon, 11 Jan 2016 19:08:52 -0500 fixed potential integer overflow / Out of bounds read in rsbaseserial.cc. Also added a few more error output. - 8e6998b electron128 Sun, 10 Jan 2016 14:34:08 +0100 removed redundant map _lobby_ids from DistributedChatService. The same information and more is stored in the _chat_lobbys map. - _lobby_ids is unused since commit 67e1495d9a78ac259649014355cd127a2febeaaf - 09ed1ea electron128 Sun, 10 Jan 2016 14:22:06 +0100 removed getVirtualPeerId method from rsmsgs lobby interface. It is not neccesary anymore to have the virtual peer id exposed to the GUI layer. - 67e1495 electron128 Sun, 10 Jan 2016 13:29:40 +0100 use ChatId instead of virtual peer id for chat lobby popup. Removed a now unused method from rsmsgs interface and DistributedChatService. - c3d422a csoler Sat, 9 Jan 2016 14:31:20 -0500 added some tooltips on keys and certificate details - 994bfaf csoler Sat, 9 Jan 2016 13:54:24 -0500 updated TODO - e01b1a4 csoler Sat, 9 Jan 2016 11:00:57 -0500 Merge pull request #245 from csoler/v0.6-Messaging - ee84ab7 csoler Sat, 9 Jan 2016 10:58:49 -0500 fixed serialisation error (missing call) for received Distant msg hash map - b125cb1 electron128 Sat, 9 Jan 2016 12:09:43 +0100 fix the bug where a filter is applied in friends file list even if view mode is tree and search box is hidden. Problem was: - SharedFilesDialog::FilterItems() is called from multiple places. The check if we should filter or not is now in the filter function itself. - a118870 electron128 Sat, 9 Jan 2016 12:01:32 +0100 if file in friends file list is available locally or is being downloaded, then show it in red like in search. The color is hardcoded, because - it is not possible to style arbitrary QObjects with stylesheets. closes #195 - 9f4256c csoler Fri, 8 Jan 2016 23:19:45 -0500 Merge pull request #244 from csoler/v0.6-Messaging - fe02167 csoler Fri, 8 Jan 2016 23:18:45 -0500 disabled part of msg re-sending code in order to improve it later - 56a844b csoler Fri, 8 Jan 2016 23:08:14 -0500 Merge pull request #243 from csoler/v0.6-Messaging - a540ffd csoler Fri, 8 Jan 2016 22:52:01 -0500 removed two debug outputs from MessageDialog - 3f6964b csoler Fri, 8 Jan 2016 22:50:03 -0500 added back messages to sent box - 75edb46 csoler Fri, 8 Jan 2016 20:48:47 -0500 added auto-resend of unsent messages. Fixed display of From field in outbox - 0c591f0 csoler Thu, 7 Jan 2016 22:22:05 -0500 added auto re-send of distant messages after global router notified the message cannot be sent. Added a map n p3msgService to avoid - receiving multiple times the same message. - 9651f43 csoler Thu, 7 Jan 2016 21:01:50 -0500 fixed wrong usage of local client ids in global router causing distant messages to stay in outbox forever. - 81e2a59 defnax Thu, 7 Jan 2016 19:25:52 +0100 Fixing People Margins Update emotes file - 4484b08 csoler Thu, 7 Jan 2016 00:04:52 -0500 cleaned up the problem of outgoing messages being shown with the from from field. - 3d6fa0c csoler Wed, 6 Jan 2016 18:38:27 -0500 fixed bug causing turtle to keep asking for a tunnel after a distant chat is closed if not connected - 61f8e73 csoler Wed, 6 Jan 2016 18:12:15 -0500 improved text of warning against pasting pgp keys in connect wizard - 984ce2d csoler Wed, 6 Jan 2016 18:07:20 -0500 removed circles tab from IdDialog. Came from a difficult manual merging between dos and unix encoded files - 7da2ad1 csoler Wed, 6 Jan 2016 10:31:59 -0500 re-enabled previously disabled code in rsgxsnetservice, that proved useful - 6398b7b csoler Tue, 5 Jan 2016 23:00:26 -0500 added comment in rsgxsnetservice.cc - 3fa8d86 csoler Tue, 5 Jan 2016 22:53:56 -0500 removed time-stamp-ing of messages on client side in locked_genReqMsgTransaction() as it is already handled when receiving messages, - and the need to stamp non subscribed groups is not justified anymore - 678afe7 csoler Tue, 5 Jan 2016 22:27:00 -0500 fixed stupid mistake in previous commit (GXS transaction timestamp) - 7b3fd53 csoler Tue, 5 Jan 2016 19:23:59 -0500 added correct timestamp in msg list response items for GXS. To be tested. - 141f092 csoler Tue, 5 Jan 2016 14:22:27 -0500 added tooltip and fixed text in connect friend dialog - 496546e defnax Tue, 5 Jan 2016 18:25:44 +0100 Merge branch 'master' of https://github.com/RetroShare/RetroShare - 19011ba defnax Tue, 5 Jan 2016 18:23:43 +0100 clean up emotes, removed some unused. changed icons for emotes button. reduze the size of the emoticons - 9fd0fc5 csoler Tue, 5 Jan 2016 11:43:50 -0500 fixed bandwidth measurement in pqistreamer - e6cd4a4 defnax Tue, 5 Jan 2016 16:09:14 +0100 Merge pull request #240 from sehraf/pr-smiley-whitespace - 54f9912 sehraf Tue, 5 Jan 2016 14:58:41 +0100 Add whitespaces around smileys. Only replace smileys with an image when they are surrounded by whitespaces. - This fixes smileys in links and other text that happen to include the sequence for a smiley. - f1f111f csoler Mon, 4 Jan 2016 20:05:44 -0500 merged - e04b933 B.Cristea Mon, 4 Jan 2016 15:25:22 +0200 corrected compilation inst on openSUSE - fddc008 csoler Sun, 3 Jan 2016 17:31:22 -0500 merged with origin - 3d5042b csoler Sun, 3 Jan 2016 14:29:33 -0500 Merge pull request #237 from G10h4ck/master - 05fd33b Gio Sun, 3 Jan 2016 17:21:11 +0100 p3ServiceControl: Optimize checkFilter(...), solve memory leak removing mSerialiser, code cleanup - 1082a8d csoler Sat, 2 Jan 2016 18:59:05 -0500 updated ubuntu changelog - - -- Cyril Soler Thu, 14 Jan 2016 20:00:00 +0100 - -retroshare06 (0.6.0-1.20160102.1082a8d1~trusty) trusty; urgency=low - - 4953324 electron128 Sat, 2 Jan 2016 14:53:24 +0100 Merge pull request #235 from PhenomRetroShare/Fix_MakeMACOS_PluginWorking - c5e6f62 Phenom Sat, 2 Jan 2016 14:19:53 +0100 Make Plugin working in Mac OSX. - b6b5f9c csoler Fri, 1 Jan 2016 22:36:07 -0500 fixed some of the issues reported by coverity scan (mainly uninitialised class members) - ab3939c csoler Fri, 1 Jan 2016 11:11:40 -0500 added missing update of mClientMsgUpdateMap, causing both a memory leak and an inconsistency in TS - 22c00fc electron128 Fri, 1 Jan 2016 14:07:15 +0100 fixed free() in UdpLayer::recv_loop - 58672e8 electron128 Fri, 1 Jan 2016 13:44:38 +0100 fix the logic to prevent using invalid iterators. First make a valid iterator, then dereference - 3b2eae4 electron128 Fri, 1 Jan 2016 12:17:08 +0100 fixed memory leak by using stack memory instead of heap memory - 9cb81f5 electron128 Fri, 1 Jan 2016 12:01:49 +0100 don't create wiki dataservice if wiki is not enabled for compile - 72812be electron128 Fri, 1 Jan 2016 11:54:59 +0100 added missing initialisation of integers in GxsForumThreadWidget - 55ea8a5 electron128 Fri, 1 Jan 2016 11:49:03 +0100 init pointer in RsServer - 7efb763 electron128 Fri, 1 Jan 2016 11:38:29 +0100 restore stream state of std::cerr after printing hex number - 640d71b electron128 Fri, 1 Jan 2016 11:09:49 +0100 removed delete of RsTemporaryMemory - d24ff5a csoler Thu, 31 Dec 2015 19:42:50 -0500 Merge pull request #232 from G10h4ck/master - 7895932 Gio Fri, 1 Jan 2016 00:45:01 +0100 print_stacktrace is OS specific - e872727 csoler Thu, 31 Dec 2015 17:37:05 -0500 updated dos->unix convertion script - b6b04dc csoler Thu, 31 Dec 2015 17:28:42 -0500 added script to convert files to unix format - 6392d65 csoler Thu, 31 Dec 2015 16:50:52 -0500 fixed [dos] LF in IdDialog.h - - a6ee7cc csoler Thu, 31 Dec 2015 14:15:14 -0500 Merge pull request #230 from G10h4ck/ss_port_invalid_family - fac1524 csoler Thu, 31 Dec 2015 13:58:13 -0500 updated todo list - c5feafa Gio Thu, 31 Dec 2015 19:56:50 +0100 Add missing stacktrace.h - 1303d85 Gio Thu, 31 Dec 2015 19:32:46 +0100 more cleanups + sanitize p3Peers::getPeerDetails avoid to look for port on null sockaddr_storage - 37a3c46 defnax Thu, 31 Dec 2015 16:40:06 +0100 Fixing Margins - ed7f958 Gio Thu, 31 Dec 2015 15:42:22 +0100 Add stacktrave.h, sanitize p3LinkMgrIMPL::retryConnectTCP avoid to look for port on null sockaddr_stor - 69f6bd0 electron128 Thu, 31 Dec 2015 14:02:51 +0100 insert the newest channel posts first and the oldest last (modified patch from Eugene Tooms) - 8a41554 csoler Wed, 30 Dec 2015 18:20:09 -0500 fixed some leaking memory issues in loadList() methods, and also increased consistency by not retur - 48750cd csoler Wed, 30 Dec 2015 17:18:22 -0500 merged - ae16fc8 csoler Wed, 30 Dec 2015 17:13:27 -0500 Merge pull request #229 from G10h4ck/master - 9c24203 Gio Wed, 30 Dec 2015 22:47:51 +0100 Fix memory leak in getLocalAddresses - cefa5d9 csoler Wed, 30 Dec 2015 13:55:15 -0500 fixed missing SSL_free when a new connection replaces the existing one - aabfcb9 csoler Wed, 30 Dec 2015 13:51:56 -0500 fixed missign initialisation of err in pqissludp.cc - d1bc892 csoler Wed, 30 Dec 2015 13:44:18 -0500 Merge pull request #228 from csoler/v0.6-GxsDebug - 0299691 csoler Wed, 30 Dec 2015 11:14:10 -0500 removed overkill test that would cause sending updates to peers when no messages are available (thx - f8be606 csoler Wed, 30 Dec 2015 10:03:32 -0500 Merge pull request #227 from PhenomRetroShare/Fix_DefaultGxsId - 894328b Phenom Wed, 30 Dec 2015 15:43:47 +0100 Fix default Identity on Chat - 6829309 csoler Tue, 29 Dec 2015 23:40:09 -0500 merged PR 219 from Jolavilette+Phenom, with some minor modifications - 2fe646c csoler Tue, 29 Dec 2015 23:39:52 -0500 merged PR 219 from Jolavilette+Phenom, with some minor modifications - 7486d54 csoler Tue, 29 Dec 2015 17:59:31 -0500 Merge pull request #226 from G10h4ck/master - 3cfa22e Gio Tue, 29 Dec 2015 23:51:16 +0100 Guard checkNetAddress debug, unary + comment clarification - 9e0dc01 csoler Tue, 29 Dec 2015 17:31:35 -0500 changed the reset of client map into a reset f server map when subscribing a group - 2d438b7 csoler Tue, 29 Dec 2015 16:39:15 -0500 Merge pull request #162 from G10h4ck/getLocalAddresses - eab4253 csoler Mon, 28 Dec 2015 18:15:51 -0500 Merge pull request #224 from PhenomRetroShare/Fix_GenCertDialogMaskingPGPKeyPassword - 312cea7 defnax Mon, 28 Dec 2015 16:42:42 +0100 Fixed double selection bug on Windows Vista style - 4521e8e Phenom Wed, 23 Dec 2015 15:49:05 +0100 Fix pqihandler::UpdateRates() to get more accurate. - c1b8850 Phenom Mon, 28 Dec 2015 13:45:22 +0100 Fix GenCertDialog masking PGP Key password dialog at end. - 00517fe csoler Sun, 27 Dec 2015 22:22:51 -0500 Merge pull request #223 from csoler/v0.6-ContactList - 71b3638 csoler Sun, 27 Dec 2015 22:19:30 -0500 removed some debug output in distant chat - a80a666 csoler Sun, 27 Dec 2015 22:16:04 -0500 added notifiction of denying conversation for distant chat - 9dfac71 csoler Sun, 27 Dec 2015 21:10:20 -0500 connected GUI to distant chat permission flags system - d287a62 defnax Mon, 28 Dec 2015 00:39:58 +0100 Merge pull request #221 from PhenomRetroShare/Fix_MacOSX.X_Plugin_Compilation - b32eb6e csoler Sun, 27 Dec 2015 17:00:54 -0500 added temporal filtering to RSGraphWidget to clear up the display. Auto-changes with scale. Can be - a63482d defnax Sun, 27 Dec 2015 19:14:20 +0100 Expand All/Contacts items by default & store/load expand settings. - 672ab25 csoler Sun, 27 Dec 2015 10:03:07 -0500 added safeguard against absurdly large packets in rsserial.cc and output of the beginning of the pa - ddec6b1 Phenom Sat, 26 Dec 2015 17:20:45 +0100 Update MacOS_X_InstallGuide.txt - cb4579e Phenom Thu, 24 Dec 2015 18:54:45 +0100 Fix compilation for plugins but miss RetroShare-gui library linking. - 3ea2e0f defnax Sat, 26 Dec 2015 16:14:28 +0100 Merge pull request #222 from PhenomRetroShare/Fix_ColoredFontInChat - 162b5fa Phenom Sat, 26 Dec 2015 15:57:46 +0100 Fix colored font in chat. - 1402051 csoler Fri, 25 Dec 2015 22:37:06 -0500 added backend for distant message and distant chat filtering based on contact list - f5c2aa3 defnax Fri, 25 Dec 2015 17:23:15 +0100 update emotes - 7afcc2a defnax Thu, 24 Dec 2015 17:46:02 +0100 Enabled back counting People Enabled "Sort by Posts" for Channels/Forums/Posted Fixed Width/Height - 12c9194 defnax Thu, 24 Dec 2015 14:31:52 +0100 Added Send Invite Button to People Dialog. - e3f496f electron128 Thu, 24 Dec 2015 13:21:40 +0100 fixed bug from contact list branch. Identity flags (pgp-linked, contact) where resettet so sig - f30f71d csoler Wed, 23 Dec 2015 18:07:10 -0500 Merge pull request #218 from csoler/v0.6-ContactList - 73f58c7 csoler Wed, 23 Dec 2015 13:48:56 -0500 improved layout and namign in MessageComposer - 4c50641 csoler Wed, 23 Dec 2015 12:12:34 -0500 cosmetic change in IdDialog - 52da8cd csoler Wed, 23 Dec 2015 12:08:20 -0500 fixed display of contactlist when changing status, and improved computaitonal efficiency - 0183919 csoler Wed, 23 Dec 2015 11:20:10 -0500 merged before commit - 98b27d6 csoler Wed, 23 Dec 2015 11:18:26 -0500 moved notify calls to RsGenExchange out of RsGxsNetService lock zone, to avoid deadlocks - 15a7487 defnax Wed, 23 Dec 2015 16:55:23 +0100 Save sorting on Chat lobby - 226948c defnax Wed, 23 Dec 2015 14:08:28 +0100 Merge pull request #217 from PhenomRetroShare/Fix_CompilationWhenNXS_NET_DEBUG_0 - b1ce2fa defnax Wed, 23 Dec 2015 14:08:01 +0100 Merge pull request #214 from PhenomRetroShare/Fix_MacOSX.X_Compilation - 1346259 Phenom Wed, 23 Dec 2015 13:45:39 +0100 Miss recomment NXS_NET_DEBUG_0... - 4aea100 Phenom Wed, 23 Dec 2015 13:40:01 +0100 From jolavillette-morkitu: in rsgxsnetservice.cc when #define NXS_NET_DEBUG_0 is set to 1 the compi - 5d92720 csoler Tue, 22 Dec 2015 18:33:01 -0500 merged with upstream/master - ab763c7 csoler Tue, 22 Dec 2015 18:29:27 -0500 converted file to unix mode - b7cba22 csoler Tue, 22 Dec 2015 17:43:37 -0500 updated ubuntu changelog - 95d8647 defnax Tue, 22 Dec 2015 19:57:26 +0100 Optimized the emoticon selector box size based on how many emoticons are loaded (by anmo), update e - 86b5591 Phenom Mon, 21 Dec 2015 17:25:02 +0100 Fix MacOSX 10.10 Yosemite Compilation - 334b414 defnax Tue, 22 Dec 2015 17:24:12 +0100 cleaning up resource file for emojione, removed old smileys - 8e9fe6d defnax Tue, 22 Dec 2015 01:07:02 +0100 Merge pull request #189 from hunbernd/feature/chat-enhancements - 4ccab41 defnax Mon, 21 Dec 2015 22:27:10 +0100 Added new Emojione Emoticons - - -- Cyril Soler Thu, 31 Dec 2015 14:00:00 +0100 - -retroshare06 (0.6.0-1.20151222.4bf2464a~trusty) trusty; urgency=low - - 436f619 Gio Mon, 21 Dec 2015 17:34:53 +0100 getLocalAddresses collects loopback address too - 9d78bba Gio Mon, 21 Dec 2015 15:48:18 +0100 Guard getLocalAddresses debug - 9826c72 Gio Tue, 15 Dec 2015 16:37:27 +0100 added rs_inet_ntop crossplatform version of inet_ntop - ca1a970 Gio Fri, 11 Dec 2015 11:44:26 +0100 Removed dead code - 1b2fa36 Gio Tue, 1 Dec 2015 23:38:44 +0100 Adapted getLocalAddresses() includes for windows - 5a541e7 Gio Mon, 26 Oct 2015 13:12:21 +0100 Removed unused getLocalInterfaces_ipv4 - 77bcc99 Gio Mon, 26 Oct 2015 12:38:08 +0100 Added sockaddr_storage_dump(...), implemented sockaddr_storage_ipv6_iptostring(...) - 747a03a Gioacchino Mazzurco Mon, 9 Mar 2015 20:00:41 +0100 Substitute getpreferredinterface flawed logic with simpler getLocalAddresses still just one address used at moment - f12b4a1 csoler Sun, 20 Dec 2015 20:53:11 -0500 Merge pull request #213 from csoler/v0.6-GxsDebug - d4926cb csoler Sun, 20 Dec 2015 20:35:48 -0500 fixed a number of memory leaks in gxsnetservice. Used a class that auto-deletes retrieved items. - ea137ad csoler Sun, 20 Dec 2015 19:07:04 -0500 fixed compilation on OSX pb in pqistreamer - d50875b csoler Sat, 19 Dec 2015 21:38:55 -0500 Merge pull request #212 from csoler/v0.6-TrafficOptim - 141b799 csoler Sat, 19 Dec 2015 21:20:25 -0500 removed debug info - 124da6f csoler Sat, 19 Dec 2015 21:12:57 -0500 Merge pull request #210 from G10h4ck/pqicleaning - d2e62b9 csoler Sat, 19 Dec 2015 19:18:53 -0500 Merge pull request #211 from csoler/v0.6-GxsDebug - 462f969 csoler Sat, 19 Dec 2015 19:15:48 -0500 merged with upstream/master - ccc5f0f csoler Sat, 19 Dec 2015 19:04:49 -0500 improved debug info in rsgxsnetservice - 5fcaa36 csoler Sat, 19 Dec 2015 19:00:06 -0500 fixed some serialising bugs, and added proper notification of observer - 6910ad3 csoler Sat, 19 Dec 2015 17:38:52 -0500 added stats exchange system to gather number of posts in unsubscribed groups without the need to actually DL the messages (reduced bw a lot) - b2c27a1 Gio Sat, 19 Dec 2015 22:10:07 +0100 Made pqiperson more readable evidence some strange code - adfa94d electron128 Fri, 18 Dec 2015 19:05:18 +0100 added missing null check libresapi ApiPluginHandler - b1b75a3 csoler Fri, 18 Dec 2015 08:07:00 -0500 fixed stupid bug causing cleanRejectedMessages() to be called continuously - 374aa65 csoler Thu, 17 Dec 2015 23:10:02 -0500 Merge pull request #209 from csoler/v0.6-GxsDebug - e8b881b csoler Thu, 17 Dec 2015 23:08:02 -0500 added rejection list to gxsnetservice that is fed by calls from GenExchange system, to avoid infinitely re-downloading rejected messages due to bad reputation, bad signatures, missing ids, etc - 03896d7 defnax Fri, 18 Dec 2015 01:40:39 +0100 Added Sorting Menu entry. - 5b63762 electron128 Thu, 17 Dec 2015 18:59:30 +0100 removed useless code which caused lots of ChatId conversation warnings - 45fb453 csoler Thu, 17 Dec 2015 09:23:16 -0500 Merge pull request #208 from csoler/v0.6-GxsDebug - 55e66d0 csoler Thu, 17 Dec 2015 00:08:08 -0500 fixed mismatch between API versions causing signed groups created with old API to fail author signature checking - dc034fe csoler Tue, 15 Dec 2015 23:17:35 -0500 removed debug info from GxsNetService - 0c4fd8e csoler Tue, 15 Dec 2015 18:13:40 -0500 added missing time-stamping of keys - 3617f9c csoler Tue, 15 Dec 2015 18:09:49 -0500 added NXS_NET_DEBUG_5 to print summary of incoming items - 92780b7 csoler Tue, 15 Dec 2015 18:01:03 -0500 added auto-request of missing GXS ids for group posts authors and group authors - 42bf996 defnax Tue, 15 Dec 2015 20:20:11 +0100 Sort lobby Parcipants by activity Set spacing between items - f7ab3ad electron128 Tue, 15 Dec 2015 19:56:49 +0100 allow plugins to integrate into the JSON API - 8d886b8 csoler Tue, 15 Dec 2015 12:31:03 -0500 added regular timestamp-ing of GXS ids of group authors and group post authors for all subscribed groups - 3f132f2 csoler Mon, 14 Dec 2015 21:13:44 -0500 added missing timestamp at message creation time and group creation time - e824a2f defnax Mon, 14 Dec 2015 16:32:00 +0100 update file extensions, patch by Agurer - f702c94 csoler Sun, 13 Dec 2015 18:22:04 -0500 added a few methods to improve consistency between client and server sides, and force update of groups in some cases (such as database erased) - 96c2872 defnax Sun, 13 Dec 2015 18:20:56 +0100 Merge pull request #203 from realityfabric/master - e003f56 realityfabric Sun, 13 Dec 2015 08:27:32 -0800 Made it so that sys/select.h is only included if the operating system is not Windows - 82d43eb csoler Sat, 12 Dec 2015 23:07:33 -0500 fixed a few bugs in packet packing in pqistreamer. - ed7a261 csoler Sat, 12 Dec 2015 21:07:48 -0500 added check for NULL client update map in rsgxsnetservice::debugDump() - ad1aafe csoler Sat, 12 Dec 2015 14:05:45 -0500 added missing mutex - f6a84aa csoler Sat, 12 Dec 2015 11:52:48 -0500 added packet packing in pqistreamer. To be tested for improvement in bw - 534be72 csoler Fri, 11 Dec 2015 22:54:45 -0500 improved debug info in rsgxsnetservice.cc - 7be7233 csoler Fri, 11 Dec 2015 22:38:17 -0500 fixed a number of timing issues in rsgxsnetservice. To be tested. - 66d6f05 csoler Fri, 11 Dec 2015 19:01:20 -0500 added debugDump() method to display update timestamps of GXS groups on both sides - 16d815f csoler Fri, 11 Dec 2015 18:03:44 -0500 added protocol documentation in rsgxsnetservice.cc - 039db26 csoler Thu, 10 Dec 2015 22:25:09 -0500 improved debug info in rsgxsnetservice.cc - c9af8e3 csoler Thu, 10 Dec 2015 22:08:28 -0500 improved debug info in rsgxsnetservice.cc - 3cb3662 csoler Thu, 10 Dec 2015 21:54:48 -0500 improved debug info in rsgxsnetservice.cc - 4f41605 csoler Thu, 10 Dec 2015 14:02:11 -0500 updated TODO list - 9db0524 csoler Thu, 10 Dec 2015 00:10:51 -0500 merged with upstream/master - 9843c1f csoler Thu, 10 Dec 2015 00:03:01 -0500 started updating debug info in gxsnetservice - 893f178 csoler Mon, 7 Dec 2015 23:09:44 -0500 changed GxsTunnel method for computing turtle hash, to avoid crashing old peers - 0957e70 csoler Mon, 7 Dec 2015 22:39:45 -0500 changed the method of computation for tunnel hashes in global router in order to avoid conflict with GxsTunnel service (breaks compatibility of distant message sending) - 4724007 defnax Mon, 7 Dec 2015 17:11:25 +0100 Changed Context Menu order issue: #187 - e2542a6 csoler Mon, 7 Dec 2015 10:02:04 -0500 added missing check after deserialisation of grouter item which caused a crash when receiving a malformed message data - 7cd880e electron128 Sat, 5 Dec 2015 17:00:57 +0100 removed member gxs_id from ChatId class, because ChatId now uses tunnel ids stored in distant_chat_id for distant chat. reverted naming confusion in in libresapi ChatHandler and fixed author of distant chat messages (distant chat is still unfinished) - 0ac76d6 csoler Sat, 5 Dec 2015 10:28:16 -0500 Merge pull request #188 from csoler/v0.6-SecuredTunnelService - 2a82ef5 csoler Fri, 4 Dec 2015 21:43:35 -0500 Merge pull request #186 from realityfabric/minor_edits - 9193d35 csoler Fri, 4 Dec 2015 21:24:51 -0500 merged with latest master before creating PR - dcdf9df csoler Fri, 4 Dec 2015 14:14:13 -0500 merged - 88d3e98 csoler Fri, 4 Dec 2015 14:13:46 -0500 updated TODO list - 89693b1 csoler Fri, 4 Dec 2015 14:12:35 -0500 updated TODO list - d2a9978 defnax Fri, 4 Dec 2015 19:56:56 +0100 Fixed Qt5 Fusion stylesheet on MessageComposer - d32765c csoler Fri, 4 Dec 2015 10:53:14 -0500 updated TODO list - 318be3a csoler Fri, 4 Dec 2015 00:06:14 -0500 fixed a few bugs in distant chat: disabled history (for now), improved tunnel handling - b198f1a csoler Thu, 3 Dec 2015 00:34:13 -0500 fixed some cleaning of remotely closed tunnels in GxsTunnelService - 9f56199 realityfabric Wed, 2 Dec 2015 06:18:17 -0800 fixed spelling errors in several files - 81b196d csoler Tue, 1 Dec 2015 23:40:35 -0500 added GUI to display authenticated tunnel info. Added counting of data sent/recvd. - 60d948b csoler Mon, 30 Nov 2015 21:52:15 -0500 added void GUI for authenticated tunnels - 266652f csoler Mon, 30 Nov 2015 21:02:12 -0500 put ifdefs around debug info in tunnel service - 12866cd csoler Mon, 30 Nov 2015 20:51:47 -0500 fixed a few bugs in new distant chat - 81ab43b csoler Mon, 30 Nov 2015 00:02:44 -0500 fixed GUI update of avatars and status for distant chat. Updated backend for new model. Fixed a few bugs in serialisation - 4b38b66 defnax Sun, 29 Nov 2015 17:28:05 +0100 update todo - 6951d73 csoler Sat, 28 Nov 2015 18:02:57 -0500 debugging of GxsTunnel service - fixed transport layer - a29f15a csoler Sat, 28 Nov 2015 14:55:56 -0500 fixed compilation, added missing methods for new distant chat - 923efda defnax Sat, 28 Nov 2015 18:13:35 +0100 update todo list - 6ca49a2 csoler Fri, 27 Nov 2015 23:37:39 -0500 fixed serialisation methods for GxsTunnel service - 950f407 csoler Fri, 27 Nov 2015 14:16:57 -0500 updated todo - a2e0f41 csoler Thu, 26 Nov 2015 20:40:06 -0500 updated GUI for new distant chat - 874f304 csoler Thu, 26 Nov 2015 14:48:30 -0500 Merge pull request #167 from G10h4ck/pqicleaning - 26f4523 csoler Wed, 25 Nov 2015 17:34:13 -0500 fixed compilation - 2f31dcf csoler Wed, 25 Nov 2015 09:27:56 -0500 Merge pull request #182 from ericthefish/master - e8173bd Ivan Lucas Wed, 25 Nov 2015 10:33:28 +0000 Improve some of the wording of labels and information - b552408 csoler Tue, 24 Nov 2015 21:57:59 -0500 added service part and item queues to GXS tunnel service - 397729b defnax Tue, 24 Nov 2015 19:41:13 +0100 Added to count downloads/uploads items Enabled to get copy the DHT label values via mouse Added counting on DHT Window & added context menu for DHT Tree, to copy IP addresses to clipboard - 36c68e7 csoler Tue, 24 Nov 2015 09:31:29 -0500 Merge pull request #181 from dali99/patch-1 - 8eadba6 Daniel L.Olsen Tue, 24 Nov 2015 14:43:09 +0100 Fixed a small spelling error - 19f1a82 csoler Mon, 23 Nov 2015 22:31:31 -0500 fixed compilation - 85a9e4c csoler Mon, 23 Nov 2015 22:19:18 -0500 coding phase done. Needs testing/debugging - 5c0f1da csoler Sun, 22 Nov 2015 23:19:46 -0500 saving ongoing work. Implementation almoast finished. - 8df9d4b csoler Sun, 22 Nov 2015 11:36:14 -0500 added some doc for tunnel service. Fixed a few function prototypes - b247056 csoler Sat, 21 Nov 2015 15:08:43 -0500 Merge pull request #179 from sirjenster/osx - c89ff9f defnax Sat, 21 Nov 2015 13:47:50 +0100 Added nickname column to pending packets & context menu action to view details Fixed ui layout. - 2e76cc6 defnax Sat, 21 Nov 2015 12:32:55 +0100 Fixed DHT icon - 4b84767 electron128 Sat, 21 Nov 2015 11:57:50 +0100 hide network mode selection in quick start wizard if node is a hidden node - 1f9cb27 Jenster Fri, 20 Nov 2015 20:40:00 -0800 other_osx_patch - 699299a Jenster Fri, 20 Nov 2015 08:10:59 -0800 latest OSX patches - 47328a4 defnax Thu, 19 Nov 2015 19:11:02 +0100 Merge branch 'master' of https://github.com/RetroShare/RetroShare - 4dacd9a defnax Thu, 19 Nov 2015 19:08:47 +0100 Added Ban/Unban Context menu actions for People list. - df6abc8 csoler Thu, 19 Nov 2015 10:54:38 -0500 merged before commit - fa4308e csoler Thu, 19 Nov 2015 10:52:53 -0500 updated TODO list - 5404cda defnax Thu, 19 Nov 2015 12:05:52 +0100 Added Forum reply with plaintext quote (by anmo) - cb97ce6 csoler Wed, 18 Nov 2015 23:56:35 -0500 half-way through GxsTunnel service - e3d12b8 defnax Wed, 18 Nov 2015 21:24:38 +0100 Disabled Fontmetrics on RemoteDirModel Columns, it causes unusable very small column height. - 7bcbc70 csoler Tue, 17 Nov 2015 18:12:46 -0500 added interface file for gxs tunnel service - cb8b814 csoler Tue, 17 Nov 2015 18:11:00 -0500 added gxs tunnel service, based on distant chat code. Does not compile yet - 701f1ce defnax Tue, 17 Nov 2015 17:33:25 +0100 Fixed counting thx to sehraf - 01f3db7 defnax Tue, 17 Nov 2015 15:58:22 +0100 Added to count identity items on People - 17dc7c7 csoler Mon, 16 Nov 2015 23:56:37 -0500 Merge pull request #68 from chozabu/systray_tweaks - 0751876 csoler Mon, 16 Nov 2015 14:06:45 -0500 changed MAX_CACHE_SIZE to not use the default (fixes previous commit that was wrong) - b44d08a csoler Sat, 14 Nov 2015 21:18:26 -0500 changed GXS id cache size to 5000 instead of 100. Should help a lot GXS id handling - e0e3621 csoler Sat, 14 Nov 2015 21:16:30 -0500 added missing wily for ubuntu packages - 8238c82 electron128 Sun, 8 Nov 2015 10:34:31 +0100 fix integer size issue in ContentTypes.cpp which can lead to an infinite loop - 0a21d92 electron128 Sun, 8 Nov 2015 10:23:45 +0100 Merge pull request #176 from hunbernd/feature/webui-download-enhancements - 3991b6f csoler Sun, 8 Nov 2015 01:38:37 -0500 Merge pull request #175 from sembrestels/patch-1 - 0ef9b22 hunbernd Sun, 8 Nov 2015 01:52:23 +0100 Some fixes: * using ContentTypes to resolve static files too * added some default content types, in the case of mime.types file not present * resolve extensions with upper case letters in them - c6ad0d4 defnax Sun, 8 Nov 2015 01:07:59 +0100 Merge pull request #122 from PhenomRetroShare/Fix_PrioritySpeedMenuForDownloadFiles - b847eea hunbernd Sat, 7 Nov 2015 00:33:37 +0100 Webui: Added video support into MediaPlayerWidget - 37353e5 Sem Sat, 7 Nov 2015 19:41:55 +0100 Adding libsqlcipher-dev package - 88e1dc0 hunbernd Fri, 6 Nov 2015 22:51:52 +0100 Webui: added links on file names Browsers can play partial files with built-in player, or save files to disk. - ce40760 hunbernd Fri, 6 Nov 2015 22:05:35 +0100 Added support for all common content-types into MHDFilestreamerHandler File extension --> content-type associations are read from mime.types file. - 413cee3 electron128 Fri, 6 Nov 2015 19:50:59 +0100 set buffer size for reading config signatures to the size of the computed signature. This fixes the load of the configuration for locations created after 8e6c7cd. - c41f98c defnax Fri, 6 Nov 2015 01:58:30 +0100 Merge pull request #86 from PhenomRetroShare/Fix_Win7_32bCompilationFromScratch - af35af1 csoler Thu, 5 Nov 2015 10:06:43 -0500 Merge pull request #174 from AsamK/hide_debug - 0e2417d AsamK Wed, 9 Sep 2015 16:18:47 +0200 Hide debug messages from p3historymgr - 75d462e csoler Thu, 5 Nov 2015 03:22:47 -0500 Merge pull request #173 from mr-alice/master - 93368aa mr-alice Wed, 4 Nov 2015 21:08:31 -0500 show or hide ID chooser in message box depending on destination of message - 3a2b5f1 defnax Wed, 4 Nov 2015 23:47:12 +0100 calculate correct icon size for the status icon - bdc70c6 hunbernd Wed, 4 Nov 2015 22:02:02 +0100 Allow arbitrary name in fstream url after hash. /fstream/fileshash/name Useful for creating file links that contains the original file name. - c4563db defnax Wed, 4 Nov 2015 17:06:44 +0100 Merge branch 'master' of https://github.com/RetroShare/RetroShare - 2a998c1 defnax Wed, 4 Nov 2015 17:05:39 +0100 Added new higher resolution bullet icons with better quality - f9e61dd csoler Sat, 31 Oct 2015 13:32:19 -0400 Merge pull request #169 from AsamK/add_missing_return - f06d150 AsamK Sat, 31 Oct 2015 15:13:47 +0100 Add missing return - - -- Cyril Soler Fri, 30 Oct 2015 20:00:00 +0100 - -retroshare06 (0.6.0-1.20151030.3c70c5cc~trusty) trusty; urgency=low - - 2a5fe4d csoler 30 Oct 2015 21:12:47 -0400 merge before push - 1bc2892 csoler 30 Oct 2015 21:11:44 -0400 removed some debug info - 6554362 defnax 30 Oct 2015 15:51:13 +0100 Fixed Layout - 12acf6d csoler 29 Oct 2015 23:31:23 -0400 fixed update of reputations display and used proper global score in id list - 512c15c csoler 29 Oct 2015 22:58:21 -0400 fixed edit/show checkbox state in GxsGroupDialog. - 958956a defnax 29 Oct 2015 17:20:32 +0100 Fixing layout & display on Details View anti spam fields - e56ba45 csoler 28 Oct 2015 21:22:07 -0400 attempt to fix the crash at exit, due to some threads asking for memory while the memory management structure is already gone - 22fd4e4 csoler 28 Oct 2015 18:11:27 -0400 fixed bug causing signed lobby to refuse login on double click - 459cbc6 csoler 28 Oct 2015 18:07:43 -0400 fixed bug causing forum posts to require PGP-signed ID on PGP-favored forums - 04ead35 csoler 28 Oct 2015 16:00:27 -0400 Merge pull request #163 from PhenomRetroShare/AddGxsIdInTextAnchor - 5beb852 csoler 28 Oct 2015 10:01:26 -0400 Merge pull request #164 from csoler/v0.6-SignedForums2 - 6df42a0 Phenom 28 Oct 2015 07:18:20 +0100 Add GXS Id in anchor in Chat. - 1471dbc csoler 27 Oct 2015 23:53:31 -0400 fixed tooltips for anti-spam forum features - a526a29 csoler 27 Oct 2015 23:40:18 -0400 added missing flag check for anti-spam feature display - b04ce5e csoler 27 Oct 2015 22:47:02 -0400 removed debug info - 79c80c9 csoler 27 Oct 2015 22:41:29 -0400 fixed a few bugs in display of tracking info - eefc8d3 defnax 28 Oct 2015 01:59:19 +0100 Fixed Tooltip on Outbox #121 Store Max Results spinbox #130 - 2096cd6 csoler 27 Oct 2015 20:15:50 -0400 added backward compatibility and API extension for RsGxsGrpMetaData - 2cc0f6d defnax 27 Oct 2015 18:52:01 +0100 Added Decline Button to Voip Toaster Added new stylesheet from Beluga for the voip buttons - d69f270 csoler 27 Oct 2015 00:02:16 -0400 restored constants and output to non debugging state - 206b27a csoler 26 Oct 2015 23:55:34 -0400 minor bugfix in msg tracking - c7d0e4c csoler 26 Oct 2015 23:38:10 -0400 enabled ID tracking forums. Fixed thresholds for anti-spam forums. Changed computation of reputation scored - b009c11 csoler 25 Oct 2015 23:45:33 -0400 changed RsGenExchange strategy to use a threshold on reputation when validating posts - e60ac99 csoler 25 Oct 2015 22:54:56 -0400 added bias to reputation score for known and signed ids. Changed computation formula to an exp - f24bddf csoler 25 Oct 2015 20:42:41 -0400 merged with upstream head - fee449b csoler 25 Oct 2015 19:28:13 -0400 added proper UI for setting anti-spam flags in GroupCreationDialog - 207e84d csoler 25 Oct 2015 18:27:15 -0400 added new flag for msg tracking - 3de29c5 csoler 25 Oct 2015 18:07:17 -0400 added load/save of message tracking info - 47dd70f csoler 25 Oct 2015 17:16:16 -0400 added non selective tracking for GXS messages - afa3f53 electron128 25 Oct 2015 14:50:28 +0100 fix #150 cannot create pgp signed gxs identity: give users infinite time to type in their password - b340d8a electron128 25 Oct 2015 11:47:23 +0100 Hide about button and add better description for unloaded plugins - b717d60 defnax 25 Oct 2015 00:54:22 +0200 Added default Email Client Button to Web Mail Page - 7db3bb1 csoler 24 Oct 2015 12:55:49 -0400 disabled debug info in GenExchange - 8ea9771 csoler 24 Oct 2015 12:48:17 -0400 added new flag to GxsIdChooser to force non anonymous ids. Disabled by default - b501d91 defnax 24 Oct 2015 17:05:12 +0200 Added Invite page for Web Mail Providers (Connect Friend Wizard) Added select page style for Quick Start Wizard. - e0db78f csoler 24 Oct 2015 10:41:31 -0400 reject messages signed by non PGP-signed IDs from non anonymous forums - febd348 csoler 24 Oct 2015 00:22:55 -0400 added GUI support for non anon forums. Changed serialisation of GxsGroupMetaData so that mSignFlags is serialised in place of mAuthenFlag, which is not used anyway - a6851b6 csoler 23 Oct 2015 22:53:00 -0400 renamed old flags into indices in rsgenexchange.cc. Fixed up duplicate constants between GxsGroupDialog and rsgxsflags.h - 4b402a4 csoler 23 Oct 2015 14:52:55 -0400 Merge pull request #155 from G10h4ck/huns_socket - 71073c1 Gioacchino Mazzurco 12 Jan 2015 15:25:01 +0100 Respect passed parameters in unix_socket - 463ebe7 csoler 21 Oct 2015 18:47:22 -0400 Merge pull request #154 from sehraf/pr-lobby-time - 164c726 sehraf 21 Oct 2015 22:40:49 +0200 suggestion from cyril - bcfb3be defnax 21 Oct 2015 22:39:48 +0200 Hide some Labels on Hidden Mode - c061189 sehraf 21 Oct 2015 22:18:43 +0200 mark chat participants as inactive as long as no activity was seen and reduce time to inactivity from 30 min to 10 min (patches #67) - aec42a8 defnax 21 Oct 2015 04:16:20 +0200 Improved Network Settings Layout, better look and order - 6f3ba57 csoler 20 Oct 2015 22:00:15 -0400 fixed up default sizes for list icons and main page icons for high DPI screens - 1d1904c csoler 20 Oct 2015 21:03:08 -0400 added missing memory clean calls in X509 certificate generation - 6398ed2 csoler 20 Oct 2015 18:39:32 -0400 added checks for result of pthread_create (issue #126) - f49f7ac csoler 20 Oct 2015 18:32:10 -0400 added missing EVP_CIPHER_CTX_cleanup calls (issue #128) - 261c7fa csoler 20 Oct 2015 18:24:49 -0400 added missing fclose (issue #134) - 78e9123 csoler 20 Oct 2015 18:20:37 -0400 added missing delete (issue #135) - 007a3c8 csoler 20 Oct 2015 18:18:10 -0400 merge/pull - b2dbf9d csoler 20 Oct 2015 18:16:18 -0400 adding missing BIO_free (issue #138) - 24a685f csoler 20 Oct 2015 18:03:06 -0400 Merge pull request #148 from G10h4ck/unsanelan - 5084add csoler 20 Oct 2015 17:56:06 -0400 Merge pull request #151 from diversys/master - 34758be Sergei Reznikov 20 Oct 2015 19:41:40 +0300 Add Haiku support - 16a5eed Gio 17 Oct 2015 10:27:49 +0200 Removed flawed logic samenet/samesubnet you cannot determine if two ip are in the same subnet just from ips the internet is not just a bunch of /24 - febea80 defnax 17 Oct 2015 02:23:46 +0200 Fixed Reputation display, and set text Alignment. - 8e6c7cd csoler 16 Oct 2015 12:49:10 -0400 changed SSL cert size to 4096 bits as suggested by cave - 6667031 defnax 15 Oct 2015 02:14:52 +0200 Moved to display pending packets on a QTreeWidget. Fixed People layout/spacing & display votes column. - 441b164 csoler 13 Oct 2015 21:54:52 -0400 fixed small bugs in average friend reputation display - 410102a csoler 13 Oct 2015 21:34:53 -0400 fixed bug causing lobby messages signed by IDs linked to unknown PGP keys to be dropped - 525310e csoler 13 Oct 2015 18:22:01 -0400 merging - 4f744a6 csoler 13 Oct 2015 18:21:05 -0400 updated ubuntu changlog - a75cbcd electron128 13 Oct 2015 20:36:00 +0200 webui: format time of chat messages - 537c492 electron128 13 Oct 2015 20:35:24 +0200 libresapi: fixed bug in JSON serialisation of uint32_t, decimal digits had inverse order - 4df3283 electron128 13 Oct 2015 20:27:53 +0200 webui: restored Makefile - 0b2fdee csoler 13 Oct 2015 14:23:31 -0400 Merge pull request #147 from PhenomRetroShare/Fix_ChatWidget_IsTypingLabel - 245a282 Phenom 13 Oct 2015 20:11:30 +0200 Fix centered Typing Label on ChatWidget. - 477c11e csoler 13 Oct 2015 13:51:23 -0400 Merge pull request #146 from PhenomRetroShare/FixVOIP_VividCompilation - 3172cd9 Phenom 13 Oct 2015 19:17:25 +0200 Fix VOIP Compilation on Vivid as they use a different version of rational.h - 791f5fe defnax 13 Oct 2015 02:18:41 +0200 Fixed ID Details Dialog with Reputation - 58bd186 defnax 13 Oct 2015 00:38:46 +0200 Set a default stylesheet padding size for the Accept/Decline buttons - e924193 defnax 12 Oct 2015 23:42:56 +0200 Merge pull request #144 from PhenomRetroShare/FixVOIP_HeightOfToolBarForWindowsInFullScreen - 5dbd84b defnax 12 Oct 2015 23:38:05 +0200 Merge pull request #145 from PhenomRetroShare/Fix_Win32CompilationForPR#143 - 47c47d1 Phenom 12 Oct 2015 23:21:17 +0200 Fix Compilation on Win32 after PR#143 merged. - 7bc6fdf Phenom 12 Oct 2015 23:17:00 +0200 Fix the height of the ToolBar in VOIP FullScreen for Windows. - - -- Cyril Soler Fri, 30 Oct 2015 20:00:00 +0100 - -retroshare06 (0.6.0-1.0120234~trusty) trusty; urgency=low - - 0120234 csoler 12 Oct 2015 15:06:12 -0400 Merge pull request #143 from csoler/v0.6-Reputations - 71c8dfd csoler 12 Oct 2015 14:45:11 -0400 manual merge before creating a conflict-free PR - f18cc82 csoler 12 Oct 2015 14:22:51 -0400 fixed up constants for reputation system, now that is has been tested - e6bb307 csoler 12 Oct 2015 14:04:23 -0400 added update for forum messages list when an author gets banned - 7dc5984 csoler 12 Oct 2015 14:03:53 -0400 added update for forum messages list when an author gets banned - 022ac10 defnax 12 Oct 2015 18:58:12 +0200 Merge pull request #141 from PhenomRetroShare/AddVOIP_ReactivateSoundEvents - 3d32fab Phenom 12 Oct 2015 18:25:03 +0200 Reactivate SoundEvents in VOIP. - 86b47d8 csoler 12 Oct 2015 10:58:24 -0400 reduced icon size a little bit in GxsTreeWidgetItem - 5a3756f csoler 12 Oct 2015 10:41:48 -0400 fixed bug on reputation cutoff. Updated tooltips - 36101a9 csoler 12 Oct 2015 00:28:21 -0400 fixed small bug preventing msg exchange - 82c16c6 csoler 11 Oct 2015 22:08:19 -0400 fixed GUI tooltips over banned items. Added dropping of messages from banned ide - 1a76bea csoler 11 Oct 2015 21:41:35 -0400 enabled bannign button in forums, and disable message passing for banned users - ad4dabf csoler 11 Oct 2015 13:31:54 -0400 Merge pull request #140 from PhenomRetroShare/AddVOIP_Accept,RingAndHangUp - ebe48f4 csoler 11 Oct 2015 11:12:11 -0400 added proper memory release after mallocs in distant chat (SVN bug 383) - e309dd6 csoler 11 Oct 2015 10:00:11 -0400 fixed banning users from forum threads - 6a3f4ce Phenom 11 Oct 2015 10:31:06 +0200 Update Toaster when ringing. - f750818 csoler 10 Oct 2015 21:25:06 -0400 added proper icons and names for banned users - 68ca57c csoler 10 Oct 2015 18:27:15 -0400 added removal of messages frm banned users - 3deee00 Phenom 10 Oct 2015 18:47:07 +0200 Hang Up when close chat window. - 1989f36 Phenom 10 Oct 2015 15:21:59 +0200 Add Accept, Ring and HangUp event for Video and Audio. Now you don't send data b - 1a229ef defnax 10 Oct 2015 14:16:12 +0200 Fixed to display GXS ID item with a better icon size - 59d2ca9 csoler 9 Oct 2015 18:55:07 -0400 fixed bug causing uninitialised friend average reputation to be shown - 338fcee csoler 9 Oct 2015 18:51:16 -0400 added button in forums to flag poster identity as bad - ce96e88 csoler 9 Oct 2015 17:51:10 -0400 debugging of reputation system - ffb8f73 defnax 9 Oct 2015 12:07:23 +0200 Merge branch 'master' of https://github.com/RetroShare/RetroShare - e97f23d defnax 9 Oct 2015 12:06:16 +0200 Improved icon size display on GroupTree. - bb7a8f2 csoler 8 Oct 2015 23:54:18 -0400 fixed some reputation sending bugs - 8c6c934 csoler 8 Oct 2015 23:02:34 -0400 fixed a few bugs in reputation items serialisation code and GUI display - 1cf9c34 csoler 8 Oct 2015 19:48:22 -0400 fixed compilation for MacOS - 4a4625e csoler 8 Oct 2015 18:54:12 -0400 fixed compilation for windows (to be tested) - 3d21d99 csoler 8 Oct 2015 18:39:50 -0400 added debug info for reputation system - 80ed6d1 csoler 7 Oct 2015 23:44:24 -0400 added pruning of opinions to limit data in memory. Fixed up types and sending/rec - e776eff csoler 7 Oct 2015 21:24:31 -0400 added new method rsGetHostByName to use gethostbyname_r for re-entrant calls. Upd - f1f722a csoler 7 Oct 2015 19:08:35 -0400 added missing shutdown of non responsive socket that could leak FDs (suggested by - 39672b2 csoler 7 Oct 2015 18:59:58 -0400 fixed typo causing non free of mutex_buf structure in pqissl.cc - 3cbf0f6 defnax 7 Oct 2015 20:13:18 +0200 Fixed Cert Display on Email Invite Page - 78e6f67 csoler 6 Oct 2015 23:56:39 -0400 added some documentation in p3gxsreputation.cc, and the method for computing fina - b094089 csoler 6 Oct 2015 22:39:14 -0400 fixed compilation - 95bdd7f defnax 7 Oct 2015 01:35:31 +0200 Fixed ChatWidget Margin's Set Alignment for frame off's Video icon - 993ca63 defnax 6 Oct 2015 19:58:42 +0200 Fixed icons display - 3f116e2 defnax 6 Oct 2015 18:54:43 +0200 display voip icons in a bigger size - fedb8f7 csoler 6 Oct 2015 09:47:54 -0400 Merge pull request #129 from PhenomRetroShare/FixVOIP_AllowVOIPToSaveSetting - ff46d90 csoler 6 Oct 2015 08:58:30 -0400 Merge pull request #120 from PhenomRetroShare/AddVOIP_HideChatTextButton - 9f6bc0c csoler 6 Oct 2015 00:11:18 -0400 added code for all reputation items - 05d95d3 Phenom 5 Oct 2015 21:04:20 +0200 Use QFontMetricsF to define Icon size. - 2b1d39c Phenom 4 Oct 2015 14:12:20 +0200 Add HideChat Button. Change layout of video when text is hidden. Add toolbar in f - 5d8972e Phenom 3 Oct 2015 02:11:52 +0200 Add real FullScreen Mode - 0120234 csoler 12 Oct 2015 15:06:12 -0400 Merge pull request #143 from csoler/v0.6-Reputations - 71c8dfd csoler 12 Oct 2015 14:45:11 -0400 manual merge before creating a conflict-free PR - f18cc82 csoler 12 Oct 2015 14:22:51 -0400 fixed up constants for reputation system, now that is has been tested - e6bb307 csoler 12 Oct 2015 14:04:23 -0400 added update for forum messages list when an author gets banned - 7dc5984 csoler 12 Oct 2015 14:03:53 -0400 added update for forum messages list when an author gets banned - 022ac10 defnax 12 Oct 2015 18:58:12 +0200 Merge pull request #141 from PhenomRetroShare/AddVOIP_ReactivateSoundEvents - 3d32fab Phenom 12 Oct 2015 18:25:03 +0200 Reactivate SoundEvents in VOIP. - 86b47d8 csoler 12 Oct 2015 10:58:24 -0400 reduced icon size a little bit in GxsTreeWidgetItem - 5a3756f csoler 12 Oct 2015 10:41:48 -0400 fixed bug on reputation cutoff. Updated tooltips - 36101a9 csoler 12 Oct 2015 00:28:21 -0400 fixed small bug preventing msg exchange - 82c16c6 csoler 11 Oct 2015 22:08:19 -0400 fixed GUI tooltips over banned items. Added dropping of messages from banned ide - 1a76bea csoler 11 Oct 2015 21:41:35 -0400 enabled bannign button in forums, and disable message passing for banned users - ad4dabf csoler 11 Oct 2015 13:31:54 -0400 Merge pull request #140 from PhenomRetroShare/AddVOIP_Accept,RingAndHangUp - ebe48f4 csoler 11 Oct 2015 11:12:11 -0400 added proper memory release after mallocs in distant chat (SVN bug 383) - e309dd6 csoler 11 Oct 2015 10:00:11 -0400 fixed banning users from forum threads - 6a3f4ce Phenom 11 Oct 2015 10:31:06 +0200 Update Toaster when ringing. - f750818 csoler 10 Oct 2015 21:25:06 -0400 added proper icons and names for banned users - 68ca57c csoler 10 Oct 2015 18:27:15 -0400 added removal of messages frm banned users - 3deee00 Phenom 10 Oct 2015 18:47:07 +0200 Hang Up when close chat window. - 1989f36 Phenom 10 Oct 2015 15:21:59 +0200 Add Accept, Ring and HangUp event for Video and Audio. Now you don't send data b - 1a229ef defnax 10 Oct 2015 14:16:12 +0200 Fixed to display GXS ID item with a better icon size - 59d2ca9 csoler 9 Oct 2015 18:55:07 -0400 fixed bug causing uninitialised friend average reputation to be shown - 338fcee csoler 9 Oct 2015 18:51:16 -0400 added button in forums to flag poster identity as bad - ce96e88 csoler 9 Oct 2015 17:51:10 -0400 debugging of reputation system - ffb8f73 defnax 9 Oct 2015 12:07:23 +0200 Merge branch 'master' of https://github.com/RetroShare/RetroShare - e97f23d defnax 9 Oct 2015 12:06:16 +0200 Improved icon size display on GroupTree. - bb7a8f2 csoler 8 Oct 2015 23:54:18 -0400 fixed some reputation sending bugs - 8c6c934 csoler 8 Oct 2015 23:02:34 -0400 fixed a few bugs in reputation items serialisation code and GUI display - 1cf9c34 csoler 8 Oct 2015 19:48:22 -0400 fixed compilation for MacOS - 4a4625e csoler 8 Oct 2015 18:54:12 -0400 fixed compilation for windows (to be tested) - 3d21d99 csoler 8 Oct 2015 18:39:50 -0400 added debug info for reputation system - 80ed6d1 csoler 7 Oct 2015 23:44:24 -0400 added pruning of opinions to limit data in memory. Fixed up types and sending/rec - e776eff csoler 7 Oct 2015 21:24:31 -0400 added new method rsGetHostByName to use gethostbyname_r for re-entrant calls. Upd - f1f722a csoler 7 Oct 2015 19:08:35 -0400 added missing shutdown of non responsive socket that could leak FDs (suggested by - 39672b2 csoler 7 Oct 2015 18:59:58 -0400 fixed typo causing non free of mutex_buf structure in pqissl.cc - 3cbf0f6 defnax 7 Oct 2015 20:13:18 +0200 Fixed Cert Display on Email Invite Page - 78e6f67 csoler 6 Oct 2015 23:56:39 -0400 added some documentation in p3gxsreputation.cc, and the method for computing fina - b094089 csoler 6 Oct 2015 22:39:14 -0400 fixed compilation - 95bdd7f defnax 7 Oct 2015 01:35:31 +0200 Fixed ChatWidget Margin's Set Alignment for frame off's Video icon - 993ca63 defnax 6 Oct 2015 19:58:42 +0200 Fixed icons display - 3f116e2 defnax 6 Oct 2015 18:54:43 +0200 display voip icons in a bigger size - fedb8f7 csoler 6 Oct 2015 09:47:54 -0400 Merge pull request #129 from PhenomRetroShare/FixVOIP_AllowVOIPToSaveSetting - ff46d90 csoler 6 Oct 2015 08:58:30 -0400 Merge pull request #120 from PhenomRetroShare/AddVOIP_HideChatTextButton - 9f6bc0c csoler 6 Oct 2015 00:11:18 -0400 added code for all reputation items - 05d95d3 Phenom 5 Oct 2015 21:04:20 +0200 Use QFontMetricsF to define Icon size. - 2b1d39c Phenom 4 Oct 2015 14:12:20 +0200 Add HideChat Button. Change layout of video when text is hidden. Add toolbar in f - 5d8972e Phenom 3 Oct 2015 02:11:52 +0200 Add real FullScreen Mode - 8a7e359 Phenom 1 Oct 2015 23:41:34 +0200 Add a button on VOIP to hide text when video is on. - 3c8f232 Phenom 5 Oct 2015 19:15:53 +0200 Allow VOIP to save its settings. - d4c838b csoler 5 Oct 2015 08:51:33 -0400 Merge pull request #127 from sehraf/pr-disable-sorting - 6a570af sehraf 5 Oct 2015 09:26:36 +0200 disable sorting while editing network view - 7a7f4c9 csoler 4 Oct 2015 23:18:31 -0400 added missing file - 317e7ea csoler 4 Oct 2015 23:14:49 -0400 added some backend for reputation system - c17dddb csoler 4 Oct 2015 17:47:30 -0400 updated GUI for reputation - b5bfddd csoler 3 Oct 2015 22:08:24 -0400 commit from PR#86 for VOIP, modified so as to restore real-time preview and video - 9158ed6 csoler 3 Oct 2015 10:46:36 -0400 fixed potential buffer overrun (reported by GuessWho) - 7fa687a csoler 3 Oct 2015 10:29:08 -0400 Merge pull request #119 from PhenomRetroShare/AddWebUI_BroadcastInLobbiesLis - b22069c csoler 3 Oct 2015 10:28:17 -0400 Merge pull request #123 from PhenomRetroShare/Fix_ChatWidgetDeleteKeyEvent - 64389e3 Phenom 3 Oct 2015 11:00:16 +0200 Fiw Delete key event in ChatWidget. - 904ea94 Phenom 2 Oct 2015 19:10:54 +0200 Remove (void) - 986853d Phenom 1 Oct 2015 18:49:39 +0200 Add Broadcast in list of lobbies. Before you can only write text on it if unread - b055500 csoler 2 Oct 2015 11:03:52 -0400 Merge pull request #117 from G10h4ck/master - bd94fcd csoler 2 Oct 2015 10:53:00 -0400 Merge pull request #98 from PhenomRetroShare/AddMinimumFontSizeInChat - f6abe2f csoler 2 Oct 2015 10:50:14 -0400 Merge pull request #115 from PhenomRetroShare/AddWebUI_LobbyOrderByType - e83ae76 Gio 27 Sep 2015 20:15:41 +0200 pqiconnect remove ni NULL pointer check as it would crash anyway for null pointer d - 28b9a44 Gio 27 Sep 2015 15:29:32 +0200 Write in a sane way pqissl::connect_parameter - b16ecc8 Gio 27 Sep 2015 15:11:55 +0200 Remove some garbage from pqissl - d6ba9a2 Phenom 25 Sep 2015 17:00:50 +0200 Order in WebUI Lobbies by first: auto_subscribe, is_private and then subscribed - 3025f4d csoler 24 Sep 2015 18:18:11 -0400 removed aliasign problem that breaks compilation on gentoo - 22d4893 csoler 24 Sep 2015 18:03:19 -0400 removed a few compilation warning that might cause compilation errors on some sy - 0614a24 csoler 23 Sep 2015 22:11:50 -0400 Merge pull request #111 from csoler/v0.6-ImprovedExtIPDetermination - 24b3325 csoler 23 Sep 2015 21:45:15 -0400 Improved reliability of the determination of external address: removed DHT stunn - 323d894 csoler 22 Sep 2015 23:21:14 -0400 Merge pull request #110 from jenster/newbranchformychanges - 68fd1b2 jenster 22 Sep 2015 18:33:16 -0700 First Mac/OSX compile fixes - 6071be9 csoler 22 Sep 2015 11:20:28 -0400 Merge pull request #109 from AsamK/workaround_broken_sqlcipher - c80ad59 AsamK 22 Sep 2015 16:31:21 +0200 Add workaround for broken sqlcipher packages - 7293cd3 csoler 21 Sep 2015 22:58:58 -0400 updated ubuntu changelog - 1d54630 thunder2 17 Sep 2015 10:05:31 +0200 Fixed Windows compile. - 66691d4 csoler 16 Sep 2015 20:01:39 -0400 Merge pull request #108 from sehraf/i2p - 04abfad sehraf 16 Sep 2015 17:01:20 +0200 manually reverted changes by Qt Creator - 7c7e4f8 sehraf 16 Sep 2015 12:13:54 +0200 added ip addr. field to the add certificate dialog - 6202e83 sehraf 16 Sep 2015 11:48:32 +0200 add default case to gui instead of falling back to tor labeling - d3d184f sehraf 16 Sep 2015 11:09:04 +0200 added simple step-by-step guide to add a I2P server tunnel - e54358a sehraf 16 Sep 2015 10:55:33 +0200 added simple step-by-step guide to add a I2P client tunnel - 1dd3375 sehraf 15 Sep 2015 17:14:55 +0200 hide debug output - d24b281 sehraf 15 Sep 2015 17:10:48 +0200 optimizations * reduced calls to mPeermgr * use switch convenience * small fixes - bfcf43f sehraf 15 Sep 2015 16:18:46 +0200 fixed connection type detection and other small things - 8725aab sehraf 14 Sep 2015 15:14:39 +0200 gui fixes - 6b87c38 sehraf 14 Sep 2015 14:56:14 +0200 small fixes - 6ec1919 sehraf 14 Sep 2015 12:39:46 +0200 gui changes - b0251e3 sehraf 14 Sep 2015 12:12:28 +0200 generalized tooltips - 4b19e73 sehraf 14 Sep 2015 09:56:43 +0200 added comments to functions - 8a7e359 Phenom 1 Oct 2015 23:41:34 +0200 Add a button on VOIP to hide text when video is on. - 3c8f232 Phenom 5 Oct 2015 19:15:53 +0200 Allow VOIP to save its settings. - d4c838b csoler 5 Oct 2015 08:51:33 -0400 Merge pull request #127 from sehraf/pr-disable-sorting - 6a570af sehraf 5 Oct 2015 09:26:36 +0200 disable sorting while editing network view - 7a7f4c9 csoler 4 Oct 2015 23:18:31 -0400 added missing file - 317e7ea csoler 4 Oct 2015 23:14:49 -0400 added some backend for reputation system - c17dddb csoler 4 Oct 2015 17:47:30 -0400 updated GUI for reputation - b5bfddd csoler 3 Oct 2015 22:08:24 -0400 commit from PR#86 for VOIP, modified so as to restore real-time preview and video - 9158ed6 csoler 3 Oct 2015 10:46:36 -0400 fixed potential buffer overrun (reported by GuessWho) - 7fa687a csoler 3 Oct 2015 10:29:08 -0400 Merge pull request #119 from PhenomRetroShare/AddWebUI_BroadcastInLobbiesLis - b22069c csoler 3 Oct 2015 10:28:17 -0400 Merge pull request #123 from PhenomRetroShare/Fix_ChatWidgetDeleteKeyEvent - 64389e3 Phenom 3 Oct 2015 11:00:16 +0200 Fiw Delete key event in ChatWidget. - 904ea94 Phenom 2 Oct 2015 19:10:54 +0200 Remove (void) - 986853d Phenom 1 Oct 2015 18:49:39 +0200 Add Broadcast in list of lobbies. Before you can only write text on it if unread - b055500 csoler 2 Oct 2015 11:03:52 -0400 Merge pull request #117 from G10h4ck/master - bd94fcd csoler 2 Oct 2015 10:53:00 -0400 Merge pull request #98 from PhenomRetroShare/AddMinimumFontSizeInChat - f6abe2f csoler 2 Oct 2015 10:50:14 -0400 Merge pull request #115 from PhenomRetroShare/AddWebUI_LobbyOrderByType - e83ae76 Gio 27 Sep 2015 20:15:41 +0200 pqiconnect remove ni NULL pointer check as it would crash anyway for null pointer d - 28b9a44 Gio 27 Sep 2015 15:29:32 +0200 Write in a sane way pqissl::connect_parameter - b16ecc8 Gio 27 Sep 2015 15:11:55 +0200 Remove some garbage from pqissl - d6ba9a2 Phenom 25 Sep 2015 17:00:50 +0200 Order in WebUI Lobbies by first: auto_subscribe, is_private and then subscribed - 3025f4d csoler 24 Sep 2015 18:18:11 -0400 removed aliasign problem that breaks compilation on gentoo - 22d4893 csoler 24 Sep 2015 18:03:19 -0400 removed a few compilation warning that might cause compilation errors on some sy - 0614a24 csoler 23 Sep 2015 22:11:50 -0400 Merge pull request #111 from csoler/v0.6-ImprovedExtIPDetermination - 24b3325 csoler 23 Sep 2015 21:45:15 -0400 Improved reliability of the determination of external address: removed DHT stunn - 323d894 csoler 22 Sep 2015 23:21:14 -0400 Merge pull request #110 from jenster/newbranchformychanges - 68fd1b2 jenster 22 Sep 2015 18:33:16 -0700 First Mac/OSX compile fixes - 6071be9 csoler 22 Sep 2015 11:20:28 -0400 Merge pull request #109 from AsamK/workaround_broken_sqlcipher - c80ad59 AsamK 22 Sep 2015 16:31:21 +0200 Add workaround for broken sqlcipher packages - - -- Cyril Soler Mon, 12 Oct 2015 20:00:00 +0100 - -retroshare06 (0.6.0-1.7293cd3~trusty) trusty; urgency=low - - 7293cd3 csoler Mon, 21 Sep 2015 22:58:58 -0400 updated ubuntu changelog - 1d54630 thunder2 17 Sep 2015 10:05:31 +0200 Fixed Windows compile. - 66691d4 csoler 16 Sep 2015 20:01:39 -0400 Merge pull request #108 from sehraf/i2p - 04abfad sehraf 16 Sep 2015 17:01:20 +0200 manually reverted changes by Qt Creator - 7c7e4f8 sehraf 16 Sep 2015 12:13:54 +0200 added ip addr. field to the add certificate dialog - 6202e83 sehraf 16 Sep 2015 11:48:32 +0200 add default case to gui instead of falling back to tor labeling - d3d184f sehraf 16 Sep 2015 11:09:04 +0200 added simple step-by-step guide to add a I2P server tunnel - e54358a sehraf 16 Sep 2015 10:55:33 +0200 added simple step-by-step guide to add a I2P client tunnel - 1dd3375 sehraf 15 Sep 2015 17:14:55 +0200 hide debug output - d24b281 sehraf 15 Sep 2015 17:10:48 +0200 optimizations * reduced calls to mPeermgr * use switch convenience * small fixes - bfcf43f sehraf 15 Sep 2015 16:18:46 +0200 fixed connection type detection and other small things - 8725aab sehraf 14 Sep 2015 15:14:39 +0200 gui fixes - 6b87c38 sehraf 14 Sep 2015 14:56:14 +0200 small fixes - 6ec1919 sehraf 14 Sep 2015 12:39:46 +0200 gui changes - b0251e3 sehraf 14 Sep 2015 12:12:28 +0200 generalized tooltips - 4b19e73 sehraf 14 Sep 2015 09:56:43 +0200 added comments to functions - 900e51b csoler 13 Sep 2015 18:08:06 -0400 Merge pull request #107 from PhenomRetroShare/AddFriendListItemMouseEvents - 48e6618 Phenom 13 Sep 2015 19:00:31 +0200 Send Mouse event to FriendList's item, since ElidedLabel was fixed. - 7195d4c csoler 10 Sep 2015 09:41:28 -0400 Merge pull request #105 from ericthefish/master - 4880fc4 Ivan Lucas 10 Sep 2015 11:21:01 +0100 Fixed grammar on add friend wizard by rewording slightly - 840e930 Ivan Lucas 10 Sep 2015 10:29:15 +0100 Fix Spelling and Grammar - 770e934 Ivan Lucas 10 Sep 2015 10:18:14 +0100 Merge remote-tracking branch 'upstream/master' - 4a0539c csoler 9 Sep 2015 19:57:07 -0400 Merge pull request #103 from AsamK/html_parsing - 1acd4a3 csoler 9 Sep 2015 16:44:59 -0400 Merge pull request #104 from PhenomRetroShare/Fix_ElidedLabel_mousePresEvent - ce9fc7b Phenom 9 Sep 2015 22:37:38 +0200 Fix ElidedLabel::mousePressEvent. - 75a7a89 Ivan Lucas 9 Sep 2015 15:19:17 +0100 Fix typo - 7aad9c1 AsamK 9 Sep 2015 13:36:00 +0200 Improve HTML parsing in libresapi - b8c3c89 AsamK 9 Sep 2015 11:53:01 +0200 Extract getPlainText method - ebd5da5 thunder2 8 Sep 2015 16:34:22 +0200 Optimizations in RsGenExchange, p3GxsForums and p3GxsChannels. - Removed not used variables - avoid copy constructors - Use swap instead of operator= to move elements of std containers - 490b88c csoler 8 Sep 2015 14:17:29 -0400 Merge pull request #100 from ericthefish/master - a2e7e4d Ivan Lucas 8 Sep 2015 16:12:50 +0100 Fixed spelling/grammar - 4f8b098 Ivan Lucas 8 Sep 2015 16:00:00 +0100 Fixing spelling - c4061fc thunder2 7 Sep 2015 22:27:04 +0200 Removed not used time consuming calculation of row count from RetroCursor. - 29a1fa2 thunder2 7 Sep 2015 21:48:18 +0200 Removed unnecessary copy of results in RsGxsDataAccess. - 0bc77d7 sehraf 8 Sep 2015 13:48:30 +0200 added some error handling - da417ee csoler 7 Sep 2015 20:38:47 -0400 Merge pull request #96 from AsamK/qmake_3 - 63e38af csoler 7 Sep 2015 20:36:03 -0400 Merge pull request #94 from AsamK/correct_libav_version - 03d99ae sehraf 7 Sep 2015 23:55:57 +0200 made GenCertDislog more generic - 4fc6c73 sehraf 7 Sep 2015 23:40:52 +0200 replaced some ifs with switch - e2768e0 defnax 7 Sep 2015 23:34:39 +0200 Added last used field to Person Details Window - fed4345 sehraf 7 Sep 2015 22:57:54 +0200 made server settings more generic and added i2p support - 95d6b06 sehraf 7 Sep 2015 18:46:19 +0200 first working version - 0107f4e sehraf 7 Sep 2015 12:59:21 +0200 first run on gui integration - ba74c04 sehraf 7 Sep 2015 11:51:24 +0200 removed duplicated code, fixed compile, few additions - c17d0e1 sehraf 7 Sep 2015 11:22:15 +0200 add i2p support to libretroshare - 2c1743f defnax 7 Sep 2015 15:13:32 +0200 Added send message function for Participants list. - cc4be39 defnax 7 Sep 2015 15:08:56 +0200 Merge branch 'master' of https://github.com/RetroShare/RetroShare - 0793a6a AsamK 6 Sep 2015 14:19:21 +0200 Use PLUGIN_DIR to define plugin directory only once - fe1ec9d AsamK 5 Sep 2015 22:49:57 +0200 Fixed mac compile. Moved sqlcipher.a to libretroshare.pro - 571336e AsamK 5 Sep 2015 23:49:15 +0200 Move duplicate common stuff out of platform parts - 66b9557 AsamK 5 Sep 2015 23:48:24 +0200 Use PKGCONFIG instead of manually specifying LIBS for Linux - b8e3a43 thunder2 6 Sep 2015 21:28:34 +0200 Auto download of recommended files adds the sender as source of the download. - 5f36500 thunder2 6 Sep 2015 14:21:05 +0200 Fixed click in column "Friend nodes" in FriendList. - 869077b thunder2 5 Sep 2015 12:46:18 +0200 Combined selects in RsDataService::retrieveNxsGrps/RsDataService::retrieveNxsMsgs. - d6f50c7 AsamK 5 Sep 2015 15:44:10 +0200 Fix libav version check - e9a5523 defnax 5 Sep 2015 00:16:07 +0200 Merge branch 'master' of https://github.com/RetroShare/RetroShare - 7f8dae9 defnax 4 Sep 2015 16:33:43 +0200 Merge branch 'master' of https://github.com/RetroShare/RetroShare - 07c5030 defnax 3 Sep 2015 17:41:30 +0200 Merge branch 'master' of https://github.com/RetroShare/RetroShare - 3d6e978 defnax 2 Sep 2015 13:06:15 +0200 Fixed Status Label on Distant Chat - - -- Cyril Soler Mon, 21 Sep 2015 20:00:00 +0100 - -retroshare06 (0.6.0-1.20150905.8bb76c95~trusty) trusty; urgency=low - - a276986 ( ) Merge pull request #60 from PhenomRetroShare/Fix_AllowChatTextFormatOption - 88a6931 (GUI ) Allow Chat Text Format Option working. - 0b5b20d ( ) Merge pull request #59 from AsamK/qmake_improvements - 0409dd8 ( ) Merge pull request #58 from AsamK/debian_make_install - 21e99cf (Packaging ) Use explicit dependencies instead of CONFIG += ordered - f002310 (Packaging ) Remove libpegmarkdown from win32 retroshare-nogui build - 2337b46 (Packaging ) Specify plugins as plugins to qmake - ecb5d93 (GUI ) changed default color for the system chat bubble - d51b4b2 (Packaging ) Adapt debian/ubuntu package files to use "make install" - c07bef3 (GUI ) Fixed Create Lobby Dialog's window size - a45de1d (Chat ) Merge pull request #57 from csoler/v0.6-SignedLobbies - 40bffc3 (Chat ) fixed last GUI bugs for authed lobbies - 6d01461 (Chat ) fixed a few GUI bits for non anonymous chat lobbies - 627dcc0 (Forums ) Merge pull request #50 from chozabu/forum_additions - 7270ba9 (Chat ) Merge pull request #56 from AsamK/distant_chat_history - 5dad168 (Chat ) Implement history for distant chat - d7531b3 ( ) Merge pull request #54 from cavebeat/coverity - 9240512 ( ) Merge pull request #55 from AsamK/install_stylesheets - 622e942 (GUI ) Remove Thumbs.db files and add to .gitignore - 699213a (Packaging ) Load chat styles also from DATA_DIR/stylesheets - 66ba687 (Packaging ) Install qss and chat styles - 4d7f92e (GXS/NXS ) Removed unnecessary select of groups in RsGxsNetService::locked_genReqGrpTransaction. - 753846b (GXS/SQL ) Added count of requests and results to debug output in RsDataService::retrieveGxsGrpMetaData - d118a13 (GXS/NXS ) Fixed adding of empty group id to notify when removing a group. - 4cc1df3 (GXS/NXS ) Ignore updates of not existing groups in RsGenExchange::processGrpMask. Solves: "Error code: no such column: su - d8aa712 (Packaging ) travis/coverity tokens updated - 6e1a8fa ( ) Merge pull request #21 from AsamK/lobby_history - 040b4fb (Chat ) implemented gp-authed lobbies. Still needs some GUI - b8459b3 ( ) Merge pull request #44 from AsamK/improve_qmake - c622ca0 (Packaging ) Issue compile error if DATA_DIR is not set - ef499cd ( ) Merge pull request #46 from PhenomRetroShare/Fix_ChatWidgetSearchTextThreshold - 668394d ( ) Merge pull request #47 from PhenomRetroShare/AddHTML_TextOptimization_0.6 - 6ba2f68 ( ) Merge pull request #45 from PhenomRetroShare/Fix_ChatWidgetLastCursorFormatting - 1736ad8 ( ) Merge pull request #11 from cavebeat/coverity_scan - a39663d ( ) Merge branch 'master' of https://github.com/RetroShare/RetroShare - 17af892 (GUI ) set a default minimum column header size for comments. - c29ae55 (Code cleaning ) Merge pull request #38 from cavebeat/rm_linkscloud - 1a1a2aa (GXS/NXS ) Lowered update of server sync TS from 10 seconds to 60 seconds. - 641a433 (GUI ) Fixed filter in FriendList. - 217c9b9 ( ) Merge branch 'master' of https://github.com/RetroShare/RetroShare - 9d65b08 (GUI ) set default background color for system messages at private chat window - da66ac5 (GXS ) GxsGroupFrameDialog: Fixed restore of active group tree item when subscrube/unsubscribe a group. - 185220b (GUI ) enable customisation of columns in forum thread widget - 389f2f0 (GXS/SQL ) Removed delete of message files in RsDataService::resetDataStore. - 836b866 ( ) Merge pull request #37 from sehraf/pr-friendlist_import_export-V2 - 5aaf3e6 (Packaging ) Move data dir from build_scripts/ to root and adapt RedHat build files - 4dbffe0 ( ) Merge pull request #48 from PhenomRetroShare/AddRetroShareLinkOpenFileWhenExists - 5c67941 ( ) Update README.md - 5ae5d76 (Packaging ) Make file names consistent with packaging - 91e19fc (Packaging ) Disable installing of headers and libretroshare.a - d4a36ed (Packaging ) Make data and plugin directory configurable at compile time - 6b7a6e2 (Packaging ) Make RS installable with "make install" - fa54fce ( ) Merge pull request #49 from heini/redhat_build - 1fcae61 (GXS/SQL ) Removed static defines for column numbers in RsDataService and replaced it with members. Initialized members wh - 531ce34 ( ) Merge branch 'master' into AddRetroShareLinkOpenFileWhenExists - 860292d ( ) Merge branch 'master' into AddHTML_TextOptimization_0.6 - 70b9c45 ( ) Merge branch 'master' into Fix_ChatWidgetSearchTextThreshold - 79fb8df ( ) Merge branch 'master' into Fix_ChatWidgetLastCursorFormatting - e9aa4ff ( ) Merge pull request #3 from chozabu/copy_version_info_button - d1deef0 (GUI ) fixed new lines in certificate string - 7bd41e9 ( ) Merge pull request #4 from chozabu/grouter_stats_basic_names - 7fe46ed (Packaging ) Provide RedHat family packaging script. - f30ed24 (GXS/SQL ) Moved gxs data from files into database - Added update to RsDataService - Added new table "DATABASE_RELEASE" to - b1aae2d ( ) Merge branch 'master' into AddRetroShareLinkOpenFileWhenExists - 0234734 (GUI ) When the file in the link already exists, RS open it. - 791fb78 (GUI ) renaming details and details2 for better clarification - ad499e6 (GUI ) renamed 'pubkey' to 'certificate' and removed empty location names - 6893c58 ( ) Merge pull request #42 from cavebeat/comma - c66de1c (Packaging ) fixed comma in README for debian - f58e347 ( ) Merge pull request #23 from AsamK/patch-1 - 326a330 (GUI ) Fix ChatWidget last cursor formatting. To test it, search a text that will be colored a end. New messages lose - c44afc0 ( ) Merge branch 'master' into Fix_ChatWidgetSearchTextThreshold - b1fd290 ( ) Merge branch 'master' into AddHTML_TextOptimization_0.6 - eb4313f ( ) merge before commit - 58d29c3 (Bug fix ) fixed error message in pqissl::cansend() - 5c97010 (GUI ) Fix ChatWidget search text label threshold. - 5a32cca (Packaging ) README: Fix executable name - 339558f (Packaging ) Update and rename README.txt to README.md - 6ac107a (GXS/SQL ) Added method "tableExist" to RetroDb. - 3665238 (GXS/SQL ) Added new methods for transaction to RetroDb. - 4309642 ( ) merging before commit - 58c70ca ( ) moved [not] operator inside parenthesis. Does not change anything except improving readability - dea7c77 (Global router ) fixed missing removal of deleted data causing a crash when large messages cause an error in Global Router - 334ddf8 (GUI ) Enabled sort by columns other than name combined with sort by state in FriendList. - 176c3ab (GUI ) FriendSelectionWidget: - Added sort by state - Moved buttons "All"/"None" into context menu - 4923c47 (GUI ) RSTreeWidget: - Added possibility to add own actions to header context menu - Added resort of items - 02775c6 (GUI ) Add HTML Text Optimization by exporting styles. - 1d9e398 (Code cleaning ) removed LinksCloud LinksCloud has been replaced by Posted and is hosted for archiving reasons in https://github - 04a1c10 (GUI ) fixed UTF-8 group names - 941959c (GUI ) conversion from QSettings to XML - 48c3eed (Packaging ) Removed "CONFIG += console" for Windows release build. - 3b40f0e (GUI ) FriendList: - Show information of the "best" ssl item on the gpg item only when the gpg item is not expanded. - - 42bbf76 (GUI ) fixed display of software revision in main window (patch from ASmith) - 80d765e (GUI ) small fix - 3634981 (GUI ) added import/export friendlist - 4d7f733 (Packaging ) fixed bug in git parameter in packaging script - 9734f32 (Packaging ) updated ubuntu changelog. improved ubuntu packaging script - - -- Cyril Soler Sun, 05 Sep 2015 20:00:00 +0100 - -retroshare06 (0.6.0-1.20150816.9734f32a~trusty) trusty; urgency=low - - f6b830d (branch merging) Merge pull request #35 from hunbernd/chat-fix - 16859a1 (GUI ) Fix: chatlobby toaster not working - 2e08dde (Bug fix ) additional check for pqissl::sockfd before using it (patch from Jenster) - 384e7ba (GXS ) Reworked processing of requests in RsGxsDataAccess to prevent freezes of the gui. - 4a50a62 (Git management) Merge branch 'master' of https://github.com/RetroShare/RetroShare - 6eccd57 (Git management) merging before commit - 3084d2a (Debug info ) improved security message in console for whitelisted peers - 0402e53 (GUI ) Fix: empty line duplication bug - 4095d9d (GXS ) Switched retrieve of posts in GxsMessageFramePostWidget from "requestMsgRelatedInfo" to "requestMsgInfo". - b1101ed (GXS ) Prevent selecting data from the database in RsGxsNetService::syncWithPeers without online friends. - 3731617 (Debug info ) Fixed typo in debug output. - e667071 (GUI ) Moved IP Filter Widgets into Tabs - caa97cc (GXS ) Added database name to the debug output in RsDataService. - 2a6b623 (GXS ) Added extended debug outputs of times in RsDataService. - 7472f81 (Git management) Merge branch 'master' of https://github.com/RetroShare/RetroShare - 9d291aa (GUI ) update windows build scripts changed gxs id icon for linked with profile. - a765016 (GUI ) Moved column show/hide from context menu of the tree to the context menu of the header in IdDialog. - e73e68d (GUI ) Reduced the size of the status icon on the avatar image in FriendList. - 442ec23 (GXS ) Added index in database for column grpId in table MESSAGES. - b8edb75 (GXS ) Optimized SELECT creation in RetroDb::sqlQuery - ab538c6 (GXS ) Avoid error messages "table already exists" in RsDataService::initialise by using "IF NOT EXISTS" - 783465b (GUI ) forget to commit this, for the Search Filter DHT IPs - 13e77fb (Bugs ) Merge pull request #19 from sehraf/pr-fix_crash_on_shutdown - 9d0b066 (Bugs ) Fixed hide offline friends in ServicePermissionsPage - c919786 (GUI ) Fixed typo. Updated english translation. - d5c95c4 (GUI ) Fixed layout of the ServicePermissionsPage - 9265145 (GUI ) Updated english translation - 87f2e6d (GUI ) FriendList: - Removed avatar column, state column. Added combined avatar and status icon - ec67ee0 (VOIP ) added graph display of instantly required bandwidth for VOIP, in preparation to chosing new - video codec. GUI layout - d5c33f5 (Packaging ) fixed windows build script - c168765 (GUI ) Added tab for the DHT TreeWidgets for better view Added a search Filter for DHT IP addresses - 48bb8b4 (Git management) sequel to 6b2ed2fb2d84d7e48b15fa917aa4eb8015922d15 - fabc3a3 (Git management) added some rules to .gitignore - 168eb45 (Debug info ) removed debug info about missing keys; added debug info about deserialization checking of string - 311358b (Git management) merged changes from master - a87adb8 (Debug info ) improved README file - 51ab1fc (Debug info ) updated readme file - 43db562 (Packaging ) Fixed build script for Windows installer - 789df68 (Packaging ) Added update of version information for Windows build - Added template file version.html.in - Removed RS_BUILD_NUM - 1412dc6 (Packaging ) Removed utopic, added new ppa name - - -- Cyril Soler Sun, 16 Aug 2015 20:00:00 +0100 - -retroshare06 (0.6.0-1.20150802.34ec6dfd~precise) precise; urgency=low - - GUI - - improved filtering method against lol bombs. Thx to ConcernedCitizen for pointing this out - - fix #21 typo "defaut" instead of "default" in switch statement in RSGraphWidget (patch from Chozabu) - - moved all bw graph files in statistics. Removed outqueue info widget. Created new cpp files to host the bw graph code. - Started minimal UI to display bw information. The goal is t - - fixed position of scaled/highlighted nodes in node graph (patch from Chozabu) - - fixed a few bugs in statistics GUI. Still misses names and proper curve display - - Enabled Messenger Window in system tray icon. - - Fixed overlay icon (star) for tray icon. - - fixed up various places in the GUI for high DPI screens (new icons and icon qrc file generation script, font-size based widgets, etc) - - disable update of group messages for IdService since it is unused and takes some bandwidth - - fixed typo in server page "127.0.01" - - Added stylesheet to plugins. - - Moved fix font from GenCertDialog to qss (Modified patch from Henry). Added defaults to ui without style sheet - - Fixed typo in string (Patch from Henry). - - Added customize of columns to RSTreeWidget. - - added back functionality to choose DL directory for each channel - - Removed generate of channel messages. - - FriendList: - Added customize of columns with RSTreeWidget. - Reduced display menu. - - Optimized fill of forums when modifying the read state. - - Fixed compile with Qt 5 - - Added disable/enable of GxsIdDetails process. Disabled GxsIdDetails process when filling gxs id's in forums. - - Optimized load of forums by moving the avatar handling for the tooltip to the tooltip creation. - - - added correct image file for finished transfers - - - added correct image file for finished transfers - - Backend / Coverity bug fixes - - removed old function entry to collect outqueue stats. - - removed unused method for OutQueue statistics; improved BW curve display; fixed a few display bugs - - Added missing initialization in - pqissl - pqissludp - PeerConnectStateBox - RsTlvBanListEntry - RsServer - TcpStream - PGPCertificateInfo - peerConnectAddress - AudioInputConfig - - Fixed usage of member _thread_id in RsMutex - - Removed unused member from ProfileManager. - - Added missing restore of ostream format (std::dec) in rschatitems.cc. - - Added missing restore of ostream format (std::dec) in CreateLobbyDialog::createLobby. - - Fixed crash in ChatMsgItem::removeItem when "mParent == NULL". - - Added missing restore of ostream format (std::dec) in p3ServiceServer::sendItem. - - Fixed crash in ChatLobbyUserNotify::subMenuClicked when using "Remove All" of the chat lobby notifier. - - Fixed possible crash in DetailsDialog::setFileHash by checking return value of dynamic_cast. - - Fixed possible crash in ftServer::receiveTurtleData by checking return value of dynamic_cast. - - Fixed possible crash in ftServer::handleIncoming by checking return value of dynamic_cast. - - Fixed possible crash in ServiceControlSerialiser by checking return value of dynamic_cast. - - Fixed possible crash in RsFileTransferSerialiser by checking return value of dynamic_cast. - - Fixed possible crash in ChatLobbyDialog::init by checking return value of dynamic_cast. - - Fixed possible crash in RsGRouterSerialiser by checking return value of dynamic_cast. - - added basic functions to collect bandwidth info in pqistreamer both ways; added a sorting method in BWGraphSource - to create curves from extracted BW info. Still not yet functiona - - Fixed possible crash in RsGxsIdSerialiser by checking return value of dynamic_cast. - - Fixed possible crash in p3GRouter by checking return value of dynamic_cast. - - Removed dead code from ImHistoryBrowser::fillItem. - - Removed potentially unintentional integer overflow in NxsBandwidthRecorder::recordEvent. - - Added initialize of RsGxsChannelPost members. - - fixed potential integer problem in image de-serialization (reported by HM) - - Added initialize of RsVOIPPingItem members - - fixed potential integer problems in de-serialization of different TLV items (patch from Henry) - - Plugins - - fix #20 crash on shutdown with plugins enabled. Settings window did leak plugin config pages (patch from hunbernd) - - WebUI - - allow only whitelisted link protocols to prevent javascript in links - - improved error message in webui: show full path of file if read failed - - make link detection work if the message ends with - - added chat - - fix serialisation of floating point numbers in SuperEasyJSON for german locale. JSON expects decimal points, but german locale used comma. - - GXS IDs - - added additional key checking for IDs received during distant chat DH handshake - - added methods to check public/private keys for consistent fingerprint and content. Should be later used to check GXS keys when they arrive from neighbor nodes. - - Distant chat - - Added check of function parameter to DistantChatService::handleRecvDHPublicKey. - - -- Cyril Soler Sun, 02 Aug 2015 16:00:00 +0100 - -retroshare06 (0.6.0-0.8551~precise) precise; urgency=low - - GUI - - * Used QTextBrowser to show the channel description for unsubscribed groups to avoid the horizontal growing of the channel list. - * fixed pasting of rslinks with special characters with Qt5 - * fixed strings in IdDialog (patch from Henry) - * Optimized fill of feed items by moving the fill of the hidden area to the first expand of the frame. - * make IP connect state string fully translatable (patch from Henry) - * Use a better icon for "linked to your profile" - * Enabled ordered/bullet list for Message Composer - * changed default news feeds to include security_IP, remove Peer connects (this one drives most people crazy) - * change label "Security Ip" to "Ip security" in feed settings(patch from Henry) - * Added a second color button to Message Composer, for set text background color. - * Changed parameter isFirstTimeRun of RsAccountsDetail::getAccountOptions to output parameter. - * Added version information of the libraries to HelpDialog. - * Added own flag and new checkbox in settings for security ip feed items. - * Changed NewsFeed::addUnique for SecurityIpItem to compare the ip addresses. That avoids duplicates when IP changes. - * Removed banner pixmap for the ConnectFriendWizard of the standard style. - * QWizard cannot be resized horizontal when a banner pixmap is set. - * fixed whitespaces in strings (patch from Henry) - * changed "Owned by node" into "Owned by" in IdDialog (patch from Henry) - * added explanation to IP change security item in a tooltip - * Changed string "TOR" to "Tor" everywhere. - * Fixed crash in context menu of the id list in IdDialog when no row is active. - * disable IP filter tab when using a hidden node - * Used ElidedLabel for the forum name to avoid the horizontal growing of the forum list. - * Set the status of the message to read when the user read it in the news feed. - * Remove the message news feed when the user reads the message in the message list. - * Added warning to IdEditDialog, when the lenght of the nickname is too short or too long. - * Used StyledElidedLabel for the nickname in Idialog to avoid the horizontal growing of the right widget. - * Updated languages from Transifex - - Plugins - * FeedReader: Added check for forum author. - * Fixed VOIP linkage for ubuntu distributions (thx to Phenom) - - WebUI - * added profile import/creation - * fixed leaking file descriptors - * added upload handler for small files - * fixed terminal thread - * removed some unused parameter warnings - - IP Filters - * added check for whitelist before sending a Security item for IP changed. - * improved voting for extr address, and make sure DHTStunner does not return a banned IP - * removed/improved debug info - - Various code improvements - * changed Radix64::decode to return result as std::vector - * removed unused branch and dummy function in pqihandler - * removed pqisecurity dummy functions. It is a packet filter which was never implemented. It's job is now done by service permissions. - * fixed compilation for versions not using sqlcipher - * added more debug info in pqissl when connection is attempted from banned address - - Bug fixes - * Fixed using uninitialized variable in p3HistoryMgr::setSaveCount. - * Fixed using uninitialized variable in p3HistoryMgr::setEnable. - * Fixed uninitialized members of bdProxyId and bdConnectionRequest. - * removed unused variable in TmpBlobStore - * let interface classes initialise their integers - * initialise BanListPeer::addr - * let turtle reputation classes initialise their integers - * let turtle items initialise their integers - * Added destructor to p3LinkMgrIMPL. - * Fixed memory leak in GuiExprElement. - * added missing initialisation in p3GxsChannels - * added missing initialisation in p3GxsCircles - * added missing initialisation in p3GxsForums - * removed useless ifs in rsaccounts.cc - * added missing initialisation in resource_api::Request - * added missing initialisation in ApiServerMHD - * fixed potential mismatch free/delete[] in distant chat - * added missing initialization for RsGXsIdGroup::mLastUsageTS - * added check for return value of fseek in ftFileProvider - * fixed potential memory leak in pgphandler - * fixed memory leak in FileIndexStore - * fixed uninitialised memory read in RsGxsNetUtils - * fixed Chat Lobby gui complaining about wrong string passed to RsGxsId constructor - * added missing delete in p3GeneralConfig - * Added proper shutdown of the plugins with remove of the service and dlcose of the plugin handle. - * fixed unlikely but possible invalid read in formatting of bandwidth numbers - * fixed potential use after free in openpgpsdk - * fixed double free in openpgpsdk - * added missing socket close in pqissllistenbase destructor - * added missing free and fclose in FileIndex - * fixed potential invalid memory read in openpgpsdk - * Removed unload of the plugins, because it causes a crash. - * Fixed possible dereference of null pointer in NotifyPage. - * Added missing breaks to p3GxsChannels::notifyChanges. - * Fixed possible fread from a null pointer in HashCache. - * Added missing breaks to p3GxsForums::notifyChanges. - * Added missing break in p3GxsChannels::handle_event. - * added missing size check in RsGxsRecognSerialiser - * fixed password handling in deferred signature algorithm (in case of cancel, enter wrong passphrase, etc). Fixes the bug of - half-initialized identities not loading when cancel is pressed, or wrong passphrase is entered, at signature step. - * improved login system: do not re-ask for passphrase when user clicks cancel. Removed warning stating that "maybe passphrase is wrong". - * fixed another x64 serialisation bug in FeedReader (see rev8396)(thanks to Eugene Tooms) - * Added missing dlcolse to RsPluginManager::loadPlugin. - * Added proper handling of the handle of the loaded plugin. - * Added check for trailing '/' of base directory in RsAccountsDetail::setupBaseDirectory. - * avoid unwanted wait in in p3IdService that slowed down the entire app (thx to jolavillette for finding this) - * Initialized the the member aes_key of DistantChatPeerInfo with memset. - * Fixed memory leak in p3FeedReaderThread::processXPath. - * Fixed uninitialized pointer read in FlowLayoutItem::dropEvent. - * Fixed memory leak in RsGenExchange::publishGrps. - * Fixed memory leak in RsGenExchange::publishMsgs. - * Fixed memory leak in DistantChatService::locked_sendDHPublicKey. - * Added missing fclose to RsAccountsDetail::loadPreferredAccount. - * Added missing fclose to ApiServerMHD::accessHandlerCallback. - * Fixed memory leak in RsRecogn::createTagRequest - * Fixed memory leak in DistributedChatService::invitePeerToLobby when lobby not found. - * Fixed memory leak in LookupDNSAddr. - * Fixed momory leak in RsDirUtil::getFileHash when the file doesn't exist. - * Fixed memory leak when RsServicePermissionItem::deserialise failed. - * Fixed uninitialised member in bdNodeManager - * fixed another uninitialised memory read in bitdht - * fixed uninitialised memory in bdfilter - * removed 2 unused members from FileDetails in ftextralist - * fixed situation leading to uninitialised message content in MessageDialog - * fixed use of wrong variable in GxsGenExchange - * fixed uninitialised variable in RSCollectionDialog - * removed ambiguous expression that confuses coverity, in TransfersDialog - * fixed access of delete iterator - * removed false positive access beyond range of iterator - * removed possibility to access invalidated iterator in grouter - * fixed invalid use of wrong iterator in GXS reputation system - * fixed bug in using invalid iterator in ChatLobbyNotify - * fixed wrong use of flags in pqibin (wtf??) - * remove potential use of deleted item in rsRecogn - * fixed use of pointer after memory ownership transferred to QCache - * fixed potential passing of deleted item to sendChatItem when a ChatLobbyItem is too big (would probably cause a crash. Found using coverity) - * fixed call to strncpy in network interface determination code which leaves unterminated string if strlen(ifptr->if_name)==16 - - -- Cyril Soler Sun, 21 June 2015 22:00:00 +0100 - -retroshare06 (0.6.0.RC1-0.8401~trusty) trusty; urgency=low - - GUI - * added IP banlist system to fight large scale traffic analysis using IP masquerading - * added security item for connection denial due to IP blacklist/whitelist - * make conclusionPage handle all make friend events - * added search and highlighting to network graph (patch from Chozabu) - * Fixed typos in strings (Patch from Henry). - * fixed avatar display - * Set default stylesheet for the Edit Identity info label. - * fix black background in chunkmap display with Qt5 (patch from sehraf) - * added testing button for incoming TOR connections ;-) - * improved GenCertDialog (patch from Henry) - * Fixed layout of the ip addresses in ConfCertDialog - * added additional button to show statistics window in settings->node - * added a button to clear the IP address list. Also started to add - diagnostic for TOR status. This is unfinished so it does not work yet. - Show if TCP connection is incoming or outgoing (modified patch from sehraf) - - WebUI - * added webUI files - * updated rules so as to include webui files in rs-nogui package - * webui: allow to set peer flags when adding friends (whitelist flag is set to false) - - VOIP/plugins - * Beautfy the stylesheet for the "Accept Call" Button, display notify text for voip calls too. - * set RS_REVISION_NUMBER to 1 to avoid plugin loading failure if no version is set - * Beautify Answer Button for VOIP Toaster - * Display peername on voip notify text - * fixed memory leak in voip plugin - * added toasters for incoming audio/video call to voip plugin (patch from Phenom) - * show error string form plugin loading as tooltip in gui (patch from Phenom) - * reduce memory corruption in voip plugin - - GXS - * hide voting buttons in channels (backend is missing) - * added virtual destructor to RsNetworkExchangeService (patch from Cyril) - * added missing mutex in idservice - * Renamed RS_TLVKEY_DISTRIB_PRIVATE into *_PUBLISH, as it is used as such. - * Allow to check signatures and validate groups using private keys in GxsSecurity - * removed inconsistency in key flags when full keys where mixed up with publish keys. - * improved IdEditDialog: added explanation text, removed unused space - * in ChatLobbyWidget: show dialog to create a new identity when there is no own identity - - This should fix the following bugs: - * channel owners did not receive posts from other peers who have publish rights - * channels sometimes not gettign through - - * Removed randomly forced updating of GUI in RsGxsUpdateBroadcastBase - * Added group changed notify when visible count or suppliers count of a group has changed - * Fixed suppliers count - - Forums - * show new identity dialog when creating a forum post and no identities exist - - Messages - * prevent crafted distant msgs with partial message flag set (Patch from Henry) - * replaced multiple location warning with a location selector menu - * added chat friend and message friend actions to FriendsList/Friend context menu - * Fixed layout of From, Recipient, Subject and Tags in MessageComposer. - - Discovery - * don't overwrite own/friends IPs with discovery info (patch from Cyril) - - Other - * Added check of account directory (check for missing subdirectories) in RsInit::InitRetroShare - * fixed uninitialised memory read in AuthGPG - * listen on localhost if node is a hidden node (patch from Henry) - * moved the stop order up to RsThread to ease the test for stopping order in single job threads - * created 2 subclasses of RsThread, one for ticking services, and one for single shot jobs. - Now all threads use the same base code. Moved semaphore based thread logic up to RsThread. - This should help terminating service threads properly and possibly remove the SIGSEGV when - quitting - * added hability to disconnect friends which report our own IP as something different than what - we know. Removed a test in discovery2 that prevented sending info to a peer about himself. - Not active yet since it needs some testing - - -- Cyril Soler Thu, 04 June 2015 18:00:00 +0100 - -retroshare06 (0.6.0-0.8263~vivid) vivid; urgency=low - - GUI - * force loading of own ID to get a proper name to display in chat lobby dialog - * improved alignment of IPs in friend list - * improved layout of forum thread widget. Removed one almost empty line. Hide unscribe button when already subscribed. - * updated names of transfers and server pages in config - * only show relevant entries in statistics graphs - * improved RSGraphWidget to take the current time as reference for all curves - * fixed PGP/SSL key size combo box in certificate creation wizard (patch from sehraf, modified) - * fixed text in transfers dialog popup menu - * disable signature checkbox when the certificate only has self signature in ConfCertDialog - * replace identity with profile in GernCertDialog (patch from Henry) - * attempt to improve/clarify relationship between nodes and PGP keys. Removed duplicate options and splitted ConfCerDialog into a dialog - to show nodes certificates and PGP key information - * removed useless thread line in forums, kept link copy functionality, used a GxsIdLabel to show the by_label correctly, - added hide/show of labels when not useful - - * fixed typo in naming and removed inconsistent entries from friend list menu. - * fixed comment voting - * hide unimplemented reputation functions in comment tree widget - * improved text of gxs share group key feature in posted and channels - * use random port >=1024 (patch from sehraf) - * fixed creation and edit of channel/forum/posted group. Force display of correct stacked widget page in GxsGroupDialog. - * re-enabled hide of status column in friends list - * show group owner in channel/forum/posted's details tab - * show forum admin/author in gui - * show gxs message store period in gui, set forums store period to one year - * allow 30 unicode symbols for identity name, instead of 30 bytes - * Saved size of participants list in profile. - * Removed show/hide button to get more space. The participants list can be colapsed by moving the splitter to the right frame border. - * removed useless column in forum thread widget - - VOIP - * Renaming all to VOIP in VOIP plugin (patch from Phenom) - * fixed wrong names in comment and debug output (patch from Phenom) - * fixed opencv dependencies for all systems using pkg-config - - WebUI - * redesigned friends list - * added friendly units on downloads page - * added progress bar on downloads page - * fixed makefile directories and updated readme - * fixed path in webui readme - * added hint to check if port is already in use if webinterface failed to start - * fixed wrong path in libresapi readme - * fixed crash in rs-gui when stopping webui - * webui: added display of own cert - * added string escape in SuperEasyJSON serialization - * added terminal restore to rs-nogui on linux. Enabled compile of webui in rs-nogui. - - GXS - * randomly force full update of RsGxsUpdateBroadcastBase so as to get fresh statistics about GXS groups from time to time - * simple hack to have non active groups gradually loose popularity and number of posts. - - Packaging - * additional fix to packaging on squeeze - * updated bubba3 (squeeze+armel) packaging scripts - - Bug fixes: - * fixed bug in global router causing SIGSEGV in some cases - * Removed maximum value from chat lobby participants list. - - -- Cyril Soler Thu, 15 May 2015 18:00:00 +0100 - - -retroshare06 (0.6.0-0.8196~precise) precise; urgency=low - - GUI - * changed sound button tooltip - * added auto subscribe status to lobby tooltip - * removed wrong info from forums help - * added checkbox to hide offline peers in permission matrix (modified patch from sehraf) - * fixed rslinks with " - * proper sorting of peers by connection state in permission matrix (patch from Sehraf) - * added for hidden label own stylesheet - - MSG - * fixed memory leak and potential crash due to not copying items passed to config saving in messages. - Added save/load for map between GRouter and Msg ids which fixes the never removed outgoing messages - * fixed small bug in global router causing incoming messages to be in SENT mode - * improved display of grouter internal info - * fixed a few bugs in global router, eliminated duplicate messages, improved routing logic - - VOIP - * add popup when get incoming VOIP call - * removed RTT statistics tab from VOIP plugin as it is already provided in Statistics - - General code change - * updated packaging scripts. Disabled libssh, protobuf; enabled webui, added dependencies in libmicrohttpd - * marked unimplemented methods in rsgxsnetservice.h - * disabled some useless old branches in the flushing of incoming items due to calling pqihandler::tick() and - pqipersongrp::tickServiceRecv which caused ghost items to print out at start - * fixed error msg due to broadcast chat trying to call statusUpdate() - - Bugs - * only reset GxsIdChooser to default item on first load. Fixes the bug of current identity that keeps changing in chat lobbies - * attempt at fixing crash that shoult not happen in rsgxsutil.cc - * fixed chat lobby context menu to allow to toggle auto subscribe - - WebUI: - * use same docroot in retroshare-nogui as in retroshare-gui - * hide login/shutdown when running in retroshare-gui - * added better live reload. It uses the Retroshare built in server. Grunt is not required anymore. - * removed unused buttons - * started ChatHandler - * enabled webui to show own locations - * added web interface to tray menu - * fixed wrong account numbering in retroshare-nogui - * added web interface to retroshare-gui - - -- Cyril Soler Tue, 30 Apr 2015 21:00:00 +0100 - -retroshare06 (0.6.0-0.8120~precise) precise; urgency=low - - GUI - * fix for revision number in ubuntu/debian (patch from heini, untested) - * fixed compile on Linux with Qt5 (patch from sehraf) - * fixed display of TOR information for hidden nodes (patch from Sehraf) - * improved display of ciphers giving TLS version - * changed default cert name so that v0.6 and v0.5 do not use the same file - - Connexions - * pqistreamer: only allocate incoming buffer when needed, free incoming buffer when not needed anymore - * removed old code in rsiface/p3face - * detach pqistreamer threads to allow resource cleanup or re-use - * added missing delete in p3discovery2::processContactInfo() - - GXS - * added missing delete in gxsnetservice - - FT - * fixed bug causing re-hashing of all files in some situations, and possibly preventing file lists - to transfer between - Debug - * reduced size of output for buggy RsItems - - WebUI - * added support for multiple client threads to ApiServer - * added api client which reads the password from stdin. This allows to login from the webinterface and - from the terminal at the same time. - * added html/css/js files for the webinterface - - -- Cyril Soler Tue, 14 Mar 2015 16:00:00 +0100 - -retroshare06 (0.6.0-0.8098~precise) precise; urgency=low - - GUI - * improved profile creation wizard: Hide by default key length combobox, for advanced users get visible - via advanced checkbox; Set stylesheet for a Info Label; Changed Window icon to higher resolution; - Not show too much technical detail on a info Label. - * Fixed path of config file RSPeers.conf - * improvement of FriendList (Patch from Sehraf) - * added scale and wheel-event resizing to RSGraphWidget - - Chat lobbies - * fixed up nickname completion in chat lobbies - * new notify capability of chat lobbies: message counting, nickname occurrence counting and specific text - counting. Also sorts out notify tab in Settings (Patch from Phenom, slightly modified: gui layout/text - + added a flag to enable/disable user defined text grep) - * fixed bug with default chat lobby identity causing settings to show an empty list. Also fixed up GxsIdChooser - - WebUI (not enabled yet) - * added Content-Type headers, added redirect to index.html - * updated SuperEasyJSON - * fixed redefinition warning of MSG_WAITALL on windows/mingw491 - * limited webinterface to localhost by default, added command line option to listen on all interfaces - * allow RsControlModule to work without control over RsInit (e.g. with rs-gui) - * disabled file streaming for libmicrohttpd < 0.9.31-1 - * added command line parameters for webui port and base directory. - - Div. - * fixed a few missing deletes when handling errors in grouter. Experimenting a new scope guard to hold - temporary memory. (Patch from GuessWho, modified) - * disabled debug print of DHT requests, disabled debug print in p3Peers::getProxyServer(), added missing - newlines in debug prints (modified patch from Hypfer) - * added missing return statement in RsDirUtil::saveStringToFile() (thx to sehraf) - * don't store name, location name and date in new SSL certs. Location name is now stored in an extra file. - Backward compatible to old locations and old peers. - * fix data directory on Linux, use new path /usr/share/RetroShare06 - * fixed constructors in button-on-text widget (Patch from Phenom) - - Messages - * fixed distant peer naming in combo box for recipient selection. - * fixed naming and completion in recipient addresses in MessageComposer - * fixed icons in FriendSelectionWidget and MsgComposer. Also added disable/enable for From field - depending on which type of recipient is used - * Updated GUI to use new Message / Mail interface. Configuration is in MessageInterface.h for the moment - * Modify Messages with additional namespace - to allow switching to new Mail. - * use RSLinks to handle recommendation message (Patch from Sehraf) - - VOIP - * added notification for VOIP calls (Patch from Phenom) - - Bug fixes - * added test to prevent using twice the same config file; changed duplicate config file name causing - deserialisation errors and loss of some config files; added printout of hex code for RsItems that - fail deserialisation - - -- Cyril Soler Tue, 14 Mar 2015 16:00:00 +0100 - -retroshare06 (0.6.0-0.8060~utopic) utopic; urgency=low - - GUI - - Fixed content of GxsIdChooser for Qt 5 by setting dynamicSortFilter to false. - - Change in the default value (Qt 4 = false, Qt 5 = true) - - made 2 different pages in ConfCertDialog for PGP key and RS certificate. Removed the old format checkbox. - - fixed update of info in ShareDialog (patch from Sentry). Updated the text to replace - Friends by friend nodes - - added check for empty author id in gxs group creation - - GxsIdChooser: request only data for own ids (was requesting all ids before) - - Click on a certificate in a message (MessageWidget) shows the add friend wizard only once. - - Added one more check of RsAutoUpdatePage::eventsLocked to GxsIdDetails::process - - added mask to select which icons to show in RsGxsIdTreeWidgetItem. Kept only avatar in - ChatLobby participant list - - GXS - - use notify for gxs events. Removed the previous polling based system. Now multiple clients - can receive gxs changes. This also fixes the always growing changes queue in rs-nogui. - - GxsGroupDialog: allow to create groups (e.g. channels, forums, posted) without an author - - Chat - - made signature verification pass when no key is present in the cache for lobby events - - increased responsivness of distant chat by forcing tunnel re-digging when no activity is - detected. WARNING: the new timestamps make the communication break will peers not up to date, - since they will not send keep alive packets on the same delay basis. - - removed dead code in chat lobbies - - Channels - - removed the constraint of sharing own files only in channels. Replaced it by a warning, - to allow peers to post from other locations etc. (port from v0.5.5 rev. 6198) - - Added waiting indicator to group tree for channels/posted when using "Mark all as read/unread". - - PGP - - commented out unused (and buggy) function in authgpg - - fixed self-signature checking for imported keys, previously causing imported certificates - with signatures to be rejected. Also fixes bug preventing discovery to send signatures. - - WebUI - - added resource_api and rs-nogui-webui (requires libmicrohttpd, Html files are not included) - - added microhttpd-dev as an additional dependency in packaging script - - Other - - fixed compile with different versions of libmicrohttpd - - fixed serialisation bug likely causing the loss of peers.cfg (Thx G10H4ck for finding this) - - -- Cyril Soler Tue, 14 Mar 2015 16:00:00 +0100 - -retroshare06 (0.6.0-0.8018~precise) precise; urgency=low - - Improvements - * Identities - - moved signature validation and encryption one level up into p3IdService. - - Added timestamp for GXS identities and auto-removal after 30 days. Updated display in IdDialog - - * GUI - - Moved TokenQueue, TokenResponse, UIStateHelper and mGroupId from the classes GxsMessageFramePostWidget/GxsForumThreadWidget - to the base class GxsMessageFrameWidget. - - Optimized search of feed items in RSFeedWidget by using a map instead of QTreeWidgetItemIterator. - - Fixed missing notify of changed message ids to the gui. - - use right status ions - - * GXS - - Reduced locking time of mutex in RsGenExchange::processMsgMetaChanges and RsGenExchange::processGrpMetaChanges. - - * Chat lobbies - - Added re-check of "Not found" identities for chat lobby participants list. - - Added check of RsAutoUpdatePage::eventsLocked to GxsIdDetails::timerEvent. - - * Packaging - - fixed packaging script modifying wrong version file - Bugs - * attempt to fix the deadlock situations in pqithreadstreamer. Also solves the crash when quitting - - -- Cyril Soler Tue, 14 Mar 2015 16:00:00 +0100 - -retroshare06 (0.6.0-0.8004~precise) precise; urgency=low - - Improvements - * GUI - - Fixed display of version information. - - Optimized GxsIdDetails::process to load the gxs details directly when the caller is the gui thread. - - Removed not used base class GxsIdTreeWidget. - Used QPixmap instead of QIcon to draw the gxs image in GxsIdTreeWidgetItem. - Fixed use of transparent background in GxsIdDetails::GenerateCombinedPixmap - (formerly GxsIdDetails::GenerateCombinedIcon). - - hide reputations which are not used yet (patch from sehraf) - - * Channels/Forums/Posted - - Fixed refill of author column in forums. - - Trimmed whitespace from URL to fix internal retroshare links. - - Added Retroshare links support to PostedItems (don't seem to work yet). - - Enabled cancel button in CreateComment Dialog. - - avoid calling rsGxsChannels::setMessageReadStatus() when the message status is already what - we want. Removed one warning that has been cleared. - - improved GUI for Posted - - Hide share of key in forums - - Hide score label in channel post item - - Fixed GUI - to allow people to post to subscribed Topics. - - * Messages - - removed mentions to encrypted messages. Replaced by distant, with the appropriate flags. Removed old - msg encryption code - - fixed recommendation signature (patch from sehraf) - - added new flag to allow peers auto-download recommended files from trusted neighbor nodes, which - gives the possibility to push data to other nodes - - * Identities - - fixed message tooltip for loading ids - - Added tooltip on key id column. - - Disable Send Message button for own Identities. - - Fixed initial size of the splitter in IdDialog. - - * Chat - - Fixed missing spaces in chat style. - - merged in new lobbies with GXS ids. Old peers and new peers cannot see each others lobby lists. - Invitations and Messages of old and new peers will not be visible to each other. - - fixed mistake in distant chat (== instead of =) - - removed deprectated items in chat lobbies. Removed debug output in distant chat. - - fixed a few bugs in distant chat protocol (allow re-negociation of DH parameters if decryption - fails, correct passing of own gxs id for server side), making the system more reactive. Also - fixed the issue of avatar not showing up. Changed t he tunnel naming system to something specific - to distant chat. WARNING: this version cannot distant chat with previous versions. - - fixed the ChatId::toStdString() method (patch from sehraf) - - * improvement of README file (patch by cave, modified) - - * Connectivity - - removed systematic printout of outgoing items which killed performance (patch from electron) - - Removed debug info fom bdnet (Patch from electron) - - attempt to fix never ending thread. To be tested. - - Allow TLSv1.2 while keeping compatibility with TLS1 and 1.1 (Patch from cave) - - Added extra check against invalid sockfds, cansend / moretoread code - - * Others - - added method in ftServer to allow retrieving data from shared/downloaded files (patch from electron, modified) - - fixed typo preventing compilation without RS_USE_BITDHT flag - - * Packaging - - fixed compilation on debian squeeze. Removed placeHolder properties in CreateGxsForumMsg.ui - and GxsGroupDialog.ui which need to be set in the cpp. Added a new DEFINE=NO_SQLCIPHER to compile - without sqlcipher when sqlcipher cannot be found (no sqlcipher is available on debian squeeze). - - -- Cyril Soler Tue, 22 Feb 2015 15:00:00 +0100 - -retroshare06 (0.6.0-0.7939~precise) precise; urgency=low - - Improvements - * GUI - - Fixed loading of avatars - - Used RsGxsGroupId instead of std:string for id/name in IdEditDialog/GxsidChooser. - - Added a send message button on header frame. - - set default border stylesheet for the Avatar Label. - - Added info pane for unsubscribed channels - - Added placeholder text to RSFeedWidget - - fixed bug in control of available identities for signature in MessageComposer - - fixed bug in distant msg composer checking - - added avatars for GXS ids in distant chat - - Receiving a shared key: - * Added notify of the group id and the refresh of the gui - * Added system message (create of message disabled) - * Added possibility to show a news feed item - - RetroShareLink: - * Fixed create unknown ssl certificate - * Fixed process of person link - - added columns context menu entry, to hide optional some columns - - Fixed double feed publication - - separated "owned by you" and "linked to your node" which are two different things; fixed bug showing - chat menu for own identity - - fixed typo in column addressing - - Fixed Scale QLabel content - - set item icon size 22x for Identity icons. - - Used AvatarDialog to choose an avatar for an identity. - - added avatar to GxsId tooltip (see in forums). - - Removed thread data race due to multiple threads accessing the static data member image_cache, - causing avatars to not show up randomly. - - removed unused code in ServicePermissionPage - - Fixed deadlock in RSGraphWidget - - Set Light gray background color for the identicons for better look n feel. - - Fixed to scale QLabel content. - - Moved to display Avatars on ID Dialog into a QLabel - - Added Avatar Dialog at the moment for own peerid, soon for gxs avatars change. - - switch to standard identity icon format for defautl icons (patch from Phenom, slightly modified) - - Enabled display of extern gxs Avatars on ID Details Dialog - - implemented dedicated widget for service permission matrix. Permissions are not saved yet, and we - also need a default switch - - Moved remove button under the add btn,for better look. - - Removed "Send" button in CreateGxsForumMsg and used "Ok" button of the buttonbox to send a message. - - * GXS - - Fixed possible crash in the handle methods of RsGxsNetService when the dynamic cast of a received item fails. - - added number of posts at friends to saveList/loadList. Improves visibility of number of posts - - * Serialisation - - re-enabled anti-svg bomb code before some jerk tries to exploit it. It was used for wide strings. - Moved it to std::string deserialisation. - - * Packaging - - Fixed utf8 issue in Windows installer - - -- Cyril Soler Tue, 10 Feb 2015 23:00:00 +0100 - -retroshare06 (0.6.0-0.7891~precise) precise; urgency=low - - Improvements - * GXS - - group pulish TS is now accounted for in mServerGrpSyncMap, so that modification of metadata is propagated in the network; - - mClientSyncMessageMap is stamped when the server cannot feed any new messages. - - group info for no-auto-update services are still sent, but only groups already present but available with a new - version are sent. This fixes the propagation of GXS avatars. - - removed sending of msg list from unsubscribed groups - - added more debug info to gxs net service so as to see what's going on - - force-updating timestamp of unsubscribed groups to avoid re-asking them indefinitly. This should remove the heavy GXS traffic. - - Fixed memory leak in request handling by adding a destructor the the request classes derived from GxsRequest and delete the result. - - * GUI - - Fixed icon to toggle participants frame in chat dialog. - - changed from setEnabled to setVisible, to not show up the disabled actions for Own Ids. - - changed dialog to none blocking mode - - Added Person details dialog, for popup mode view. - - Removed timeout of waiting tokens in TokenQueue (gui) and increased timeout of requests in libretroshare from 30 seconds to 2 minutes. - - * Identities - - added avatars to identities. - - -- Cyril Soler Sat, 31 Jan 2015 14:00:00 +0100 - -retroshare06 (0.6.0-0.7870~precise) precise; urgency=low - - Improvements - * Global Router - - new global router system. Provides secure/authed (sync-ed) data sending between GXS ids. - - * GUI - - renaming strings and changed icons for Network/People - - added Peer def for Identities. - - Removed version files from retroshare-gui. Added version information to Windows executable. - - Moved header file with version information to retroshare/rsversion.h. - - added code to generate 3072 and 4096 bit PGP keys at startup (Patch from Serhaf) - - Fixed removing of a node in friends list. - - Moved ID ComboBox at the top, before recipient or Subject fields, to switch faster and easy Identity. - - Added a Filter ComboBox for Message Composer, to switch Show types. Moved Search Filter to the top of the Selection Widget. - - Changed statusbar hashing label to ElidedLabel - - Renamed "location" to "node" in gui (Patch from Henry) - - Added a new base class RSTextEdit with placeholder for Qt < 5.2 - - Fixed when the FriendList columns are hidden, set header sizes to default, Changed profile settings icon. - - * Messages - - distant messaging system now uses new GRouter. This provides sync-ed distant messaging. - - Show size of attached files in MessageWidget with friendly unit. - - Added a info Frame, when adding a Distant Peer to the send list. - - added "reply to authors" in forum (needs improvement) - - Changed default text color for own group & online status text color - - Added to Display File size of the attached files in messages - - Changed on the Message Composer when adding GXS Identity to the "To" field, for user friendly display look like a email address. - - Enabled to display identity icons for Distant peers on Message Composer and on Friend Selection Widget - - Fixed to display mail icon when Distant Message is read. - - * Chat - - added missing line when exporting ChatID to std::string (fix by sehraf) - - fixed unread chat count in FriendsDialog, fix display of status in distant chat (Patch from electron) - - fixed font handling for chat config page (Patch from HM) - - Fixed to hide Search Box Action when ChatWidget is used on FriendsDialog - - Fixed Incoming Nickname Text color, which looks for your eyes better then green. - - simplification of the chat interface to libretroshare using a single unified class for chat IDs. Used a common - chat widget for all chats including broadcast. Opens the way to having plugins send/recv chat messages (Patch from Electron). - - Moved Search Filter feature into a frame, to hide by default for a clean Chat Window, optional enable from the menu. - - * NewsFeed - - Moved checkbox for news feed sort order from settings to NewsFeed - - Fixed reading memory after it was deleted. The error was the reason for the ghost feed items. - - clean up security feed item - - * Turtle - - added non aggressive mode option to turtle router to make distant chat happy - - * Forums/Channels/Posted - - Added Default blue forum icons for own Forums. - - Fixed placeholder display on GXS Group Dialog - - Changed sign icon on create forum message, added a "Post as:" label before gxs id chooser - - Added icons to GxsIdChooser - - Fixed display of "Create new Identity" without an identity - - Fixed filter of description in group tree of forums, channels and posted. - - Display at Header Channel name (Show Mode) - - Display Subscribers on Channels - - Added a new StackedPage for the Show mode (GXS Group Dialog), clean up the code. - - Set the description Text field to read only for the Show Mode - - * Identities - - Added fixed size for the splitter in Identity - - optimized fill, fixed utf8 issue, added new strings to translation, added load/save of ui state - - fixed splitter resize, fixed sensitive state of menu items in context menu - - Fixed double (or more) add of own identity to p3IdService::mOwnIds after edit in the gui. - - Added Send Message context menu action for Identities List - - Added new entry to GxsIdChooser to create a new identity. - - * Packaging - - Switched to dynamic linking of openssl for Windows build. Added needed dll's to Windows installer. - - renamed Ubuntu/Debian packaging scripts, removed binary package scripts - - Added icon, publisher and version to Windows uninstall information. - - improved packaging scripts (patch by Heini) - - * Others - - Fixed inconsistent code in udprelay.cc (Patch rom G10H4ck) - - Code simplification and suppression of a bug in handling Relay connect attempt (Patch rom G10H4ck) - - Added missing free() in error handling code (Patch rom G10H4ck) - - Few optimizations and code improvements. Also added one missing fclose in error handling code (Patch rom G10H4ck) - - * VOIP - - fix memory management issue in voip (patch from electron) - - Moved the VoIP Buttons to the top right corner on the Chat Window. - - Bug fixes - * fixed fclose before rename in fimonitor.cc, causing some cache file lists to never be deleted. - * fixed bug causing a security breach by storing private GXS keys into the public key cache. Added a few asserts - to totally remove that possibility. Ideally we should have 2 incompatible key types. - * fixed non saving of checkAttempts for pgp signatures of groups, causing pgp signatures of unknown keys to be re-checked every minute (Patch from HM, modified) - * improved RsServer so that join() is called on every running thread at shutdown, hence avoiding SIGSEGV. Removed some unused members of RsServer - - -- Cyril Soler Sat, 25 Jan 2015 14:00:00 +0100 - -retroshare06 (0.6.0-0.7769~precise) precise; urgency=low - - Improvements - - GUI - * Set to display a placeholder text when status message is empty. - * Added new class StyledElidedLabel and used it for nick name and channel label. - * Disabled own location display on Friends Frame. - * Removed the Fixed size for Messages ListWidget - * Update stylesheets - * Fixed compile with Qt 5 - * Added a warning MessageBox when closing Forum Post Dialog. - * Set the list with buttons in MainWindow and friend list in FriendsDialog to - fixed when resizing the window. - * Optimized polling in TokenQueue - * Removed unecessary space around the main pages. - * Moved own frame for Avatar,status,nick display to the top of FriendsList. - * Moved font size definitions from ui files to default qss. - * Clean up Peer and SecurityItem feeds - * Set a fixed size for the Messages search filter. - * Enabled Minimize/Maximize Button for File Transfer details dialog. - * Clean up Buttons on ChatWidget, for Fonts use now Font Button. - * Changed rs logo icons, for better look and feel on the Taskbar - * Hide by default the Attachments Recommend Files list. - * Changed the tooltips for the Hide/Show Button , "Download all" Button now - with default text. - * Moved files count label before "Recommend Files" label - * Reduced speed of scrolling of RSFeedWidget - - GXS - * improved network statistics for GXS net service. Added number of available - messages for unsubscribed forums in GUI. Should be done as well for channels. - * Added missing initialize of members in constructor of GxsGroupStatistic and - GxsServiceStatistic - * remove GXS ids with faulty signature. This should not happen anyway. - * added additional check for signature consistency after signing GXS id. - * improved/cleaned debug outputs in in rsgxsnetservice.cc. Performed - * optimization of transaction system: limited the size of message transactions and allowed - a much larger transaction timeout to suppress the transaction cancelling epidemic that caused - global bandwidth increase and lack of channel/forum propagation - * Simplified usage of GxsIdDetails and removed some QTimer. - * fixed proper deleting of pending transactions inside mutex to avoid concurrent thread to use them - * fixed uninitialised memory read in rsgxsdataaccess.cc - * fixed inconsistency using getKey() and getPrivateKey() supposing it returns a boolean. It should return a boolean anyway. - - Core - * protection against multi-threaded usages in tcponudp - * fixed weird logic in handling connection attempt for an already connected peer. - - Chat - * Added size limit for chat types - Public, Private, Lobby, Distant - Set the size limit for private and distant chat to unlimited. - * fixed bug in distant chat causing multiple tunnels to break the DH session. - * added keep-alive packets to distant chat. Improved the tunnel management logic. - - VOIP - * Moved to display own video at bottom and Friend at top. - * Added to display system message text when call is stopped. - * Fixing spaces on chat window. - * Clean up chatwidget buttons, moved text color to the font menu button - * Added a border radius to the Video Widget. - * Moved to Display the Video Widget on the right side - - FT - * two improvements of turtle router logic: increase of TR cache storage time to avoid too many void - tunnels due to bouncing TR beyond storage period of 120 secs; prevent openning upload tunnels for - files currently being downloaded before any chunk was obtained. Suggested by Jo. - - Messaging - * Adding start of new Mail Service. - * added setFlags method in Id combo box. Removed possibility to send anonymous distant messages - (too risky). Improved the logic in message composer GUI. Fixed bug when key not available in - message encryption/signing routine. - - Plugin system - * Added service pointer of forums and channels to RsPlugInInterfaces. - - Installer - * Added missing dll to Windows installer. - - Bug fixes - - * fixed cross-deadlock between pqissl and pqithreadstreamer by removing locks over atomic operations. - * fixed tcponudp bug causing SEGV when quitting and crash on UDP connexion reset. - * Fixed utf8 issue when using strings with openssl - * fixed serialisation bug preventing the correct save of grouter matrix in some cases - - -- Cyril Soler Fri, 12 Dec 2014 23:00:00 +0100 - -retroshare06 (0.6.0-0.7702~precise) precise; urgency=low - - Improvements - GUI - * HTML Text optimization (patch from Phenom) - * Enabled by default to display Friends Avatar on Friendslist - * Changed for RS 0.6 the status icons - * beautify the status string which displays after nicknames - * improved GUI for distant chat, making it possible to choose which identity we use to chat someone - * improved design of existing feed items - * Added new stylesheet qdarkstyle - * created new RSFeedWidget to be used in news feed - * Added to change dynamicly the share key info description. - * Added default stylesheet for the info label - - Distant chat - * improved logic in distant chat, and fixed several bugs causing unstable conversations - - GXS - * implemented more tests and fixed a few bugs in GxsSecurity - * added feed items and logic for GXS channels/forums/posted - - Core - * Mutex debugging: added a new macro RS_STACK_MUTEX(myMutex) to trigger a scope guard while recording file location - and line number. Moved the timings from RsMutex to RsStackMutex. Changed the mutexes in rsgenexchange and rsgxsntservice to use the new macro. - * separated chat items from message items, separated chat into tree components: chat, distant chat and distributed chat - (i.e. lobbies). moved all chat components into chat/. Removed deprecated chat items. Moved all distant chat code into a - separate file. - * fixed compilation of network simulator - * updated windows build bats - - Bug fixes - * removed uninitialised memory read in rsgxsnetservice.cc - * fixed re-login after wrong passwd. Patch from Electron - * fixed adding groups to message recipient (Patch from Phenom, modified) - * fixed memory leak in rsgenexchange.cc - - -- Cyril Soler Sun, 23 Nov 2014 19:00:00 +0100 - -retroshare06 (0.6.0-0.7661~precise) precise; urgency=low - - Improvements: - GUI - * Added systray menu in status bar. Helps people without a systray (Patch form Phenom) - * Saving tool button position (patch from Phenom) - * Changed the chat bubbles when typing/chat on the private chat, which displays on the Taskbar & window icon - * Changed the MainWindow icon to a higher resolution for better look & feel, when the logo is displayed on the - taskbar, same for the im status icons. - * Added very basic display of outqueue statistics in BwCtrlWindow. Removed unnecessary list::size() calls in pqistreamer - * Added to change header image and text on Share Key Dialog. - * Improved display of popularity in forums/posted/channels - * Fixed display of TOR connexions in the friend list - * Fixed the frame margins - * Fixed navigate to channel post when clicking a channel post link. - * Fixed navigate to forum message when clicking a forum message link. - * Fixed copy of forum message link to clipboard - * Set standard style of public/lobby chat to compact colored. - * Fixed navigate to forum and channel group when clicking a forum/channel link. - * Navigate to post/message is still a todo. - * Fixed display of unknown PGP keys in IDDialog. Removed debug output - * Using GxsIdChooser in message composition dialog - * Fixed bad connect in notifyQt for chat window - * Fixed start of chat with right or double click on a friend item (not location) in friend list. - * Fixed display of unknown hash in turtle router dialog - * Enable "Next unread" button in forum without an active post. - * Fixed up DHT Stats window so you can maximise any section with splitters. - - DHT: - * Fixed saving of bdboot.txt on windows (patch from electron) - * Add peer version to Ping Message (improves finding RS peers) - * Add local flag to search query - to only find bitdht peers. - - Links: - * Fixed check if address has changed - was preventing resetting of local port. - * Tweaked TOU so it can accept Generic Sized Ip Addresses, even though it will only accept IPv4 addresses - - GXS: - * Added tempering system for GXS, so as to not send more in the outqueues than what the current bandwidth can handle - - GRouter: - * Limited storage of DEAD items in grouter cache to 1 hour to favor re-explore dead routes and limit cache size - * Added feedback from rsgenexchange into Global router to add routing information - * Weighted maximum length of a msg in grouter inversely to how much it has spread - * Improved anti-flooding stategy in g-router - * Fixed bug in global router making the routing matrix too sparse - - Diverse - * Fixed compilation after removing operators!= (patch from phenom) - * Removed unused comparison operators in some GxsItems - * Removed unnecessary string to string conversion in pqipersongrp - * Removed ifdef for the different sleep methods. Now only usleep is used, on all systems (Patch from Phenom) - - Utils: - * added more time measurements in RsMutex, so as to measure locking time and waiting time. Only enabled with RS_MUTEX_DEBUG - - Bug fixes: - * Added security check in pqissl::senddata() to avoid SIGSEGV when quitting - * Changed sleep to usleep in RsStackFileLock::RsStackFileLock(). Caused a very long lock. - * Fixed SIGSEGV when quitting due to deletion of UPnP handler during callback - * Added missing record of Dn traffic in turtle router - - Optimisations: - * Changed post fixed operator++ into prefixed. More efficient on some systems. Patch from Phenom. - * Replaced tests on std::list::size() by std::list::empty() (Patch from Phenom, modified) - - -- Cyril Soler Sun, 02 Nov 2014 18:00:00 +0100 - -retroshare06 (0.6.0-0.7621~precise) precise; urgency=low - - * Improvements - - GUI: Factored all classes used to draw graphs into a consistent common class. Reworked the look - of existing graphs. - - UDP: Tweaked TOU so it can accept Generic Sized Ip Addresses,even though it will only accept IPv4 - addresses. - - extended group share keys to Posted - - Improvements of People dialog. Patch from Phenom (slightly modified). Not enabled in this built. - - GXS: Added read status to posted messages - - GXS: Set new messages to unread - - GXS: Fixed missuse of message flag UNPROCESSED as indicator for a NEW message - - GXS: Added the delete of the TokenQueue in some destructors to fix crashes. - - DHT: Fixed up DHT Stats window so you can maximise any section with splitters. - - DHT: Add peer version to Ping Message. (improves finding RS peers) - - DHT: Add local flag to search query - to only find bitdht peers. - - Fixed check if address has changed - was preventing resetting of local port - - -- Cyril Soler Sat, 18 Oct 2014 21:25:00 +0100 - -retroshare06 (0.6.0-0.7596~precise) precise; urgency=low - - - Switched MessagesDialog from QTreeView to QTreeWidget and use GxsIdRSTreeWidgetItem to - show the gxs id for a distant message. - - increased sync period in RsGxsNetService so as to reduce network load. Increased transaction - timeout to 30 seconds - to avoid wasting too many transactions - - Fixed initial fill of the contact list in message composer when only trusted people is checked. - - Replaced external library libcrypt32-cygwin.a by libcrypt32.a from MinGW for Windows compile. - - added a structure in GxsNetService to record who sends info about groups, so as to dynamically - compute group popularity. The GUI needs to be improved to update - regularly so as to reflect current values for popularity. For now only - subscribing/unsubscribing and new messages trigger the update - - fixed display of channels with publish key - - -- Cyril Soler Sat, 11 Oct 2014 15:28:00 +0100 - -retroshare06 (0.6.0-0.7584~precise) precise; urgency=low - - * Improvements - - implemented publish key sharing between peers for channels. - - Added automatic upgrade (cipher_migrate) of the sqlite database. - - Setup common folders for libraries, includes and binaries of all external libraries for Windows compile. - - Enabled Antialiasing for QGraphicsView and channel images - - enabled by default to inform me via Message a Friend request from a known peer - - Fixed load/save config of FeedReader plugin - - Big progress for People dialog. Phenom work. (Not enabled in unstable version) - - restaured tunnel names in the gui - - added Qt socket test to update TOR led. This is a very basic test that does not prove the presence of TOR on the socket. - - Forums load all messages (not only latest), Fixed flat view - - RsGxsIntegrityCheck - * Fixed message hash checking - * Added check for existing but not loadable messages - * Notify the gui when messages are deleted - - Removed Edit/Delete ID Buttons, for better look and feel and get more space for the search filter, use Edit/Delete from context menu. - - Removed the directory name of the message file name in the database column "nxsFile". - - removed "use old key format" from certificate export - - improved GXS Id display when unsigned, in Identities. - - fixed fonts for IDs in Identities - - Fixed count of new and unread messages for Channels and Posted. - - improved naming and layout in Identities - - Removed Add Friend Button from Friends Dialog - - Removed Distant Chat page from Settings - - use ProfileManager to export own PGP key pair in keyring and profile. - - -- Cyril Soler Sun, 05 Oct 2014 20:00:00 +0100 - -retroshare06 (0.6.0-0.7555~precise) precise; urgency=low - - * Improvements - - this version is the first unstable release of 0.6. It is incompatible with v0.5.5, but can be - used simultaneously on the same computer. Please see release notes for v0.6 - on https://retroshareteam.wordpress.com/ - - -- Cyril Soler Sun, 21 Sep 2014 20:00:00 +0100 - -retroshare (0.5.5-0.XXXXXX~YYYYYY) YYYYYY; urgency=low - - * Improvements - - General - * Updated languages from Transifex - * Added language Catalan (ca_ES) - - - Transfers - * new cache system for RemoteDirModel, which significantly speeds up the display of shared files - * added generic function to return the correct string for scanf for unsigned ints depending on the - size of the actual variable that is scanned. Should fix the rehash bug and bugs corrupting - timestamps on some 32bits systems - * Added few more file type icons for "cpp", "h" nd "c", "patch" and "diff" extensions - * Moved Uploads to Downloads Tab. - * Added to change the text for the Play Button, when file is not a media file. - * Added a custom context menu for pasting RS-links to the base class MimeTextEdit and removed - the custom context menu from derived classes. Updated english translation. - * patch "AddSearchFilesourceSorted_6951.diff" from Phenom. Adds correct sorting for search results. - * extended max chunk TTL to 1 hour. A short TTL is not anymore needed since chuns are shared between sources - - - Chat - * patch "chatdialog_allow_buttons_from_different_plugins_3" from electron. ChatDialog allows - now Buttons from different Plugins. - * patch "Fix_ChatLobbyAutoSubscribe_6951.diff" from Phenom. Fixes request for existing lobbies - when no lobby ihas been found yet. Code beautification - * added lobby ID as tooltip to lobby list - - - Forums - * added ElidedLabel to be used in places where labels might be too long and therefore - trigger an unwanted window resize. This is currently used as forum thread titles (Patch from Phenom) - - - Channels - * patch "Fix_ChannelNotificationFeedLink" from Phenom. Allows to finish loading a channel - before jumping to the linked post - * Added a default background color for the Channel Message Logo for a better look and feel, - removed stretching of the logo, set a minimum size, background is now filled black. - - - Notification - * reworked the notification system, which is now a standalone service. Now plugins can receive notifications. - * Corrected the layout of the Connect Progress Dialog - * Changed the logo size for some news feed items to use same size for better look. - * Added to display blue/black forum message icons for the forum feeds, when forum is anon or signed. - * Added new feed item types and logic to show connection attempts from forged certificates - (e.g. bad signature, bad certificate) - * Limit number of feed items to 500 to avoid flooding - * Changed the default stylesheet color for the Security Feed - * improved display/fixed bugs in security item - - - plugins - * Added service pointer for forums to the plugin interface - * FeedReader: Used the forums pointer from the plugin interface instead of the global pointer - * added missing services in RsPluginInterface class - - - GXS - * Enabled the Filter Line edit for filtering friends, by nick/ID for Create Circles Dialog's - Known Identities Widget. - * Set some minimum header sizes for some items - * Enabled sorting for the QTreeWidget's - * fixed temporary to load the Wiki Groups Tree at startup, auto update seems not to work. - - - core - * moved PGP id and SSLid types into rsid.h, and renamed them with a more appropriate name - * fixed cipher list for openssl. ECDHE is not configured, so it cannot be used - * added serialisation methods for SSLId and time_t - * added an option in the pro file for dsdv, as it is compiled when not used - * removed status member from FileDetails. Not used => misleading - * removed asserts in reader_armoured.c, reader_encrypted_se.c, reader_encrypted_seip.c, readerwriter.c - * Allow loading packets of large size from config files (fixed storing of big messages), - and continue on config files skipping items that cannot be deserialised (Modified patch from Phenom) - * put a hard limit to packet size in pqistore to avoid calling realloc with fancy numbers - when the stream has been corrupted - - * Bug fixes - - fixed bug due to ot sending notifications to the file lists - - added missign cleanup call in RsAES.cc, causing a small memory leak - - Changed order of the shutdown to fix a crash of the WebUI plugin. First stop the - plugins then the other services. - - fixed ghost lobby issue (thx to thunder for spotting it out) - - patch from HM to avoid allocating absurdly long uids - - added check to only import version 4 keys in the keyring - - fixed error handling in certificates that could crash RS when a bad cert is pasted - - fixed proper handling in failed malloc in openpgp-sdk, causing crash with deliberate bad cert. - - fixed small error in pgphandler, potentially adding empty certs in database - - limited the number of packets to be parsed in a row, to prevent compressed - data to contain an enormous number of packets. Fixes one possible attack pointed out by HM - - removed potential uninitialized memory read in TlvKey item. - - fixed mismatched free/delete in p3channels.cc - - fixed bug introduced in 6965 that prevented people joining private lobbies to see the messages and talk - - fixed potential attack by supplying non hexadecimal strings as certificate common name - - Fixed spaces in copy/paste of rich text (Patch from Phenom) - - -- Cyril Soler Thu, 09 Jan 2014 20:00:00 +0100 - -retroshare (0.5.5-0.6933~precise) precise; urgency=low - - * Improvements - - - fixed up some debug text (patch from H.Morgan) - - reduced string for lol bomb filtering, to filter out <\?xml* instead of <\?xml\ * - - Added freeze option in NetworkView (Modified patch from K. Eisentraut) - - Updated languages from Transifex - - fixed up compatibility with Qt5 - - PGP - - added restriction to only accept self-signed certificates for friend keys - - added test program for identity import - - removed asserts from validate.c, and signature.c in openpgp-sdk - it will not be shared until re-hashed. Should prevent chunks error in files that get hashed while being copied. - - do not accept keys without a uid. Previously this was crashing RS - - added check over recursive compression depth. Fixes CVE-2013-4402 - - Channels: - - Added back the Subscribe Button to Channels - - Use destination directory when manually downloading a file from a channel - - Show destination directory in channel details - - Fixed utf8 issue when choosing the destination directory - - GUI - - show fingerprint in ConfCertDialog, and splitted the string with spaces. Removed - the use of the ambiguous peer id for both pgp and locations ids - - Global router (Not active yet. Is a replacement to tunnels for messaging. Wil allow offline anonymous distant messages) - - squeleton code for the whole system - - computation/update of routing probabilities - - File Transfer (Speed changes according to experiments from jolavilette. Brings the max LAN speed from 1.3MB/s to approx 13MB/s) - - set desiredRate of peers to 10MB/s instead of 1MB/s - - maximum number of active chunks per peer is now 20 (that was a serious limiting factor) - - ticks that bring no data are not accounted for in the speed estimate anymore. The data is averaged over all ticks - since the previous non zero data chunk -> this brings much more stability to sources and removes lots of oscillation. - - added post-hash check for file modification. If the file has been modified while being hashed, - - removed false warning that come up when openning a non existing file in ftFileCreator. - - Shared Files - - changed re-hashign strategy. Now uses in priority the system time of the index file as a reference for new files. This automatically - accounts for changes in system time and fixes the re-hashing bug for daylight changing time. In case the reference time cannot be - establishd, the comparison reverts to the old method. This change is backward compatible and should not cause a re-hash. - - * Bug fixing - - fixed import of retroshare identities that have multiple signatures from the same key ID. Fixed bug reported by claude37 - - split lastRecvTimeStamp into two different time stamps: one for last - time the file is wrote (or data is received) and one for last activity - that is used (and sometimes reset) by ftcontroller when queuing files - - fixed display of correct IP for connected friends. Only the external IP was shown previously. Port is not - shown because it is random and could be misleading. - - filter out disallowed direct sources from file request source list. Should systematically prevent unwanted direct transfers - - -- Cyril Soler Sat, 08 Dec 2013 12:00:00 +0100 - -retroshare (0.5.5-0.6864~precise) precise; urgency=low - - * Improvements - - code fixed up for Qt5,added display of Qt version in AboutDialog - - fixed up compilation for MinGW-w64 - - Added new options to retroshare-gui.pro for Qt 5 - - Added new file QtVersion.h with macros to compile with Qt 4 and Qt 5 - - fixed GUI for encrypted messages. Now showing correct To/From, added icon for decrypted msg, correct To when reply - - allow change destination directory for queued files (modified patch from Phenom) - - remove three costly loops in ftController - - added help strings in some config pages (relays, notify, plugins) - - added warning label in MakeFriendWizard to warn against too many friends - - changed the voip icons, disable the voip buttons when friend is offline. - - added scope timer to measure times conveniently - - * Bugs - - removed potential deadlock in notifyQt - - fixed bug that would cause virtual peers list for outgoing files to never get cleanred up. Also improved - cost of updating the status of virtual peers. Many thanks to Jolavillette for finding this out! - - - -- Cyril Soler Sat, 19 Oct 2013 15:00:00 +0100 - -retroshare (0.5.5-0.6804~precise) precise; urgency=low - - * Improvements - Optimisations/compilation: - - re-wrote cleanupDirectory() function. As this a cause of the slow startup. Startup time is massively improved! - - Fixed compile of the libraries with MinGW 4.8 on Windows. - - Removed the external library pthreads 2.8.0 on Windows build and used the library of MinGW (version 2.8.0 too). - This fixes header mixup of bo th versions. - - Switched to the release version of pthread so the name of the dll changes from pthreadGC2d.dll to pthreadGC2.dll. - The new dll can be found in the bin directory of MinGW. - - Optimized p3HistoryMgr::cleanOldMessages - - File Transfer: - - restore file state when restart (Modified patch from Phenom) - - Enabled multi-tunneling by consistently perturbating partial tunnel id in TRs. - This causes tunnels with a different route to have different ids and therefore - coexist as different sources for a given transfer. - This should cause file transfers to have more tunnels and therefore a better balance - of bandwidth over intermediate peers. This needs to be evaluated on a large scale network. - - included random bias in tunnel ID computation to make them impossible to correlate to the end points - - Distant chat/lobbies/chat: - - added the possibility to distant chat with unverified identities, while warning the user about it. Should help distant chatting. - - removed warning that happens when lobby has no activity - - Key creation - - added entropy collection system based on mouse movement to location/identity creation, to make keys less predictable - - Connectivity: - - Made connection progress dialog only show up when really making friend - - Security: - - Enabled PFS for SSH connections, based on a 4096 bits safe prime. This is retro-compatible, meaning that - old peers will connect to the new one using PFS if they act as a client (meaning they request the connection) - - added limit to posts on chat lobbies to 6000 characters, removing the risk of enormous posts crafted to kill the msg history - - added filter to take care of svg bombs that can be hidden in the strings in lobbies,forums,channels and chat - - added control for suspicious message activity in chat lobbies. Lobby items are not bounced if coming - from a peer that sends more messages per seconds than a given limit. The limit is adaptive and depends on lobby count - - added limit in number of chat lobby ids sent by a peer - - added filter to remove xml bombs in all std::wstrings. - - Various gui stuff: - - added a "Load Images" system to messages. - - added new delegate for BW statistics window. Changed column names to more appropriate values (Patch from Phenom) - - Added proper sorting of DL files according to sources (Patch from Phenom) - - changed the connect wizard so that we can add someone key to keyring without making friend. - - fixed image resizing for channel thumbnails. Apparently there is a bug in Qt preventing - Qt::KeepAspectRatioByExpanding to work correctly - - Changed the additional buttons of ChatLobbyDialog and AudioPopupChatDialog to QToolButton. - - added some sound files - - changed the voip icons and the tooltips - - added fingerprint to cryptopage - - added tree items for chat lobbies. - - moved help browser from MainPage to new base class FloatingHelpBrowser - - added warning info label to MakeFriendWizard - - Added info widget for encrypted messages in MessageWidget - - removed copy/paste of links of type PERSON in friendlist. This caused confusion and did not provide - anything useful since the creation of the full certificate links - - changed default header text and context menu icons - - changed the default style layout of profile creation dialog - - highlight peers in network graph according to friendship distance from selected node - - Chat lobbies - - added history parameters for chat lobbies - - added max storage time for items in chat history. Avoids filling up the history with chat from volatile peers. - - worked out the layout in config->ChatPage in a more compact design and added help - - * Bug fixes - - fixed missing update of transferred bytes count, that caused tunnels to not show a correct speed estimate on server side - - fixed bug in turtle router, causing potential memory access error in rare occasions (sendItem does not - delete items fast enough, normally). - - added missing setPeerState that caused tunnels to get stuck to default minimum rate unless - the list of connected peers change - - fixed bug showing play for unfinished files and preview for finished ones - - -- Cyril Soler Sat, 12 Oct 2013 15:00:00 +0100 - -retroshare (0.5.5-0.6732~precise) precise; urgency=low - - * Notes - This is the final release of the 0.5 brand. - - - distant chat (encrypted with AES-PSK using tunnels, autenticated with PGP) - - distant messages (encrypted, through tunnels) - => See http://retroshareteam.wordpress.com/2013/08/08/distant-chat-and-messaging-using-generic-tunnels/ - - connection progress/status dialog - - keyring cleaning dialog - - improved GUI (better layout, higher readability, protection agains xml bombs) - - many bug fixes in core - - -- Cyril Soler Tue, 08 Aug 2013 18:00:00 +0100 - -retroshare (0.5.4-0.6685~precise) precise; urgency=low - - * Improvements - - Added connection progress dialog, to show connection state, and give some feedback/advice to the user - - added storage for denied connections in linkMgr - - new splash screen / about image - - improved GUI layout. Many patches, mainly from Phenom, electron - - GUI improvement for distant messages, showing correct names, handling links, correct toasters, etc - - improved security feed so that one can send distant messages to peers that attempt to connect - - improved command line parameter handling (used argstream class) - - Disabled setting "Start RetroShare when my system starts" on Windows when running the debug version. - - modified patch from AC to remove messages with security issues (e.g. Billion Laughs bomb). The message is - replaced by a warning, and is not forwarded - - Updated english translation - - Enabled distant messages. These need to be switched on the config->Messages. GUI improvements needs to be done, - such as properly setting peers names everywhere, but the service works. Have fun using it! - - updated values for min/normal partial packet size to 1MB in openpgp-sdk, so that we do not create partial packets - for everyday use. We will have to properly extend openpgp-sdk to support parsing of partial packets if we want to - PGP-encrypt chunks larger than 1MB - - patched RsCollection code to disallow crafted xml bombs - - plugged send message from security item to send distant messages - - added info about libssh-0.6.0rc1 in README.txt - - added argstream.h (with authorized modified licence) to handle parameter lines - - added Use As Direct Source in service permission dialog - - fixed OpenBSD compilation (Patch from Stefan Sperling) - - Removed rsiface and moved configuration options to RsServerConfig - - Fixed cipher list to "HIGH:!DSS:!aNULL:!3DES", which should disable the weak ones, no idea how to force it to - PFS (which it should use) - - fixed void * pointer maths. - - - * Bug fixes - - Added missing location from cert when adding new friend - - Added missing IndicateConfigChanged to p3PeerMgrIMPL::setDynDNS - - Fixed crash when closing the main window without the setting "Minimize to Tray Icon" - - Renamed the setting "Do not Minimize to Tray Icon" to "Minimize to Tray - Icon" and fixed wrong usage Please check your setting! - - removed dropping an entire config file when a single item cannot be serialized. - - removed time shift warning in lobbies. Changed into warning in help panel - - fixed bug allowing malicious peer to display lobby messages in broadcast window - - patch to avoid corrupting file cache on 64bits archs that store time_t as 32bits (from Stefan Sperling) - - allow big messages to bounce correctly in lobbies, after fixing a splitting error. - - fixed lobby aut-subscribe by looking at lobbies every 121 seconds - - fixed looping in pqistore when a crazily long packet is found. That is - the result of an unknown bug, but at least we should handle it correctly. - - -- Cyril Soler Tue, 08 Aug 2013 18:00:00 +0100 - -retroshare (0.5.4-0.6546~precise) precise; urgency=low - - * Improvements - - doubled data chunk for signature in chat links. Apparently some keys need more than 287 bytes - - added security checks against disk full in PGP keyring manager - - TokenQueue: fixed stop of TokenQueue polling when events are locked - - RsProtectedTimer: switched to faster poll when events are locked - - distant chat: added ACK system to make sure the secured tunnels for distant chat are actually working, before one starts using it. - - moved all files related to file transfer in gui/FileTransfer/ - - renamed known people into keyring - - make friendlist fully resizable (Patch from phenom) - - added DynDNS to RS certificate link if available - - removed MT19937 random generator which is not used anymore. Changed N from 624 to 1024 to reduce cost - - improved completion for chat (Patch from Phenom) - - added help panels in MainWindow, to help beginners startup with the basic concepts. - - changed welcome message in broadcast chat - - improved GUI layouts in FriendList, NewsFeed, Forums, Channels, removed doubling unused buttons - - added last time of transfer (Patch from Phenom) - - added column with IP for connected peers (modified patch from Phenom) - - Removed some more hardcoded colors - - added completer to MimeTextEdit and ChatWidget (Patch from Phenom) - - fixed deadlock (reported by Like) - - Added quick fix to show the plain name and title in the chat lobby - - Use the best network interface to route an ip instead of the first interface in getLocalInterfaces on Windows - - Fixed showing utf8 characters in chat lobby name - - Updated build instruction in file readme.txt (Patch from Henry) - - Patch (modified) from Phenom to allow auto-subscribe to chat lobbies - - added display of SSL encryption parameters in PeerDetails dialog - - fixed packaging with GXS (sqlite linkage, define for encrypted database - - patch from Henry morgan to fix soem typos (e.g misspelled connexion into connection) - - Made pqiStore accept packets even after deserialization error, so that it is retrocompatible (Patch from Phenom) - - Set path to sqlcipher instead of sqlite for Windows compile. - - new db for release, TESTNET5, old TESTNET4 db's are not keyed - - Updated english translation - - added Specific protected timer class RsProtectedTimer to avoid passwd deadlock. - - Added filter of items to RSTreeWidget. - - removed email field from GenCertDialog, since it is not useful inside RS - GXS: - - GxsChannels: - * cleaned source code - * added auto refresh - * added todo button - * removed some debug output - - Posted Links: - * cleaned source code - * added auto refresh - * Updated english translation - - GxsForums: - * added automatic refresh after subscribe/unsubscribe - * removed some debug output - * moved GxsForumsDialog.* to gui/gxsforums - * optimized steps of the progressbar when loading - * added UIStateHelper - * removed debug output - * added Todo button - - Identity: - * Redesigned dialog - * Fixed high CPU usage when showing reputation list - * Added todo button - - UIStateHelper: - * Added new base class for easier handling of ui elements with token request (show "Loading", set enable state, ...) - - Circles: - * cleaned source code - * added auto refresh - * added todo button - * fixed utf8 issues - * added new strings to translation - - added three new classes for automatic refresh of ui - * RsGxsUpdateBroadcastBase - * RsGxsUpdateBroadcastWidget - * RsGxsUpdateBroadcastPage - - prevent call to :singleShot on RsProtectedTimer - - extend RsGxsUpdateBroadcast - - added automatic refresh to Identity and Forums (except subscribe/unsubscribe) - - Added new method cancelActiveRequestTokens to TokenQueue - - GxsIdChooser - * Sort items - * Added timer to load not cached RsGxsId's - - * Bugs - - fixed deadlock in notifyQt - - fixed memory leak in cert signature verification at connect (Patch from Phenom). Also removed some unused variables reported by gcc - - add date to chat msg if it is mroe than 1 day old - - fixed bug in distant chat accepting tunnels for collecting invites with same hash - - fixed memory leaks in p3distrib, signature key verification, RsDataService::retrieveNxsGrps, - RsGxsNetService, p3GxsCircles, p3Posted, RsDiscReply handling, getGroupData of all gxs services - - -- Cyril Soler Tue, 02 Jun 2013 22:00:00 +0100 - -retroshare (0.5.4-0.6455~precise) precise; urgency=low - - * Improvements - - GUI - * added/enabled GUI for distant chat (Invitation handler in config->chat, handling of Distant chat links) - * Localized Greek and Dutch (patch from Henry). Updated English. - * Languages updates from transifex - * Color transfer for copy/paste (patch from AC) - * various improvements to FriendSelectionWidget - * typos (patches from Henry) - * Added default stylesheet for the QTextEdit in ProfileManager - * Fixed sort of friends in shared files. - * fixed update of flag for peer signature over own key - - - FT - * added a new per-friend flag to allow to seek for direct transfers. Disabled for existing friends - (should be added manually), enabled by default for new friends - - - libretroshare - * Merged branch v0.5-GenericTunneling into trunk (Rev. 6284 to 6410). - - Tunnel system is now generic. Any service can asks for tunnels and send generic data through them - - made ftServer a client of the service. Now turtle file items are handled in ftServer - - added new client: p3MsgService to send/recv pgp-encrypted distant messages - - added new client: p3ChatService to perform private (AES-encrypted) distant chat through tunnels. - - added distant chat. Works on invitations and tunnels. Has tunnel closing notification. - - Added system to collect and create chat invites from pgp keys - - /!\ Needs a route of peers with version > 6441 to work. - * drop generic items with inconsistent peer id vs. tunnel directions (due to tunnel re-routing) - * fixed several compiler warnings - * fixed bug in anti-search-by-depth mechanism - * Fixed crash with Windows compile. Renamed method "RsFiles::CopyFile" to "RsFiles::copyFile" (lower case) - to avoid renaming of "CopyFile" to "CopyFileW" with the newly included "windows.h". - - - GXS - * Merged GXS-phase2 branch into trunk - * Enabled db encryption and changed gxs folder - needs sql cipher to compile if gxs compile flags are enabled - * Bugs - - Fixed deadlock in FriendSelectionWidget - - fixed assert for non RSA keys - - -- Cyril Soler Sat, 22 Jun 2013 15:00:00 +0100 - -retroshare (0.5.4-0.6399~precise) precise; urgency=low - - * Improvements - - Added a drop-down item to allow removing unused keys, in the Network dialog, key removal method in OpenPGP-SDK, - and PGPHandler. - - added backup system to public keyring, impossibility to remove public parts of owned secret keys, etc. - - added columns for last used statistics on pgp keys in network dialog. - - * Bugs - - fixed display of names in file lists - - fixed destination directory when downloading channel items in auto DL mode - - improved time-stamp management for pgp keys - - fixed translatable string with .arg (Req. From H. Morgan) - - -- Cyril Soler Sun, 02 Jun 2013 23:00:00 +0100 - -retroshare (0.5.4-0.6379~precise) precise; urgency=low - - * Improvements - - GUI - * added choice for default auto-download directory per channel. - * Removed unused member mChanReadStatus from p3Channels - * Ensured that inserConnect() is only called when the widget is visible. This reduces lags due to discovery info. - * patch from phenom to all resizing lobby participant lists - * Added patch from Henry Morgan, Fixed some typos. - * Added a info Label for the Friend Request Page - * Fixed online time in profile widget, Fixed width of settings dialog. - * patch (from Henry Morgan) to make the tooltips translate-able in the group flags widget - * Fixed the perm bug in ConnectFreindWizard (Patch from Henry Morgan) - * patch from Henry Morgan to use ConfCertDialog rather than connectFriendWizard from Security item - * made passwd box modal - - pgp - * added ability to keep track of when keys have been last used for signature check, signing and encryption, - so that we can later detect which keys are unused and get rid of them - - Chat Lobbies - * Enabled history for chat lobbies (not saved to disc) - - FeedReader - * Added new icon for news feed from Agurer - * added new setting to save the config in the background for slow systems - * fixed memory leak in p3FeedReader::saveList - - retroshare-nogui - * Updated version of RPC protocol with fancy new features like streaming, add/remove friends, file listings. - (Merging r6107 through r6332 into 'libretroshare') - - GXS - * lots of ongoing developments. - * Bugs - - GUI - * Fixed sending of status typing in chat. Modifier keys does not send typing anymore. - * patch from Henry Morgan to avoid removing peer permission flags when removing locations - * fixed remembering flags for own id, tentatively fixed service perm bug - - File transfer - * changed priority for forwarded turtle traffic. The priority was so low that it explains - why tunnels of length > 2 are so slow - - fixed bug in p3peer.cc not calling the correct method - - added missing mutex, and warnings if permission flags methods are not called with correct ids - - fixed bug that would reset service permission flags when discovery is enabled and discovery info is received - - -- Cyril Soler Sat, 25 May 2013 14:00:00 +0100 - -retroshare (0.5.4-0.6270~precise) precise; urgency=low - - * Improvements - - translations updated from transiflex - - Major improvements to GXS services (new service: channels, posted) and GUI (Not yet released) - - further reduced TR forward probability so as to avoid a crazy increase of TR out when we have a large number of friends - - renamed Transfers tab "File Sharing", as it is more appropriate - - removed the constraint of sharing own files only in channels. Replaced it by a warning, to allow peers to post from other locations etc. - - switched to libssh-0.5.4 (updated README.txt with package deps) - - fixed packaging/compilation for ubuntu raring - - significantly lowered the cost of the network graph by computing pairwise repulsive forces 8 times less often - - Patch from AC to enable completion over chat lobby participants - - patch from AC to better handle colors in lobby list - - fixed up protobuf files generation - - improved chat lobby layout (removed columns => tool tip) - - added a warning in chat lobbies when there's a big time shift between peers. - - renamed Security page in settings => Profile - - added dest dit to FT details window - - added warning when opnning external url - - VOIP - * Removed special settings for win32 from VOIP.pro - * patch from Henry Morgan to unify compilation settings for VOIP - - * Bugs - - removed dead-end for peers not answering downloads, that would get file cache transfers to get stuck indefinitly - when peers are too much stressed for a short period. The offline state is entirely given by setPeerState() - - fixed a few fixed other uninitialized memory read (In p3NetMgr, ftChunkMap) - - do not show msg icon for current lobby (Improved upon patch from AC) - - removed auto-clear of search field when searching (Patch from AC) - - fixed auto DL for own channels. Apparently the channel status is missing for this special case - - allow to import new identity before even creating one - - fixed up profile manager to only allow to export (Importing during a session caused a bug) - - dropping chat lobby msg for more than 10 mins in the future - - re-enabled context menus in chat lobby list - - -- Cyril Soler Wed, 14 Mar 2013 21:30:00 +0100 - -retroshare (0.5.4-0.6178~precise) precise; urgency=low - * Improvements - - Added dynamic menu for choosing the destination directory for files, and change the name of the des. file - - Merged branch v0.5-ImprovedGUI. Brings all sorts of changes, the most of which are: - * News feed to be a new tab at the top level. - * improved transfers panel. Some tabs have been moved to Config. - * new Chat lobby panel with improved layout. Removed tabs. - * merged shared files and search into Transfers - - Auto-check of shared files after download - - Removed Qt flags from nogui .pro file - - Packaging of VOIP for ubuntu lucid, and improved packaging scripts - - Added new "Progressive" download mode, in between random and streaming. Still random as the - former and disk-friendly as the later. - - Lots of work on ongoing new services (Not released yet): Wiki, GXS, Forums, Identity. - - * Bugs - - Fixed crash when lobby invitation received - - Fixed DL getting stalled in streaming mode - - -- Cyril Soler Wed, 27 Jan 2013 21:30:00 +0100 - -retroshare (0.5.4-0.6099~precise) precise; urgency=low - - * Improvements - - GUI - * Added new dialog to set service permissions for friends. - * Enabled embedded images in private chat and messages (only for QT version 4.7.0 and higher) - * added tooltips to GroupFlagsWidget when buttons are unchecked (Patch from Anonym) - * when an unknow user attempt to connect, show the name in the security item (Patch from Anonym) - * Load new stylesheets for locale depended things. Loading order: qss.default (internal), qss. (internal e.g. qss.de_DE) - stylesheet.qss (internal or external), stylesheet_.lqss (parallel to stylesheet) - * Added api for news feeds to the plugin interface. Added news feeds to the FeedReader plugin. - * Removed toaster for muted participant of a chat lobby. - * Removed the policy TabFocus from some gui elements. - * Made cert parsing errors translatable - * added turkish translation - - - Packaging - * packaging of NewsReader plugin and retroshare-nogui - * added patch from bNK to make glib include dir detected on all linux systems. - Removed warnings about gpgme and gpg-error , which have no reason to stay now. - - - FeedReader: - * Added error handling to xml functions - * Added xslt transformation - * Added retransform of existing messages - * Redesigned preview dialog - * Enabled embed images for forum feeds - * Changed config format, switching back to an older version results in a loss of all data of the FeedReader - * Fixed memory leak in xpath processing - * Stop long loops when closing the preview dialog or shutdown - * Added drag and drop to xpath lists in preview dialog - * Fixed save of xpaths lists - * Recalculate message count of the user notify when a feed with new items is deleted. - * Set deleted message to read and !new. - * Added test feed item in notify settings. - * Fixed crash when removing a feed displayed in the main tab. - * Fixed reading author of ATOM feeds. - - - libretroshare - * fixed inconsistency in parameter naming, causing error_string to be mixed up with gpg id (Not a bug). - * removed unimplemented entry loadCertificateFromFile() - * removed #ifdef USE_NEW_CHUNK_CHECKING_CODE (enabled by default). Disable assume_availablility to put chunks or - not in checking mode. This was inconsistent. As a side effect, cache files of size > 1MB get chunk-checked as well, which is good - * fixed tests: compilation, running, added new util functions, etc. Updated test results. - * Added little upnp utility / test. - * added checksum for new certificate format. Will be enabled in 0.6. - * Fixed up bootstrap singleshot search function. Now returns parameters. Not functioning 100% correctly yet - due - to libbitdht behaviour (TO FIX) - * merged GXS branch into trunk. GXS Services are disabled by default. - - - retroshare-nogui - * made port non-optional for -S - * Added SystemExternalAccess Function to RPC. This provides ExternalPort + DHTKey to Client. To be - used to find and connect - even if Dynamic IP address changes :) - * fixed compilation - - - GXS - * lots of improvements to GXSForums. Not released yet. - * added pegmarkdown langage to Wiki - - - Other - * added list of non backward compatible changes in README.txt, so that we can track them - - * Bugs - - fixed the wrong notification of unexpected characters in management of RetroShare Links - - -- Cyril Soler Mon, 28 Jan 2013 16:30:00 +0100 - -retroshare (0.5.4-0.5995~precise) precise; urgency=low - - * Improvements - - DHT - * disable bitdht printStatus - * increased expected dht startup period, as message rate has been dropped. - * updated bdboot.txt file. - - - Chat - * Made the private lobbies more accessible: - - record which friend participates in a lobby even after they unsubscribed. The lobby - list that is sent to these - - friends contains the privaye lobby as well. In practice, people jsut need to be invited - once to a private lobby. - - Afterwards, they get the lobby in the list of nearby lobbies and can join by clicking on it. - - added new item RsChatLobbyList_deprecated2, to replace old existing item. Should be removed in v0.6 - - changed PublicLobbies for VisibleLobbies in the code, to avoid confusion - - the change is backward compatible, although old peers won't receive private lobby info from - new peers, of course. - - - GUI - * Set email address in GenCertDialog to optional. - * Fixed display of "TextLabel" in SecurityItem. - - * Added patch from Henry: enable italian language - * Added patch from Henry: Renamed gpg to pgp - * removed some unused images - * Added "Edit Share Permissions" Context Menu entry to My Directions, to edit easily share - permissions for each directory - * Updated languages from transiflex. - * updated English, Danish, German, Swedish translations - * Added OperatingMode ComboBox to the status bar - - Added second (temporary) switch to turtle. - - Use session switch for OperatingMode. - - made OperatingMode temporary - not saved. - - Moved DataRate interface from rsiface (old) -> rsConfig. - - Internally moved storage of data rate from pqipersongroup -> p3serverconfig - - made DataRate + Operating Mode work together. - - add ToolTip to OpModeStatus .... (can't actually view - please correct as necessary) - - * Fixed utf8 characters for group names in RemoteDirModel (shared files). - * Fixed layout of the FriendRequestPage in ConnectFriendWizard. - * Added flags for services and service permissions for peers - Flags are identity-related, meaning that all locations of the same peers have the same flags. - - It's now possible to tweak which services each peer can use. Service that can be disabled are - forums/channels, discovery, anonymous routing. - - by default, peers have all flags on. - - File Transfer - * use a std::map to search file hashes instead of sweeping the entire database. Improves performance a lot. - - - OpenPGP-SDK - * Added function "ops_open" to openpgpsdk to open files with utf8 characters on Windows. - * changed fopen into RsDirUtil::rs_fopen in PGPHandler, to allow paths with utf8 chars on windows. - Shoudl probably fix many startup issues - - * Bugs - - added proper filtering of directories from RSLinks and RsCollection to avoid the possibility of writing out of the - download directory. - - Added missing closeConnection when the connection dies with SSL_ERROR_SYSCALL. - - Fixed display of files in flat view. The files of friends are shown again - - fixed bug in ShareManager causing directory flags to be set on wrong directory after sorting - - Protected waitingIds with Mutex in pqipersongrp.cc. - - Reviewed Mutex in pqihandler. - * In general it is okay, except for: DataRate Handling, and Win32 specific: WaitingList. - * Cleaned up some functions. - * renamed createPerson and createListener to locked_createPerson and locked_createListener. - This is required as neither Listener nor Person are thread safe (TODO). - - fixed missing error msg in p3cfgmgr when serialisation fails. - - fixed bug in RemoteDirModel causing infinite loop to happen when group name is unknown - - -- Cyril Soler Tue, 20 Nov 2012 12:30:00 +0100 - -retroshare (0.5.4-0.5875~precise) precise; urgency=low - * Improvements - - GUI - * patch from AC to perform html optimization of forum posts using the canonical function optimizeHtml() - * fixed bug preventing share manager to modify more than one directory at once - * Moved most of the hardcoded colors of lists and trees to the file qss.default (with help from braindead). - Now the stylesheet can redefine these colors. - * Added multiselective mute/unmute to chat lobby. Added mute/unmute with double click on icon. - * Added flag for hungarian language. - * Fixed sorting of date in forums - * redesigned the Chatlobby participants list - - used now QTreeWidget instead of a QListWidget - - added icons for display the muted participants - - added context menu for "Mute participant" ( context menu fix from thunder) - - * Removed context help button from the dialogs (currently not used) and added - minimize/maximize buttons to the "floating" dialogs. - * Added to identify for Channel Files if its a media file(s) or not, to change the Play Button text from "Play" to "Open" - - - FT - * added dynamic adding of direct sources from file lists. Useful for channels. Is called once every 61 seconds. - * Added new link type: EXTRA_FILE, to allow sendign links with sources included so as to trigger direct transfer. - This makes possible to send files through chat without permitting tunnel access to the files. The client requests - the file as a direct transfer only, using the supplied source. - - - Patch to allow compilation on BSD - - Fixed command to grab upnp patched version - - - Merged branch that provide group-based file permissions. - Now users can sort peers into groups in the friend list, and attribute flags and parent groups - to the directories in the share manager. - - Flags are B-B-N, meaning in order: - - browsable for peers in the parent groups - - browsable for everyone - - network wide for everyone - Backward compatibility makes previously BN flags been interpreted as -BN, meaning - browsable/network wide for everyone. - - The merge also includes a significant improvement of the naming of flags with incompatible types - which should sort out some existing bugs as well, since inconsistencies in flag usage have been - found during the process. - - * Bugs - - added additional checking of incoming compressed chunk map, in case the data is - currupted, which might happens with a corrupted ft_transfer.cfg file. - - fixed permission of drap+dropped files. all attached files get added to extra list, - but with different permission flags depending on the client. From that, we compute - sharing permissions : turtle, or direct transfer only - - suppressed unitialized memory read in p3peers.cc - - added missing mutex in destructor of ftFileProvider. Probably responsible for some random crashes - - -- Cyril Soler Tue, 20 Nov 2012 12:30:00 +0100 - -retroshare (0.5.4-0.5755~natty) natty; urgency=low - - * Improvements - - GUI - * Added icons for the Channel TreeWidget - * Added placeholder text for Search Filter items on Group TreeWidget - * Added placeholder text for Search Filter items in Messages Dialog - * update the authors on the help page - * Redesigned GenCertDialog for the usage in Profile Manager. - * Removed the filter comboboxes and replaced it with a menu in LineEditClear. - * Added settings for the blinking icons - - private chat window/tab - - chat lobby tab - - all tray notifier - * Added a find Icon Button for the class LineEditClear - * Removed all not needed find icons from the Dialogs. - * Enabled sorting for the Lobby Dialog - * Added a placeholder text for the Search Forum filter - - * Added blinking of the chat icon for private chat window and chat lobby - * Added blinking of the systray icon for the notifier and enabled it - for private chat. - * Cleaned includes in FriendsDialog.cpp - * Fixed switching between combined and not combined tray icon notify - with available messages. - * Added sounds when message has arrived and download was finished. - * The next unread button in forums search for child items and start - at the top when the end of the list is reached. - * Changed SoundManger to allow the plugins to play sounds. - * Added example to VOIP (commented out). - * Added more PRE_TARGETDEPS for Windows compile. - - - DHT - * Improved the dht msg history storage. - * specify how long we store for. - * cleanup old msgs. - * improve printing of history. - * add timeline storage as well. - * disabled by default, enable USE_HISTORY in bdnode.c - - There appears to be a bug related to copying bdId's around. - Some of the bootstrap ids are malformed, and this crashes rs. - - * Bugs - * Fixed stupid bug inDHT. Labels are the wrong way around. - This meant limit is set to HIGH (50msg/sec) when it should be LOW - (5msg/sec) - - -- Cyril Soler Sat, 27 Oct 2012 14:30:00 +0100 - -retroshare (0.5.4-0.5697~natty) natty; urgency=low - - * Improvements - - - GUI - * Added Search Filter for the FriendsList - * set a minimum spacing on ChatWidget - * Added to display tooltip's for the Voip button's - * Moved the Send Button to right side of the Chat LineEdit for better look. - * Changed some language strings in the GUI, removed hardcoded fonts (Patch from Henry) - * removed html strings from GenCertDialog - * moved some description text from the header, to look better - * update translation strings - * several improvements of the GUI layout. - * cleaned up many unnecessary files - * Improved (ungendered) English friend recommendation message (patch ID: 3536093 ) - * Support for custom qss in data dir and config dir - * update win installer script, to install turkish Qt translation - * renamed Bubble Compact folder - * Added attempt to load the translations for the Qt's internal srings from datadir/translations - - - VOIP plugin - * Added support for external translation files for the main application and the plugins LinksCloud and VOIP. - The following files are loaded from the directory /translations: retroshare_*.qm, LinksCloud_*.qm, VOIP_*.qm - * Added turkish voip translation - * Added Brazilian Portuguese VOIP translation - - * Bugs - - Fixed "jumping" of the items in channels and news feed when items are changed (load, toggle and remove). - - Added workaround for QTBUG-3372. - - Hide request Label, when peer is unknown - - Fixed edit of a message with plaintext. The newlines remain unchanged (investigated by braindead) - - - Plugin LinksCloud: - * Fixed crash when clicking on the link. - * Fixed process of https links. - - -- Cyril Soler Sat, 20 Oct 2012 14:30:00 +0100 - -retroshare (0.5.4-0.5611~natty) natty; urgency=low - - * Improvements - - removed some warnings and debug info - - Fixed sensitivity of the action in the context menu to copy a link from the chat text - when scrollbars are visible. - - Stored some license files to utf-8 encoding, required by nsis installer - - Changed font color in ProfileWidget to standard. - - Corrected installer translation - - Disabled fix color of chat messages for Qt 4.5 and lower because of missing methods on QColor in Qt 4.5 - - Add direct public sources for files shared in channels, when available - - Improvements to turtle router: - * made faster tunnels stay longer by increasing tunnel campain time. Should favor fast tunnels. - * desactivated tunnel shortenning since it cannot produce consistent tunnels every time - * increase cache TTL for search requests to 240 secs and tunnel requests to 120 secs. - This should remove some zombie tunnels and search requests. - - Debian Buildscript. Fixed Version for Packagename - - * Bugs - - Fixed crash when closing the settings dialog - - -- Cyril Soler Sat, 26 Sept 2012 22:30:00 +0100 - -retroshare (0.5.4-0.5582~natty) natty; urgency=low - - * Improvements - - updated to v0.5.4a - - improved chat readability (Patch from AC) - - Added patch from braindead for embedded images in private chat and - messages (only for QT version 4.7.0 and higher) (Not enabled on 0.5.4a release) - - removed debug info outputs - - changed priority of search request items to 6 instead of 5, to make it - consistent with tunnel request priority - - added missing libs to compile on arch linux (Patch by AC) - - * Bugs - - ensure that ssl id is always converted to lower case before being used - to add a new friend. This fixes the bug allowing to add multiple times - the same friend by changing the case is the SSL id - - -- Cyril Soler Sat, 22 Sept 2012 14:30:00 +0100 - -retroshare (0.5.4-0.5555~natty) natty; urgency=low - - * Improvements - - improved plugin system - * now using two lists of rejected/accepted plugins. RS asks at start to load unknown plugins - when plugins or main executable have changed. - * added API and SVN numbers into required external plugin symbols - * added help dialog to plugins - * improved version number scripts to add the missing revision number as a int - - Added window icon for the application. All windows without a parent are now showing this icon. - - Moved some internal stylesheets to the file Standard.qss. - - Tweaked standard style of the feed items. - - moved file rsversion.h to rsguiversion.h, since it caused a conflict with libretroshare/src/util/rsversion.h - when included as util/rsversion.h. Updated version detail script. - - reworked context channel menu to allow unsubscribing from own channels. Removed some irrelevant items. - Added warning when publish rights can/cannot be restored. - - Improved ProfileManager - * removed combobox and added export to the list of identities - * add extension to the filename when the user enters a name without extension - * refill list after generating a new identity - - Fixed height of the search input field when using no stylesheet. - - Changed the colors of the feed items. It was too bright. - - Enabled the menu item in the context menu again to copy the link when right clicking on a link. - - Reworked some elements in the standard gui. - - Added VOIP Plugin to windows installer - - Added new finish translation from Beluga - - Added two buttons to the NotifyPage to show examples of the activated news feeds and toasters. - Can also be used to test the stylesheets. - - Reworked design of the toaster and moved internal stylesheets to the file Standard.qss. - - * Bugs - - Fixed report of failing connexion attempts/recepts. Cleaned the code a little bit - - Fixed message in pgphandler when signing a post - - Fixed small display issue causing the availability map to become black when more than 6 sources are present - - Added missing close of the temporary keyring file. Now the keyring is saved properly and the newly - added keys are not lost after shutdown of RetroShare. - - Patch from AsamK to avoid crash when no uids are present in the key. How can this happen anyway? - - -- Cyril Soler Sat, 15 Sept 2012 14:30:00 +0100 - -retroshare (0.5.3-0.5503~natty) natty; urgency=low - - * Improvements - - Big cleaning of style sheets - * Moved some internal stylesheets to the file Standard.qss. - * Set the built-in stylesheet "Standard" as default for new profiles. - * Removed some unnecessary style sheets. - * Added two internal stylesheets: - - qss.default - This file is used as default for all stylesheets (e.g. the frames of - the AvatarWidget) and can be overloaded from the selected stylesheet - - Standard.qss - The standard stylesheet for the current look of RetroShare. More internal stylesheets can be added. - The plan is to move nearly all internal stylesheets to the files Standard.qss/qss.default. After that the "empty" stylesheet - should represent the system theme of the os. - - - Added clear chat history to the context menu of the message text browser - - Added new base class HeaderFrame - image and text at top of the windows - - Enabled the RetroShare icon of the collection file dialogs. - - estored SSLid to lower case in old certificate format. - - Removed dialog FriendRequest and use ConnectFriendWizard instead. - - Added new certificate format (Easier to parse/clean, more robust) - * checkbox for using old cert format in security page. Old format used by default, to avoid confusing newbees - * added new RsCertificate class to handle all certificate actions - - Several small tweaks to the gui - - Redesigned the Create Chat lobby dialog - - Fixed compilation with newer versions of libupnp, except for debian sid which uses a patched old version (crap!) - - update Spanish translation (from Senpai) - - Added a new page for user request to ConnectFriendWizard. The page is shown instead of the conclusion page when - the user clicks on the certificate link in a message of type user request. - - Enabled icons for VOIP plugin - - Enabled display of plugin version in plugin items - * Hide the import/export button, and set the new identity CheckBox set checked, when start a new Profile - generation from Profile Manager. - * Set PluginItem icon size to 24 - - Added automatic clean of the friend certificate in ConnectFriendWizard. - - Fixed code for certificate link generation. - - Added new Chat style Bubble, generated by Victor for RetroShare - - Added a profile manager. Shoudl be useful for importing/exporting identities. - - * Bugs - - fixed nasty bug causing crashes when syncing the keyring from disc - - added writing of public keyring to a tmp file + rename, to avoid corrupting it when RS stops during the whole operation - - Added a quick fix for the freeze of RetroShare when using a file dialog on Windows - - Fixed showup of self signatures in certificates that are not in the keyring already - - Added code to avoid corruption of bdboot.txt: first write to tmp file then move the file. Refers on - Windows utf16ToUtf8 from libretroshare. This forward reference can be improved. - - Fixed bug with empty certificate strings when clicking on a certificate link with only a PGP id. - - Removed deadly assert in validate.c:338 causing crashes on error. - - -- Cyril Soler Mon, 25 June 2012 21:30:00 +0100 - -retroshare (0.5.3-0.5400~natty) natty; urgency=low - - * Improvements - - improved GenCertDialog logic, showing import buttons only when necessary, enabled - key import when no key is present - - show count of new messages in the toolbar - - improved chat dialog (enabled colored nicknames) - - Reworked notification code in system tray. - - Added a base class and a possibility for the main dialogs and the plugins (derived from MainPage) to provide a notifier. - - added systray notifications for chat lobbies. - - Enabled some more translations in news feed items and fixed german translation. - - Removed not needed file "Thumbs.db" in skin directory. - - improved pgp cleaning function - - * Bugs - - fixed a few bugs in cert creation window: - * private key was not correctly added to private keyring - * self signature validation was reported unsuccessful when unknown signatures where found - - fixed re-copy of dht bootstrap file when the file is empty - - fixed up memory leak in openpgp - - Trim right spaces from certificate name. - - removed a couple of assert that could crash RS - - Fixed bad default value for filter column in ForumsDialog - - return false when ssl passphrase is of length 0. This should not happen, unless the file is void, since openpgp does not complain about decrypting empty files - - added auto-clean of certificates at load time. Removes many errors. - - fixed bug due to misinterpreting non SSLid drectories as potential locations - - * Ongoing developments - - merged GXS branch into trunk. No visible changes to the end user for now. - - -- Cyril Soler Mon, 25 June 2012 21:30:00 +0100 - -retroshare (0.5.3-0.5327~natty) natty; urgency=low - - * Improvements - - Merged branch v0.5-OpenPGP into trunk. Please read the following important release notes: - - User-level changes: - ================== - * libgpgme is not used anymore; it is replaced by a built-in piece of code called OpenPGP-SDK - (http://openpgp.nominet.org.uk/cgi-bin/trac.cgi) that was improved to be used by RetroShare - for handling PGP keys. - - * the gnupg keyring is not used anymore. Now, RetroShare has it's own gpg keyring, shared by all instances. - On linux it's located in ~/.retroshare/pgp/. A lock system prevents multiple locations to read/write keyrings - simultaneously. - - * the trust database from gnupg is not documented, so RetroShare cannot import it. This comes from the fact that - the GPG standard (RFC4880) asks explicitly not to export trust information. So RetroShare has it's own - trust DB shared by locations. This means you need to re-trust people. Sorry for that! - - * at start, if no keyring is found, RS will propose to copy the gnupg keyring to use your existing keys. Clicking on - "OK" will do the copy, and you should find back all existing locations, except for DSA keys. - - * locations for which the suitable keypair is not in the keyring will not be displayed in the login window - * locations for which the suitable keypair is not a RSA/RSA key will not be displayed. RetroShare does not - support DSA/Elgamal keypairs yet. - - * a key import/export exchange function has been added in the certificate creation window (you go there from the login - window by clicking on "manage keys/locations". This allows to easily create a new location with the same pgp key on - another computer. To obtain a suitable keypair using gnupg, you need to concatenate the encrypted private key and the - public key into an ascii file. This can be done using: - gpg -a --export-secret-keys [your ID] > mykey.asc - gpg -a --export [your ID] >> mykey.asc - - * importing a key with subkeys in not yet possible. Please remove subkeys before importing. - - * The code has been tested for a reasonnable amount of time, but it's not possible to prevent some new bugs - to appear. Please report them asap supplying: call-stacks if possible, and terminal output. In particular, - openpgp has some assert()'s that should not be triggered unless RetroShare is calling it in an improper way. - - Internal changes - ================ - * a specific component, PGPHandler, takes care of the interface between openpgp-sdk and RetroShare - openpgp-sdk is c-code, with it's own memory management, which has been kept well separated from - RetroShare. - - * GPG Ids are now a specific class (not a std::string anymore) for code consistency reasons. As strings are - still used in many places, this requires a few conversions. In particular, AuthGPG takes strings as - function params and calls GPGHandler with the proper PGPIdType class. In the future, RetroShare should - only use PGPIdType. The same will be done for SSL ids. - - * signature cleaning is still handled by the Retroshare built-in function, not by openpgp, but we will - do this later. - - Still to do - =========== - * DSA needs subkey handling, since the encryption is performed by a Elgamal subkey. Not sure this will be done. - * GPGIds/SSLIds cleaning (meaning replace strings by appropriate types). Lots of confusion throughout the code - in retroshare-gui in particular. - * key removal from keyring. This is a challenge to keep locations synchronised. - - - Rework of tcponudp/tcpstream should make UDP connections much more stable. - * Fixed retransmit algorithm. Much more closely matched to TCP standard: http://tools.ietf.org/html/rfc2988 - * This increases retransmit timeouts, and reduces the number of packets resent. - * Added better debugging for retrans/close as separate #defines. - * Further testing is required ;) - - - Added dynamic choose of sources for chunk crc requests. Fixes the bug that would let - a transfer not finish if the original surce for a crc is not here anymore. - If you have a unfinished transfer do a force-check after restart to get back chunks that - where still on verification stage. - - - moved channel action menu into right click, for better consistency - - Enabled word wrap of the description in ChanNewItem. - - Added a new button in ChanMsgItem and ForumMsgItem to set the message as read (without expanding the message) and - remove the item from the news feed. - - Redesigned ChanMsgItem. - - updated french translation (Max Romeo) - - improved build bat file (san) - - Moved the include folder OpenSSL to the other external includes for Windows compile. - - added warning for unsupported keys. It is triggered when no valid keypairs are found at start, and when unsupported - keys pairs are found when copying the keyring - - Enabled translation (system default language) of the message box before the login to a profile. - - Fixed german translation. - - removed not needed info buttons for the infodialog - - desactivated TrustMatrix, by the time we decide wether it is worth keeping it, and implement a better version of it - - updated package building scripts for ubuntu - - * Bugs - - fixed stupid bug in friendlyUnits() causing crashes when displaying files with size > 1TB - - possible fix for bug on ARM archs (reported by Ralfk) - - fixed possible bug due to misplaced mutex (Reported by bNK) - - added missign break, causing a crash when creating a new key - - Fixed crash when starting the help browser from friend details the second time. - - -- Cyril Soler Mon, 25 June 2012 21:30:00 +0100 - -retroshare (0.5.3-0.5254~natty) natty; urgency=low - - * Improvements - - Added windows for bandwidth/display analysis in tray menu - - Reworked tcponudp/tcpstream. Should make UDP connections much more stable - Increses increases retransmit timeouts, and reduces the number of packets resent. - Added better debugging for retrans/close as separate #defines. - - Moved QoS from pqihandler to pqistreamer. Removes one out queue, suppressed lags - when program is eavily loaded. - - Added bandwidth monitoring service to libretroshare - * p3bwctrl.h/.cc & rsbwctrlitems.h/.cc - * New Interface in pqihandler to extract the data. - * New Interface in rsconfig to display in GUI. - * Added extra debugging in pqistreamer for catching big outqueues. - - Enabled full chunk checking code: - * unchecked chunks are not made available to swarming sources, not saved as done. - * force check now uses the simple method to put all chunks in checking mode - * force checked files can be cancelled (finally!) - * improved display (use red for active chunks, yellow for checking) - * cache file are not using chunk checking (assume_availability=true) - - fixed compilation on OSX - - Added patch #3510849 from Adam (interfect). Capitalize "copy RetroShare key to clipboard" - - Added "file:///" to "%style-dir%" for the chat styles. - - Renamed "RetorShare" to "RetroShare". - - Fixed german language - - Changed chatstyle structure from - - [RS-Dir] / stylesheets / {public | private | history} / my_chatstyle / - to - [RS-Dir] / stylesheets / my_chatstyle / {public | private | history} / - - Optimized the fill of the up- and downloads in TransfersDialog - - * Bugs - - fixed bug in friendly display of size > 1TB causing crashes in e.g. channels - - fixed bug in display of upload progress - - Fixed bug in Qt for Windows Vista and higher. Convert path from native separators - of filenames from QFileDialog::getOpenFileName(s) (Patch from AsamK) - - Fixed sorting (case insensitive, numbers) in SearchDialog. - - bug fix, avatar item deserialisation unsafely assumes valid image length. caused crash on windows. - - -- Cyril Soler Mon, 25 June 2012 21:30:00 +0100 - -retroshare (0.5.3-0.5189~lucid) lucid; urgency=low - - * Improvements - - Sort participants list in the chat lobby case insensitive - - Added check for empty lobby nick name. - - Moved notify of lobby nick name change from the gui to p3ChatService. - - Added new placeholder %style-dir% for ChatStyles (patch from Imanuel) - - Fixed replacing of %color% in ChatStyle. It should not be replaced after %message%. - - Redesigned ConnectFriendWizard as ui file. - - Added new base class DropLineEdit. - - Fixed german language. - - changed base-class of AvatarWidget to QLabel (Patch from braindead) - - prepared property-dependend stylesheets - - simplified avatarwidget - - * Bugs - - Added missing mutex locks for p3ChatService::_default_nick_name. - - -- Cyril Soler Wed, 24 May 2012 22:30:00 +0100 - -retroshare (0.5.3-0.XXXXXX~YYYYYY) YYYYYY; urgency=low - - * Improvements - - Added threaded loading of channels (GUI). - - added paste own certificate to chat/forum context menu (patch from AC) - - Added function to mute some participants in chat lobbies - - Switched on optimized compile on Windows. - - Improved multi-source file transfer in two ways: - * tunnels can borrow data chunks from only slower tunnels, to prevent blocking fast tunnels - * inactive chunks are asked again after a longer time, to avoid wasting bandwidth asking them twice - - - Added new notify on connect attempt by the local message system. - - Removed not needed field in FriendRequest Dialog - - Added new friend request toaster from defnax. - - Fixed base path for the external stylesteets - - Optimized channel loading and layout. - - Optimized RsCollectionDialog (still without thread). - - Enabled extended selection and mark with the key 'space'. - - Improved the default recommendation text - - Added a default styleSheet for the "Confirm Friend / Add as Friend" Button - - Moved HandleRichText from the folder "chat" to "util" and redesigned the source - - Extended RsHtml::formatText to replace the RetroShare links with an image and enabled - this for the certificate links in the system messages (friend recommendation and user request) - - Added new ObjectPainter for painting a button on a pixmap - - Display old and new nickname to Peers during nickname change in ChatLobby. - - update french translation (Max Romeo) - - Fixed utf8 in notifyQt - - Improved friend recommendation - - Added a title label to Friend Request Toaster, little design changes - - Added empty entry to stylesheet-choice for "no stylesheet" and moved method "loadStyleSheet" from MainWindow to Rshare (patch from braindead) - - Added ability to style the system messages in chat (e.g. Lobby management) - - Added new message flag for system messages like friend request. - - Show "RetroShare" as sender of system messages to myself. - - Added new quick view in MessagesDialog to filter system messages. - - Changed RetroShare link in friend request message to certificate. - - Added new subject image for the system messages (defnax). - - Removed not used notify in message service. - - * Bugs - - Removed data race in QObject::connect() vs. NotifyQt signals by enabling notification signals only after GUI is created - - Added dynamic locking function for the OpenSSL library to prevent data races. - - Fixed handling of html links in HandleRichText::formatText. - - Removed possible data race on boolean value (Not critical) - - Removed non-mutex-protected reference in p3turtle.cc - - Fixed issue with lost downloads when RetroShare exits (or crashes) during the load of the file transfer items. The pending list was not saved. - - Fixed bug probably responsible for random crashes in DHT code - - Removed usages of "std::istringstream" and "std::stringstream", which are not thread-safe. - - -- Cyril Soler Wed, 16 May 2012 22:30:00 +0100 - -retroshare (0.5.3-0.5114~natty) natty; urgency=low - - * Improvements - - removed minimal version - - Improved TR routing strategy: - * updated base forward probabilities to larger values - * used a minimum FP to 1/nb_connected_friends instead of 0. This is the larger non-explosive value. - * changed tunnel management time to 2 secs instead of 1, setting the overall number of TR/s emmitted - for all downloads to 0.5 (Should reduce the TR load for the whole network by a factor of 2). - - Activate DHTML in Doxygen Documentation, for Fold in/out Class hierarchy images. - - New Doxygen configuratin for Retroshare GUI, see at - http://notdefine.de/retroshare/retroshare/trunk/retroshare-gui/src/html/index.html - - Add missing includes "unistd.h" for compiling with gcc 4.7.0. (Patch from AC) - - Added a label for Connect Attempt after nickname "wants to be friends with you on RetroShare" - - Added "You have a friend request" label to FriendRequest Dialog - - Renamed "Accept Friend Request" Button to "Confirm", - - set correct stylesheet for new forum item - - Added stylesheet for the Friend Request Buttons - - Added new basic class for a QLineEdit with a clear button - LineEditClear. - - Enabled file preview on Windows. - - The link file to preview a not finished download is created in temp directory. - - Added a messagebox when preview a not finished download to remove the link file. - - Fixed german language - - Removed the max length from the ip fields in ProfileWidget to display all 15 digits. - - enabled disabling autodownload for channel admin (patch from asamK) - - * Bugs - - removed all calls to std::stringstream, causing a thread data race on windows - - don't remove color and font when the last char is deleted from the chat text entry box (Patch from AC) - - Fixed, hide "Accept Friend Request" Button for Unknown Peers - - Improved Search Dialog (Patch from AsamK) - * don't add friend sources count to anonymous count each time a result for the same file is received!, this could - lead to enormously large sources numbers - * don't readd search in summary list if it was already removed by the user - * don't clear the filter when new search results are added - * when using the file name filter only show result from the current search, not also from previous searches - * fixed adding only file types which were searched for, for this I created a new hidden column in summary list to store the file type - * fixed sorting by file size/age, pad string with '0' instead of ' ' Search feature: a quirk I've found - * decrease gui hanging: - -when adding search results temporarily disable sorting - -only add 250 instead of 500 items in one go - -don't call selectSearchResults() for each item added to the result list; instead call hideOrShowSearchResult() - which only sets the hidden status of the added item, not the complete list - -replace std::string with QString, removes unnecessary conversions - - Fixed clickable links in forum message feed. - - -- Cyril Soler Sat, 21 apr 2012 10:00:00 +0100 - -retroshare (0.5.3-0.5067~natty) natty; urgency=low - - * Improvements - - Added Copy Certificate Button to ProfileWidget - - Fixed compile of VOIP on Windows with Qt >4.7 - - Modified some defaults (auto check of shared directories to 15 minutes, time to idle mode to 5 minutes) - - Added welcome message to the chat lobby - - Changed display of the own name in FriendsDialog from "Name (me) Location" to "Name (Location)". - - update new Spanish translation from Aitor - - Added two new functions to libretroshare for writing formatted data to std::string - - Added two new images from defnax to SecurityItem for SEC_TYPE_CONNECT_ATTEMPT and SEC_TYPE_UNKNOWN_IN.kkkkk - - added new toasters for private/group/lobby chat. - - added copy certificate button to profile widget - - added topics to chat lobbies. Improved CL gui - - added deferred checking of chunks in FT. Not fully functional yet, for backward compatibility reasons. - - prepared libretroshare for OpenSSL-1.0 - - Bring the main window to foreground when receiving a link from the browser (Windows only). - - Fixed compilation on MacOS 10.6 (patch from K.Gupta) - - Update installer script, added spanish,arabic,italian,greek and portuguese language support - - Optimized layout of the newsfeed items. - - Fixed linking of the VOIP plugin on Windows (Exports all symbols from RetroShare.exe and import it in the plugins. - Removed the direct linking of the libretroshare and libbitdht from the plugins.) - - Fixed utf8 characters in the transfer tab name of plugins. - - Functional version of VOIP plugin. - - Added ability for plugins to return their own PopupChatDialog class - - Count the friends (gpg id's) instead of the locations (ssl id's) in the statusbar. - - Moved update of the friends from QTimer to signals. - - Combined p3LinkMgr::getFriendCount and p3LinkMgr::getOnlineCount and moved to p3PeerMgr. - - Fixed scroll position of the text browser in the chat dialog when the friend changes the status and the info frame is shown or hidden - - Reworked the start of a chat with a gpg id (doubleclick in friends tree). Removed the question to send a message when a chat - with an offline friend is started. Start the chat when only one ssl id exist (online or offline) or only one ssl id is online. - Show a messagebox when more than one ssl ids are online or all are offline. - - Added check for required location during gpg key generation. - - * Bugs - - Added thread safe function for inet_ntoa in libbitdht using the existing thread safe function for inet_ntoa in libretroshare - - Fixed deadlock when receiving a chat message with open history browser. - - fixed version script (Patch form AC) - - Fixed Download link for Email Invite - - Fixed utf8 in dropping links to channels (patch from AsamK) - - Fixed pasting cert links in the friend list (patch from AsamK) - - Added code to allow pasting GPG certificates missing a newline at the end (patch from AsamK) - - Fixed display of the location with utf8 characters in ConnectFriendWizard. - - Fixed icon size in forums - - Disabled adding new keys from friends of friends in non-discovery mode. - - Fixed display of friend status in chat window - - Fixed bug returning false while a string is expected in p3distrib - - -- Cyril Soler Fri, 20 feb 2012 12:00:00 +0100 - -retroshare (0.5.3-0.4973~natty) natty; urgency=low - - * Improvements - - added BSD specific changes - - made settings page system more automatic - - updated french translation - - mark local existing files in search dialog with red color - - started working on VOIP plugin (not finished yet) - * merged p3voRS code with plugin code - * created new interface directory retroshare-gui/src/retroshare-gui - * improved plugin system to allow adding settings pages from plugins - - * Bugs - - fixed crash in config dialog - - fixed missing return value in ftcontroller.cc - - -- Cyril Soler Fri, 20 feb 2012 12:00:00 +0100 - -retroshare (0.5.3-0.4953~natty) natty; urgency=low - - * Improvements - - removed unused plugins in .pro file - - added early sendign of chunkmap requests to new sources (FT) - - saving finished/checking transfers (FT) - - improved swarming test code with fault simulation - - started conversion of VOIP code (from Joss) into a plugin. Unfinished! - - Added multi friend recommendation dialog. You can start it from the tools menu in FriendsDialog. - - GUI - * Moved the news feed tab to the first position. - * Added icon to the ConnectFriendWizard. - * renamed Dht to DHT, Authemticated to Authenticated - * The channel message (in channels) is set to read when the user clicks on the show more button. - * The forum/channel news feed is removed when the user reads the message in forums/channels - * The standard font is now used for new chat lobbies. - * Added a new menu item to set the font of a private chat and chat lobby to the default font. - * Changed the color of the time of the compact chat style from red to gray. - * disabled autodownload when subscribing to a channel. - * set a icon for Friend Recommendation menu action - * Sort nick names by name in the chat lobby. - - - Added missing IPs to certificate links - - set max chunk inactivity period to 5 mins instead of 1 mins. Shoudl favor slow DLs. This - is nw possible since missing bits will be re-asked regularly (FT) - - added Cache system to GPG certificates. Should reduce GPG calls by 90% - - added code for Intro Server: automatically accept peers, and spews a chat lobby where users can meet. - - Show clickable links in the channel feed message. - - updated franch and german translations - - added control over TR forward rate, so that we can experiment with it on large bandwidth servers - - * Bugs - - fixed 2 potential flaws of swarming causing request of unavailable data - - only ask CRC32 maps to peers that have a complete file. - - Fixed private message notification. Remove offline private messages of none friends - at startup and when a friend is removed. - - Moved the removing of the history of removed friends from p3PeerMgrIMPL to p3ChatService. - - Fixed Download toaster (utf8 in file name, use QDesktopServices vs RsUrlHandler for collections, fixed - crash after opening a collection) (Patch from AsamK). - - fixed utf8 chars in certificate links (Patch from AsamK) - - removed cache adding strategy to DL queue that was O(n^2). Now adding cache at the end of the queue - - Fixed bug when the user clicks on a link without http:// in a QTextBrowser. This link was - oppened directly in RetroShare. - - Attempted fix for maintaining External Port in Manual Forwarded Mode. - * added check for RS_NET_MODE_EXT instead of RS_NET_MODE_TRY_EXT... as trys aren't used in p3PeerMgr. - * removed tryMode from external interface - as this data is not available anymore. - * Removed setting this parameter in p3peers.cc - - Fixed reference to tryNetMode. - - -- Cyril Soler Fri, 17 feb 2012 14:00:00 +0100 - -retroshare (0.5.3-0.4909~lucid) lucid; urgency=low - - * Improvements - - Added Code to convert retroshare-nogui into an "Introduction Server". - Perhaps the community can use this instead of their existing certificate exchanger. - - Updated the help page, added few more infos - - * Bug fixes - - Fixed RS links with special caracters: ",&,# - - Removed unused plugins from trunk - - Fixed parenthesis problem with #ifdef that armed lupdate - - Fixed layout of the CryptoPage and german language. - - Fixed many tranlation issues - - -- Cyril Soler Wed, 08 feb 2012 22:00:00 +0100 - -retroshare (0.5.3-0.4885~natty) natty; urgency=low - - * Improvements - - Added new variant to the compact chat style with colored nicknames calculated from the name. - It's disabled by default. You can enable it with the define COLORED_NICKNAMES in ChatStyle.cpp. - - Fixed up Email Invite Text... - * Unified Text Source. - * Added "Cut Below Here" line - - Switched BanList sharing to only your own list. (was OWN + FRIENDS lists) - This data is not used at the moment, so just reducing data before release. - - Updated English Email Invite (sorry guys, you'll have to redo translations). - - Set OSX default style to "Cleanlooks" - as AQUA style hides some windows. - - Updated Version strings to V0.5.3a. / 4874 - - Fixed missing headers for plugin manager. - - Disabled ZEROCONF for OSX. - - minor improvements to plugin system - - updated french translation (from Max Romeo) - - Added new compact style for chat. - - Improved the HTML optimizer. - - Start the CreateLobbyDialog from the list of chat lobbies with the privacy level of the selected item. - - fixed to display the the correct help icon on MainWindow - - Fixup BSD qmake parameters: mainly library locations. - - * Bug fixes - - Fixed handling of utf8 characters in lobby nick name. - - fixed small bug in certificate correction (missing ending newline caused crash) - - -- Cyril Soler Fri, 03 Feb 2012 22:00:00 +0100 - -retroshare (0.5.2-0.4861~natty) natty; urgency=low - - * Improvements - - Added (make functional) the lobby menu in the context menu of the gpg and group item in FriendList. - - Added button to add/remove signatures and button to copy RS cert link to clipboard - - Added doubleclick to join a lobby. - - Disable the Startup Wizard. Most of the defaults are sensible now, so its no longer needed! - - Fixed default data rates to sensible options: 200 kB/s down, 50 kB/s up. - - Added Minimal certificates to discovery exchange. They are invoked if the standard cert is over 10k. - - Switched std::vector.data => &(std::vector[0]) to remove linuxism in radix64. - - Added new common widget FriendSelectionWidget for selecting friends and use it in CreateLobbyDialog, - ShareKey (forums and channels) and MessageComposer. - - Fixed german language. - - * Bug fixes - - Added Check for successful Req creation (was crashing with NULL pointer). - - Fixed echoes in chat lobbies - * added a time stamp to lobby events (new item tag) - * controlling time stamp of lobby msg and event: drop packets if time is older than cache duration. - * moved connexion challenge code to lobby management loop - * added new type of lobby invite to handle connexion challenges and avoid false invitations in the GUI - - New lobby event format is not backward compatible -> "peer typing" and "peer joined/left" will need - the new version. Messages are still compatible) - - - Fixed crash when closing a chat window. - - Fixed Auto-Download Button - - Fixed wrong display of the news feed notify in FriendsDialog when the tabs were moved. - - Another fix for the discovery fiasco... Turns out that I broke the system with my previous changes. - * Allow certificates through with no attached GPG Certs. - * Added StoreAllKeys() call after adding new GPG Certificate. - - -- Cyril Soler Thu, 24 Jan 2012 19:00:00 +0100 - -retroshare (0.5.2-0.4840~natty) natty; urgency=low - - * Improvements - - added retroshare certificate links: allows to paste certificates everywhere. - - added certificate links in friend recommandations - - added certificate cleaning method, to remove signatures at export - - improved chat lobby GUI - * added proper counting of peers in chat lobbies, using keep-alive packets, time stamps, etc. - * Moved the chat lobby tabs to the FriendsDialog. - * Extracted a new widget ChatWidget for the basic chat handling from the - PopupChatDialog and use it in ChatLobbyDialog too. - * Added an own ui for the ChatLobbyDialog. - * Saved settings of the ChatLobbyDialog. - - Reworked SoundManager and SoundPage in the settings. - - Added new icon in the statusbar to switch off the sound - - Enabled Relays by default. - * This will only effect people who upgrade from a very old version. - * Other people will have to switch it on manually. - * Default is 0 friends, 1 FOF & 1 General @ 1kb/s... max 4kb/s usage per peer. - - Disabled Thread debugging. - - Fixed up bdProxyId initialisation - - Improved Error Code translation (for unknown entries) - - cleaned up some of the std::cerr output. - - Changed parameters of RsStatus interface from "std::string" to "const std::string&" - - Fixed german language. - - - Added Native (Bonjour API) Nat Port Forwarding to OSX. - * new classe p3zcNatAssist - * moved some common ZeroConf functions / definitions around. - * moved virtual tick() to parent class: pqiNetAssist - * added zcNetAssist section to makefiles. (active for OSX build) - * setup switch between p3zcNatAssist & upnphandler in rsinit.cc - - - Changes to support Relays. - * added p3BitDht::addKnownNode() so that DhtIds can be used instead of SslIds. - * switched from bdStdDht() functions to use bdModDht(). - * made DhtFunctions a class variable. - * added function to modify NodePerBucket() parameter. - * Bugfix for LinkType. peerConnectAddress.flags was not initialised. - * Extra debugging of LinkType data (use LINKMGR_DEBUG_LINKTYPE). - * cleaned up udprelay output. - * Added Compile Rules to libretroshare.pro for building LocalNet Testing Version. (testnetwork) - * Added NumQueryNodes() function to bdDhtFunctions. - * Switched bdquery.cc to use bdNumQueryNodes(). - * Extended bdStdDht class to bdModDht to allow NodesPerBucket to be modified. - * Fixed up Connection Fail Callback for Relay Servers. - * Added Extra debugging for Proxy Connections. - * disabled turtle routing for relayed connexions - - * Bugs - - lobby participant list now updated when peers join/leave - - Added chat lobby privacy type to lobby invite => lobby type is propagated - correctly to friends that are invited. - - Bugfix for natassist (zeroconf returns 0.0.0.0:0 when its doesn't work). - - Logged IP Addresses for Failed incoming connections. - - Hacked IP address into the NewsFeed notifications (ugly). - - - Attempts at fixing disconnections :) - * Added limit of 10kB for Certificate size. If it is bigger - discard certificate. - * Remove certificates for slow / trickle connections (for Relay connections). - * Disabled check for gpgcert text in p3disc. - * Disabled creation of GPG Cert in AuthGPG. - * Added extra error code to pqinetwork. - * Added DataRate accounting to Relay and Dht. - * Rates are exposed through rsDht.h interface. - * Added LastIncomingTS() to pqistreamer. - * Turned HeartBeat reset() into a warning. - * Added NoPacket in 60 sec reset(). - * Minor typos/errors corrected. - - - Fixed message reply and forward. The new lines were removed falsely. - - Improved logging of Connection Behaviours. - - Added history for chat lobbies and disabled it until the lobbies are saved. - - Added check in cachestrapper to see if a duplicate cache has been requested. - In this case, don't cancel the old one - just keep going! - - -- Cyril Soler Thu, 24 Jan 2012 19:00:00 +0100 - -retroshare (0.5.2-0.4783~natty) natty; urgency=low - - * Improvements - - Added Chat Lobbies: decentalized anonymous chat rooms. - * Chat lobbies are private (on invitation only) or public (friends can join) - * Bit of GUI to show lobby list, with one tab per active chat lobby - * Most fonctionality of chat are ported to lobbies including status messages - * Internally to libretroshare, lobbies are virtual peers to talk to. - * Deriving a RsItem from ChatLobbyBouncingObject allows the item to be bounced - to all peers in the lobby. - * Improved message splitting by adding sub item ids to lobby messages. Should - be ported to normal chat in the next version. - * Added parent id to RsChatLobbyMsgItem, to allow threaded chat. - * List of public lobbies at friends are requested only when needed - * Major cleaning of p3chatservice.cc - - - Added new entry in config->transfers to allow reserving n slots to non cache transfers - - Add the ip address of the DNSResolver to the top of the list of the connect addresses. - - Little design improvements for Plugin Item - - Added manual entry for plugins - - Added relay connexions (Note: There are still some service changes required to - reduce the traffic over relays) - * Merging Dht Relay improvements into the trunk. These changes should finally make relays functional. - * Changed the way proxy/relay peers are selected in bdConnection. (needs more work). - * Added LinkType to peer info in p3LinkMgr & rspeers.h interface. - * Added getConnectionType() to p3PeerMgr. This defaults to FRIEND for the moment. - * Provide information about Bandwidth, Transport and Peer Type via LinkType(). - * Added RateCap() to limit traffic over Relay connections. - * Set Internal Rate to 75% of Relay Limit to account for transport overhead. - * Added various #include "util/rswin.h" to fix compile errors with standard ssl package. - * Removed Local variables (mConnectProxyAddr, etc) which were hiding Class Variables. - * Cleaned up bits in pqissl.cc and p3linkmgr.cc - * Increased UDP Relay Packet size (max transport of 1400 bytes per UDP packet) - * Modified checkRelay() to use Low Pass Filter to calculate Relay Bandwidth. - * Improved udprelay debugging. - * increased (x2) Relay Lifetimes - this is so that enough useful data can be transported (1meg). - * Added LOCALNET_TESTING code to rsinit.cc. This allows Port Restrictions to simulate firewalls. - * more debugging and minor bugfixes. - - libbitdht - * added Relay Flags to bdNode::setNodeDhtMode() - * added dropRelayServers() / pingRelayServers() functions for mode switches - * added utility function: bdFriendList::findPeersWithFlags() - * added utility function: bdSpace::clean_node_flags(uint32_t flags) - * added RelayMode to ConnectManager. - * added failedConnection callback when in Server Mode. - * added incomplete udpproxylayer code. (not compiled) - - libretroshare - * added Configuration to p3BitDht for storing Relay Settings. (bit Hackish!) - * added RelayHandler & getRelayReceiver() - to outsource some Relay functions. - * + RelayHandler_InstallRelayConnection() & RelayHandler_LogFailedProxyAttempt() - * added RelayServer, Mode and RelayAllowance to external DHT interface. - * added p3PeerMgr::getGpgId() for ZeroConf usage. - * updated parts of pqiassist virtual interfaces. - * added Bandwidth storage to udprelay. - * modified the way Relay Slots are allocated to match GUI interface. - * ZeroConf now working on OSX. - * added ZeroConf to OSX compilation. - * extended rsDht interface to expose Relay configuration. - - retroshare-gui - * added Relay configuration panel. - - -- Cyril Soler Thu, 12 Jan 2012 19:00:00 +0100 - -retroshare (0.5.2-0.4747~natty) natty; urgency=low - - * Improvements - - Added the real size of all files of a collection to the link when added with drag and drop. - - ConnectionFriendWizard: Show the messagebox "Your Cert is copied to Clipboard" after copying the cert into the clipboard. - - Removed "release" from the win32 build in retroshare-nogui.pro. - - Added retroshare-nogui to the subdir project. - - - DHT (Merging r4705 through r4717 from retroshare/branches/v0.5-dhtmods) - * Switched on Local BadPeer DHT Filter. - - This will remove any peer detected to be spoofing yourself or your friends. - - This list is also shared with you friends. (in Test Mode). - * Added Cleanup of BadPeer Filter. - - Instead of permanent ban, peers are be banned for 6 hours. - - bdManager periodically calls this - which prints out ban list too. - * Added Checks against spoofing to UdpStunner. - - Throw away Stun Results where remote_addr = reported ext_addr. - - Added extra checks to ensure that the same Ext IP is returned, before reporting. - - accept BadPeer List from DHT BadPeer Detection. - * Changed BanList Service Id from Test ID to Real ID. - - - Added new widget for hashing files. - - Added new common class FilesDefs to handle informations of file types like icons and names. - - Removed calls to exit() in rsinit. Replaced them by proper return false - - Adjustment of some values for file transfer: some delays can be larger, now that chunks are shared between sources. This makes file transfer more stable: - FT_TM_DOWNLOAD_TIMEOUT: 10 -> 20 secs (RTT limit of 10 secs is too low -> transfers in long tunnels kept switching between active and inactive) - INACTIVE_CHUNKS_CHECK_DELAY: 60 -> 240 secs (Chunks are kept longer before beign cancelled, which is now affordable) - MAX_TIME_INACTIVE_REQUEUED: 60 -> 120 secs.(Transfers a kept longer before being re-prioritized in queue) - - * Bug fixes - - Added the size of the collection to the link only for files (missing test) - - Show the correct name in the title of the RsCollectionDialog when the filename contains ".". - - Fixed creating of the download path of the collection when running as portable version. - - -- Cyril Soler Wed, 21 Dec 2011 20:30:00 +0100 - -retroshare (0.5.2-0.4706~lucid) lucid; urgency=low - - * Improvements - - DHT: - * Reduced Default DHT Message rate from 50msg/sec to 5msg/sec - (Searches now take longer, but it should make crappy firewalls happy.) - * Added Interface to allow this rate to be dynamically changed (no GUI yet). - * Bugfixes for p3BanList: removed internal IPs from Lists, fixed AddBanPeer() logic bug. - * Disabled p3Dsdv, after brief test. - * Added knowledge of Friends / FoFs and Relays to DHT. - * Added bdFriendList class to store this information. - * Added Checks against known Peer:IP information to detect bad peers. - * Bad Peer Checking is in Test Mode Only for the moment, - * New Interfaces to exchange above information with libretroshare - * Cleaned up various compiler warnings. - - GUI - * Added new button "Open Collection" in TransfersDialog. - * Show main window with click on system icon when the main window is minimized. - * Beautified RsCollectionDialog. - * Fixed german language. - * Added new column "Last Contact" to the FriendsDialog and MessengerWindow. - Moved some more basic functions to FriendsList and optimized the exisiting code. - * Added translation for plugins and added german language to LinksCloud. Recompile needed. - * Changed the name and the description of the plugin to utf8. - * fixed download priority handling. Proof-tested on multiple DL from the same peer. - - - libretroshare Improvements: - * corrected disabled RequestdirDetails in FileIndexStore to be able to retrieve root directory of a user ID - * removed dependency of mRateIncrease into measured rtt -> would cause very slow transfers through long tunnels - * Removed compiler warnings. - * Added p3BanList Service and DataTypes to exchange Bad Peer information. - * Added Plumbing to get info from network to DHT and back. - * Supply Friend List from p3LinkMgr - * Supply Friend of Friend List from p3Disc. - * Added p3Dsdv Service and DataTypes for NetworkWide Routing (Testing Mode). - * Various BugFixes. - * Patch Manual Forward mode to preserve user selected Port. - - * Bug fixes - - 2 bug fixes (by AsamK) to make rscollection files compatible with utf8 - - fixed bug asking data to deleted mTransfer - - -- Cyril Soler Wed, 02 Dec 2011 20:30:00 +0100 - -retroshare (0.5.2-0.4653~lucid) lucid; urgency=low - - * Improvements - - implemented handling and creation of collection files - - improved computation of CRC32 maps (separate thread, cache keeping, sending of keep-alive packets) - - fixed compilation of some tests in libretroshare/src/tests/ft/ - - updated german language - - started implementing a file mapper to allow linear download of data with automatic de-fragmentation (not enabled yet) - - * Bug fixes - - bug in CRC32 map cross-checking: only downloaded chunks would be checked. - - fixed bug in file transfer re-allocating a local variable - - -- Cyril Soler Wed, 09 Nov 2011 20:30:00 +0100 - -retroshare (0.5.2-0.4653~lucid) lucid; urgency=low - - * Improvements - - removed delay in file checking that would cause excessively long file update cycle - - implemented slice sharing between peers. - - Replaced spaces with %20 in RetroShare links. - - obfuscation of TR and SR by random rare non-increase of length 1 requests (original idea by Costa) - - layout changes for PluginItem, fixed qrc resource load in plugins. - - * Bug fixes - - corrected bug about wrong layout of friend list (patch from asamK) - - corrected bug that would allow a direct friend to DL a file that is NETWORK_WIDE only, using direct transfer - - -- Cyril Soler Sun, 24 Oct 2011 20:30:00 +0100 - -retroshare (0.5.2-0.4642~lucid) lucid; urgency=low - - * Improvements - - updated build scripts and .pro files forubuntu oneiric - - fixed plugin system on windows. - - updated french translation - - Add the private chat message to the history after removing the private chat - queue (when the user has read the message). - - Added loading text to forumsdialog and enabled percentage numbers to be shown also - - added display of TR forwarding probability as a function of depth. - - Moved the chat history into the libretroshare. - * Now the history is saved encrypted. Please delete all files with "chat*.xml" in your profile folder. - * Added new config p3HistoryMgr and interface p3History. - * Added new option to limit the count of the saved history items. - * Added new simple html optimizer "RsHtml::optimizeHtml" to reduce the size of the html strings. - - - * Bug fixes - - fixed issue of loading the correct instance of RetroShare.conf when switching - locations (Patch from AsamK #3423256) - - fixed utf8 issues (umlauts in the Windows user name, search string with utf8, - location names, links from browser, history manager) - - fixed update of friend status in chat window - - fixed bug with anonymous channels asking for friends to be sources - - fixed link passed issue due to usin self-closign links (Patch from Asamk #3418941) - - fixed display of filename when an upload is a partially downloaded file - - removed early pruning of TR which was preventing any TR to go beyond the limit - in case of heavy traffic. Pruning now applied probabilitically at end of loop. - - -- Cyril Soler Sun, 16 Oct 2011 20:30:00 +0100 - -retroshare (0.5.2-0.4622~lucid) lucid; urgency=low - - * Improvements - - Changed default random number generator to use RAND_bytes from openssl. - - Updated random testing code and fixed compilation - - Fixed compilation on FreeBSD, and improved sorting on DHT window - (Patch from Ben Laurie) - - Added next unread button to forums (patch from devnewton #3401840) - - Fixed inaccurate text in transfer page - - Removed calls to rsfiles->get{Download,Partials}Directory() in RsDiscSpace - class, since it would trigger a call to ftController - - Changed names of functions in ftTransferModules to locked_* when appropriate - (helps debugging) - - Show the availability status of peers at the level of locations instead of GPG - keys (patch from AsamK) - - Added paste of RS links to post on channels, and additional check that the file - is actually shared. - - * Bug fixes - - fixed missing TCP connection call - when peer is found on the DHT. - * save IP address for DHT display. - * store Action in action Queue (the BUG). - - fixed sorting of transfer by priority - - fixed utf8 issues in sending cert by email (patch from asamK #3393826) - - added a lock into ftTransferModule::recvFileData() (Crash reported by Costa - of data race due to storing data in a deleted transfer module) - - Added chunk splitting in case part of the file transfer data does not come. - Added strategy to ask again for missing data. The combination of these two cannot - result into an infinite loop (as before) - - -- Cyril Soler Thu, 29 Sep 2011 20:30:00 +0100 - -retroshare (0.5.2-0.4608~lucid) lucid; urgency=low - - * Improvements - - Stopping hash when a shared directory containing the file was removed - - Reworked the process of the RetroShare links. Now RetroShare asks when - adding a file or a person link and shows a detailed result. - - Merging distrib split into trunk, suppressed p3distrib in services - - Send msg in plain text when the html encoding does not change anything - into the message. This drastically reduces message s size - - Added missing status frame for idle. - - Merged QoS branch into trunk. - - Set own status initially to online - - Added double click to NetworkDialog to show the peer details - - Put some pqissl warnings in log file only in debug mode, since this is quite CPU demanding - - Added new widget to display an avatar with or without the status frame - AvatarWidget. - Changed all existing avatars to AvatarWidget. - - Added avatar image to ConfCertDialog (defnax). - - Added new class AvatarDefs to get the avatar for a ssl id or gpg id - - * Bug fixes - - Fixed bug fue to deleting ftFileCreator used by datamultiplex before - asking datamultiplex to remove it! - - Fixed crash in pqiSSLstore::readPkt() when rsSerialiser->deserialise() returns NULL - - Added auto-split of long private messages, and re-combination of partial messages on - client side. Corrects the bug causing disconnection when sending messages of side - larger than the maximum packet size - - Patch from AsamK to fix up crash at startup due to a missing else in config load - - -- Cyril Soler Fri, 16 Sep 2011 20:30:00 +0100 - -retroshare (0.5.2-0.4584~lucid) lucid; urgency=low - - * Improvements - - changed local root directory to be "My files" instead of SSLid - - set default of the signature checkbox in ConnectFriendWizard to disabled - - set the initial option for the download directory to network wide only - - set the default of a new shared directory to network wide - - added private groups option to forums - - Added a new checbox in the settings (NotifyPage) to enable/disable the - new SecurityItem. It is enabled by default, but all existing users need to enable it. - - Added new buttons to SecurityItem to add/remove the peer and view peer details. - - Added new call to notifyListChange with NOTIFY_LIST_FRIENDS in AuthGPGimpl::AllowConnection. - - Fixed german language. - - Removed "location:" before the ssl name in FriendsDialog and MessengerWindow. - - * Bug fixes - - fixed up color codes for qt 4.7 in NetworkGraph (bug in qt::lighter()) - - corrected a few bugs in the cert cleaning method. - - corrected several utf8 issues (for peer names, in private chat and file list, and search) - - fixed time display in security item - - removed potential mem leak with p3distrib group edit - - Added check for administrator rights to add/remove the retroshare:// protocol. - - -- Cyril Soler Sat, 13 Aug 2011 20:30:00 +0100 - -retroshare (0.5.2-0.4550~lucid) lucid; urgency=low - - * Improvements - - - Plugin system - * Added configuration saving for plugin manager and serialization methods - * added a list of accepted plugin hashes - * added plugin widget for each plugin in settings, to allow enabling/disabling plugins - * updated LinkCloud plugin to new rsPlugin class - * put the addconfiguration for plugin manager in rsinit.cc a bit earlier to allow to load - the list of accepted hashes early enough - * added icon for disabled plugins - * added missing Q_INIT_RESOURCE call to get the plugins icon loading correctly - - - GUI - * Fixed an error when cancel the login password dialog at startup, the password dialog can be canceled. - * Fixed layout in GeneralPage under Windows (there are three additional checkboxes). - * Applied patch to enable the sort of the columns star and unread in messages (from AsamK) - * Added missing "FORWARDED_PORT" case to natstatus - * updated Dht and Nat Indicators to accurately reflect Network status. Roughly: - - DHT. Off: gray, ERROR: red, NO RS PEERS: yellow, GOOD: green. - - NAT. Offline: gray, BAD NET: red, NO DHT, or FIREWALLED: yellow, GOOD: green - * added Advanced mode to the GUI - - Switched ServerPage to use netMode, rather than tryNetMode. This fixes the Network Status. - - Added "Advanced Mode" to Settings GeneralPage. - - Store / Set Advanced Mode via rsConfig::get/setConfigurationOptions. - - removed %0D%0A from Linux / OSX emails - made it Windows Only. - - updated GetStartedDialog text. - - disable GetStartedDialog is AdvancedMode is set. - - Enabled buttons for "Invite Friends" and "Add Friend". Linked to Email Invite, and Connect Friend Wizard. - - Switched out FAQ for links to website, and email support buttons. - * Added Basic Dht Details Window to Retroshare GUI. - - created gui/dht/DhtWindow class. - - brought across the basic structure from PeerNetQt... will be a condensed version of that GUI. - - added to status Menu. - - enabled via #define USE_DHTWINDOW (which is defined! in MainWindow at the moment). - - Dht Details only displays Dht Peers at the moment. - * Net, Dht and Configuration changes. - - set PortForward in NetStateBox when the Network has been setup. - - add GeneralConfig to rsConfig external interface. - - enabled ADVANCED configuration option. - * Addition of a "Getting Started Guide". - * Optimized layout of the SubFileItem. - * Optimized layout of the private chat window. - * Show the cancel button only when downloading or when used in CreateChannelMsg. - * Fixed layout problem (vertical scrollbar) in ChannelFeed. - * Added a new image to the private chat window to set the window always on top. - * Indent text of the channel message and set it to selectable. - * Removed the single notify systray icon (combined icon) and combined it with the - normal RetroShare systray icon. The user can choose, which notify icon is shown as - single icon in systray or with the normal RetroShare icon. - - - Key mamagement - * added a signature add/remove button in connect wizard, only when gpgme-1.3.1 or greater is used, - based on the availability of the GPGME_EXPORT_MODE_MINIMAL option. - - - Connectivity - * Added Second Queue, to check if connections are actually valid before installing. - * Added Check of Time for main Core Cycle. - * Fixed Bug in choosing port for Proxy UDP. Chooses a Random one between 30000-50000. - * Added Address update from p3NetMgr => p3PeerMgr, when external address has been determined. - * Simplification of p3ConnectMgr => p3LinkMgr, p3PeerMgr & p3NetMgr. - - p3peermgr now uses RS_NET_MODE_XXXX instead of RS_NET_MODE_TRY_XXXX - - p3netmgr maintains both TRY and ACTUAL mode (not visible through old interface -- TO FIX) - - added default to UPNP mode. - * Increased TCP WAIT time to allow external port to stabilize. - * Improvements to tcponudp library to allow multiple UdpStacks / ports, with alternative receivers. - * Improved a lot UDP Connection Code - - Increased Timeout Periods for UDP connections - this was stopping half of them from succeeding. - - Export UDP Addresses to DhtWindow. - - disabled DIRECT UDP connections (Not always stable, especially if you are firewalled, and not - needed as a TCP connection can be made!) - - Added DropPeers() as NON-ACTIVE (this allows peers which aren't VISIBLE to still try and connect) - - Resurrected the UdpStunner code, and improved it. - - Added UdpRelay code. - - Modified startup code and ssludp code to use the new tcponudp and add a stunner. - * Added notifications of Failed Connection Attempts in both ways - - - Services - * Refactored p3chatservice move avatar declaration to p3chat header and encapsulating config methods - * added www.myip.dk, and removed showmyip.org address from extaddrfinder - - - Internationalization - * Fixed german language. - * Changed the generation of the gpg key and location to utf8. - - - DHT - * Added Bloom filter to speed up finding RS peers in DHT. - * Added External DHT Interface to display Connection Information. - * extended p3bitdht to provide RsDht interface. (p3bitdht_interface.cc) - * Switched on Dht "Attach" Mode if RS is firewalled. (and not nice firewall). - * Added interfaces to enable AttachMode switch. - * Updated bdboot file. - - - Tests - * Restored and improved regression test for tcponudp - * Added another Test UdpLayer: TimedUdpLayer, This simulates the firewalled situation, by - only accepting packets after 60 seconds. - * Added quick and dirty BitDht Packet check. test against "d1:" for the first 3 bytes. This should - not conflict with Stun, Relay or TOU packets. - - - packaging - * Added win32 build bat for libbitdht - - * Bug fixes - - Fixed "double-click" chat startup bug, the gpgOnly flag was incorrectly set false. - - Fixed the sending of outgoing messages - - Removed popup window for file copy error, and redirected the message to std::cerr, to save users. - - Set maximum port value to 65535 instead of old arbitrary value of 50000, and warned about - system-reserved ports in server settings gui enabled sorting and added dht icon for the window - - Fixed bug in dnsresolver reset function - - Silly Bug, overwritten the mConnectFlag with the Bandwidth parameter. - - Added missing mutex protection that caused random SIGSEGV in p3disc - - Corrected a bug due to reading uint64_t with wrong format on some systems, which caused the hash cache to sometime fail - - Fixed bug for 'copy error' and losing cache data conflict in unix and windows style directory - names led to cleaning of remote and local directories in Cachestrapper::loadlist() - - Bugfixes to serialization - * print out messages when serialisation fails. - * removed BUG in TlvGetString() which allows a zero length TLV - - Fixed startup bug (loops into FAILURE) - - Fixed buggy rs_inet_ntoa - - Fixed a bunch of apple gcc warnings. mainly for(;;); => for(;;) ; - - Stops loading of a cache in p3GroupDistrib::loadFileMsgs on shutdown of RetroShare. - - Fixed early initialization of QIcon in LinksCloud plugin - - Fixed duplicate msgs found between cachefile being formed (caused by not marking cache opt loaded files as local or not) - also missing own-msgs bug caused by not accounting for msgs created by users - - Added a name to the RsMutex class, allowing debugging of the waiting time for a lock of RsMutex in - rsthreads.h with #define RSMUTEX_DEBUG 300. That means all locks waiting longer than 300ms are logged into the stderr. - - Added missing notify when sending a message to an offline user. - - DHT code: - * fixed up buggy overloading for the udplayer (for testing). - * added processing multiple (5) remote processes per tick - * removed unused variables from query data structure. - * #defined out debugging in bdSpace, removed old functions. - * More agressive attempts to find proxies for connections. - * made "final query attempt" use exact peer address rather than midid. - * tweaked bdconnection debugging. - * increase CONNECTION_MAX_TIMEOUT from 30 => 45. wasn't enough! - * Limited bdQuery::QueryIdlePeriod to 15min (was unlimited). - * added bdQuery::PotentialPeer cleanup functions - for more robust reporting. - * fixed bdQuery debugging printouts. - * Implemented BITDHT_QFLAGS_UPDATES flag. - - TcoOnUdp code: - * Reduce Maximum Transmission size from 1500 -> 1000. This is the cause of Failed Connections. - It looks like UDP packets are being truncated from 1520 -> 1492 bytes, and this is killing the - - -- Cyril Soler Sat, 13 Aug 2011 20:30:00 +0100 - -retroshare (0.5.1-0.4350~lucid) lucid; urgency=low - - * Improvements - - Updated tests for tcponudp. - - * Bug fixes - - fixed bug in search with size in MB. Caused crash due to deserialization error. - - Added Check for the existance of each Cache File before that are passed on the loader. - This should once and for-all remove the copy file warnings - - -- Cyril Soler Tue, 28 Jun 2011 19:35:46 +0100 - -retroshare (0.5.1-0.4337~lucid) lucid; urgency=low - - * Bug fixes - - Fixed the cache transfer killing bug (misplaced brackets) - - Fixed bug in pqissl wrongly casting a pointer to unsigned long, possibly impacting 64bit systems - - Fixed bug responsible for corrupting large packets. Solved the chat bug, - the errors in GetTlvString, the corrupted exchange of keys, location names, etc. - - -- Cyril Soler Sat, 25 Jun 2011 19:35:46 +0100 - -retroshare (0.5.1-0.4331~lucid) lucid; urgency=low - - * Improvements - - Started dev of plugin system. Works on linux, not yet on windows. - - Added gui for plugins in Settings - - Ported LinksCloud service as a plugin - - Improvement of the unit tests, and coverage calculations. - - Hash cache: missing root directories are not discarded anymore, but kept empty, - unless the user really removes them explicitely. - - Reworked settings dialog - - Automatic add the recommended friend(s) as CC in the MessageComposer. - - Send plain text message instead of html, when the text contains no html specifics. - This is a huge gain in forum posts size, up to a factor of 50 - - Enabled Spanish translation - - Moved the fill function of the ForumsDialog to a QThread. - - Made multiple keyword search use an AND instead of an OR. - - * Bug fixes - - Fixed display of upload transfers - - Fixed the Missing Cache File bug. - - Added Old Cache Storage... so these can be retrieved. - - Connected up the CancelCacheFile() -> FileCancel. - - Removed "ipaddr=1" bug - - Fixed uninitialized value in p3turtle - - Fixed html title bug in forum message when answering from news feed - - Fixed reaction of the checkbox "web of trust" - - Fixed calculation of the unread messages in MessagesDialog - - Corrected bug that would wipe out the hash cache file every other start - - Fixed crash in ForumsDialog - - Fixed memory leak of the fill thread of the history browser - - Fixed refill of the threads tree after receiving a new message. Now the new message is expanded. - - -- Cyril Soler Mon, 11 Apr 2010 21:35:46 +0100 - -retroshare (0.5.1-0.4239~lucid) lucid; urgency=low - - * Improvements - - Optimized the functions for the forum messages. - - added a star functionality to forums - - placed private message editing into a separate window - - added a tab to graphically display turtle router statistics - - added automatic handling of turtle requests/search conjestion cases - - patched for compilation on OpenSuze11.4 - - put links to peer and signers in certificate dialog - - updated french translation - - added copy/paste functionality of RS links to friends keys - - various GUI tweaks - - added to RetroShare Help page noew commands entry for "-r retroshare://..." - - added history cache optimisation to subscribed/client groups (functionality is now disabled) - - Added new RetroShare link format to write a message retroshare://message?id=...[&subject=...] - - Added new RetroShare link format to start a search retroshare://search?keywords=... - - Enabled on Private Chat to display for the status string smileys, when there is smiley codes used. - - * Bug fixes - - Channels: Fixed bug related to opening cache hist file in text mode for windows - - Chat: Sending large messages now works, thanks to RsChatMsgItem splitting (not 100% backward compatible, but avoids crashing) - - Chat: Removed crash due to dynamic_cast onto a deleted pointer. - - Dbase: Removed the difference of the separator for Linux and Windows. - - Dbase: Removed extra "/" of the filename (e.g. "E://") of the hashed file when sharing a whole drive. - - Forums: Fixed drag and drop of files to a forum message with utf8 chars. - - General: Fixed recommend friend. - - Search: Fixed sorting by date in search - - -- Cyril Soler Mon, 11 Apr 2010 21:35:46 +0100 - -retroshare (0.5.1-0.4179~lucid) lucid; urgency=low - - * Improvements - - updated packaging for ubuntu natty, removed dependency on qt4-opengl - - updated french/german translations - - updated icons - - enabled drag and drop of directories in share manager - - * Bug fixes - - suppred unwanted apparence of channel source id as channel source - - improved strategy for cleaning stalled cache transfers - - fixed leaking of sources in channel posts - - -- Cyril Soler Mon, 11 Apr 2010 21:35:46 +0100 - -retroshare (0.5.1-0.4166~lucid) lucid; urgency=low - - * Improvements - - made flat view for shared files less CPU demanding - - added automated treatment of RS links from web browser - - * Bug fixes - - removed potential segfault when decrypting cache file - - -- Cyril Soler Mon, 11 Apr 2010 21:35:46 +0100 - -retroshare (0.5.1-0.4154~lucid) lucid; urgency=low - - * Improvements - - added flat view for shared files, with search, sorting and temporised update - - enabled file preview for partially downloaded files, for non windows users - - removed display of directories from search - - added auto-download option to channels - - added random bias to turtle search and tunnels at maximum depth, to prevent security issues - - added biased rerouting of tunnels requests to statistically optimize tunnel length - - made sign GPG button disabled by default - - optimized lookups of/into FileEntry structures (faster, better memory coalescence) - - added tunning for auto-check of shared directories, in config - - updated french/german translations - - saved the visible state of the avatar picture in private chat for the friend. - - removed own settings for news feed - - added tooltip for systray to display nickname and location - - made lock file warning more explicit - - * Bug fixes - - channel download is now called only once for each channel post - - fixed cleaning issue of certificates. Added a button in cert dialog for cleaning. - - removed automatic cleaning of certs. - - fixed bug with utf8 chatacters in %appdata% paths on windows - - fixed crash on shutdown when the cache loading is running - - fixed some stylesheets to use gradients instead of a background images, - - fixed thread leak in file checking due to not calling pthread_join() on finished thread - - showing uploads by default, instead of current transfer - - -- Cyril Soler Mon, 11 Apr 2010 21:35:46 +0100 - -retroshare (0.5.1-0.4097~lucid) lucid; urgency=low - - * Improvements - - attempt to make GPG errors more verbose at cert exchange time - - translate QuickStartWizard, GenCertDialog and StartDialog into german - - fixed tab order of the upload and download settings in QuickStartWizard - - Added a basic description of the chat style - - Added share incoming directory to the QuickStartWizard, while keeping - the Download directory shared by default - - * Bug Fixes - - implemented a backward compatible fix for advance searching with size - larger than 2Gb - - implemented a better management of tunnel requests - - - -- Cyril Soler Thu, 07 Mar 2010 21:35:46 +0100 - -retroshare (0.5.1-0.4087~lucid) lucid; urgency=low - - * Improvements - - The working (hashing) thread FileIndexMonitor is now stopped when RetroShare is closed. - - Removed tab focus from the toolbar and image buttons. - - Fixed german translation. - - * Bug Fixes: - - Fixed a toolbar icon to display with a correct size on macosx - - Added missing return... which was causing crash at start during directory creation. - - Supressed memory leak due to not deleting a RsItem - - Suppressed potential SIGSEGV as exit time - - -- Cyril Soler Thu, 07 Mar 2010 21:35:46 +0100 - -retroshare (0.5.1-0.4069~lucid) lucid; urgency=low - - * Improvements: - - Added a confirm to the delete history action. - - Added the RetroShare icon to the password input window. - - Added display of number of intermediate tunnels, and limited the number of displayed tunnel requests - - * Bug Fixes: - - Fixed potential SIGSEGV because of not checking returned pointer in DHT code. - - Fixed memory leak in GUI responsible for high leaks in large networks. - - Fixed memory leak in p3distrib - - -- Cyril Soler Thu, 28 Feb 2010 21:35:46 +0100 - -retroshare (0.5.1-0.4059~lucid) lucid; urgency=low - - * Release 0.5.1: - New features (DHT, Channels, Network View), Improved stability w.r.t. previous version 0.5.0g - - -- Cyril Soler Thu, 24 Feb 2010 21:35:46 +0100 diff -Nru retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/clean.sh retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/clean.sh --- retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/clean.sh 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/clean.sh 1970-01-01 00:00:00.000000000 +0000 @@ -1,13 +0,0 @@ -#!/bin/sh - -rm -f ./libssh-0.5.4.tar.gz.* -rm -f ./retroshare_0.?.?-1.*_source.build -rm -f ./retroshare_0.?.?-1.*_source.changes -rm -f ./retroshare_0.?.?-1.*.tar.gz -rm -f ./retroshare_0.?.?-1.*.diff.gz -rm -f ./retroshare_0.?.?-1.*.dsc -rm -f *.upload - -rm -f *~ -find . -name "*~" -exec rm {} \; - diff -Nru retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/control.artful retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/control.artful --- retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/control.artful 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/control.artful 1970-01-01 00:00:00.000000000 +0000 @@ -1,46 +0,0 @@ -Source: retroshare -Section: devel -Priority: standard -Maintainer: Cyril Soler -Build-Depends: debhelper (>= 7), libglib2.0-dev, libupnp-dev, libssl-dev, libxss-dev, libgnome-keyring-dev, libbz2-dev, libspeex-dev, libspeexdsp-dev, libxslt1-dev, cmake, libcurl4-openssl-dev, libopencv-dev, tcl8.6, libsqlcipher-dev, libmicrohttpd-dev, libavcodec-dev, qtmultimedia5-dev, qttools5-dev, libqt5x11extras5-dev, qt5-default -Standards-Version: 3.9.6 -Homepage: http://retroshare.sourceforge.net - -Package: retroshare-voip-plugin -Architecture: any -Conflicts: retroshare06-voip-plugin -Depends: ${shlibs:Depends}, ${misc:Depends}, retroshare, libspeex1, libspeexdsp1, libqt5multimedia5 -Description: RetroShare VOIP plugin - This package provides a plugin for RetroShare, a secured Friend-to-Friend communication - plateform. The plugin adds voice-over-IP functionality to the private chat window. Both - friends chatting together need the plugin installed to be able to talk together. - -Package: retroshare-feedreader-plugin -Architecture: any -Conflicts: retroshare06-feedreader-plugin -Depends: ${shlibs:Depends}, ${misc:Depends}, retroshare -Description: RetroShare FeedReader plugin - This package provides a plugin for RetroShare, a secured Friend-to-Friend communication - plateform. The plugin adds a RSS feed reader tab to retroshare. - -Package: retroshare-nogui -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, gnome-keyring -Conflicts: retroshare,retroshare06-nogui -Description: Secure communication with friends - This is the command-line client for RetroShare network. This client - can be contacted and talked-to using SSL. Clients exist for portable - devices running e.g. Android. - -Package: retroshare -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, gnome-keyring -Conflicts: retroshare-nogui,retroshare06 -Description: Secure communication with friends - RetroShare is a Open Source cross-platform, private and secure decentralised - commmunication platform. It lets you to securely chat and share files with your - friends and family, using a web-of-trust to authenticate peers and OpenSSL to - encrypt all communication. RetroShare provides filesharing, chat, messages, - forums and channels. - - diff -Nru retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/control.bionic retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/control.bionic --- retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/control.bionic 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/control.bionic 1970-01-01 00:00:00.000000000 +0000 @@ -1,46 +0,0 @@ -Source: retroshare -Section: devel -Priority: standard -Maintainer: Cyril Soler -Build-Depends: debhelper (>= 7), libglib2.0-dev, libupnp-dev, libssl-dev, libxss-dev, libgnome-keyring-dev, libbz2-dev, libspeex-dev, libspeexdsp-dev, libxslt1-dev, cmake, libcurl4-openssl-dev, libopencv-dev, tcl8.6, libsqlcipher-dev, libmicrohttpd-dev, libavcodec-dev, qtmultimedia5-dev, qttools5-dev, libqt5x11extras5-dev, qt5-default -Standards-Version: 3.9.6 -Homepage: http://retroshare.sourceforge.net - -Package: retroshare-voip-plugin -Architecture: any -Conflicts: retroshare06-voip-plugin -Depends: ${shlibs:Depends}, ${misc:Depends}, retroshare, libspeex1, libspeexdsp1, libqt5multimedia5 -Description: RetroShare VOIP plugin - This package provides a plugin for RetroShare, a secured Friend-to-Friend communication - plateform. The plugin adds voice-over-IP functionality to the private chat window. Both - friends chatting together need the plugin installed to be able to talk together. - -Package: retroshare-feedreader-plugin -Architecture: any -Conflicts: retroshare06-feedreader-plugin -Depends: ${shlibs:Depends}, ${misc:Depends}, retroshare -Description: RetroShare FeedReader plugin - This package provides a plugin for RetroShare, a secured Friend-to-Friend communication - plateform. The plugin adds a RSS feed reader tab to retroshare. - -Package: retroshare-nogui -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, gnome-keyring -Conflicts: retroshare,retroshare06-nogui -Description: Secure communication with friends - This is the command-line client for RetroShare network. This client - can be contacted and talked-to using SSL. Clients exist for portable - devices running e.g. Android. - -Package: retroshare -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, gnome-keyring -Conflicts: retroshare-nogui,retroshare06 -Description: Secure communication with friends - RetroShare is a Open Source cross-platform, private and secure decentralised - commmunication platform. It lets you to securely chat and share files with your - friends and family, using a web-of-trust to authenticate peers and OpenSSL to - encrypt all communication. RetroShare provides filesharing, chat, messages, - forums and channels. - - diff -Nru retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/control.jessie retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/control.jessie --- retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/control.jessie 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/control.jessie 1970-01-01 00:00:00.000000000 +0000 @@ -1,46 +0,0 @@ -Source: retroshare -Section: devel -Priority: standard -Maintainer: Cyril Soler -Build-Depends: debhelper (>= 7), libglib2.0-dev, libupnp-dev, libssl-dev, libxss-dev, libgnome-keyring-dev, libbz2-dev, libspeex-dev, libspeexdsp-dev, libxslt1-dev, cmake, libcurl4-openssl-dev, libopencv-dev, tcl8.6, libsqlcipher-dev, libmicrohttpd-dev, libavcodec-dev, qtmultimedia5-dev, qttools5-dev, libqt5x11extras5-dev, qt5-default -Standards-Version: 3.9.6 -Homepage: http://retroshare.sourceforge.net - -Package: retroshare-voip-plugin -Architecture: any -Conflicts: retroshare06-voip-plugin -Depends: ${shlibs:Depends}, ${misc:Depends}, retroshare, libspeex1, libspeexdsp1, libqt5multimedia5 -Description: RetroShare VOIP plugin - This package provides a plugin for RetroShare, a secured Friend-to-Friend communication - plateform. The plugin adds voice-over-IP functionality to the private chat window. Both - friends chatting together need the plugin installed to be able to talk together. - -Package: retroshare-feedreader-plugin -Architecture: any -Conflicts: retroshare06-feedreader-plugin -Depends: ${shlibs:Depends}, ${misc:Depends}, retroshare -Description: RetroShare FeedReader plugin - This package provides a plugin for RetroShare, a secured Friend-to-Friend communication - plateform. The plugin adds a RSS feed reader tab to retroshare. - -Package: retroshare-nogui -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, gnome-keyring -Conflicts: retroshare,retroshare06-nogui -Description: Secure communication with friends - This is the command-line client for RetroShare network. This client - can be contacted and talked-to using SSL. Clients exist for portable - devices running e.g. Android. - -Package: retroshare -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, gnome-keyring -Conflicts: retroshare-nogui, retroshare06 -Description: Secure communication with friends - RetroShare is a Open Source cross-platform, private and secure decentralised - commmunication platform. It lets you to securely chat and share files with your - friends and family, using a web-of-trust to authenticate peers and OpenSSL to - encrypt all communication. RetroShare provides filesharing, chat, messages, - forums and channels. - - diff -Nru retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/control.precise retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/control.precise --- retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/control.precise 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/control.precise 1970-01-01 00:00:00.000000000 +0000 @@ -1,46 +0,0 @@ -Source: retroshare -Section: devel -Priority: standard -Maintainer: Cyril Soler -Build-Depends: debhelper (>= 7), libglib2.0-dev, libupnp-dev, qt4-dev-tools, libqt4-dev, libssl-dev, libxss-dev, libgnome-keyring-dev, libbz2-dev, libqt4-opengl-dev, libqtmultimediakit1, qtmobility-dev, libspeex-dev, libspeexdsp-dev, libxslt1-dev, cmake, libcurl4-openssl-dev, libcv-dev, libopencv-core-dev, libopencv-contrib-dev, libhighgui-dev, tcl8.5, libsqlcipher-dev, libmicrohttpd-dev, libavcodec-dev -Standards-Version: 3.9.3 -Homepage: http://retroshare.sourceforge.net - -Package: retroshare-voip-plugin -Architecture: any -Conflicts: retroshare06-voip-plugin -Depends: ${shlibs:Depends}, ${misc:Depends}, retroshare, libspeex1, libspeexdsp1, libqtmultimediakit1 -Description: RetroShare VOIP plugin - This package provides a plugin for RetroShare, a secured Friend-to-Friend communication - plateform. The plugin adds voice-over-IP functionality to the private chat window. Both - friends chatting together need the plugin installed to be able to talk together. - -Package: retroshare-feedreader-plugin -Architecture: any -Conflicts: retroshare06-feedreader-plugin -Depends: ${shlibs:Depends}, ${misc:Depends}, retroshare -Description: RetroShare FeedReader plugin - This package provides a plugin for RetroShare, a secured Friend-to-Friend communication - plateform. The plugin adds a RSS feed reader tab to retroshare. - -Package: retroshare-nogui -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, gnome-keyring -Conflicts: retroshare,retroshare06-nogui -Description: Secure communication with friends - This is the command-line client for RetroShare network. This client - can be contacted and talked-to using SSL. Clients exist for portable - devices running e.g. Android. - -Package: retroshare -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, gnome-keyring -Conflicts: retroshare-nogui,retroshare06 -Description: Secure communication with friends - RetroShare is a Open Source cross-platform, private and secure decentralised - commmunication platform. It lets you to securely chat and share files with your - friends and family, using a web-of-trust to authenticate peers and OpenSSL to - encrypt all communication. RetroShare provides filesharing, chat, messages, - forums and channels. - - diff -Nru retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/control.squeeze_bubba3 retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/control.squeeze_bubba3 --- retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/control.squeeze_bubba3 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/control.squeeze_bubba3 1970-01-01 00:00:00.000000000 +0000 @@ -1,46 +0,0 @@ -Source: retroshare -Section: devel -Priority: standard -Maintainer: Cyril Soler -Build-Depends: debhelper (>= 7), libglib2.0-dev, libupnp-dev, qt4-dev-tools, libqt4-dev, libssl-dev, libxss-dev, libgnome-keyring-dev, libbz2-dev, libqt4-opengl-dev, libqt4-multimedia, libspeex-dev, libspeexdsp-dev, libxslt1-dev, cmake, libcurl4-openssl-dev, libcv-dev, libcvaux-dev, libhighgui-dev, tcl8.5, libmicrohttpd-dev, libsqlite3-dev, libavcodec-dev -Standards-Version: 3.9.3 -Homepage: http://retroshare.sourceforge.net - -Package: retroshare-voip-plugin -Architecture: any -Conflicts: retroshare06-voip-plugin -Depends: ${shlibs:Depends}, ${misc:Depends}, retroshare, libspeex1, libspeexdsp1, libqtmultimediakit1 -Description: RetroShare VOIP plugin - This package provides a plugin for RetroShare, a secured Friend-to-Friend communication - plateform. The plugin adds voice-over-IP functionality to the private chat window. Both - friends chatting together need the plugin installed to be able to talk together. - -Package: retroshare-feedreader-plugin -Architecture: any -Conflicts: retroshare06-feedreader-plugin -Depends: ${shlibs:Depends}, ${misc:Depends}, retroshare -Description: RetroShare FeedReader plugin - This package provides a plugin for RetroShare, a secured Friend-to-Friend communication - plateform. The plugin adds a RSS feed reader tab to retroshare. - -Package: retroshare-nogui -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, gnome-keyring -Conflicts: retroshare,retroshare06-nogui -Description: Secure communication with friends - This is the command-line client for RetroShare network. This client - can be contacted and talked-to using SSL. Clients exist for portable - devices running e.g. Android. - -Package: retroshare -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, gnome-keyring -Conflicts: retroshare-nogui,retroshare06 -Description: Secure communication with friends - RetroShare is a Open Source cross-platform, private and secure decentralised - commmunication platform. It lets you to securely chat and share files with your - friends and family, using a web-of-trust to authenticate peers and OpenSSL to - encrypt all communication. RetroShare provides filesharing, chat, messages, - forums and channels. - - diff -Nru retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/control.stretch retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/control.stretch --- retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/control.stretch 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/control.stretch 1970-01-01 00:00:00.000000000 +0000 @@ -1,46 +0,0 @@ -Source: retroshare -Section: devel -Priority: standard -Maintainer: Cyril Soler -Build-Depends: debhelper (>= 7), libglib2.0-dev, libupnp-dev, libssl-dev, libxss-dev, libgnome-keyring-dev, libbz2-dev, libspeex-dev, libspeexdsp-dev, libxslt1-dev, cmake, libcurl4-openssl-dev, libopencv-dev, tcl8.6, libsqlcipher-dev (>= 3.4.1), libmicrohttpd-dev, libavcodec-dev, qtmultimedia5-dev, qttools5-dev, libqt5x11extras5-dev, qt5-default -Standards-Version: 3.9.6 -Homepage: http://retroshare.sourceforge.net - -Package: retroshare-voip-plugin -Architecture: any -Conflicts: retroshare06-voip-plugin -Depends: ${shlibs:Depends}, ${misc:Depends}, retroshare, libspeex1, libspeexdsp1, libqt5multimedia5 -Description: RetroShare VOIP plugin - This package provides a plugin for RetroShare, a secured Friend-to-Friend communication - plateform. The plugin adds voice-over-IP functionality to the private chat window. Both - friends chatting together need the plugin installed to be able to talk together. - -Package: retroshare-feedreader-plugin -Architecture: any -Conflicts: retroshare06-feedreader-plugin -Depends: ${shlibs:Depends}, ${misc:Depends}, retroshare -Description: RetroShare FeedReader plugin - This package provides a plugin for RetroShare, a secured Friend-to-Friend communication - plateform. The plugin adds a RSS feed reader tab to retroshare. - -Package: retroshare-nogui -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, gnome-keyring -Conflicts: retroshare,retroshare06-nogui -Description: Secure communication with friends - This is the command-line client for RetroShare network. This client - can be contacted and talked-to using SSL. Clients exist for portable - devices running e.g. Android. - -Package: retroshare -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, gnome-keyring -Conflicts: retroshare-nogui,retroshare06 -Description: Secure communication with friends - RetroShare is a Open Source cross-platform, private and secure decentralised - commmunication platform. It lets you to securely chat and share files with your - friends and family, using a web-of-trust to authenticate peers and OpenSSL to - encrypt all communication. RetroShare provides filesharing, chat, messages, - forums and channels. - - diff -Nru retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/control.trusty_retrotor retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/control.trusty_retrotor --- retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/control.trusty_retrotor 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/control.trusty_retrotor 1970-01-01 00:00:00.000000000 +0000 @@ -1,20 +0,0 @@ -Source: retroshare -Section: devel -Priority: standard -Maintainer: Cyril Soler -Build-Depends: debhelper (>= 7), libglib2.0-dev, libupnp-dev, libssl-dev, libxss-dev, libgnome-keyring-dev, libbz2-dev, libspeex-dev, libspeexdsp-dev, libxslt1-dev, cmake, libcurl4-openssl-dev, libopencv-dev, tcl8.6, libsqlcipher-dev, libmicrohttpd-dev, libavcodec-dev, qtmultimedia5-dev, qttools5-dev, libqt5x11extras5-dev, qt5-default -Standards-Version: 3.9.6 -Homepage: http://retroshare.net - -Package: retrotor -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, gnome-keyring, tor (>= 0.2.6) -Conflicts: retroshare-nogui,retroshare06,retroshare -Description: Secure communication with friends - RetroShare is a Open Source cross-platform, private and secure decentralised - commmunication platform. It lets you to securely chat and share files with your - friends and family, using a web-of-trust to authenticate peers and OpenSSL to - encrypt all communication. RetroShare provides filesharing, chat, messages, - forums and channels. - - diff -Nru retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/control.ubuntu_lucid retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/control.ubuntu_lucid --- retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/control.ubuntu_lucid 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/control.ubuntu_lucid 1970-01-01 00:00:00.000000000 +0000 @@ -1,54 +0,0 @@ -Source: retroshare -Section: devel -Priority: standard -Maintainer: Cyril Soler -Build-Depends: debhelper (>= 7), libglib2.0-dev, libupnp-dev, qt4-dev-tools, libqt4-dev, libssl-dev, libxss-dev, libgnome-keyring-dev, libbz2-dev, libqt4-opengl-dev, libspeex-dev, libspeexdsp-dev, libxslt1-dev, libprotobuf-dev, protobuf-compiler, cmake, libcurl4-openssl-dev, libavcodec-dev -Standards-Version: 3.9.1 -Homepage: http://retroshare.sourceforge.net - -Package: retroshare-voip-plugin -Architecture: any -Conflicts: retroshare06-voip-plugin -Depends: ${shlibs:Depends}, ${misc:Depends}, retroshare, libspeex1, libspeexdsp1, libqtmultimediakit1 -Description: RetroShare VOIP plugin - This package provides a plugin for RetroShare, a secured Friend-to-Friend communication - plateform. The plugin adds voice-over-IP functionality to the private chat window. Both - friends chatting together need the plugin installed to be able to talk together. - -Package: retroshare-linkscloud-plugin -Architecture: any -Conflicts: retroshare06-feedreader-plugin -Depends: ${shlibs:Depends}, ${misc:Depends}, retroshare -Description: RetroShare LinksCloud plugin - This package provides a plugin for RetroShare, a secured Friend-to-Friend communication - plateform. The plugin adds a pool of html links that friends can share, and includes a - voting system to promote links. - -Package: retroshare-feedreader-plugin -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, retroshare -Description: RetroShare LinksCloud plugin - This package provides a plugin for RetroShare, a secured Friend-to-Friend communication - plateform. The plugin adds a RSS feed reader tab to retroshare. - -Package: retroshare-nogui -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, gnome-keyring -Conflicts: retroshare,retroshare06-nogui -Description: Secure communication with friends - This is the command-line client for RetroShare network. This client - can be contacted and talked-to using SSL. Clients exist for portable - devices running e.g. Android. - -Package: retroshare -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, gnome-keyring -Conflicts: retroshare-nogui,retroshare06 -Description: Secure communication with friends - RetroShare is a Open Source cross-platform, private and secure decentralised - commmunication platform. It lets you to securely chat and share files with your - friends and family, using a web-of-trust to authenticate peers and OpenSSL to - encrypt all communication. RetroShare provides filesharing, chat, messages, - forums and channels. - - diff -Nru retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/control.xenial retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/control.xenial --- retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/control.xenial 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/control.xenial 1970-01-01 00:00:00.000000000 +0000 @@ -1,46 +0,0 @@ -Source: retroshare -Section: devel -Priority: standard -Maintainer: Cyril Soler -Build-Depends: debhelper (>= 7), libglib2.0-dev, libupnp-dev, libssl-dev, libxss-dev, libgnome-keyring-dev, libbz2-dev, libspeex-dev, libspeexdsp-dev, libxslt1-dev, cmake, libcurl4-openssl-dev, libopencv-dev, tcl8.6, libsqlcipher-dev, libmicrohttpd-dev, libavcodec-dev, qtmultimedia5-dev, qttools5-dev, libqt5x11extras5-dev, qt5-default -Standards-Version: 3.9.6 -Homepage: http://retroshare.sourceforge.net - -Package: retroshare-voip-plugin -Architecture: any -Conflicts: retroshare06-voip-plugin -Depends: ${shlibs:Depends}, ${misc:Depends}, retroshare, libspeex1, libspeexdsp1, libqt5multimedia5 -Description: RetroShare VOIP plugin - This package provides a plugin for RetroShare, a secured Friend-to-Friend communication - plateform. The plugin adds voice-over-IP functionality to the private chat window. Both - friends chatting together need the plugin installed to be able to talk together. - -Package: retroshare-feedreader-plugin -Architecture: any -Conflicts: retroshare06-feedreader-plugin -Depends: ${shlibs:Depends}, ${misc:Depends}, retroshare -Description: RetroShare FeedReader plugin - This package provides a plugin for RetroShare, a secured Friend-to-Friend communication - plateform. The plugin adds a RSS feed reader tab to retroshare. - -Package: retroshare-nogui -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, gnome-keyring -Conflicts: retroshare,retroshare06-nogui -Description: Secure communication with friends - This is the command-line client for RetroShare network. This client - can be contacted and talked-to using SSL. Clients exist for portable - devices running e.g. Android. - -Package: retroshare -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, gnome-keyring -Conflicts: retroshare-nogui,retroshare06 -Description: Secure communication with friends - RetroShare is a Open Source cross-platform, private and secure decentralised - commmunication platform. It lets you to securely chat and share files with your - friends and family, using a web-of-trust to authenticate peers and OpenSSL to - encrypt all communication. RetroShare provides filesharing, chat, messages, - forums and channels. - - diff -Nru retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/control.xenial_retrotor retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/control.xenial_retrotor --- retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/control.xenial_retrotor 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/control.xenial_retrotor 1970-01-01 00:00:00.000000000 +0000 @@ -1,20 +0,0 @@ -Source: retroshare -Section: devel -Priority: standard -Maintainer: Cyril Soler -Build-Depends: debhelper (>= 7), libglib2.0-dev, libupnp-dev, libssl-dev, libxss-dev, libgnome-keyring-dev, libbz2-dev, libspeex-dev, libspeexdsp-dev, libxslt1-dev, cmake, libcurl4-openssl-dev, libopencv-dev, tcl8.6, libsqlcipher-dev, libmicrohttpd-dev, libavcodec-dev, qtmultimedia5-dev, qttools5-dev, libqt5x11extras5-dev, qt5-default -Standards-Version: 3.9.6 -Homepage: http://retroshare.sourceforge.net - -Package: retrotor -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, gnome-keyring, tor (>= 0.2.6) -Conflicts: retroshare-nogui,retroshare06,retroshare -Description: Secure communication with friends - RetroShare is a Open Source cross-platform, private and secure decentralised - commmunication platform. It lets you to securely chat and share files with your - friends and family, using a web-of-trust to authenticate peers and OpenSSL to - encrypt all communication. RetroShare provides filesharing, chat, messages, - forums and channels. - - diff -Nru retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/control.yakkety retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/control.yakkety --- retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/control.yakkety 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/control.yakkety 1970-01-01 00:00:00.000000000 +0000 @@ -1,46 +0,0 @@ -Source: retroshare -Section: devel -Priority: standard -Maintainer: Cyril Soler -Build-Depends: debhelper (>= 7), libglib2.0-dev, libupnp-dev, libssl-dev, libxss-dev, libgnome-keyring-dev, libbz2-dev, libspeex-dev, libspeexdsp-dev, libxslt1-dev, cmake, libcurl4-openssl-dev, libopencv-dev, tcl8.6, libsqlcipher-dev, libmicrohttpd-dev, libavcodec-dev, qtmultimedia5-dev, qttools5-dev, libqt5x11extras5-dev, qt5-default -Standards-Version: 3.9.6 -Homepage: http://retroshare.sourceforge.net - -Package: retroshare-voip-plugin -Architecture: any -Conflicts: retroshare06-voip-plugin -Depends: ${shlibs:Depends}, ${misc:Depends}, retroshare, libspeex1, libspeexdsp1, libqt5multimedia5 -Description: RetroShare VOIP plugin - This package provides a plugin for RetroShare, a secured Friend-to-Friend communication - plateform. The plugin adds voice-over-IP functionality to the private chat window. Both - friends chatting together need the plugin installed to be able to talk together. - -Package: retroshare-feedreader-plugin -Architecture: any -Conflicts: retroshare06-feedreader-plugin -Depends: ${shlibs:Depends}, ${misc:Depends}, retroshare -Description: RetroShare FeedReader plugin - This package provides a plugin for RetroShare, a secured Friend-to-Friend communication - plateform. The plugin adds a RSS feed reader tab to retroshare. - -Package: retroshare-nogui -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, gnome-keyring -Conflicts: retroshare,retroshare06-nogui -Description: Secure communication with friends - This is the command-line client for RetroShare network. This client - can be contacted and talked-to using SSL. Clients exist for portable - devices running e.g. Android. - -Package: retroshare -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, gnome-keyring -Conflicts: retroshare-nogui,retroshare06 -Description: Secure communication with friends - RetroShare is a Open Source cross-platform, private and secure decentralised - commmunication platform. It lets you to securely chat and share files with your - friends and family, using a web-of-trust to authenticate peers and OpenSSL to - encrypt all communication. RetroShare provides filesharing, chat, messages, - forums and channels. - - diff -Nru retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/control.zesty retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/control.zesty --- retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/control.zesty 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/control.zesty 1970-01-01 00:00:00.000000000 +0000 @@ -1,46 +0,0 @@ -Source: retroshare -Section: devel -Priority: standard -Maintainer: Cyril Soler -Build-Depends: debhelper (>= 7), libglib2.0-dev, libupnp-dev, libssl-dev, libxss-dev, libgnome-keyring-dev, libbz2-dev, libspeex-dev, libspeexdsp-dev, libxslt1-dev, cmake, libcurl4-openssl-dev, libopencv-dev, tcl8.6, libsqlcipher-dev, libmicrohttpd-dev, libavcodec-dev, qtmultimedia5-dev, qttools5-dev, libqt5x11extras5-dev, qt5-default -Standards-Version: 3.9.6 -Homepage: http://retroshare.sourceforge.net - -Package: retroshare-voip-plugin -Architecture: any -Conflicts: retroshare06-voip-plugin -Depends: ${shlibs:Depends}, ${misc:Depends}, retroshare, libspeex1, libspeexdsp1, libqt5multimedia5 -Description: RetroShare VOIP plugin - This package provides a plugin for RetroShare, a secured Friend-to-Friend communication - plateform. The plugin adds voice-over-IP functionality to the private chat window. Both - friends chatting together need the plugin installed to be able to talk together. - -Package: retroshare-feedreader-plugin -Architecture: any -Conflicts: retroshare06-feedreader-plugin -Depends: ${shlibs:Depends}, ${misc:Depends}, retroshare -Description: RetroShare FeedReader plugin - This package provides a plugin for RetroShare, a secured Friend-to-Friend communication - plateform. The plugin adds a RSS feed reader tab to retroshare. - -Package: retroshare-nogui -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, gnome-keyring -Conflicts: retroshare,retroshare06-nogui -Description: Secure communication with friends - This is the command-line client for RetroShare network. This client - can be contacted and talked-to using SSL. Clients exist for portable - devices running e.g. Android. - -Package: retroshare -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, gnome-keyring -Conflicts: retroshare-nogui,retroshare06 -Description: Secure communication with friends - RetroShare is a Open Source cross-platform, private and secure decentralised - commmunication platform. It lets you to securely chat and share files with your - friends and family, using a web-of-trust to authenticate peers and OpenSSL to - encrypt all communication. RetroShare provides filesharing, chat, messages, - forums and channels. - - diff -Nru retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/convert_dos_files_to_unix.sh retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/convert_dos_files_to_unix.sh --- retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/convert_dos_files_to_unix.sh 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/convert_dos_files_to_unix.sh 1970-01-01 00:00:00.000000000 +0000 @@ -1,32 +0,0 @@ -#!/bin/sh - -# This script search for files with [dos] line endings down the current directory and converts them to unix format - -if test "$*" = ""; then - echo No files supplied. Searching for files down the current directory... - files="" - files=$files" "`find . -name "*.cpp" | xargs file /tmp | grep CRLF | cut -d: -f1` - files=$files" "`find . -name "*.h" | xargs file /tmp | grep CRLF | cut -d: -f1` - files=$files" "`find . -name "*.ui" | xargs file /tmp | grep CRLF | cut -d: -f1` - files=$files" "`find . -name "*.pro" | xargs file /tmp | grep CRLF | cut -d: -f1` -else - files="$*" -fi - -echo About to convert the following files to unix format: -for i in $files; do - echo " "$i -done -echo Please press [ENTER] when ready - -read tmp - -for i in $files; do - echo " "converting $i... - cat $i | sed -e s/ //g > $i.tmp0000 - mv -f $i.tmp0000 $i -done - -echo Done. - - diff -Nru retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/debian/compat retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/debian/compat --- retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/debian/compat 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/debian/compat 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -7 diff -Nru retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/debian/control retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/debian/control --- retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/debian/control 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/debian/control 1970-01-01 00:00:00.000000000 +0000 @@ -1,46 +0,0 @@ -Source: retroshare -Section: devel -Priority: standard -Maintainer: Cyril Soler -Build-Depends: debhelper (>= 7), libglib2.0-dev, libupnp-dev, qt4-dev-tools, libqt4-dev, libssl-dev, libxss-dev, libgnome-keyring-dev, libbz2-dev, libqt4-opengl-dev, libqtmultimediakit1, qtmobility-dev, libspeex-dev, libspeexdsp-dev, libxslt1-dev, cmake, libcurl4-openssl-dev, libopencv-dev, tcl8.5, libsqlcipher-dev, libmicrohttpd-dev, libavcodec-dev -Standards-Version: 3.9.3 -Homepage: http://retroshare.sourceforge.net - -Package: retroshare-voip-plugin -Architecture: any -Conflicts: retroshare06-voip-plugin -Depends: ${shlibs:Depends}, ${misc:Depends}, retroshare, libspeex1, libspeexdsp1, libqtmultimediakit1 -Description: RetroShare VOIP plugin - This package provides a plugin for RetroShare, a secured Friend-to-Friend communication - plateform. The plugin adds voice-over-IP functionality to the private chat window. Both - friends chatting together need the plugin installed to be able to talk together. - -Package: retroshare-feedreader-plugin -Architecture: any -Conflicts: retroshare06-feedreader-plugin -Depends: ${shlibs:Depends}, ${misc:Depends}, retroshare -Description: RetroShare FeedReader plugin - This package provides a plugin for RetroShare, a secured Friend-to-Friend communication - plateform. The plugin adds a RSS feed reader tab to retroshare. - -Package: retroshare-nogui -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, gnome-keyring -Conflicts: retroshare,retroshare06-nogui -Description: Secure communication with friends - This is the command-line client for RetroShare network. This client - can be contacted and talked-to using SSL. Clients exist for portable - devices running e.g. Android. - -Package: retroshare -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, gnome-keyring -Conflicts: retroshare-nogui,retroshare06 -Description: Secure communication with friends - RetroShare is a Open Source cross-platform, private and secure decentralised - commmunication platform. It lets you to securely chat and share files with your - friends and family, using a web-of-trust to authenticate peers and OpenSSL to - encrypt all communication. RetroShare provides filesharing, chat, messages, - forums and channels. - - diff -Nru retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/debian/copyright retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/debian/copyright --- retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/debian/copyright 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/debian/copyright 1970-01-01 00:00:00.000000000 +0000 @@ -1,44 +0,0 @@ -This package was debianized by: - - Cyril Soler on Sat, 06 Feb 2010 07:15:46 +0100 - -It was downloaded from: - - - -Upstream Author(s): - - - - -Copyright: - - - - -License: - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This package is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . - -On Debian systems, the complete text of the GNU General -Public License version 3 can be found in `/usr/share/common-licenses/GPL-3'. - -The Debian packaging is: - - Copyright (C) 2010 Cyril Soler - -and is licensed under the GPL version 3, see above. - -# Please also look if there are files or directories which have a -# different copyright/license attached and list them here. diff -Nru retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/debian/README.Debian retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/debian/README.Debian --- retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/debian/README.Debian 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/debian/README.Debian 1970-01-01 00:00:00.000000000 +0000 @@ -1,6 +0,0 @@ -retroshare for Debian ---------------------- - - - - -- Cyril Soler Sat, 06 Feb 2010 07:15:46 +0100 diff -Nru retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/debian/retroshare-feedreader-plugin.install retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/debian/retroshare-feedreader-plugin.install --- retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/debian/retroshare-feedreader-plugin.install 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/debian/retroshare-feedreader-plugin.install 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -debian/tmp/usr/lib/retroshare/extensions6/libFeedReader.so* diff -Nru retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/debian/retroshare.install retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/debian/retroshare.install --- retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/debian/retroshare.install 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/debian/retroshare.install 1970-01-01 00:00:00.000000000 +0000 @@ -1,6 +0,0 @@ -debian/tmp/usr/bin/retroshare -debian/tmp/usr/bin/retroshare-nogui -debian/tmp/usr/share/applications/retroshare.desktop -debian/tmp/usr/share/icons/hicolor/* -debian/tmp/usr/share/pixmaps/retroshare.xpm -debian/tmp/usr/share/retroshare/* diff -Nru retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/debian/retroshare-nogui.install retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/debian/retroshare-nogui.install --- retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/debian/retroshare-nogui.install 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/debian/retroshare-nogui.install 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -debian/tmp/usr/bin/retroshare-nogui -debian/tmp/usr/share/retroshare/bdboot.txt -debian/tmp/usr/share/retroshare/webui/* diff -Nru retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/debian/retroshare-voip-plugin.install retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/debian/retroshare-voip-plugin.install --- retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/debian/retroshare-voip-plugin.install 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/debian/retroshare-voip-plugin.install 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -debian/tmp/usr/lib/retroshare/extensions6/libVOIP.so* diff -Nru retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/debian/retrotor.install retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/debian/retrotor.install --- retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/debian/retrotor.install 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/debian/retrotor.install 1970-01-01 00:00:00.000000000 +0000 @@ -1,5 +0,0 @@ -debian/tmp/usr/bin/retroshare -debian/tmp/usr/share/applications/retroshare.desktop -debian/tmp/usr/share/icons/hicolor/* -debian/tmp/usr/share/pixmaps/retroshare.xpm -debian/tmp/usr/share/retroshare/* diff -Nru retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/debian/rules retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/debian/rules --- retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/debian/rules 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/debian/rules 1970-01-01 00:00:00.000000000 +0000 @@ -1,61 +0,0 @@ -#!/usr/bin/make -f - -configure: configure-stamp -configure-stamp: - dh_testdir - cd src && qmake "CONFIG-=debug" "CONFIG+=release" "CONFIG+=rs_autologin" "CONFIG+=retroshare_plugins" PREFIX=/usr LIB_DIR=/usr/lib RetroShare.pro - touch $@ - - -build: build-stamp -build-stamp: configure-stamp - dh_testdir - # Add here commands to compile the package. - # cd libssh-0.6.4 && mkdir -p build && cd build && cmake -DWITH_STATIC_LIB=ON .. && make - # cd sqlcipher && ./configure --disable-shared --enable-static --enable-tempstore=yes CFLAGS="-DSQLITE_HAS_CODEC" LDFLAGS="-lcrypto" && make - # mkdir lib - # cp -r libssh-0.6.4 lib/ - #cp -r sqlcipher lib/ - #cd src/rsctrl/src && make - cd src && $(MAKE) - touch $@ - -clean: - dh_testdir - dh_testroot - rm -f configure-stamp build-stamp - # Add here commands to clean up after the build process. - [ ! -f src/Makefile ] || (cd src && $(MAKE) distclean) - dh_clean - -install: build - dh_testdir - dh_testroot - dh_clean -k - #dh_installdirs - cd src && $(MAKE) INSTALL_ROOT=$(CURDIR)/debian/tmp install - -# Build architecture-independent files here. -binary-indep: build install -# We have nothing to do by default. - -# Build architecture-dependent files here. -binary-arch: build install - dh_testdir - dh_testroot - dh_install --list-missing - #dh_installdocs - #dh_installexamples - #dh_installman - dh_link - dh_strip - dh_compress - dh_fixperms - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install configure diff -Nru retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/debian.gxs/compat retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/debian.gxs/compat --- retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/debian.gxs/compat 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/debian.gxs/compat 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -7 diff -Nru retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/debian.gxs/control retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/debian.gxs/control --- retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/debian.gxs/control 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/debian.gxs/control 1970-01-01 00:00:00.000000000 +0000 @@ -1,52 +0,0 @@ -Source: retroshare -Section: devel -Priority: standard -Maintainer: Cyril Soler -Build-Depends: debhelper (>= 7), tcl8.5, libsqlite3-dev, libglib2.0-dev, libupnp-dev, qt4-dev-tools, libqt4-dev, libssl-dev, libxss-dev, libgnome-keyring-dev, libbz2-dev, libqt4-opengl-dev, libqtmultimediakit1, qtmobility-dev, libspeex-dev, libspeexdsp-dev, libxslt1-dev, libprotobuf-dev, protobuf-compiler, cmake, libcurl4-openssl-dev -Standards-Version: 3.9.1 -Homepage: http://retroshare.sourceforge.net - -Package: retroshare-voip-plugin -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, retroshare, libspeex1, libspeexdsp1, libqtmultimediakit1 -Description: RetroShare VOIP plugin - This package provides a plugin for RetroShare, a secured Friend-to-Friend communication - plateform. The plugin adds voice-over-IP functionality to the private chat window. Both - friends chatting together need the plugin installed to be able to talk together. - -Package: retroshare-linkscloud-plugin -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, retroshare -Description: RetroShare LinksCloud plugin - This package provides a plugin for RetroShare, a secured Friend-to-Friend communication - plateform. The plugin adds a pool of html links that friends can share, and includes a - voting system to promote links. - -Package: retroshare-feedreader-plugin -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, retroshare -Description: RetroShare LinksCloud plugin - This package provides a plugin for RetroShare, a secured Friend-to-Friend communication - plateform. The plugin adds a RSS feed reader tab to retroshare. - -Package: retroshare-nogui -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, gnome-keyring -Conflicts: retroshare -Description: Secure communication with friends - This is the command-line client for RetroShare network. This client - can be contacted and talked-to using SSL. Clients exist for portable - devices running e.g. Android. - -Package: retroshare -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, gnome-keyring -Conflicts: retroshare-nogui -Description: Secure communication with friends - RetroShare is a Open Source cross-platform, private and secure decentralised - commmunication platform. It lets you to securely chat and share files with your - friends and family, using a web-of-trust to authenticate peers and OpenSSL to - encrypt all communication. RetroShare provides filesharing, chat, messages, - forums and channels. - - diff -Nru retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/debian.gxs/copyright retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/debian.gxs/copyright --- retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/debian.gxs/copyright 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/debian.gxs/copyright 1970-01-01 00:00:00.000000000 +0000 @@ -1,44 +0,0 @@ -This package was debianized by: - - Cyril Soler on Sat, 06 Feb 2010 07:15:46 +0100 - -It was downloaded from: - - - -Upstream Author(s): - - - - -Copyright: - - - - -License: - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This package is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . - -On Debian systems, the complete text of the GNU General -Public License version 3 can be found in `/usr/share/common-licenses/GPL-3'. - -The Debian packaging is: - - Copyright (C) 2010 Cyril Soler - -and is licensed under the GPL version 3, see above. - -# Please also look if there are files or directories which have a -# different copyright/license attached and list them here. diff -Nru retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/debian.gxs/dirs retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/debian.gxs/dirs --- retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/debian.gxs/dirs 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/debian.gxs/dirs 1970-01-01 00:00:00.000000000 +0000 @@ -1,8 +0,0 @@ -usr/bin -usr/sbin -usr/share/pixmaps -usr/share/applications/ -usr/share/RetroShare/ -usr/share/icons/hicolor/24x24/apps/ -usr/share/icons/hicolor/48x48/apps/ -usr/share/icons/hicolor/64x64/apps/ diff -Nru retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/debian.gxs/README.Debian retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/debian.gxs/README.Debian --- retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/debian.gxs/README.Debian 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/debian.gxs/README.Debian 1970-01-01 00:00:00.000000000 +0000 @@ -1,6 +0,0 @@ -retroshare for Debian ---------------------- - - - - -- Cyril Soler Sat, 06 Feb 2010 07:15:46 +0100 diff -Nru retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/debian.gxs/retroshare-feedreader-plugin.install retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/debian.gxs/retroshare-feedreader-plugin.install --- retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/debian.gxs/retroshare-feedreader-plugin.install 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/debian.gxs/retroshare-feedreader-plugin.install 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -usr/lib/retroshare/extensions/libFeedReader.so - diff -Nru retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/debian.gxs/retroshare.install retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/debian.gxs/retroshare.install --- retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/debian.gxs/retroshare.install 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/debian.gxs/retroshare.install 1970-01-01 00:00:00.000000000 +0000 @@ -1,10 +0,0 @@ -usr/share/applications/retroshare.desktop -usr/share/pixmaps/retroshare.xpm -usr/share/RetroShare/bdboot.txt -usr/share/icons/hicolor/48x48/apps/retroshare.png -usr/share/icons/hicolor/24x24/apps/retroshare.png -usr/share/icons/hicolor/64x64/apps/retroshare.png -usr/bin -usr/bin/RetroShare -usr/bin/RetroShare-nogui - diff -Nru retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/debian.gxs/retroshare-linkscloud-plugin.install retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/debian.gxs/retroshare-linkscloud-plugin.install --- retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/debian.gxs/retroshare-linkscloud-plugin.install 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/debian.gxs/retroshare-linkscloud-plugin.install 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -usr/lib/retroshare/extensions/libLinksCloud.so - diff -Nru retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/debian.gxs/retroshare-nogui.install retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/debian.gxs/retroshare-nogui.install --- retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/debian.gxs/retroshare-nogui.install 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/debian.gxs/retroshare-nogui.install 1970-01-01 00:00:00.000000000 +0000 @@ -1,6 +0,0 @@ -usr/bin -usr/bin/RetroShare-nogui -usr/share -usr/share/RetroShare -usr/share/RetroShare/bdboot.txt - diff -Nru retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/debian.gxs/retroshare-voip-plugin.install retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/debian.gxs/retroshare-voip-plugin.install --- retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/debian.gxs/retroshare-voip-plugin.install 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/debian.gxs/retroshare-voip-plugin.install 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -usr/lib/retroshare/extensions/libVOIP.so - diff -Nru retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/debian.gxs/rules retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/debian.gxs/rules --- retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/debian.gxs/rules 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/debian.gxs/rules 1970-01-01 00:00:00.000000000 +0000 @@ -1,75 +0,0 @@ -#!/usr/bin/make -f - -builddir: - mkdir -p builddir - -builddir/Makefile: builddir - touch $@ - -build: build-stamp - -build-stamp: builddir/Makefile - dh_testdir - # Add here commands to compile the package. - cd sqlcipher && ./configure --disable-shared --enable-static --enable-tempstore=yes CFLAGS="-DSQLITE_HAS_CODEC" LDFLAGS="-lcrypto" && make - cd libssh-0.5.4 && mkdir build && cd build && cmake -DWITH_STATIC_LIB=ON .. && make - mkdir lib - cp -r libssh-0.5.4 lib - cp -r sqlcipher lib - #cd src/rsctrl/src && make - cd src && qmake-qt4 CONFIG="release gxs" RetroShare.pro && make - touch $@ - -clean: - dh_testdir - dh_testroot - rm -f build-stamp - # Add here commands to clean up after the build process. - rm -rf builddir - dh_clean - -install: build - dh_testdir - dh_testroot - dh_clean -k - dh_installdirs - install -D -m 644 src/data/retroshare.desktop $(CURDIR)/debian/retroshare/usr/share/applications/retroshare.desktop - install -D -m 644 src/data/24x24/retroshare.png $(CURDIR)/debian/retroshare/usr/share/icons/hicolor/24x24/apps/retroshare.png - install -D -m 644 src/data/48x48/retroshare.png $(CURDIR)/debian/retroshare/usr/share/icons/hicolor/48x48/apps/retroshare.png - install -D -m 644 src/data/64x64/retroshare.png $(CURDIR)/debian/retroshare/usr/share/icons/hicolor/64x64/apps/retroshare.png - install -D -m 644 src/data/retroshare.xpm $(CURDIR)/debian/retroshare/usr/share/pixmaps/retroshare.xpm - install -D -m 644 src/plugins/VOIP/libVOIP.so.1.0.0 $(CURDIR)/debian/retroshare-voip-plugin/usr/lib/retroshare/extensions/libVOIP.so - install -D -m 644 src/plugins/LinksCloud/libLinksCloud.so.1.0.0 $(CURDIR)/debian/retroshare-linkscloud-plugin/usr/lib/retroshare/extensions/libLinksCloud.so - install -D -m 644 src/plugins/FeedReader/libFeedReader.so.1.0.0 $(CURDIR)/debian/retroshare-feedreader-plugin/usr/lib/retroshare/extensions/libFeedReader.so - install -D -m 644 src/libbitdht/src/bitdht/bdboot.txt $(CURDIR)/debian/retroshare-nogui/usr/share/RetroShare/bdboot.txt - install -D -m 644 src/libbitdht/src/bitdht/bdboot.txt $(CURDIR)/debian/retroshare/usr/share/RetroShare/bdboot.txt - install -D -m 755 src/retroshare-nogui/src/retroshare-nogui $(CURDIR)/debian/retroshare-nogui/usr/bin/RetroShare-nogui - install -D -m 755 src/retroshare-nogui/src/retroshare-nogui $(CURDIR)/debian/retroshare/usr/bin/RetroShare-nogui - install -D -m 755 src/retroshare-gui/src/RetroShare $(CURDIR)/debian/retroshare/usr/bin/RetroShare - -# Add here commands to install the package into debian/your_appname -# cd builddir && $(MAKE) INSTALL_ROOT=$(CURDIR)/debian/$(APPNAME) install -# Build architecture-independent files here. -binary-indep: build install -# We have nothing to do by default. - -# Build architecture-dependent files here. -binary-arch: build install - dh_testdir - dh_testroot - dh_installdocs - dh_installexamples - dh_installman - dh_link - dh_strip - dh_compress - dh_fixperms - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install configure - diff -Nru retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/full_packaging_pipeline.sh retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/full_packaging_pipeline.sh --- retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/full_packaging_pipeline.sh 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/full_packaging_pipeline.sh 1970-01-01 00:00:00.000000000 +0000 @@ -1,22 +0,0 @@ -#!/bin/sh - -######################################################## -# This script make the debian packages for all Debian -# and all architectures specified in the variables below: - -distribs="stretch jessie" -archis="armhf amd64 i386" - -######################################################## - -./clean.sh -rm -rf retroshare-0.6.2 -./makeSourcePackage.sh -distribution "$distribs" - -for dist in $distribs; do - for arch in $archis; do - pbuilder-dist $dist $arch build retroshare.6.2-1.???????.????????~"$dist".dsc - done -done - - diff -Nru retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/gitlog.sh retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/gitlog.sh --- retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/gitlog.sh 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/gitlog.sh 1970-01-01 00:00:00.000000000 +0000 @@ -1,5 +0,0 @@ -#!/bin/sh - -git log --pretty="%h %an %aD %s" - - diff -Nru retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/how_to_build_for_stretch.txt retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/how_to_build_for_stretch.txt --- retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/how_to_build_for_stretch.txt 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/how_to_build_for_stretch.txt 1970-01-01 00:00:00.000000000 +0000 @@ -1,36 +0,0 @@ -Aug 09, 2017 -============ - -Building packages for debian stretch requires an extra dependency of libsqlcipher0-3.4.1, which is not shipped mainstream with Debian. -As a consequence, the package needs to be added to pbuilder before it's creating the .deb - -0 - create the .dsc for debian stretch using the RS packaging script - - > ./makeSourcePackage.sh -distribution stretch - - This should produce the file retroshare_0.6.3-1.20170806.3ae85dbc~stretch.dsc - -1 - add /home/csoler/pbuilder/stretch_result as an extra deb repository for pbuilder: - - > cat ~/.pbuilderrc - HOOKDIR="/var/cache/pbuilder/hook.d" - BINDMOUNTS="/home/csoler/pbuilder/stretch_result" - - > cat /var/cache/pbuilder/hook.d/D70results - cd /home/csoler/pbuilder/stretch_result - /usr/bin/dpkg-scanpackages . /dev/null > /home/csoler/pbuilder/stretch_result/Packages - /usr/bin/apt-get update - -2 - make sure that the directory /home/csoler/pbuilder/stretch-result/ contains the packages needed: - - > ls -l ~/pbuilder/stretch_result/ - total 1344 - -rw-r--r-- libsqlcipher0_3.4.1-1_amd64.deb - -rw-r--r-- libsqlcipher-dev_3.4.1-1_amd64.deb - -3 - build the package using additional arguments to pbuilder-dist: - - > pbuilder-dist stretch build --override-config --othermirror "deb [trusted=yes] file:///home/csoler/pbuilder/stretch_result ./" retroshare_0.6.3-1.20170806.3ae85dbc~stretch.dsc - -Sources: - * http://blog.anthonywong.net/2014/10/26/how-to-include-local-packages-for-pbuilder/ diff -Nru retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/make.sh retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/make.sh --- retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/make.sh 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/make.sh 1970-01-01 00:00:00.000000000 +0000 @@ -1,27 +0,0 @@ -#!/bin/sh - -echo This script will -echo - remove the directory retroshare-0.5/ -echo - remove existing sources packages in the current directory -echo - build a new source package from the svn -echo - rebuild the source package for the karmic i386 arch. -echo - -echo attempting to get svn revision number... -svn=`svn info | grep 'Revision:' | cut -d\ -f2` -echo Revision number is $svn. - -echo Type ^C to abort, or enter to continue -read tmp - -#rm -rf ./retroshare-0.5 -# ./makeSourcePackage.sh - -#for dist in maverick natty; do -for dist in oneiric karmic lucid maverick natty; do - pbuilder-dist "$dist" build retroshare_0.5.3-0."$svn"~"$dist".dsc - cp /home/csoler/pbuilder/"$dist"_result/retroshare_0.5.3-0."$svn"~"$dist"_amd64.deb . - pbuilder-dist "$dist" i386 build retroshare_0.5.3-0."$svn"~"$dist".dsc - cp /home/csoler/pbuilder/"$dist"-i386_result/retroshare_0.5.3-0."$svn"~"$dist"_i386.deb . -done - diff -Nru retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/makeSourcePackage.sh retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/makeSourcePackage.sh --- retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/makeSourcePackage.sh 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/makeSourcePackage.sh 1970-01-01 00:00:00.000000000 +0000 @@ -1,168 +0,0 @@ -#!/bin/sh - -###################### PARAMETERS #################### -gitpath="https://github.com/RetroShare/RetroShare.git" -branch="master" -#branch="v0.6.3-official_release" -#bubba3="Y" # comment out to compile for bubba3 -###################################################### - -RS_MAJOR_VERSION=`fgrep RS_MAJOR_VERSION ../../libretroshare/src/retroshare/rsversion.h | cut -d\\ -f3- | sed -e s\/\ \/\/g | cut -c1` -RS_MINOR_VERSION=`fgrep RS_MINOR_VERSION ../../libretroshare/src/retroshare/rsversion.h | cut -d\\ -f3- | sed -e s\/\ \/\/g | cut -c1` -RS_BUILD_NUMBER=`fgrep RS_BUILD_NUMBER ../../libretroshare/src/retroshare/rsversion.h | grep -v BUILD_NUMBER_ADD | cut -d\\ -f3- | sed -e s\/\ \/\/g | cut -c1` - -# echo "RS_MAJOR_VERSION="${RS_MAJOR_VERSION} -# echo "RS_MINOR_VERSION="${RS_MINOR_VERSION} -# echo "RS_BUILD_NUMBER="${RS_BUILD_NUMBER} - -version_number="${RS_MAJOR_VERSION}"'.'"${RS_MINOR_VERSION}"'.'"${RS_BUILD_NUMBER}" -workdir=retroshare-${version_number} - -echo This script is going to build the debian source package for RetroShare, from the Git repository. - -if test -d "${workdir}" ; then - echo Removing the ${workdir} directory... - rm -rf ${workdir} -fi - -# Parse options -rev="" -dist="" -# This is the key for "Cyril Soler " -gpgkey="0932399B" - -date=`git log --pretty=format:"%ai" | head -1 | cut -d\ -f1 | sed -e s/-//g` -time=`git log --pretty=format:"%aD" | head -1 | cut -d\ -f5 | sed -e s/://g` -hhsh=`git log --pretty=format:"%H" | head -1 | cut -c1-8` - -rev=${date}.${hhsh} -useretrotor="false" - -while [ ${#} -gt 0 ]; do - case ${1} in - "-rev") shift - rev=${1} - shift - ;; - "-retrotor") shift - useretrotor="true" - ;; - "-distribution") shift - dist=${1} - shift - ;; - "-key") shift - gpgkey=${1} - shift - ;; - "-h") shift - echo Package building script for debian/ubuntu distributions - echo Usage: - echo " "${0} '-key [PGP key id] -rev [svn revision number] -distribution [distrib name list with quotes, in (wheezy, sid, precise, saucy, etc)]' - exit 1 - ;; - "*") echo "Unknown option" - exit 1 - ;; - esac -done - -if test "${useretrotor}" = "true"; then - if ! test "${dist}" = "trusty"; then - echo ERROR: retro-tor can only be packaged for trusty for now. - exit 1; - fi - #gitpath="https://github.com/csoler/RetroShare.git" - #branch="v0.6-TorOnly" -fi - -if test "${dist}" = "" ; then - dist="trusty xenial artful bionic" -fi - -echo Attempting to get revision number... -ccount=`git rev-list --count --all` -ccount=`expr $ccount + 8613 - 8267` - -echo " Workdir :"${workdir} -echo " Version :"${version_number} -echo " Using revision :"${rev} -echo " Commit count :"${ccount} -echo " Hash :"${hhsh} -echo " Date :"${date} -echo " Time :"${time} -echo " Using branch :"${branch} -echo " Using distributions:"${dist} -echo " Using PGP key id :"${gpgkey} - -if test ${useretrotor} = "true"; then - echo " "Specific flags : retrotor -fi - -echo Done. -version="${version_number}"."${rev}" -echo Got version number ${version} -echo -echo Please check that the changelog is up to date. -echo Hit ENTER if this is correct. Otherwise hit Ctrl+C -read tmp - -echo Extracting base archive... - -mkdir -p ${workdir}/src -echo Checking out latest snapshot... -cd ${workdir}/src -git clone --depth 1 ${gitpath} --single-branch --branch $branch . - -# if ! test "$hhsh" = "" ; then -# echo Checking out revision $hhsh -# git checkout $hhsh -# fi - -cd - - -if ! test -d ${workdir}/src/libretroshare/; then - echo Git clone failed. - exit -fi - -cp -r debian ${workdir}/debian - -# VOIP tweak -cp ${workdir}/src/retroshare-gui/src/gui/chat/PopupChatDialog.ui ${workdir}/src/plugins/VOIP/gui/PopupChatDialog.ui - -# Cloning sqlcipher -# git clone https://github.com/sqlcipher/sqlcipher.git - -cd ${workdir} -echo Setting version numbers... - -# setup version numbers -sed -e "s%RS_REVISION_NUMBER.*%RS_REVISION_NUMBER 0x${hhsh}%" src/libretroshare/src/retroshare/rsversion.in > src/libretroshare/src/retroshare/rsversion.h - -# Various cleaning -echo Cleaning... - -\rm -rf src/.git - -echo Calling debuild... -for i in ${dist}; do - echo copying changelog for ${i} - sed -e s/XXXXXX/"${rev}"/g -e s/YYYYYY/"${i}"/g -e s/ZZZZZZ/"${version_number}"/g ../changelog > debian/changelog - - if test ${useretrotor} = "true"; then - cp ../rules.retrotor debian/rules - cp ../control.trusty_retrotor debian/control - elif test -f ../control."${i}" ; then - echo \/\!\\ Using specific control file for distribution "${i}" - cp ../control."${i}" debian/control - else - echo Using standard control file control."${i}" for distribution "${i}" - cp ../debian/control debian/control - fi - - debuild -S -k${gpgkey} -done -cd - - -exit 0 diff -Nru retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/make_tgz.sh retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/make_tgz.sh --- retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/make_tgz.sh 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/make_tgz.sh 1970-01-01 00:00:00.000000000 +0000 @@ -1,22 +0,0 @@ -#!/bin/sh - -rm BaseRetroShareDirs.tgz - -mv retroshare-0.5/src/data retroshare-0.5/ -rm -rf retroshare-0.5/libssh-0.5.2 -rm -rf retroshare-0.5/src/* -mv retroshare-0.5/data retroshare-0.5/src/ - -find retroshare-0.5 -name "*~" -exec \rm {} \; -find retroshare-0.5 -name ".svn" -exec \rm -rf {} \; - -tar zcvf BaseRetroShareDirs.tgz retroshare-0.5/ - -if ! test -f BaseRetroShareDirs.tgz; then - echo BaseRetroShareDirs.tgz could not be created - exit; -fi - -rm -rf retroshare-0.5/ - - diff -Nru retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/ppa_upload.sh retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/ppa_upload.sh --- retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/ppa_upload.sh 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/ppa_upload.sh 1970-01-01 00:00:00.000000000 +0000 @@ -1,4 +0,0 @@ -#!/bin/sh -for i in `ls retroshare_0.6.4-1.*.changes` ; do - dput ppa:retroshare/unstable $i -done diff -Nru retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/README.txt retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/README.txt --- retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/README.txt 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/README.txt 1970-01-01 00:00:00.000000000 +0000 @@ -1,77 +0,0 @@ -This directory contains the material for building a debian/ubuntu source package from -the svn repository of RetroShare. The various files here are: - - BaseRetroShareDirs.tgz: basic directory structure. Does not contain any source file. - makeSourcePackage.sh : main script. Produces source binary debian package (.dsc+.tgz files) - from the base directory structure and the sources in the svn repository. - clean.sh : compiles the source package. Produce a binary pkg for a given ubuntu distribution - make_tgz.sh : rebuilds the basic directory structure if some config/debian files where modified - in the retroshare-0.5 directory - -The pipeline is the following: - - [This directory] => [Create a source package] => [Compile the package for various ubuntu/debian and various arch] - -How do I create a source package? -================================= - - Use the script! - - > ./makeSourcePackage.sh [-h for options] - - The script gets the svn number, grabs the sources from the svn - repository, removed .svn files from it, and calls debuild to create a - source package. - - You might: - - specify a given svn revision (usually not needed) - - specify a list of distribs to build for - - Example: - - > ./makeSourcePackage.sh -distribution "precise wheezy trusty" - - You should get as many source packages as wanted distributions. For each - of them you get (example here for wheezy): - - retroshare_0.6.0-0.7829~wheezy.dsc - retroshare_0.6.0-0.7829~wheezy_source.build - retroshare_0.6.0-0.7829~wheezy_source.changes - retroshare_0.6.0-0.7829~wheezy.tar.gz - -How do I create a binary package? -================================= - -*Initial steps* - - 1 - You need to use/install pbuilder-dist: - - > sudo apt-get install ubuntu-dev-tools - - 2 - To do once: Init the building environment for each distribution you need: - - > pbuilder-dist wheezy amd64 create - - Then, when needed, keep t up to date (this solved almost all compiling - issues you might have: - - > pbuilder-dist wheezy amd64 update - - 3 - For ubuntu distribs, add a ppa dependency for sqlcipher: - - * add this line to ~/.pbuilderrc: OTHERMIRROR="deb http://ppa.launchpad.net/guardianproject/ppa/ubuntu precise main" - * add the ppa to the build environment: - - > pbuilder-dist precise login --save-after-login - # apt-key adv --keyserver pgp.mit.edu --recv-keys 2234F563 - # exit - > pbuilder-dist precise update --release-only # the --release-only is really required! - -*Package compilation* - - > pbuilder-dist wheezy build retroshare_0.6.0~7856~wheezy.dsc - - The generated compiled binary packages (including all package plugins etc) - will be in ~/pbuilder/wheezy_result/ - - diff -Nru retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/retroshare_ppastatistics.py retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/retroshare_ppastatistics.py --- retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/retroshare_ppastatistics.py 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/retroshare_ppastatistics.py 1970-01-01 00:00:00.000000000 +0000 @@ -1,32 +0,0 @@ -#!/usr/bin/python - -# Requires packages -# python-launchpad-integration -# python-launchpadlib - -from launchpadlib.launchpad import Launchpad -PPAOWNER = "csoler-users" #the launchpad PPA owener. It's usually the first part of a PPA. Example: in "webupd8team/vlmc", the owener is "webupd8team". - -distribs = ['jaunty','karmic','lucid','maverick','natty'] -archs = ['i386','amd64'] -ppas = ['retroshare','retroshare-snapshots'] -total = 0 - - -for PPA in ppas: - for distrib in distribs: - for arch in archs: - desired_dist_and_arch = 'https://api.edge.launchpad.net/devel/ubuntu/' + distrib + '/' + arch - #here, edit "maverick" and "i386" with the Ubuntu version and desired arhitecture - - cachedir = "~/.launchpadlib/cache/" - lp_ = Launchpad.login_anonymously('ppastats', 'edge', cachedir, version='devel') - owner = lp_.people[PPAOWNER] - archive = owner.getPPAByName(name=PPA) - - for individualarchive in archive.getPublishedBinaries(status='Published',distro_arch_series=desired_dist_and_arch): - print PPA + "\t" + arch + "\t" + individualarchive.binary_package_version + "\t" + str(individualarchive.getDownloadCount()) - total += individualarchive.getDownloadCount() - -print "Total downloads: " + str(total) - diff -Nru retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/rules.retrotor retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/rules.retrotor --- retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/rules.retrotor 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/rules.retrotor 1970-01-01 00:00:00.000000000 +0000 @@ -1,61 +0,0 @@ -#!/usr/bin/make -f - -configure: configure-stamp -configure-stamp: - dh_testdir - cd src && qmake "CONFIG-=debug" "CONFIG+=release retrotor" "CONFIG+=rs_autologin" PREFIX=/usr LIB_DIR=/usr/lib RetroShare.pro - touch $@ - - -build: build-stamp -build-stamp: configure-stamp - dh_testdir - # Add here commands to compile the package. - # cd libssh-0.6.4 && mkdir -p build && cd build && cmake -DWITH_STATIC_LIB=ON .. && make - # cd sqlcipher && ./configure --disable-shared --enable-static --enable-tempstore=yes CFLAGS="-DSQLITE_HAS_CODEC" LDFLAGS="-lcrypto" && make - # mkdir lib - # cp -r libssh-0.6.4 lib/ - #cp -r sqlcipher lib/ - #cd src/rsctrl/src && make - cd src && $(MAKE) - touch $@ - -clean: - dh_testdir - dh_testroot - rm -f configure-stamp build-stamp - # Add here commands to clean up after the build process. - [ ! -f src/Makefile ] || (cd src && $(MAKE) distclean) - dh_clean - -install: build - dh_testdir - dh_testroot - dh_clean -k - #dh_installdirs - cd src && $(MAKE) INSTALL_ROOT=$(CURDIR)/debian/tmp install - -# Build architecture-independent files here. -binary-indep: build install -# We have nothing to do by default. - -# Build architecture-dependent files here. -binary-arch: build install - dh_testdir - dh_testroot - dh_install --list-missing - #dh_installdocs - #dh_installexamples - #dh_installman - dh_link - dh_strip - dh_compress - dh_fixperms - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install configure diff -Nru retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/rules.stretch retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/rules.stretch --- retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/rules.stretch 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/build_scripts/Debian+Ubuntu/rules.stretch 1970-01-01 00:00:00.000000000 +0000 @@ -1,61 +0,0 @@ -#!/usr/bin/make -f - -configure: configure-stamp -configure-stamp: - dh_testdir - cd src && qmake "CONFIG-=debug" "CONFIG+=release" PREFIX=/usr LIB_DIR=/usr/lib RetroShare.pro - touch $@ - - -build: build-stamp -build-stamp: configure-stamp - dh_testdir - # Add here commands to compile the package. - # cd libssh-0.6.4 && mkdir -p build && cd build && cmake -DWITH_STATIC_LIB=ON .. && make - # cd sqlcipher && ./configure --disable-shared --enable-static --enable-tempstore=yes CFLAGS="-DSQLITE_HAS_CODEC" LDFLAGS="-lcrypto" && make - # mkdir lib - # cp -r libssh-0.6.4 lib/ - #cp -r sqlcipher lib/ - #cd src/rsctrl/src && make - cd src && $(MAKE) - touch $@ - -clean: - dh_testdir - dh_testroot - rm -f configure-stamp build-stamp - # Add here commands to clean up after the build process. - [ ! -f src/Makefile ] || (cd src && $(MAKE) distclean) - dh_clean - -install: build - dh_testdir - dh_testroot - dh_clean -k - #dh_installdirs - cd src && $(MAKE) INSTALL_ROOT=$(CURDIR)/debian/tmp install - -# Build architecture-independent files here. -binary-indep: build install -# We have nothing to do by default. - -# Build architecture-dependent files here. -binary-arch: build install - dh_testdir - dh_testroot - dh_install --list-missing - #dh_installdocs - #dh_installexamples - #dh_installman - dh_link - dh_strip - dh_compress - dh_fixperms - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install configure diff -Nru retroshare-0.6.4/src/build_scripts/OSX/MacOS.10.6_RS_Compilation_Instructions.txt retroshare-0.6.4/src/build_scripts/OSX/MacOS.10.6_RS_Compilation_Instructions.txt --- retroshare-0.6.4/src/build_scripts/OSX/MacOS.10.6_RS_Compilation_Instructions.txt 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/build_scripts/OSX/MacOS.10.6_RS_Compilation_Instructions.txt 1970-01-01 00:00:00.000000000 +0000 @@ -1,60 +0,0 @@ -Hi there, - -I heard about RetroShare recently (on Slashdot) and really like the goal of the program; it's something I've been wanting for a long time now. I'm a software developer so I figured I could help contribute to the project. I started by getting a build up and running on my mac, which was non-trivial as it looks like the Mac build hasn't been maintained (or maybe it's just targetting older OS X version?). Anyway, I have instructions and patches to get a build going on OS X 10.6, if you want to put them up on the wiki or something. The steps I used boiled down to running the following commands in a directory that also contains the retroshare-mac-build.patch file, which I posted at https://staktrace.com/pub/retroshare-mac-build.patch (you can also see the changes at https://github.com/staktrace/retroshare/commit/51f554f909086f4baca7be215d5edacab744dea4) - -sudo port selfupdate -sudo port install qt4-mac -sudo port install wget - -wget ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-1.10.tar.bz2 -tar xjf libgpg-error-1.10.tar.bz2 -rm libgpg-error-1.10.tar.bz2 -pushd libgpg-error-1.10 -./configure --prefix=$PWD/build --enable-static=yes --enable-shared=no -make -make install -popd - -wget ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-1.3.1.tar.bz2 -tar xjf gpgme-1.3.1.tar.bz2 -rm gpgme-1.3.1.tar.bz2 -pushd gpgme-1.3.1 -./configure --prefix=$PWD/build --enable-static=yes --enable-shared=no --with-gpg-error-prefix=$PWD/../libgpg-error-1.10/build -make -make install -popd - -wget http://miniupnp.free.fr/files/download.php?file=miniupnpc-1.3.tar.gz -tar xzf miniupnpc-1.3.tar.gz -rm miniupnpc-1.3.tar.gz -pushd miniupnpc-1.3 -make upnpc-static -popd - -git clone https://github.com/kigeia/retroshare -pushd retroshare -git apply ../retroshare-mac-build.patch -popd - -pushd retroshare/libbitdht/src -qmake -make -popd - -pushd retroshare/libretroshare/src -qmake -make -popd - -pushd retroshare/retroshare-gui/src -qmake -make -popd - -At the end there is a RetroShare.App in the retroshare/retroshare-gui/ folder which seems to work as expected. - -Now that I've gotten it building and working, I'd like to start working on adding features. One that I would like to see is taking advantage of the RetroShare platform to enable F2F games. A while back I wrote a P2P collaborative crossword solver app in Java; porting that to work as a RetroShare plugin would probably be a good start for me. I looked briefly at the existing plugins in the source tree but haven't yet had time to peruse the rsplugin.h API in detail; if you have any tips or pointers before I dive in, please do let me know. I'll probably start work on it in a couple of days and progress might be a little slow because I'm also fairly busy with other things right now. - -Cheers, -kats - diff -Nru retroshare-0.6.4/src/build_scripts/OSX/OSX_RS_Compilation_Instructions.txt retroshare-0.6.4/src/build_scripts/OSX/OSX_RS_Compilation_Instructions.txt --- retroshare-0.6.4/src/build_scripts/OSX/OSX_RS_Compilation_Instructions.txt 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/build_scripts/OSX/OSX_RS_Compilation_Instructions.txt 1970-01-01 00:00:00.000000000 +0000 @@ -1,66 +0,0 @@ - -Mac OSX Build Instructions. -------------------------------------------- - -There are several complications with building Retroshare under OSX. - 1) Support Libraries must be built and installed seperately. - 2) Universal and OSX 10.5 support is a little tricky, mainly due to the support libraries. - -Additional Libraries ---------------------- - - * GnuPG Package, that comes with Retroshare OSX install image. (GnuPG-1.4.9.dmg) - -GPG Development libraries - * libassuan (I'm using 2.0.1) - * libgpg-error (I'm using 1.9) - * libgpgme (I'm using 1.3.0) - -These libraries use standard UNIX installation systems: AUTOCONF/AUTOMAKE (configure, make, etc) -Unfortunately, this makes it difficult and a little manual to compile Universal and 10.5 libraries. - -UPNPC (for OSX and windows) - * miniupnpc (I'm using 1.0) - -You will also need to install - * XCode (available on the Apple Install CDs) - * Qt4 (from trolltech.com) - -First Compilation... --------------------- - -The First challenge is to build Retroshare on your Mac. For this first compilation, -we only build for your specific machine, and not attempt a Generic / 10.5 / Univeral build. - - -1) Install / Compile all the packages listed above. - be sure to use a configure command like this where applicable to only create a static library. - ./configure --enable-static=yes --enable-shared=no CFLAGS="-arch i386" CPPFLAGS="-arch i386" - -2) Check out the Retroshare SVN. - -3) compile libbitdht: - cd libbitdht/src - qmake - - This recreates a xcodeproj file for compilation using XCode. - Open with Xcode, and build. - -4) compile libretroshare: same way. -5) compile retroshare-gui: same way. - - -Creating Retroshare OSX Distribution Packages. ------------------------------------------------ - TODO, once I've got feedback on First Compilation! - - - - - - - - - - - diff -Nru retroshare-0.6.4/src/build_scripts/OSX/retroshare-mac-build.patch retroshare-0.6.4/src/build_scripts/OSX/retroshare-mac-build.patch --- retroshare-0.6.4/src/build_scripts/OSX/retroshare-mac-build.patch 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/build_scripts/OSX/retroshare-mac-build.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,94 +0,0 @@ -commit 51f554f909086f4baca7be215d5edacab744dea4 -Author: Kartikaya Gupta -Date: Wed Mar 7 23:30:48 2012 -0500 - - Modifications needed to get build working on Mac OS X 10.6 - -diff --git a/.gitignore b/.gitignore -new file mode 100644 -index 0000000..3e90033 ---- /dev/null -+++ b/.gitignore -@@ -0,0 +1,6 @@ -+*.o -+Makefile -+libbitdht/src/lib/ -+libretroshare/src/lib/ -+retroshare-gui/src/RetroShare.app/ -+retroshare-gui/src/temp/ -diff --git a/libretroshare/src/libretroshare.pro b/libretroshare/src/libretroshare.pro -index 6f35e01..267cc91 100644 ---- a/libretroshare/src/libretroshare.pro -+++ b/libretroshare/src/libretroshare.pro -@@ -312,7 +312,7 @@ mac { - OBJECTS_DIR = temp/obj - MOC_DIR = temp/moc - #DEFINES = WINDOWS_SYS WIN32 STATICLIB MINGW -- #DEFINES *= MINIUPNPC_VERSION=13 -+ DEFINES *= MINIUPNPC_VERSION=13 - DESTDIR = lib - - #miniupnp implementation files -@@ -326,12 +326,11 @@ mac { - # Beautiful Hack to fix 64bit file access. - QMAKE_CXXFLAGS *= -Dfseeko64=fseeko -Dftello64=ftello -Dfopen64=fopen -Dvstatfs64=vstatfs - -- UPNPC_DIR = ../../../miniupnpc-1.0 -- GPG_ERROR_DIR = ../../../../libgpg-error-1.7 -- GPGME_DIR = ../../../../gpgme-1.1.8 -+ UPNPC_DIR = ../../../miniupnpc-1.3 -+ GPG_ERROR_DIR = ../../../libgpg-error-1.10 -+ GPGME_DIR = ../../../gpgme-1.3.1 - -- INCLUDEPATH += . $${UPNPC_DIR} -- #INCLUDEPATH += . $${UPNPC_DIR} $${GPGME_DIR}/src $${GPG_ERROR_DIR}/src -+ INCLUDEPATH += . $${UPNPC_DIR} $${GPGME_DIR}/src $${GPG_ERROR_DIR}/src - } - - ################################# FreeBSD ########################################## -diff --git a/libretroshare/src/pqi/sslfns.cc b/libretroshare/src/pqi/sslfns.cc -index 2588cb8..305433f 100644 ---- a/libretroshare/src/pqi/sslfns.cc -+++ b/libretroshare/src/pqi/sslfns.cc -@@ -586,8 +586,8 @@ X509 *loadX509FromDER(const uint8_t *ptr, uint32_t len) - X509 *tmp = NULL; - #ifdef __APPLE__ - // This depends on which version you are compiling for... OSX10.5 doesn't have consts (old OpenSSL!) -- unsigned char **certptr = (unsigned char **) &ptr; -- //const unsigned char **certptr = (const unsigned char **) &ptr; -+ //unsigned char **certptr = (unsigned char **) &ptr; -+ const unsigned char **certptr = (const unsigned char **) &ptr; - #else - const unsigned char **certptr = (const unsigned char **) &ptr; - #endif -diff --git a/retroshare-gui/src/RetroShare.pro b/retroshare-gui/src/RetroShare.pro -index adcb5a0..ffbf669 100644 ---- a/retroshare-gui/src/RetroShare.pro -+++ b/retroshare-gui/src/RetroShare.pro -@@ -140,19 +140,21 @@ win32 { - - macx { - # ENABLE THIS OPTION FOR Univeral Binary BUILD. -- CONFIG += ppc x86 -- QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.4 -+ # CONFIG += ppc x86 -+ QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.6 - - CONFIG += version_detail_bash_script - LIBS += ../../libretroshare/src/lib/libretroshare.a -- LIBS += -lssl -lcrypto -lz -lgpgme -lgpg-error -lassuan -- LIBS += ../../../miniupnpc-1.0/libminiupnpc.a -+ LIBS += ../../../libgpg-error-1.10/build/lib/libgpg-error.a -+ LIBS += ../../../gpgme-1.3.1/build/lib/libgpgme.a -+ LIBS += ../../../miniupnpc-1.3/libminiupnpc.a -+ LIBS += -lssl -lcrypto -lz -lassuan - LIBS += -framework CoreFoundation - LIBS += -framework Security - - # LIBS += -framework CoreServices - -- INCLUDEPATH += . -+ INCLUDEPATH += . ../../../gpgme-1.3.1/src - #DEFINES* = MAC_IDLE # for idle feature - CONFIG -= uitools - diff -Nru retroshare-0.6.4/src/build_scripts/RedHat+Fedora/00Readme retroshare-0.6.4/src/build_scripts/RedHat+Fedora/00Readme --- retroshare-0.6.4/src/build_scripts/RedHat+Fedora/00Readme 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/build_scripts/RedHat+Fedora/00Readme 1970-01-01 00:00:00.000000000 +0000 @@ -1,14 +0,0 @@ -This is the build directory for RPM based Linux distributions like RedHat -Enterprise Linux and compatible distributions (CentOS, Oracle Linux, ...) or -Fedora. - -To create an RPM package (as well as Source RPM) for your distribution, just -run the makePackages.sh script found in this directory, like so: - - ./makepackages.sh - -The script needs the rpmbuild command, which is part of the rpm-build package. - -In case any build dependency is missing, the rpmbuild command will fail. Just -install the missing package(s) and restart the script (Hint: all needed -packages are listed in the provided retroshare06.spec file.) diff -Nru retroshare-0.6.4/src/build_scripts/RedHat+Fedora/data/retroshare.desktop retroshare-0.6.4/src/build_scripts/RedHat+Fedora/data/retroshare.desktop --- retroshare-0.6.4/src/build_scripts/RedHat+Fedora/data/retroshare.desktop 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/build_scripts/RedHat+Fedora/data/retroshare.desktop 1970-01-01 00:00:00.000000000 +0000 @@ -1,10 +0,0 @@ -[Desktop Entry] -Version=1.0 -Name=RetroShare -Comment=Securely share files with your friends -Exec=/usr/bin/retroshare %U -Icon=/usr/share/pixmaps/retroshare.xpm -Terminal=false -Type=Application -Categories=Network;P2P; -MimeType=x-scheme-handler/retroshare; diff -Nru retroshare-0.6.4/src/build_scripts/RedHat+Fedora/makePackages.sh retroshare-0.6.4/src/build_scripts/RedHat+Fedora/makePackages.sh --- retroshare-0.6.4/src/build_scripts/RedHat+Fedora/makePackages.sh 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/build_scripts/RedHat+Fedora/makePackages.sh 1970-01-01 00:00:00.000000000 +0000 @@ -1,85 +0,0 @@ -#!/bin/bash - -###################### PARAMETERS #################### -VERSION="0.6.0" -###################################################### -dirs -c - -echo "This script is going to build the RedHat family source package for RetroShare, from a clone of the GitHub repository." - -# Parse options -while [[ ${#} > 0 ]] -do - case ${1} in - "-h") shift - echo "Package building script for RedHat family distributions" - echo "Usage:" - echo " ${0}" - exit 1 - ;; - "*") echo "Unknown option" - exit 1 - ;; - esac -done - -GITROOT=$(git rev-parse --show-toplevel) -DATE=$(git log --pretty=format:"%ai" | head -1 | cut -d\ -f1 | sed -e s/-//g) -HASH=$(git log --pretty=format:"%H" | head -1 | cut -c1-8) -REV=${DATE}.${HASH} -FULL_VERSION=${VERSION}.${REV} - -echo "Using version number: ${VERSION}" -echo "Using revision: ${REV}" -echo "Hit ENTER if this is correct. Otherwise hit Ctrl+C" -read tmp - -WORKDIR="retroshare-${FULL_VERSION}" - -if [[ -d ${WORKDIR} ]] -then - echo "Removing the directory ${WORKDIR}..." - rm -rf ${WORKDIR} -fi -mkdir -p ${WORKDIR}/src - -echo "Copying sources into workdir..." -rsync -rc --exclude build_scripts ${GITROOT}/* ${WORKDIR}/src -rsync -rc --copy-links data ${WORKDIR}/src -pushd ${WORKDIR} >/dev/null - -# Cloning sqlcipher -echo "Cloning sqlcipher repository..." -mkdir lib -pushd lib >/dev/null -git clone https://github.com/sqlcipher/sqlcipher.git -pushd sqlcipher >/dev/null -git checkout v3.3.1 -rm -rf .git -popd >/dev/null -popd >/dev/null - -# VOIP tweak -cp src/retroshare-gui/src/gui/chat/PopupChatDialog.ui src/plugins/VOIP/gui/PopupChatDialog.ui - -# cleaning up protobof generated files -rm -f src/retroshare-nogui/src/rpc/proto/gencc/*.pb.h -rm -f src/retroshare-nogui/src/rpc/proto/gencc/*.pb.cc - -# setup version numbers -echo "Setting version numbers..." -sed -e "s%RS_REVISION_NUMBER.*%RS_REVISION_NUMBER 0x${HASH}%" src/libretroshare/src/retroshare/rsversion.in >src/libretroshare/src/retroshare/rsversion.h -popd >/dev/null - -echo "Creating RPMs..." -[[ -d rpm-build/rpm ]] || mkdir -p rpm-build/rpm -pushd rpm-build/rpm >/dev/null -for DIR in BUILD RPMS SOURCES SPECS SRPMS -do - [[ -d ${DIR} ]] || mkdir ${DIR} -done -popd >/dev/null -tar -zcf rpm-build/rpm/SOURCES/${WORKDIR}.tar.gz ${WORKDIR} -rpmbuild --define="%rev ${REV}" --define="%_usrsrc $PWD/rpm-build" --define="%_topdir %{_usrsrc}/rpm" -ba retroshare.spec -rm -rf ${WORKDIR} -exit 0 diff -Nru retroshare-0.6.4/src/build_scripts/RedHat+Fedora/retroshare.spec retroshare-0.6.4/src/build_scripts/RedHat+Fedora/retroshare.spec --- retroshare-0.6.4/src/build_scripts/RedHat+Fedora/retroshare.spec 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/build_scripts/RedHat+Fedora/retroshare.spec 1970-01-01 00:00:00.000000000 +0000 @@ -1,99 +0,0 @@ -Summary: Secure communication with friends -Name: retroshare -Version: 0.6.0.%{rev} -Release: 1%{?dist} -License: GPLv3 -Group: Productivity/Networking/Other -URL: http://retroshare.sourceforge.net/ -Source0: %{name}-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -Requires: qt5-qtbase-gui qt5-qtmultimedia qt5-qtx11extras qt5-qtbase -BuildRequires: gcc-c++ desktop-file-utils libgnome-keyring-devel glib2-devel libssh-devel protobuf-devel libcurl-devel libxml2-devel libxslt-devel openssl-devel libXScrnSaver-devel libupnp-devel bzip2-devel libmicrohttpd-devel qt5-qtx11extras-devel qt5-qttools-devel qt5-qtmultimedia-devel qt5-qttools-static -# This is because of sqlcipher: -BuildRequires: tcl - -%description -RetroShare is a decentralized, private and secure commmunication and sharing platform. RetroShare provides filesharing, chat, messages, forums and channels. - -Authors: -see http://retroshare.sourceforge.net/team.html - -%package nogui -Summary: RetroShare cli client -Group: Productivity/Network/Other -Requires: openssl -Conflicts: %name = %{version} - -%description nogui -This is the command-line client for RetroShare network. This client can be contacted and talked-to using SSL. Clients exist for portable devices running e.g. Android. - -%package voip-plugin -Summary: RetroShare VOIP plugin -Group: Productivity/Networking/Other -Requires: %name = %{version} -BuildRequires: opencv-devel speex-devel -%if 0%{?fedora} >= 22 -BuildRequires: speexdsp-devel -%endif - -%description voip-plugin -This package provides a plugin for RetroShare, a secured Friend-to-Friend communication platform. The plugin adds voice-over-IP functionality to the private chat window. Both friends chatting together need the plugin installed to be able to talk together. - -%package feedreader-plugin -Summary: RetroShare FeedReader plugin -Group: Productivity/Networking/Other -Requires: %name = %{version} - -%description feedreader-plugin -This package provides a plugin for RetroShare, a secured Friend-to-Friend communication platform. The plugin adds a RSS feed reader tab to retroshare. - -%prep -%setup -q - -%build -cd lib/sqlcipher -./configure --disable-shared --enable-static --enable-tempstore=yes CFLAGS="-fPIC -DSQLITE_HAS_CODEC" LDFLAGS="-lcrypto" -make -cd - -cd src -qmake-qt5 "CONFIG-=debug" "CONFIG+=release" PREFIX=%{_prefix} LIB_DIR=%{_libdir} RetroShare.pro -make -cd - - -%install -rm -rf $RPM_BUILD_ROOT -cd src -make INSTALL_ROOT=$RPM_BUILD_ROOT install -#menu -desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/retroshare.desktop - -%clean -rm -rf $RPM_BUILD_ROOT - -%files -%defattr(-,root,root,-) -%{_bindir}/retroshare -%defattr(644, root, root) -%{_datadir}/pixmaps/%{name}.xpm -%{_datadir}/icons/hicolor -%{_datadir}/applications/%{name}.desktop -%{_datadir}/retroshare - -%files nogui -%defattr(-, root, root) -%{_bindir}/retroshare-nogui -%defattr(644, root, root) -%{_datadir}/retroshare - -%files voip-plugin -%defattr(-, root, root) -%{_libdir}/retroshare/extensions6/libVOIP.so* - -%files feedreader-plugin -%defattr(-, root, root) -%{_libdir}/retroshare/extensions6/libFeedReader.so* - -%changelog -* Sat Apr 4 2015 Heini - -- Initial build. - diff -Nru retroshare-0.6.4/src/build_scripts/Windows/build/build.bat retroshare-0.6.4/src/build_scripts/Windows/build/build.bat --- retroshare-0.6.4/src/build_scripts/Windows/build/build.bat 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/build_scripts/Windows/build/build.bat 1970-01-01 00:00:00.000000000 +0000 @@ -1,84 +0,0 @@ -@echo off - -setlocal - -:: Initialize environment -call "%~dp0..\env.bat" -if errorlevel 1 goto error_env -call "%EnvPath%\env.bat" -if errorlevel 1 goto error_env - -:: Get gcc versions -call "%ToolsPath%\get-gcc-version.bat" GCCVersion -if "%GCCVersion%"=="" echo Cannot get gcc version.& exit /B 1 - -:: Check external libraries -if not exist "%RootPath%\libs" echo Please build external libraries first.& exit /B 1 - -:: Check gcc version of external libraries -if not exist "%RootPath%\libs\gcc-version" echo Cannot get gcc version of external libraries.& exit /B 1 -set /P LibsGCCVersion=<"%RootPath%\libs\gcc-version" -if "%LibsGCCVersion%" NEQ "%GCCVersion%" echo Please use correct version of external libraries. (gcc %GCCVersion% ^<^> libs %LibsGCCVersion%).& exit /B 1 - -:: Initialize environment -call "%~dp0env.bat" %* -if errorlevel 1 goto error_env - -:: Check git executable -set GitPath= -call "%ToolsPath%\find-in-path.bat" GitPath git.exe -if "%GitPath%" NEQ "" goto found_git -choice /M "Git not found in PATH. Version information cannot be calculated. Do you want to proceed?" -if %errorlevel%==2 exit /B 1 -:found_git - -echo. -echo === Version -echo. - -title Build - %SourceName%%RsType%-%RsBuildConfig% [Version] - -pushd "%SourcePath%\retroshare-gui\src\gui\images" -:: Touch resource file -copy /b retroshare_win.rc +,, -popd - -if not exist "%RsBuildPath%" mkdir "%RsBuildPath%" -pushd "%RsBuildPath%" - -echo. -echo === qmake -echo. - -title Build - %SourceName%%RsType%-%RsBuildConfig% [qmake] - -set RS_QMAKE_CONFIG=%RsBuildConfig% version_detail_bash_script rs_autologin retroshare_plugins -if "%RsRetroTor%"=="1" set RS_QMAKE_CONFIG=%RS_QMAKE_CONFIG% retrotor - -qmake "%SourcePath%\RetroShare.pro" -r "CONFIG+=%RS_QMAKE_CONFIG%" -if errorlevel 1 goto error - -echo. -echo === make -echo. - -title Build - %SourceName%%RsType%-%RsBuildConfig% [make] - -if exist "%EnvJomExe%" ( - "%EnvJomExe%" -) else ( - mingw32-make -) - -:error -popd - -title %COMSPEC% - -if errorlevel 1 echo.& echo Build failed& echo. -exit /B %ERRORLEVEL% - -:error_env -echo Failed to initialize environment. -endlocal -exit /B 1 diff -Nru retroshare-0.6.4/src/build_scripts/Windows/build/build-installer.bat retroshare-0.6.4/src/build_scripts/Windows/build/build-installer.bat --- retroshare-0.6.4/src/build_scripts/Windows/build/build-installer.bat 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/build_scripts/Windows/build/build-installer.bat 1970-01-01 00:00:00.000000000 +0000 @@ -1,56 +0,0 @@ -@echo off - -setlocal - -:: Initialize environment -call "%~dp0..\env.bat" -if errorlevel 1 goto error_env -call "%EnvPath%\env.bat" -if errorlevel 1 goto error_env - -:: Get gcc versions -call "%ToolsPath%\get-gcc-version.bat" GCCVersion -if "%GCCVersion%"=="" echo Cannot get gcc version.& exit /B 1 - -:: Check external libraries -if not exist "%RootPath%\libs" echo Please build external libraries first.& exit /B 1 - -:: Check gcc version of external libraries -if not exist "%RootPath%\libs\gcc-version" echo Cannot get gcc version of external libraries.& exit /B 1 -set /P LibsGCCVersion=<"%RootPath%\libs\gcc-version" -if "%LibsGCCVersion%" NEQ "%GCCVersion%" echo Please use correct version of external libraries. (gcc %GCCVersion% ^<^> libs %LibsGCCVersion%).& exit /B 1 - -:: Initialize environment -call "%~dp0env.bat" standard -if errorlevel 1 goto error_env - -:: Build defines for script -set NSIS_PARAM= - -set NSIS_PARAM=%NSIS_PARAM% /DRELEASEDIR="%RsBuildPath%" -set NSIS_PARAM=%NSIS_PARAM% /DQTDIR="%QtPath%\.." -set NSIS_PARAM=%NSIS_PARAM% /DMINGWDIR="%MinGWPath%\.." -set NSIS_PARAM=%NSIS_PARAM% /DOUTDIR="%RsPackPath%" -set NSIS_PARAM=%NSIS_PARAM% /DINSTALLERADD="%RsArchiveAdd%" - -:: Scan version from source -set RsRevision= -set RsBuildAdd= -call "%ToolsPath%\get-rs-version.bat" RS_REVISION_STRING RsRevision -if "%RsRevision%"=="" echo Revision not found.& exit /B 1 -call "%ToolsPath%\get-rs-version.bat" RS_BUILD_NUMBER_ADD RsBuildAdd -if errorlevel 1 exit /B 1 - -set NSIS_PARAM=%NSIS_PARAM% /DREVISION=%RsRevision% /DBUILDADD=%RsBuildAdd% - -set QtMainVersion=%QtVersion:~0,1% - -:: Create installer -"%EnvMakeNSISExe%" %NSIS_PARAM% "%SourcePath%\build_scripts\Windows\installer\retroshare-Qt%QtMainVersion%.nsi" - -exit /B %ERRORLEVEL% - -:error_env -echo Failed to initialize environment. -endlocal -exit /B 1 diff -Nru retroshare-0.6.4/src/build_scripts/Windows/build/clean.bat retroshare-0.6.4/src/build_scripts/Windows/build/clean.bat --- retroshare-0.6.4/src/build_scripts/Windows/build/clean.bat 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/build_scripts/Windows/build/clean.bat 1970-01-01 00:00:00.000000000 +0000 @@ -1,21 +0,0 @@ -@echo off - -setlocal - -:: Initialize environment -call "%~dp0..\env.bat" -if errorlevel 1 goto error_env -call "%EnvPath%\env.bat" -if errorlevel 1 goto error_env -call "%~dp0env.bat" %* -if errorlevel 1 goto error_env - -if not exist "%RsBuildPath%" exit /B 0 -call "%ToolsPath%\remove-dir.bat" "%RsBuildPath%" - -exit /B %ERRORLEVEL% - -:error_env -echo Failed to initialize environment. -endlocal -exit /B 1 diff -Nru retroshare-0.6.4/src/build_scripts/Windows/build/env.bat retroshare-0.6.4/src/build_scripts/Windows/build/env.bat --- retroshare-0.6.4/src/build_scripts/Windows/build/env.bat 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/build_scripts/Windows/build/env.bat 1970-01-01 00:00:00.000000000 +0000 @@ -1,47 +0,0 @@ -if "%~1"=="standard" ( - set RsRetroTor= - set RsType= -) else ( - if "%~1"=="retrotor" ( - set RsRetroTor=1 - set RsType=-tor - ) else ( - echo. - echo Usage: standard^|retrotor - echo. - exit /B 1 - ) -) - -set BuildPath=%EnvRootPath%\builds -set DeployPath=%EnvRootPath%\deploy - -if not exist "%BuildPath%" mkdir "%BuildPath%" -if not exist "%DeployPath%" mkdir "%DeployPath%" - -:: Check Qt environment -set QtPath= -call "%ToolsPath%\find-in-path.bat" QtPath qmake.exe -if "%QtPath%"=="" echo Please run command in the Qt Command Prompt.& exit /B 1 - -:: Check MinGW environment -set MinGWPath= -call "%ToolsPath%\find-in-path.bat" MinGWPath gcc.exe -if "%MinGWPath%"=="" echo Please run command in the Qt Command Prompt.& exit /B 1 - -:: Get Qt version -call "%ToolsPath%\get-qt-version.bat" QtVersion -if "%QtVersion%"=="" echo Cannot get Qt version.& exit /B 1 - -set RsBuildConfig=release -set RsBuildPath=%BuildPath%\Qt-%QtVersion%%RsType%-%RsBuildConfig% -set RsDeployPath=%DeployPath%\Qt-%QtVersion%%RsType%-%RsBuildConfig% -set RsPackPath=%DeployPath% -set RsArchiveAdd= - -if not exist "%~dp0env-mod.bat" goto no_mod -call "%~dp0env-mod.bat" -if errorlevel 1 exit /B %ERRORLEVEL% -:no_mod - -exit /B 0 \ No newline at end of file diff -Nru retroshare-0.6.4/src/build_scripts/Windows/build/git-log.bat retroshare-0.6.4/src/build_scripts/Windows/build/git-log.bat --- retroshare-0.6.4/src/build_scripts/Windows/build/git-log.bat 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/build_scripts/Windows/build/git-log.bat 1970-01-01 00:00:00.000000000 +0000 @@ -1,117 +0,0 @@ -:: Usage: -:: call git-log.bat standard|retrotor [no-ask] - -@echo off - -setlocal - -set NoAsk= -if "%~2"=="no-ask" set NoAsk=1 - -:: Initialize environment -call "%~dp0..\env.bat" -if errorlevel 1 goto error_env -call "%EnvPath%\env.bat" -if errorlevel 1 goto error_env -call "%~dp0env.bat" %1 -if errorlevel 1 goto error_env - -:: Check git executable -set GitPath= -call "%ToolsPath%\find-in-path.bat" GitPath git.exe -if "%GitPath%"=="" echo Git executable not found in PATH.& exit /B 1 - -:: Get compiled revision -set GetRsVersion=%SourcePath%\build_scripts\Windows\tools\get-rs-version.bat -if not exist "%GetRsVersion%" ( - echo File not found - echo %GetRsVersion% - exit /B 1 -) - -call "%GetRsVersion%" RS_REVISION_STRING RsRevision -if "%RsRevision%"=="" echo Revision not found.& exit /B 1 - -:: Get compiled version -call "%GetRsVersion%" RS_REVISION_STRING RsRevision -if "%RsRevision%"=="" echo Revision not found.& exit /B 1 - -call "%GetRsVersion%" RS_MAJOR_VERSION RsMajorVersion -if "%RsMajorVersion%"=="" echo Major version not found.& exit /B 1 - -call "%GetRsVersion%" RS_MINOR_VERSION RsMinorVersion -if "%RsMinorVersion%"=="" echo Minor version not found.& exit /B 1 - -call "%GetRsVersion%" RS_BUILD_NUMBER RsBuildNumber -if "%RsBuildNumber%"=="" echo Build number not found.& exit /B 1 - -call "%GetRsVersion%" RS_BUILD_NUMBER_ADD RsBuildNumberAdd - -set RsVersion=%RsMajorVersion%.%RsMinorVersion%.%RsBuildNumber%%RsBuildNumberAdd% - -:: Check WMIC is available -wmic.exe alias /? >nul 2>&1 || echo WMIC is not available.&& exit /B 1 - -:: Use WMIC to retrieve date in format YYYYMMDD -set RsDate= -for /f "tokens=2 delims==" %%I in ('wmic os get localdatetime /format:list') do set RsDate=%%I -set RsDate=%RsDate:~0,4%%RsDate:~4,2%%RsDate:~6,2% - -:: Get last revision -set RsLastRefFile=%BuildPath%\Qt-%QtVersion%%RsType%-%RsBuildConfig%-LastRef.txt -set RsLastRef= -if exist "%RsLastRefFile%" set /P RsLastRef=<"%RsLastRefFile%" - -if "%NoAsk%"=="1" goto no_ask_for_last_revision -if not "%RsLastRef%"=="" echo Last Revision was %RsLastRef% -set /P RsLastRefInput=Last Revision: -if "%RsLastRefInput%" NEQ "" set RsLastRef=%RsLastRefInput% -:no_ask_for_last_revision - -:: Get current revision -pushd "%SourcePath%" -call "%ToolsPath%\get-git-ref.bat" RsRef -popd - -if errorlevel 1 exit /B 1 -if "%RsRef%"=="" echo Cannot get git revision.& exit /B 1 - -echo. -echo Creating log from %RsLastRef% -echo to %RsRef% - -if "%NoAsk%"=="1" goto no_confirm -choice /M "Do you want to proceed?" -if %errorlevel%==2 exit /B 1 -:no_confirm - -if "%RsBuildConfig%" NEQ "release" ( - set RsGitLog=%DeployPath%\RetroShare-%RsVersion%-Windows-Portable-%RsDate%-%RsRevision%-Qt-%QtVersion%%RsType%%RsArchiveAdd%-%RsBuildConfig%.txt -) else ( - set RsGitLog=%DeployPath%\RetroShare-%RsVersion%-Windows-Portable-%RsDate%-%RsRevision%-Qt-%QtVersion%%RsType%%RsArchiveAdd%.txt -) - -title %SourceName%-%RsBuildConfig% [git log] - -pushd "%SourcePath%" -if "%RsLastRef%"=="" ( - git log %RsRef% >"%RsGitLog%" -) else ( - if "%RsLastRef%"=="%RsRef%" ( - git log %RsRef% --max-count=1 >"%RsGitLog%" - ) else ( - git log %RsLastRef%..%RsRef% >"%RsGitLog%" - ) -) -popd - -title %COMSPEC% - -echo %RsRef%>"%RsLastRefFile%" - -exit /B %ERRORLEVEL% - -:error_env -echo Failed to initialize environment. -endlocal -exit /B 1 diff -Nru retroshare-0.6.4/src/build_scripts/Windows/build/pack.bat retroshare-0.6.4/src/build_scripts/Windows/build/pack.bat --- retroshare-0.6.4/src/build_scripts/Windows/build/pack.bat 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/build_scripts/Windows/build/pack.bat 1970-01-01 00:00:00.000000000 +0000 @@ -1,232 +0,0 @@ -@echo off - -setlocal - -set Quite=^>nul - -:: Initialize environment -call "%~dp0..\env.bat" -if errorlevel 1 goto error_env -call "%EnvPath%\env.bat" -if errorlevel 1 goto error_env - -:: Get gcc versions -call "%ToolsPath%\get-gcc-version.bat" GCCVersion -if "%GCCVersion%"=="" echo Cannot get gcc version.& exit /B 1 - -:: Check external libraries -if not exist "%RootPath%\libs" echo Please build external libraries first.& exit /B 1 - -:: Check gcc version of external libraries -if not exist "%RootPath%\libs\gcc-version" echo Cannot get gcc version of external libraries.& exit /B 1 -set /P LibsGCCVersion=<"%RootPath%\libs\gcc-version" -if "%LibsGCCVersion%" NEQ "%GCCVersion%" echo Please use correct version of external libraries. (gcc %GCCVersion% ^<^> libs %LibsGCCVersion%).& exit /B 1 - -:: Initialize environment -call "%~dp0env.bat" %* -if errorlevel 1 goto error_env - -:: Remove deploy path -if exist "%RsDeployPath%" rmdir /S /Q "%RsDeployPath%" - -:: Check compilation -if not exist "%RsBuildPath%\Makefile" echo Project is not compiled.& goto error - -:: Get compiled revision -set GetRsVersion=%SourcePath%\build_scripts\Windows\tools\get-rs-version.bat -if not exist "%GetRsVersion%" ( - echo File not found - echo %GetRsVersion% - goto error -) - -call "%GetRsVersion%" RS_REVISION_STRING RsRevision -if "%RsRevision%"=="" echo Revision not found.& goto error - -:: Get compiled version -call "%GetRsVersion%" RS_MAJOR_VERSION RsMajorVersion -if "%RsMajorVersion%"=="" echo Major version not found.& goto error - -call "%GetRsVersion%" RS_MINOR_VERSION RsMinorVersion -if "%RsMinorVersion%"=="" echo Minor version not found.& goto error - -call "%GetRsVersion%" RS_BUILD_NUMBER RsBuildNumber -if "%RsBuildNumber%"=="" echo Build number not found.& goto error - -call "%GetRsVersion%" RS_BUILD_NUMBER_ADD RsBuildNumberAdd - -set RsVersion=%RsMajorVersion%.%RsMinorVersion%.%RsBuildNumber%%RsBuildNumberAdd% - -:: Check WMIC is available -wmic.exe alias /? >nul 2>&1 || echo WMIC is not available.&& goto error - -:: Use WMIC to retrieve date in format YYYYMMDD -set RsDate= -for /f "tokens=2 delims==" %%I in ('wmic os get localdatetime /format:list') do set RsDate=%%I -set RsDate=%RsDate:~0,4%%RsDate:~4,2%%RsDate:~6,2% - -if "%RsRetroTor%"=="1" ( - :: Check Retrotor - if not exist "%EnvDownloadPath%\tor\Tor\tor.exe" ( - echo Tor binary not found. Please download Tor Expert Bundle from - echo https://www.torproject.org/download/download.html.en - echo and unpack to - echo %EnvDownloadPath%\tor - goto error - ) -) - -set QtMainVersion=%QtVersion:~0,1% - -rem Qt 4 = QtSvg4.dll -rem Qt 5 = Qt5Svg.dll -set QtMainVersion1= -set QtMainVersion2= -if "%QtMainVersion%"=="4" set QtMainVersion2=4 -if "%QtMainVersion%"=="5" set QtMainVersion1=5 - -if "%RsBuildConfig%" NEQ "release" ( - set Archive=%RsPackPath%\RetroShare-%RsVersion%-Windows-Portable-%RsDate%-%RsRevision%-Qt-%QtVersion%%RsType%%RsArchiveAdd%-%RsBuildConfig%.7z -) else ( - set Archive=%RsPackPath%\RetroShare-%RsVersion%-Windows-Portable-%RsDate%-%RsRevision%-Qt-%QtVersion%%RsType%%RsArchiveAdd%.7z -) - -if exist "%Archive%" del /Q "%Archive%" - -:: Create deploy path -mkdir "%RsDeployPath%" - -title Pack - %SourceName%%RsType%-%RsBuildConfig% [copy files] - -set ExtensionsFile=%SourcePath%\libretroshare\src\rsserver\rsinit.cc -set Extensions= -for /f %%e in ('type "%ExtensionsFile%" ^| "%EnvSedExe%" -n "s/^.*\/\(extensions[^/]*\)\/.*$/\1/p" ^| "%EnvSedExe%" -n "1,1p"') do set Extensions=%%e -if "%Extensions%"=="" echo Folder for extensions not found in %ExtensionsFile%& goto error - -:: Copy files -mkdir "%RsDeployPath%\Data\%Extensions%" -mkdir "%RsDeployPath%\imageformats" -mkdir "%RsDeployPath%\qss" -mkdir "%RsDeployPath%\stylesheets" -mkdir "%RsDeployPath%\sounds" -mkdir "%RsDeployPath%\translations" - -copy nul "%RsDeployPath%\portable" %Quite% - -echo copy binaries -copy "%RsBuildPath%\retroshare-gui\src\%RsBuildConfig%\RetroShare*.exe" "%RsDeployPath%" %Quite% -copy "%RsBuildPath%\retroshare-nogui\src\%RsBuildConfig%\retroshare*-nogui.exe" "%RsDeployPath%" %Quite% - -echo copy extensions -for /D %%D in ("%RsBuildPath%\plugins\*") do ( - call :copy_extension "%%D" "%RsDeployPath%\Data\%Extensions%" - call :copy_dependencies "%RsDeployPath%\Data\%Extensions%\%%~nxD.dll" "%RsDeployPath%" -) - -echo copy external binaries -copy "%RootPath%\libs\bin\*.dll" "%RsDeployPath%" %Quite% - -echo copy dependencies -call :copy_dependencies "%RsDeployPath%\retroshare.exe" "%RsDeployPath%" - -echo copy Qt DLL's -copy "%QtPath%\Qt%QtMainVersion1%Svg%QtMainVersion2%.dll" "%RsDeployPath%" %Quite% - -if "%QtMainVersion%"=="5" ( - mkdir "%RsDeployPath%\platforms" - copy "%QtPath%\..\plugins\platforms\qwindows.dll" "%RsDeployPath%\platforms" %Quite% - mkdir "%RsDeployPath%\audio" - copy "%QtPath%\..\plugins\audio\qtaudio_windows.dll" "%RsDeployPath%\audio" %Quite% -) - -if exist "%QtPath%\..\plugins\styles\qwindowsvistastyle.dll" ( - echo Copy styles - mkdir "%RsDeployPath%\styles" %Quite% - copy "%QtPath%\..\plugins\styles\qwindowsvistastyle.dll" "%RsDeployPath%\styles" %Quite% -) - -copy "%QtPath%\..\plugins\imageformats\*.dll" "%RsDeployPath%\imageformats" %Quite% -del /Q "%RsDeployPath%\imageformats\*d?.dll" %Quite% - -echo copy qss -xcopy /S "%SourcePath%\retroshare-gui\src\qss" "%RsDeployPath%\qss" %Quite% - -echo copy stylesheets -xcopy /S "%SourcePath%\retroshare-gui\src\gui\qss\chat" "%RsDeployPath%\stylesheets" %Quite% -rmdir /S /Q "%RsDeployPath%\stylesheets\compact" %Quite% -rmdir /S /Q "%RsDeployPath%\stylesheets\standard" %Quite% -rmdir /S /Q "%RsDeployPath%\stylesheets\__MACOSX__Bubble" %Quite% - -echo copy sounds -xcopy /S "%SourcePath%\retroshare-gui\src\sounds" "%RsDeployPath%\sounds" %Quite% - -echo copy translation -copy "%SourcePath%\retroshare-gui\src\translations\qt_tr.qm" "%RsDeployPath%\translations" %Quite% -copy "%QtPath%\..\translations\qt_*.qm" "%RsDeployPath%\translations" %Quite% -if "%QtMainVersion%"=="5" ( - copy "%QtPath%\..\translations\qtbase_*.qm" "%RsDeployPath%\translations" %Quite% - copy "%QtPath%\..\translations\qtscript_*.qm" "%RsDeployPath%\translations" %Quite% - copy "%QtPath%\..\translations\qtquick1_*.qm" "%RsDeployPath%\translations" %Quite% - copy "%QtPath%\..\translations\qtmultimedia_*.qm" "%RsDeployPath%\translations" %Quite% - copy "%QtPath%\..\translations\qtxmlpatterns_*.qm" "%RsDeployPath%\translations" %Quite% -) - -echo copy bdboot.txt -copy "%SourcePath%\libbitdht\src\bitdht\bdboot.txt" "%RsDeployPath%" %Quite% - -echo copy changelog.txt -copy "%SourcePath%\retroshare-gui\src\changelog.txt" "%RsDeployPath%" %Quite% - -if exist "%SourcePath%\libresapi\src\webui" ( - echo copy webui - mkdir "%RsDeployPath%\webui" - xcopy /S "%SourcePath%\libresapi\src\webui" "%RsDeployPath%\webui" %Quite% -) - -if "%RsRetroTor%"=="1" ( - echo copy tor - echo n | copy /-y "%EnvDownloadPath%\tor\Tor\*.*" "%RsDeployPath%" %Quite% -) - -rem pack files -title Pack - %SourceName%%RsType%-%RsBuildConfig% [pack files] - -"%EnvSevenZipExe%" a -mx=9 -t7z "%Archive%" "%RsDeployPath%\*" - -title %COMSPEC% - -call :cleanup - -endlocal -exit /B 0 - -:error -call :Cleanup -endlocal -exit /B 1 - -:cleanup -goto :EOF - -:error_env -echo Failed to initialize environment. -endlocal -exit /B 1 - -:copy_extension -if exist "%~1\%RsBuildConfig%\%~n1.dll" ( - copy "%~1\%RsBuildConfig%\%~n1.dll" %2 %Quite% -) -goto :EOF - -:copy_dependencies -for /F "usebackq" %%A in (`%ToolsPath%\depends.bat list %1`) do ( - if exist "%QtPath%\%%A" ( - copy "%QtPath%\%%A" %2 %Quite% - ) else ( - if exist "%MinGWPath%\%%A" ( - copy "%MinGWPath%\%%A" %2 %Quite% - ) - ) -) -goto :EOF diff -Nru retroshare-0.6.4/src/build_scripts/Windows/build.bat retroshare-0.6.4/src/build_scripts/Windows/build.bat --- retroshare-0.6.4/src/build_scripts/Windows/build.bat 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/build_scripts/Windows/build.bat 1970-01-01 00:00:00.000000000 +0000 @@ -1,31 +0,0 @@ -@echo off - -setlocal - -:: Initialize environment -call "%~dp0env.bat" -if errorlevel 1 goto error_env -call "%EnvPath%\env.bat" -if errorlevel 1 goto error_env - -%cecho% info "Build libraries" -call "%~dp0build-libs\build-libs.bat" auto-copy -if errorlevel 1 %cecho% error "Failed to build libraries." & exit /B %ERRORLEVEL% - -%cecho% info "Build %SourceName%" -call "%~dp0build\build.bat" standard -if errorlevel 1 %cecho% error "Failed to build %SourceName%." & exit /B %ERRORLEVEL% - -%cecho% info "Pack %SourceName%" -call "%~dp0build\pack.bat" standard -if errorlevel 1 %cecho% error "Failed to pack %SourceName%." & exit /B %ERRORLEVEL% - -%cecho% info "Build installer" -call "%~dp0build\build-installer.bat" -if errorlevel 1 %cecho% error "Failed to build installer." & exit /B %ERRORLEVEL% - -exit /B 0 - -:error_env -echo Failed to initialize environment. -exit /B 1 diff -Nru retroshare-0.6.4/src/build_scripts/Windows/build-libs/build-libs.bat retroshare-0.6.4/src/build_scripts/Windows/build-libs/build-libs.bat --- retroshare-0.6.4/src/build_scripts/Windows/build-libs/build-libs.bat 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/build_scripts/Windows/build-libs/build-libs.bat 1970-01-01 00:00:00.000000000 +0000 @@ -1,45 +0,0 @@ -:: Usage: -:: call build-libs.bat [auto-copy] [make tasks] - -@echo off - -setlocal - -:: Parameter -set MakeParam="DOWNLOAD_PATH=../download" -if "%~1"=="auto-copy" set MakeParam=%MakeParam% "COPY_ANSWER=y"& shift /1 - -set MakeTask= -:param_loop -if "%~1" NEQ "" ( - set MakeTask=%MakeTask% %1 - shift /1 - goto param_loop -) - -:: Initialize environment -call "%~dp0..\env.bat" -if errorlevel 1 goto error_env -call "%EnvPath%\env-msys.bat" -if errorlevel 1 goto error_env - -:: Check MSYS environment -if not exist "%EnvMSYSSH%" %cecho% error "Please install MSYS first." & exit /B 1 - -:: Initialize environment -call "%~dp0env.bat" -if errorlevel 1 goto error_env - -call "%ToolsPath%\msys-path.bat" "%~dp0" MSYSCurPath -call "%ToolsPath%\msys-path.bat" "%BuildLibsPath%" MSYSBuildLibsPath - -if not exist "%BuildLibsPath%" mkdir "%BuildLibsPath%" - -%EnvMSYSCmd% "cd "%MSYSBuildLibsPath%" && make -f %MSYSCurPath%/makefile %MakeParam% %MakeTask%" - -exit /B %ERRORLEVEL% - -:error_env -echo Failed to initialize environment. -endlocal -exit /B 1 diff -Nru retroshare-0.6.4/src/build_scripts/Windows/build-libs/clean.bat retroshare-0.6.4/src/build_scripts/Windows/build-libs/clean.bat --- retroshare-0.6.4/src/build_scripts/Windows/build-libs/clean.bat 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/build_scripts/Windows/build-libs/clean.bat 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -@echo off - -call "%~dp0build-libs.bat" clean diff -Nru retroshare-0.6.4/src/build_scripts/Windows/build-libs/env.bat retroshare-0.6.4/src/build_scripts/Windows/build-libs/env.bat --- retroshare-0.6.4/src/build_scripts/Windows/build-libs/env.bat 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/build_scripts/Windows/build-libs/env.bat 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ -:: Check MinGW environment -set MinGWPath= -call "%ToolsPath%\find-in-path.bat" MinGWPath gcc.exe -if "%MinGWPath%"=="" %cecho% error "Please run command in the Qt Command Prompt or add the path to MinGW bin folder to PATH variable." & exit /B 1 - -:: Get gcc versions -call "%ToolsPath%\get-gcc-version.bat" GCCVersion -if "%GCCVersion%"=="" %cecho% error "Cannot get gcc version." & exit /B 1 - -set BuildLibsPath=%EnvRootPath%\build-libs\gcc-%GCCVersion% - -exit /B 0 diff -Nru retroshare-0.6.4/src/build_scripts/Windows/build-libs/Makefile retroshare-0.6.4/src/build_scripts/Windows/build-libs/Makefile --- retroshare-0.6.4/src/build_scripts/Windows/build-libs/Makefile 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/build_scripts/Windows/build-libs/Makefile 1970-01-01 00:00:00.000000000 +0000 @@ -1,342 +0,0 @@ -ZLIB_VERSION=1.2.3 -BZIP2_VERSION=1.0.6 -MINIUPNPC_VERSION=2.0 -OPENSSL_VERSION=1.0.2n -SPEEX_VERSION=1.2.0 -SPEEXDSP_VERSION=1.2rc3 -OPENCV_VERSION=3.4.1 -LIBXML2_VERSION=2.9.7 -LIBXSLT_VERSION=1.1.32 -CURL_VERSION=7.58.0 -TCL_VERSION=8.6.2 -SQLCIPHER_VERSION=2.2.1 -LIBMICROHTTPD_VERSION=0.9.59 -FFMPEG_VERSION=3.4 - -MAKEFILE_PATH=$(dir $(MAKEFILE_LIST)) -LIBS_PATH?=$(MAKEFILE_PATH)../../../../libs - -DOWNLOAD_PATH?=download -COPY_ANSWER?= - -all: dirs zlib bzip2 miniupnpc openssl speex speexdsp opencv libxml2 libxslt curl sqlcipher libmicrohttpd ffmpeg copylibs - -download: \ - $(DOWNLOAD_PATH)/zlib-$(ZLIB_VERSION).tar.gz \ - $(DOWNLOAD_PATH)/bzip2-$(BZIP2_VERSION).tar.gz \ - $(DOWNLOAD_PATH)/miniupnpc-$(MINIUPNPC_VERSION).tar.gz \ - $(DOWNLOAD_PATH)/openssl-$(OPENSSL_VERSION).tar.gz \ - $(DOWNLOAD_PATH)/speex-$(SPEEX_VERSION).tar.gz \ - $(DOWNLOAD_PATH)/speexdsp-$(SPEEXDSP_VERSION).tar.gz \ - $(DOWNLOAD_PATH)/opencv-$(OPENCV_VERSION).tar.gz \ - $(DOWNLOAD_PATH)/libxml2-$(LIBXML2_VERSION).tar.gz \ - $(DOWNLOAD_PATH)/libxslt-$(LIBXSLT_VERSION).tar.gz \ - $(DOWNLOAD_PATH)/curl-$(CURL_VERSION).tar.gz \ - $(DOWNLOAD_PATH)/tcl$(TCL_VERSION)-src.tar.gz \ - $(DOWNLOAD_PATH)/sqlcipher-$(SQLCIPHER_VERSION).tar.gz \ - $(DOWNLOAD_PATH)/libmicrohttpd-$(LIBMICROHTTPD_VERSION).tar.gz \ - $(DOWNLOAD_PATH)/ffmpeg-$(FFMPEG_VERSION).tar.gz - -clean: - rm -r -f libs - -dirs: - mkdir -p $(DOWNLOAD_PATH) - mkdir -p libs - gcc --version | head --lines 1 | tr ' ' '\n' | tail -1 >libs/gcc-version - -$(DOWNLOAD_PATH)/zlib-$(ZLIB_VERSION).tar.gz: - wget --no-check-certificate http://sourceforge.net/projects/libpng/files/zlib/$(ZLIB_VERSION)/zlib-$(ZLIB_VERSION).tar.gz/download -O $(DOWNLOAD_PATH)/zlib-$(ZLIB_VERSION).tar.gz - -zlib: libs/zlib-$(ZLIB_VERSION) - -libs/zlib-$(ZLIB_VERSION): $(DOWNLOAD_PATH)/zlib-$(ZLIB_VERSION).tar.gz - # prepare - rm -r -f libs/zlib-* - tar xvf $(DOWNLOAD_PATH)/zlib-$(ZLIB_VERSION).tar.gz - # build - cd zlib-$(ZLIB_VERSION) && ./configure - #cd zlib-$(ZLIB_VERSION) && make install prefix="`pwd`/../libs" - cd zlib-$(ZLIB_VERSION) && make - # copy files - mkdir -p libs/zlib-$(ZLIB_VERSION).tmp/include - cp zlib-$(ZLIB_VERSION)/zlib.h libs/zlib-$(ZLIB_VERSION).tmp/include/ - cp zlib-$(ZLIB_VERSION)/zconf.h libs/zlib-$(ZLIB_VERSION).tmp/include/ - mkdir -p libs/zlib-$(ZLIB_VERSION).tmp/lib - cp zlib-$(ZLIB_VERSION)/libz.a libs/zlib-$(ZLIB_VERSION).tmp/lib/ - rm -r -f zlib-$(ZLIB_VERSION) - mv libs/zlib-$(ZLIB_VERSION).tmp libs/zlib-$(ZLIB_VERSION) - -bzip2: libs/bzip2-$(BZIP2_VERSION) - -$(DOWNLOAD_PATH)/bzip2-$(BZIP2_VERSION).tar.gz: - wget http://bzip.org/$(BZIP2_VERSION)/bzip2-$(BZIP2_VERSION).tar.gz -O $(DOWNLOAD_PATH)/bzip2-$(BZIP2_VERSION).tar.gz - -libs/bzip2-$(BZIP2_VERSION): $(DOWNLOAD_PATH)/bzip2-$(BZIP2_VERSION).tar.gz - # prepare - rm -r -f libs/bzip2-* - tar xvf $(DOWNLOAD_PATH)/bzip2-$(BZIP2_VERSION).tar.gz - # build - #cd bzip2-$(BZIP2_VERSION) && make install PREFIX="`pwd`/../libs" - cd bzip2-$(BZIP2_VERSION) && make - # copy files - mkdir -p libs/bzip2-$(BZIP2_VERSION).tmp/include - cp bzip2-$(BZIP2_VERSION)/bzlib.h libs/bzip2-$(BZIP2_VERSION).tmp/include/ - mkdir -p libs/bzip2-$(BZIP2_VERSION).tmp/lib - cp bzip2-$(BZIP2_VERSION)/libbz2.a libs/bzip2-$(BZIP2_VERSION).tmp/lib/ - rm -r -f bzip2-$(BZIP2_VERSION) - mv libs/bzip2-$(BZIP2_VERSION).tmp libs/bzip2-$(BZIP2_VERSION) - -miniupnpc: libs/miniupnpc-$(MINIUPNPC_VERSION) - -$(DOWNLOAD_PATH)/miniupnpc-$(MINIUPNPC_VERSION).tar.gz: - wget http://miniupnp.free.fr/files/download.php?file=miniupnpc-$(MINIUPNPC_VERSION).tar.gz -O $(DOWNLOAD_PATH)/miniupnpc-$(MINIUPNPC_VERSION).tar.gz - -libs/miniupnpc-$(MINIUPNPC_VERSION): $(DOWNLOAD_PATH)/miniupnpc-$(MINIUPNPC_VERSION).tar.gz - # prepare - rm -r -f libs/miniupnpc-* - tar xvf $(DOWNLOAD_PATH)/miniupnpc-$(MINIUPNPC_VERSION).tar.gz - # build - cd miniupnpc-$(MINIUPNPC_VERSION) && export CC=gcc && make -f Makefile.mingw init libminiupnpc.a miniupnpc.dll - # copy files - mkdir -p libs/miniupnpc-$(MINIUPNPC_VERSION).tmp/include/miniupnpc - cp miniupnpc-$(MINIUPNPC_VERSION)/*.h libs/miniupnpc-$(MINIUPNPC_VERSION).tmp/include/miniupnpc/ - mkdir -p libs/miniupnpc-$(MINIUPNPC_VERSION).tmp/lib - cp miniupnpc-$(MINIUPNPC_VERSION)/miniupnpc.lib libs/miniupnpc-$(MINIUPNPC_VERSION).tmp/lib/ - mkdir -p libs/miniupnpc-$(MINIUPNPC_VERSION).tmp/bin - cp miniupnpc-$(MINIUPNPC_VERSION)/miniupnpc.dll libs/miniupnpc-$(MINIUPNPC_VERSION).tmp/bin/ - rm -r -f miniupnpc-$(MINIUPNPC_VERSION) - mv libs/miniupnpc-$(MINIUPNPC_VERSION).tmp libs/miniupnpc-$(MINIUPNPC_VERSION) - -openssl: libs/openssl-$(OPENSSL_VERSION) - -$(DOWNLOAD_PATH)/openssl-$(OPENSSL_VERSION).tar.gz: - wget --no-check-certificate https://www.openssl.org/source/openssl-$(OPENSSL_VERSION).tar.gz -O $(DOWNLOAD_PATH)/openssl-$(OPENSSL_VERSION).tar.gz - -libs/openssl-$(OPENSSL_VERSION): $(DOWNLOAD_PATH)/openssl-$(OPENSSL_VERSION).tar.gz - # prepare - rm -r -f libs/openssl-* - tar xvf $(DOWNLOAD_PATH)/openssl-$(OPENSSL_VERSION).tar.gz - # build - #cd openssl-$(OPENSSL_VERSION) && ./config --prefix="`pwd`/../libs" - #cd openssl-$(OPENSSL_VERSION) && make install - cd openssl-$(OPENSSL_VERSION) && ./config shared - cd openssl-$(OPENSSL_VERSION) && make - # copy files - mkdir -p libs/openssl-$(OPENSSL_VERSION).tmp/include/openssl - cp openssl-$(OPENSSL_VERSION)/include/openssl/*.h libs/openssl-$(OPENSSL_VERSION).tmp/include/openssl/ - mkdir -p libs/openssl-$(OPENSSL_VERSION).tmp/bin - cp openssl-$(OPENSSL_VERSION)/libeay32.dll libs/openssl-$(OPENSSL_VERSION).tmp/bin/ - cp openssl-$(OPENSSL_VERSION)/ssleay32.dll libs/openssl-$(OPENSSL_VERSION).tmp/bin/ - mkdir -p libs/openssl-$(OPENSSL_VERSION).tmp/lib - cp openssl-$(OPENSSL_VERSION)/libcrypto.dll.a libs/openssl-$(OPENSSL_VERSION).tmp/lib/ - cp openssl-$(OPENSSL_VERSION)/libssl.dll.a libs/openssl-$(OPENSSL_VERSION).tmp/lib/ - rm -r -f openssl-$(OPENSSL_VERSION) - mv libs/openssl-$(OPENSSL_VERSION).tmp libs/openssl-$(OPENSSL_VERSION) - -speex: libs/speex-$(SPEEX_VERSION) - -$(DOWNLOAD_PATH)/speex-$(SPEEX_VERSION).tar.gz: - wget --no-check-certificate http://downloads.xiph.org/releases/speex/speex-$(SPEEX_VERSION).tar.gz -O $(DOWNLOAD_PATH)/speex-$(SPEEX_VERSION).tar.gz - -libs/speex-$(SPEEX_VERSION): $(DOWNLOAD_PATH)/speex-$(SPEEX_VERSION).tar.gz - # prepare - rm -r -f libs/speex-* - tar xvf $(DOWNLOAD_PATH)/speex-$(SPEEX_VERSION).tar.gz - # build - cd speex-$(SPEEX_VERSION) && ./configure - #cd speex-$(SPEEX_VERSION) && make install exec_prefix="`pwd`/../libs" - cd speex-$(SPEEX_VERSION) && make - # copy files - mkdir -p libs/speex-$(SPEEX_VERSION).tmp/include/speex - cp speex-$(SPEEX_VERSION)/include/speex/*.h libs/speex-$(SPEEX_VERSION).tmp/include/speex/ - mkdir -p libs/speex-$(SPEEX_VERSION).tmp/lib - cp speex-$(SPEEX_VERSION)/libspeex/.libs/libspeex.a libs/speex-$(SPEEX_VERSION).tmp/lib - rm -r -f speex-$(SPEEX_VERSION) - mv libs/speex-$(SPEEX_VERSION).tmp libs/speex-$(SPEEX_VERSION) - -speexdsp: libs/speexdsp-$(SPEEXDSP_VERSION) - -$(DOWNLOAD_PATH)/speexdsp-$(SPEEXDSP_VERSION).tar.gz: - wget --no-check-certificate http://downloads.xiph.org/releases/speex/speexdsp-$(SPEEXDSP_VERSION).tar.gz -O $(DOWNLOAD_PATH)/speexdsp-$(SPEEXDSP_VERSION).tar.gz - -libs/speexdsp-$(SPEEXDSP_VERSION): $(DOWNLOAD_PATH)/speexdsp-$(SPEEXDSP_VERSION).tar.gz - # prepare - rm -r -f libs/speexdsp-* - tar xvf $(DOWNLOAD_PATH)/speexdsp-$(SPEEXDSP_VERSION).tar.gz - # build - cd speexdsp-$(SPEEXDSP_VERSION) && ./configure - cd speexdsp-$(SPEEXDSP_VERSION) && make - # copy files - mkdir -p libs/speexdsp-$(SPEEXDSP_VERSION).tmp/include/speex - cp speexdsp-$(SPEEXDSP_VERSION)/include/speex/*.h libs/speexdsp-$(SPEEXDSP_VERSION).tmp/include/speex/ - mkdir -p libs/speexdsp-$(SPEEXDSP_VERSION).tmp/lib - cp speexdsp-$(SPEEXDSP_VERSION)/libspeexdsp/.libs/libspeexdsp.a libs/speexdsp-$(SPEEXDSP_VERSION).tmp/lib - rm -r -f speexdsp-$(SPEEXDSP_VERSION) - mv libs/speexdsp-$(SPEEXDSP_VERSION).tmp libs/speexdsp-$(SPEEXDSP_VERSION) - -opencv: libs/opencv-$(OPENCV_VERSION) - -$(DOWNLOAD_PATH)/opencv-$(OPENCV_VERSION).tar.gz: - wget --no-check-certificate https://github.com/opencv/opencv/archive/$(OPENCV_VERSION).tar.gz -O $(DOWNLOAD_PATH)/opencv-$(OPENCV_VERSION).tar.gz - -libs/opencv-$(OPENCV_VERSION): $(DOWNLOAD_PATH)/opencv-$(OPENCV_VERSION).tar.gz - # prepare - rm -r -f libs/opencv-* - tar xvf $(DOWNLOAD_PATH)/opencv-$(OPENCV_VERSION).tar.gz - # build - mkdir -p opencv-$(OPENCV_VERSION)/build - #cd opencv-$(OPENCV_VERSION)/build && cmake .. -G"MSYS Makefiles" -DCMAKE_BUILD_TYPE=Release -DBUILD_PERF_TESTS=OFF -DBUILD_TESTS=OFF -DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_PREFIX="`pwd`/../../libs" - cd opencv-$(OPENCV_VERSION)/build && cmake .. -G"MSYS Makefiles" -DCMAKE_BUILD_TYPE=Release -DBUILD_PERF_TESTS=OFF -DBUILD_TESTS=OFF -DBUILD_SHARED_LIBS=OFF -DENABLE_CXX11=ON -DCMAKE_CXX_FLAGS="${CMAKE_CXX_FLAGS} -DSTRSAFE_NO_DEPRECATE" -DCMAKE_INSTALL_PREFIX="`pwd`/install" - cd opencv-$(OPENCV_VERSION)/build && make install - # copy files - mkdir -p libs/opencv-$(OPENCV_VERSION).tmp/include - cp -r opencv-$(OPENCV_VERSION)/build/install/include/* libs/opencv-$(OPENCV_VERSION).tmp/include/ - mkdir -p libs/opencv-$(OPENCV_VERSION).tmp/lib/opencv - cp -r opencv-$(OPENCV_VERSION)/build/install/x86/mingw/staticlib/* libs/opencv-$(OPENCV_VERSION).tmp/lib/opencv/ - rm -r -f opencv-$(OPENCV_VERSION) - mv libs/opencv-$(OPENCV_VERSION).tmp libs/opencv-$(OPENCV_VERSION) - -libxml2: libs/libxml2-$(LIBXML2_VERSION) - -$(DOWNLOAD_PATH)/libxml2-$(LIBXML2_VERSION).tar.gz: - wget ftp://xmlsoft.org/libxml2/libxml2-$(LIBXML2_VERSION).tar.gz -O $(DOWNLOAD_PATH)/libxml2-$(LIBXML2_VERSION).tar.gz - -libs/libxml2-$(LIBXML2_VERSION): $(DOWNLOAD_PATH)/libxml2-$(LIBXML2_VERSION).tar.gz - # prepare - rm -r -f libs/libxml2-* - tar xvf $(DOWNLOAD_PATH)/libxml2-$(LIBXML2_VERSION).tar.gz - # build - cd libxml2-$(LIBXML2_VERSION) && ./configure --without-iconv -enable-shared=no - #cd libxml2-$(LIBXML2_VERSION) && make install exec_prefix="`pwd`/../libs" - cd libxml2-$(LIBXML2_VERSION) && make - # copy files - mkdir -p libs/libxml2-$(LIBXML2_VERSION).tmp/include/libxml - cp libxml2-$(LIBXML2_VERSION)/include/libxml/*.h libs/libxml2-$(LIBXML2_VERSION).tmp/include/libxml/ - mkdir -p libs/libxml2-$(LIBXML2_VERSION).tmp/lib - cp libxml2-$(LIBXML2_VERSION)/.libs/libxml2.a libs/libxml2-$(LIBXML2_VERSION).tmp/lib/ - #rm -r -f libxml2-$(LIBXML2_VERSION) # see libxslt - mv libs/libxml2-$(LIBXML2_VERSION).tmp libs/libxml2-$(LIBXML2_VERSION) - -libxslt: libs/libxslt-$(LIBXSLT_VERSION) - -$(DOWNLOAD_PATH)/libxslt-$(LIBXSLT_VERSION).tar.gz: - wget ftp://xmlsoft.org/libxml2/libxslt-$(LIBXSLT_VERSION).tar.gz -O $(DOWNLOAD_PATH)/libxslt-$(LIBXSLT_VERSION).tar.gz - -libs/libxslt-$(LIBXSLT_VERSION): $(DOWNLOAD_PATH)/libxml2-$(LIBXML2_VERSION).tar.gz $(DOWNLOAD_PATH)/libxslt-$(LIBXSLT_VERSION).tar.gz - # prepare - rm -r -f libs/libxslt-* - tar xvf $(DOWNLOAD_PATH)/libxml2-$(LIBXML2_VERSION).tar.gz - tar xvf $(DOWNLOAD_PATH)/libxslt-$(LIBXSLT_VERSION).tar.gz - # build - cd libxslt-$(LIBXSLT_VERSION) && ./configure --with-libxml-src=../libxml2-$(LIBXML2_VERSION) -enable-shared=no CFLAGS=-DLIBXML_STATIC - cd libxslt-$(LIBXSLT_VERSION) && make - # copy files - mkdir -p libs/libxslt-$(LIBXSLT_VERSION).tmp/include/libxslt - cp libxslt-$(LIBXSLT_VERSION)/libxslt/*.h libs/libxslt-$(LIBXSLT_VERSION).tmp/include/libxslt/ - mkdir -p libs/libxslt-$(LIBXSLT_VERSION).tmp/lib - cp libxslt-$(LIBXSLT_VERSION)/libxslt/.libs/libxslt.a libs/libxslt-$(LIBXSLT_VERSION).tmp/lib/ - cp libxslt-$(LIBXSLT_VERSION)/libexslt/.libs/libexslt.a libs/libxslt-$(LIBXSLT_VERSION).tmp/lib/ - rm -r -f libxml2-$(LIBXML2_VERSION) - rm -r -f libxslt-$(LIBXSLT_VERSION) - mv libs/libxslt-$(LIBXSLT_VERSION).tmp libs/libxslt-$(LIBXSLT_VERSION) - -curl: libs/curl-$(CURL_VERSION) - -$(DOWNLOAD_PATH)/curl-$(CURL_VERSION).tar.gz: - wget --no-check-certificate http://curl.haxx.se/download/curl-$(CURL_VERSION).tar.gz -O $(DOWNLOAD_PATH)/curl-$(CURL_VERSION).tar.gz - -libs/curl-$(CURL_VERSION): $(DOWNLOAD_PATH)/curl-$(CURL_VERSION).tar.gz - # prepare - rm -r -f libs/curl-* - tar xvf $(DOWNLOAD_PATH)/curl-$(CURL_VERSION).tar.gz - # build - cd curl-$(CURL_VERSION) && ./configure --disable-shared --with-ssl="`pwd`/../libs/openssl-$(OPENSSL_VERSION)" - #cd curl-$(CURL_VERSION) && make install exec_prefix="`pwd`/../libs" - cd curl-$(CURL_VERSION) && make - # copy files - mkdir -p libs/curl-$(CURL_VERSION).tmp/include/curl - cp curl-$(CURL_VERSION)/include/curl/*.h libs/curl-$(CURL_VERSION).tmp/include/curl/ - mkdir -p libs/curl-$(CURL_VERSION).tmp/lib - cp curl-$(CURL_VERSION)/lib/.libs/libcurl.a libs/curl-$(CURL_VERSION).tmp/lib/ - rm -r -f curl-$(CURL_VERSION) - mv libs/curl-$(CURL_VERSION).tmp libs/curl-$(CURL_VERSION) - -sqlcipher: libs/sqlcipher-$(SQLCIPHER_VERSION) - -$(DOWNLOAD_PATH)/tcl$(TCL_VERSION)-src.tar.gz: - wget --no-check-certificate http://downloads.sourceforge.net/project/tcl/Tcl/$(TCL_VERSION)/tcl$(TCL_VERSION)-src.tar.gz -O $(DOWNLOAD_PATH)/tcl$(TCL_VERSION)-src.tar.gz - -$(DOWNLOAD_PATH)/sqlcipher-$(SQLCIPHER_VERSION).tar.gz: - wget --no-check-certificate https://github.com/sqlcipher/sqlcipher/archive/v$(SQLCIPHER_VERSION).tar.gz -O $(DOWNLOAD_PATH)/sqlcipher-$(SQLCIPHER_VERSION).tar.gz - -libs/sqlcipher-$(SQLCIPHER_VERSION): $(DOWNLOAD_PATH)/tcl$(TCL_VERSION)-src.tar.gz $(DOWNLOAD_PATH)/sqlcipher-$(SQLCIPHER_VERSION).tar.gz - # prepare - rm -r -f libs/sqlcipher-* - # tcl - tar xvf $(DOWNLOAD_PATH)/tcl$(TCL_VERSION)-src.tar.gz - mkdir -p tcl$(TCL_VERSION)/build - cd tcl$(TCL_VERSION)/build && ../win/configure - cd tcl$(TCL_VERSION)/build && make - #sqlcipher - tar xvf $(DOWNLOAD_PATH)/sqlcipher-$(SQLCIPHER_VERSION).tar.gz - cd sqlcipher-$(SQLCIPHER_VERSION) && ln -s ../tcl$(TCL_VERSION)/build/tclsh86.exe tclsh - mkdir -p tcl$(TCL_VERSION)/lib - ln -s `pwd`/tcl$(TCL_VERSION)/library `pwd`/tcl$(TCL_VERSION)/lib/tcl8.6 - # build - cd sqlcipher-$(SQLCIPHER_VERSION) && PATH=.:$$PATH:`pwd`/../tcl$(TCL_VERSION)/build && export LIBS="-L`pwd`/../libs/openssl-$(OPENSSL_VERSION)/lib -lgdi32 $$LIBS" && ./configure --disable-shared --enable-static --enable-tempstore=yes CFLAGS="-DSQLITE_HAS_CODEC -I`pwd`/../libs/openssl-$(OPENSSL_VERSION)/include -I`pwd`/../tcl$(TCL_VERSION)/generic" LDFLAGS="-L`pwd`/../libs/openssl-$(OPENSSL_VERSION)/lib -lcrypto -lgdi32" --with-tcl="`pwd`/../tcl$(TCL_VERSION)/build" && make install prefix="`pwd`/install" - # copy files - mkdir -p libs/sqlcipher-$(SQLCIPHER_VERSION).tmp/include - cp -r sqlcipher-$(SQLCIPHER_VERSION)/install/include/* libs/sqlcipher-$(SQLCIPHER_VERSION).tmp/include/ - mkdir -p libs/sqlcipher-$(SQLCIPHER_VERSION).tmp/lib - cp sqlcipher-$(SQLCIPHER_VERSION)/install/lib/libsqlcipher.a libs/sqlcipher-$(SQLCIPHER_VERSION).tmp/lib/ - mkdir -p libs/sqlcipher-$(SQLCIPHER_VERSION).tmp/bin - cp sqlcipher-$(SQLCIPHER_VERSION)/install/bin/sqlcipher.exe libs/sqlcipher-$(SQLCIPHER_VERSION).tmp/bin/ - rm -r -f sqlcipher-$(SQLCIPHER_VERSION) - rm -r -f tcl$(TCL_VERSION) - mv libs/sqlcipher-$(SQLCIPHER_VERSION).tmp libs/sqlcipher-$(SQLCIPHER_VERSION) - -libmicrohttpd: libs/libmicrohttpd-$(LIBMICROHTTPD_VERSION) - -$(DOWNLOAD_PATH)/libmicrohttpd-$(LIBMICROHTTPD_VERSION).tar.gz: - wget --no-check-certificate http://ftp.gnu.org/gnu/libmicrohttpd/libmicrohttpd-$(LIBMICROHTTPD_VERSION).tar.gz -O $(DOWNLOAD_PATH)/libmicrohttpd-$(LIBMICROHTTPD_VERSION).tar.gz - -libs/libmicrohttpd-$(LIBMICROHTTPD_VERSION): $(DOWNLOAD_PATH)/libmicrohttpd-$(LIBMICROHTTPD_VERSION).tar.gz - # prepare - rm -r -f libs/libmicrohttpd-* - tar xvf $(DOWNLOAD_PATH)/libmicrohttpd-$(LIBMICROHTTPD_VERSION).tar.gz - # build - cd libmicrohttpd-$(LIBMICROHTTPD_VERSION) && ./configure --disable-shared --enable-static --prefix="`pwd`/../libs/libmicrohttpd-$(LIBMICROHTTPD_VERSION).tmp" - cd libmicrohttpd-$(LIBMICROHTTPD_VERSION) && make install - # copy files - rm -r -f libmicrohttpd-$(LIBMICROHTTPD_VERSION) - mv libs/libmicrohttpd-$(LIBMICROHTTPD_VERSION).tmp libs/libmicrohttpd-$(LIBMICROHTTPD_VERSION) - -ffmpeg: libs/ffmpeg-$(FFMPEG_VERSION) - -$(DOWNLOAD_PATH)/ffmpeg-$(FFMPEG_VERSION).tar.gz: - wget --no-check-certificate https://ffmpeg.org/releases/ffmpeg-$(FFMPEG_VERSION).tar.gz -O $(DOWNLOAD_PATH)/ffmpeg-$(FFMPEG_VERSION).tar.gz - -libs/ffmpeg-$(FFMPEG_VERSION): $(DOWNLOAD_PATH)/ffmpeg-$(FFMPEG_VERSION).tar.gz - # prepare - rm -r -f libs/ffmpeg-* - tar xvf $(DOWNLOAD_PATH)/ffmpeg-$(FFMPEG_VERSION).tar.gz - # build - cd ffmpeg-$(FFMPEG_VERSION) && ./configure --disable-shared --enable-static --disable-programs --disable-ffmpeg --disable-ffplay --disable-ffprobe --disable-ffserver --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-yasm --disable-everything --enable-encoder=mpeg4 --enable-decoder=mpeg4 --prefix="`pwd`/../libs/ffmpeg-$(FFMPEG_VERSION).tmp" - cd ffmpeg-$(FFMPEG_VERSION) && make install - # copy files - rm -r -f ffmpeg-$(FFMPEG_VERSION) - mv libs/ffmpeg-$(FFMPEG_VERSION).tmp libs/ffmpeg-$(FFMPEG_VERSION) - -copylibs: - if [ "$(COPY_ANSWER)" = "" ] ; then \ - read -p "Do you want to copy libs to retroshare? (y|n)" answer; \ - else \ - answer=$(COPY_ANSWER) ; \ - fi ; \ - if [ "$$answer" = "y" ] ; then \ - rm -r -f $(LIBS_PATH) ; \ - mkdir -p $(LIBS_PATH) ; \ - cp ./libs/gcc-version $(LIBS_PATH) ; \ - find ./libs -mindepth 1 -maxdepth 1 -type d -not -name "*.tmp" -print -exec cp -r {}/. $(LIBS_PATH) \; ; \ - fi diff -Nru retroshare-0.6.4/src/build_scripts/Windows/build-retrotor.bat retroshare-0.6.4/src/build_scripts/Windows/build-retrotor.bat --- retroshare-0.6.4/src/build_scripts/Windows/build-retrotor.bat 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/build_scripts/Windows/build-retrotor.bat 1970-01-01 00:00:00.000000000 +0000 @@ -1,27 +0,0 @@ -@echo off - -setlocal - -:: Initialize environment -call "%~dp0env.bat" -if errorlevel 1 goto error_env -call "%EnvPath%\env.bat" -if errorlevel 1 goto error_env - -%cecho% info "Build libraries" -call "%~dp0build-libs\build-libs.bat" auto-copy -if errorlevel 1 %cecho% error "Failed to build libraries." & exit /B %ERRORLEVEL% - -%cecho% info "Build %SourceName%" -call "%~dp0build\build.bat" retrotor -if errorlevel 1 %cecho% error "Failed to build %SourceName%." & exit /B %ERRORLEVEL% - -%cecho% info "Pack %SourceName%" -call "%~dp0build\pack.bat" retrotor -if errorlevel 1 %cecho% error "Failed to pack %SourceName%." & exit /B %ERRORLEVEL% - -exit /B 0 - -:error_env -echo Failed to initialize environment. -exit /B 1 diff -Nru retroshare-0.6.4/src/build_scripts/Windows/compilingForWindows.txt retroshare-0.6.4/src/build_scripts/Windows/compilingForWindows.txt --- retroshare-0.6.4/src/build_scripts/Windows/compilingForWindows.txt 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/build_scripts/Windows/compilingForWindows.txt 1970-01-01 00:00:00.000000000 +0000 @@ -1,224 +0,0 @@ - -Compling for Windows. ------------------------------------ -For Version V0.5.0+ we are switching to GPGme libraries. -This documents a clean compilation of V0.5 for Windows. - -Tested on: WinXP July 2009. - -You will need: - * Qt4.5 Development Libraries (from TrollTech) - * MinGw/MinSys full installation (from sourceforge.net) - * Cygwin (for OpenSSL compilation / SVN / Unix Tools) - * OpenSSL standard libraries. - * GPG Windows Install (includes gpg.exe) - * MiniUpnp library - * gpgme Library. - * libgpg-error Library. - - -This compilation is a little tricky as different environments -are needed to compile different libraries. -a) Cygwin: libssl.a libcrypto.a -b) MinGW/MSYS: libgpg-error, libgpgme.a, libretroshare.a, libminiupnp.a -c) Qt/MinGW: Retroshare.exe - - -/***************** Installation of Development Tools **************/ -In this section we install: cygwin, mingw/msys and Qt4.5 - -1) Install Cygwin - a) download the installer and run. - b) be sure to select from the development packages: - * mingw - * svn - * gcc/gdb - * make - links: - http://www.cygwin.org/ - -2) install the MinGW/Msys package. - a) Download MinGW-5.1.4 installer and run. - b) Download MSYS-1.0.11 installer and run. - - links: - http://downloads.sourceforge.net/mingw/MinGW-5.1.4.exe - http://downloads.sourceforge.net/mingw/MSYS-1.0.11.exe - http://www.mingw.org/ - http://sourceforge.net/projects/mingw/files/ - -3) Install Qt4.5 LGPL Version. (Qt SDK 2009.03) - a) Download from website and run. - b) Select all options (including MinGW) - - links: - http://www.qtsoftware.com/downloads - -/***************** Installation of Development Tools **************/ -/******************* Compiling Support Libraries ******************/ - -1) Compile OpenSSL using Cygwin. - a) launch cygwin xterm - b) untar openssl source package. - c) Configure mingw - d) make. - -2) Compile gpg-error - a) Download from gpg - b) load up MinGW/MSYS Bash shell. - c) extract code. - d) configure - e) make - f) make install - - The library will end up in /local/lib - -3) Compile gpgme - a) Download from gpg - b) load up MinGW/MSYS Bash shell. - c) extract code. - d) configure - e) make - f) make install - - The library will end up in /local/lib - - -4) Compile MiniUPnP. - up to release v1.3 now. - links: - http://miniupnp.free.fr/ - http://miniupnp.free.fr/files/ - -5) Install pthreads - - links: - http://sourceware.org/pthreads-win32/ - ftp://sourceware.org/pub/pthreads-win32/pthreads-w32-2-8-0-release.exe - -/******************* Compiling Support Libraries ******************/ -/*********************** Compiling Retroshare *********************/ - -1) Setup Source Code TAR (TODO: Update for windows). - This is useful as it provides a standard structure to work against, - we will update this with the required support libraries soon. - - a) Open MSYS Bash shell, and change to this location. - c:/msys/1.0/home/XXX/retroshare - b) create a working directory under this. - 1) c:/msys/1.0/home/XXX/miniupnpc-1.3 - 2) c:/msys/1.0/home/XXX/pthreads-w32-2-8-0-release - 3) c:/msys/1.0/home/XXX/zlib-1.2.3 - 4) c:/msys/1.0/home/XXX/gpgme-1.1.8 - 5) c:/msys/1.0/home/XXX/libgpg-error-1.7 - c) Install OpenSSL to this directory (get from http://www.slproweb.com/download/Win32OpenSSL-0_9_8k.exe) - 1) c:/msys/1.0/home/XXX/OpenSSL - d) get the latest svn trunk and unzip to (get from http://retroshare.svn.sourceforge.net/viewvc/retroshare/trunk.tar.gz) . - 1) c:/msys/1.0/home/XXX/retroshare - -2) Compile libretroshare - a) change to the libretroshare directory. - 1) cd c:/msys/1.0/home/XXX/retroshare/libretroshare/src - b) modify support directory paths to point at correct locations. - 1) open scripts/config.mk and enable OS = Win # MinGw. - 2) open scripts/config-mingw.mk - 3) disable lines (line 20-29) - 4) enable lines 34-42 and 118-119 - #### Enable this section for compiling with MSYS/MINGW compile - SRC_ROOT=/home/linux - - SSL_DIR=$(SRC_ROOT)/OpenSSL - GPGME_DIR=$(SRC_ROOT)/gpgme-1.1.8 - GPG_ERROR_DIR=$(SRC_ROOT)/libgpg-error-1.7 - - ZLIB_DIR=$(SRC_ROOT)/zlib-1.2.3 - UPNPC_DIR=$(SRC_ROOT)/miniupnpc-1.0 - PTHREADS_DIR=$(SRC_ROOT)/pthreads-w32-2-8-0-release - - ### Enable this for GPGME and GPG ERROR dirs - CFLAGS += -I$(GPGME_DIR)/src - CFLAGS += -I$(GPG_ERROR_DIR)/src - 5) Edit your SRC_ROOT to your /home/xxxx dir - - - c) compile libretroshare - 1) make - -3) Copy all the required support libraries into the library directory: - c:/msys/1.0/home/XXX/lib - - This should include: - - gpg-error / gpgme libraries: - libgpg-error.a - libgpg-error.dll.a - libgpg-error.la - libgpgme.dll.a - libgpgme.la - - openssl libraries: - libcrypto.a - libssl.a - - miniupnpc / pthreads / libz - - libminiupnpc.a - miniupnpc.dll - libpthreadGCE2.a - pthreadGCE2.dll - libz.a - - extra library from cygwin. (renamed from libcrypt32.a) - libcrypt32-cygwin.a - - libretroshare - libretroshare.a - - -4) Compile GUI. - -/*********************** Compiling Retroshare *********************/ -/************************ Running Retroshare **********************/ - -1) Collect Relevant DLL's with Application. - a) make retroshare application directory. - b) copy Retroshare.exe executable into directory. - c) Copy required DLL's into that directory. - These include: - - mingw runtime: - mingwm10.dll - - gpgme/gpg-error: - libgpg-error-0.dll - libgpgme-11.dll - - other support libraries: - miniupnpc.dll - pthreadGCE2.dll - - Qt DLLs: - QtCore4.dll, - QtGui4.dll,... - etc. - - d) You should be able to run Retroshare from this directory now! - -2) Install gpg4win package... for gpg.exe - -3) Create an OpenGPG identity using gpa or Enigmail or other PGP tool. - -4) You should be able to use Retroshare on your PC now. - -/************************ Running Retroshare **********************/ -/******************************** FAQs ****************************/ -Ask and it might be answered! -/******************************** FAQs ****************************/ - -This is obviously a work in progress - -drBob. - - - - - diff -Nru retroshare-0.6.4/src/build_scripts/Windows/env/env.bat retroshare-0.6.4/src/build_scripts/Windows/env/env.bat --- retroshare-0.6.4/src/build_scripts/Windows/env/env.bat 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/build_scripts/Windows/env/env.bat 1970-01-01 00:00:00.000000000 +0000 @@ -1,31 +0,0 @@ -:: Initialize environment -call "%~dp0..\env.bat" -if errorlevel 1 goto error_env - -set EnvRootPath=%RootPath%\%SourceName%-env -set EnvToolsPath=%EnvRootPath%\tools -set EnvTempPath=%EnvRootPath%\tmp -set EnvDownloadPath=%EnvRootPath%\download - -::set EnvCurlExe=%EnvToolsPath%\curl.exe -set EnvWgetExe=%EnvToolsPath%\wget.exe -set EnvSevenZipExe=%EnvToolsPath%\7z.exe -set EnvJomExe=%EnvToolsPath%\jom.exe -set EnvSedExe=%EnvToolsPath%\sed.exe -set EnvCutExe=%EnvToolsPath%\cut.exe -set EnvDependsExe=%EnvToolsPath%\depends.exe -set EnvMakeNSISExe=%EnvToolsPath%\NSIS\makensis.exe -set EnvCEchoExe=%EnvToolsPath%\cecho.exe -set cecho=call "%ToolsPath%\cecho.bat" - -:: Create folders -if not exist "%EnvRootPath%" mkdir "%EnvRootPath%" -if not exist "%EnvToolsPath%" mkdir "%EnvToolsPath%" -if not exist "%EnvDownloadPath%" mkdir "%EnvDownloadPath%" - -call "%~dp0tools\prepare-tools.bat" -exit /B %ERRORLEVEL% - -:error_env -echo Failed to initialize environment. -exit /B 1 diff -Nru retroshare-0.6.4/src/build_scripts/Windows/env/env-msys.bat retroshare-0.6.4/src/build_scripts/Windows/env/env-msys.bat --- retroshare-0.6.4/src/build_scripts/Windows/env/env-msys.bat 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/build_scripts/Windows/env/env-msys.bat 1970-01-01 00:00:00.000000000 +0000 @@ -1,22 +0,0 @@ -:: Usage: -:: call env-msys.bat [reinstall|clean] - -:: Initialize environment -call "%~dp0env.bat" -if errorlevel 1 goto error_env - -set EnvMSYSPath=%EnvRootPath%\msys - -call "%~dp0tools\prepare-msys.bat" %1 -if errorlevel 1 exit /B %ERRORLEVEL% - -set EnvMSYSSH=%EnvMSYSPath%\msys\1.0\bin\sh.exe -if not exist "%EnvMSYSSH%" if errorlevel 1 goto error_env - -set EnvMSYSCmd="%EnvMSYSSH%" --login -i -c - -exit /B 0 - -:error_env -echo Failed to initialize environment. -exit /B 1 diff -Nru retroshare-0.6.4/src/build_scripts/Windows/env/env-qt.bat retroshare-0.6.4/src/build_scripts/Windows/env/env-qt.bat --- retroshare-0.6.4/src/build_scripts/Windows/env/env-qt.bat 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/build_scripts/Windows/env/env-qt.bat 1970-01-01 00:00:00.000000000 +0000 @@ -1,23 +0,0 @@ -:: Usage: -:: call env-qt4.bat version [reinstall|clean] - -:: Initialize environment -call "%~dp0env.bat" -if errorlevel 1 goto error_env - -set EnvQtBasePath=%EnvRootPath%\qt - -:: Create folders -if not exist "%EnvQtBasePath%" mkdir "%EnvQtBasePath%" - -call "%~dp0tools\prepare-qt.bat" %1 %2 -if errorlevel 1 exit /B %ERRORLEVEL% - -if "%MinGWDir%" NEQ "" set PATH=%MinGWDir%\bin;%PATH% -if "%QtDir%" NEQ "" set PATH=%QtDir%\bin;%PATH% - -exit /B 0 - -:error_env -echo Failed to initialize environment. -exit /B 1 diff -Nru retroshare-0.6.4/src/build_scripts/Windows/env/tools/prepare-msys.bat retroshare-0.6.4/src/build_scripts/Windows/env/tools/prepare-msys.bat --- retroshare-0.6.4/src/build_scripts/Windows/env/tools/prepare-msys.bat 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/build_scripts/Windows/env/tools/prepare-msys.bat 1970-01-01 00:00:00.000000000 +0000 @@ -1,80 +0,0 @@ -:: Usage: -:: call prepare-msys.bat [reinstall|clean] - -setlocal enabledelayedexpansion - -if "%EnvMSYSPath%"=="" exit /B 1 -if not exist "%EnvRootPath%"=="" exit /B 1 - -copy "%~dp0root\update-msys.bat" "%EnvRootPath%" >nul - -if "%~1"=="clean" ( - %cecho% info "Clean MSYS" - call "%ToolsPath%\remove-dir.bat" "%EnvMSYSPath%" - goto exit -) - -if exist "%EnvMSYSPath%\bin\mingw-get.exe" ( - if "%~1"=="reinstall" ( - choice /M "Found existing MSYS version. Do you want to proceed?" - if !ERRORLEVEL!==2 goto exit - ) else ( - goto exit - ) -) - -set MSYSInstall=mingw-get-0.6.2-mingw32-beta-20131004-1-bin.zip -set MSYSUrl=http://sourceforge.net/projects/mingw/files/Installer/mingw-get/mingw-get-0.6.2-beta-20131004-1/%MSYSInstall%/download -set CMakeInstall=cmake-3.1.0-win32-x86.zip -set CMakeUrl=http://www.cmake.org/files/v3.1/%CMakeInstall% -set CMakeUnpackPath=%EnvMSYSPath%\msys\1.0 - -%cecho% info "Remove previous MSYS version" -call "%ToolsPath%\remove-dir.bat" "%EnvMSYSPath%" - -%cecho% info "Download installation files" -if not exist "%EnvDownloadPath%\%MSYSInstall%" call "%ToolsPath%\download-file.bat" "%MSYSUrl%" "%EnvDownloadPath%\%MSYSInstall%" -if not exist "%EnvDownloadPath%\%MSYSInstall%" %cecho% error "Cannot download MSYS" & goto error - -if not exist "%EnvDownloadPath%\%CMakeInstall%" call "%ToolsPath%\download-file.bat" "%CMakeUrl%" "%EnvDownloadPath%\%CMakeInstall%" -if not exist "%EnvDownloadPath%\%CMakeInstall%" %cecho% error "Cannot download CMake" & goto error - -%cecho% info "Unpack MSYS" -"%EnvSevenZipExe%" x -o"%EnvMSYSPath%" "%EnvDownloadPath%\%MSYSInstall%" - -%cecho% info "Install MSYS" -if not exist "%EnvMSYSPath%\var\lib\mingw-get\data\profile.xml" copy "%EnvMSYSPath%\var\lib\mingw-get\data\defaults.xml" "%EnvMSYSPath%\var\lib\mingw-get\data\profile.xml" -pushd "%EnvMSYSPath%\bin" -mingw-get.exe install mingw32-mingw-get -mingw-get.exe install msys-coreutils -mingw-get.exe install msys-base -mingw-get.exe install msys-autoconf -mingw-get.exe install msys-automake -mingw-get.exe install msys-autogen -mingw-get.exe install msys-mktemp -mingw-get.exe install msys-wget -popd - -%cecho% info "Unpack CMake" -"%EnvSevenZipExe%" x -o"%CMakeUnpackPath%" "%EnvDownloadPath%\%CMakeInstall%" - -%cecho% info "Install CMake" -set CMakeVersion= -for /D %%F in (%CMakeUnpackPath%\cmake*) do set CMakeVersion=%%~nxF -if "%CMakeVersion%"=="" %cecho% error "CMake version not found." & goto :exit -%cecho% info "Found CMake version %CMakeVersion%" - -set FoundProfile= -for /f "tokens=3" %%F in ('find /c /i "%CMakeVersion%" "%EnvMSYSPath%\msys\1.0\etc\profile"') do set FoundProfile=%%F - -if "%FoundProfile%"=="0" ( - echo export PATH="${PATH}:/%CMakeVersion%/bin">>"%EnvMSYSPath%\msys\1.0\etc\profile" -) - -:exit -endlocal -exit /B 0 - -:error -endlocal -exit /B 1 diff -Nru retroshare-0.6.4/src/build_scripts/Windows/env/tools/prepare-qt.bat retroshare-0.6.4/src/build_scripts/Windows/env/tools/prepare-qt.bat --- retroshare-0.6.4/src/build_scripts/Windows/env/tools/prepare-qt.bat 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/build_scripts/Windows/env/tools/prepare-qt.bat 1970-01-01 00:00:00.000000000 +0000 @@ -1,204 +0,0 @@ -:: Usage: -:: call prepare-qt.bat version [reinstall|clean] - -setlocal enabledelayedexpansion - -if "%EnvQtBasePath%"=="" exit /B 1 -if not exist "%EnvRootPath%"=="" exit /B 1 - -set EnvQtVersion=%~1 -if "%EnvQtVersion%"=="" ( - %cecho% error "Please specify Qt version" - goto error -) - -for /f "tokens=1,2 delims=." %%A in ("%EnvQtVersion%") do set EnvQtMainVersion=%%A& set EnvQtBaseVersion=%%A.%%B -set EnvQtPath=%EnvQtBasePath%\%EnvQtVersion% - -if "%~2"=="clean" ( - %cecho% info "Clean Qt %EnvQtVersion%" - call "%ToolsPath%\remove-dir.bat" "%EnvQtPath%" - goto exit -) - -set CheckQmakeExe= -if "%EnvQtMainVersion%"=="4" ( - set CheckQmakeExe=%EnvQtPath%\Qt\bin\qmake.exe -) else ( - if "%EnvQtMainVersion%" GEQ "5" ( - call :get_mingw_version EnvQtMinGWVersion "%EnvQtPath%\%EnvQtBaseVersion%" - if "!EnvQtMinGWVersion!" NEQ "" ( - set CheckQmakeExe=%EnvQtPath%\%EnvQtBaseVersion%\!EnvQtMinGWVersion!\bin\qmake.exe - ) - ) -) - -if "%CheckQmakeExe%" NEQ "" ( - if exist "%CheckQmakeExe%" ( - if "%~2"=="reinstall" ( - choice /M "Found existing Qt %EnvQtVersion% version. Do you want to proceed?" - if !ERRORLEVEL!==2 goto exit - ) else ( - goto exit - ) - ) -) - -set QtInstall=qt-opensource-windows-x86-mingw-%EnvQtVersion%.exe -set QtInstallWildcard=qt-opensource-windows-x86-mingw*-%EnvQtVersion%.exe -set QtUrl=http://download.qt.io/official_releases/qt/%EnvQtBaseVersion%/%EnvQtVersion% - -%cecho% info "Remove previous Qt %EnvQtVersion% version" -call "%ToolsPath%\remove-dir.bat" "%EnvQtPath%" - -%cecho% info "Download Qt installation files" -if not exist "%EnvDownloadPath%\%QtInstall%" ( - call "%ToolsPath%\download-file-wildcard.bat" "%QtUrl%" "%QtInstallWildcard%" "%EnvDownloadPath%" QtInstallDownload - if "!QtInstallDownload!"=="" %cecho% error "Cannot download Qt %EnvQtVersion%" & goto error - ren "%EnvDownloadPath%\!QtInstallDownload!" "%QtInstall%" -) -if not exist "%EnvDownloadPath%\%QtInstall%" %cecho% error "Cannot download Qt %EnvQtVersion%" & goto error - -mkdir "%EnvQtPath%" - -if "%EnvQtMainVersion%"=="4" ( - rem Qt 4 - goto install_qt4 -) -if "%EnvQtMainVersion%" GEQ "5" ( - rem Qt >= 5 - goto install_qt5 -) - -%cecho% error "Unknown Qt version %EnvQtVersion%" - -:error -endlocal & set QtDir=& set MinGWDir= -exit /B 1 - -:exit -set QtDir= -set MinGWDir= - -if "%EnvQtMainVersion%"=="4" ( - rem Qt 4 - set QtDir=%EnvQtBasePath%\%EnvQtVersion%\Qt - set MinGWDir=%EnvQtBasePath%\%EnvQtVersion%\mingw32 -) else ( - if "%EnvQtMainVersion%" GEQ "5" ( - call :get_mingw_version EnvQtToolsMinGWVersion "%EnvQtPath%\Tools" - - set QtDir=%EnvQtPath%\%EnvQtBaseVersion%\!EnvQtMinGWVersion! - set MinGWDir=%EnvQtPath%\Tools\!EnvQtToolsMinGWVersion! - ) -) - -endlocal & set QtDir=%QtDir%& set MinGWDir=%MinGWDir% -exit /B 0 - -:get_mingw_version -setlocal enabledelayedexpansion -set Variable=%~1 -set Result= - -for /D %%A in (%~2\*) do set Name=%%~nA& if "!Name:~0,5!"=="mingw" set Result=!Name! -endlocal & set %Variable%=%Result% -goto :EOF - -:replace -set InFile=%~1 -set InFileName=%~nx1 -set OutFile=%~1.tmp -set SearchText=%~2 -set ReplaceText=%~3 - -if exist "%OutFile%" del /Q "%OutFile%" - -for /f "tokens=1* delims=]" %%A in ('find /n /v ""^<%InFile%') do ( - set string=%%B - - if "!string!"=="" ( - echo.>>%OutFile% - ) else ( - set modified=!string:%SearchText%=%ReplaceText%! - echo !modified!>> %OutFile% - ) -) -del "%InFile%" -rename "%OutFile%" "%InFileName%" -goto :EOF - -:install_qt4 -set MinGWInstall=i686-4.8.2-release-posix-dwarf-rt_v3-rev3.7z -set MinGWUrl=http://sourceforge.net/projects/mingw-w64/files/Toolchains targetting Win32/Personal Builds/mingw-builds/4.8.2/threads-posix/dwarf/%MinGWInstall%/download - -%cecho% info "Download MinGW installation files" -if not exist "%EnvDownloadPath%\%MinGWInstall%" call "%ToolsPath%\download-file.bat" "%MinGWUrl%" "%EnvDownloadPath%\%MinGWInstall%" -if not exist "%EnvDownloadPath%\%MinGWInstall%" %cecho% error "Cannot download MinGW" & goto error - -%cecho% info "Unpack Qt %EnvQtVersion%" -call "%ToolsPath%\remove-dir.bat" "%EnvTempPath%" -mkdir "%EnvTempPath%" -"%EnvSevenZipExe%" x -o"%EnvTempPath%" "%EnvDownloadPath%\%QtInstall%" $_14_ -move "%EnvTempPath%\$_14_" "%EnvQtPath%\Qt" -call "%ToolsPath%\remove-dir.bat" "%EnvTempPath%" - -%cecho% info "Unpack MinGW" -"%EnvSevenZipExe%" x -o"%EnvQtPath%" "%EnvDownloadPath%\%MinGWInstall%" - -echo Prepare Qt %EnvQtVersion% -echo [Paths]>"%EnvQtPath%\Qt\bin\qt.conf" -echo Prefix=..>>"%EnvQtPath%\Qt\bin\qt.conf" - -goto exit - -:install_qt5 -set EnvQtInstallerFrameworkVersion=2.0.3 - -set QtInstallerFrameworkInstall=QtInstallerFramework-%EnvQtInstallerFrameworkVersion%-win-x86.exe -set QtInstallerFrameworkUrl=http://download.qt.io/official_releases/qt-installer-framework/%EnvQtInstallerFrameworkVersion%/QtInstallerFramework-win-x86.exe - -%cecho% info "Download QtInstallerFramework installation files" -if not exist "%EnvDownloadPath%\%QtInstallerFrameworkInstall%" call "%ToolsPath%\download-file.bat" "%QtInstallerFrameworkUrl%" "%EnvDownloadPath%\%QtInstallerFrameworkInstall%" -if not exist "%EnvDownloadPath%\%QtInstallerFrameworkInstall%" %cecho% error "Cannot download Qt Installer Framework %EnvQtInstallerFrameworkVersion%" & goto error - -%cecho% info "Unpack Qt Installer Framework" -call "%ToolsPath%\remove-dir.bat" "%EnvTempPath%" -mkdir "%EnvTempPath%" -"%EnvSevenZipExe%" x -o"%EnvTempPath%" "%EnvDownloadPath%\%QtInstallerFrameworkInstall%" bin\devtool.exe -move "%EnvTempPath%\bin\devtool.exe" "%EnvQtPath%" -call "%ToolsPath%\remove-dir.bat" "%EnvTempPath%" - -%cecho% info "Unpack Qt %EnvQtVersion%" -call "%ToolsPath%\remove-dir.bat" "%EnvTempPath%" -mkdir "%EnvTempPath%" -"%EnvQtPath%\devtool.exe" "%EnvDownloadPath%\%QtInstall%" --dump "%EnvTempPath%" - -pushd "%EnvTempPath%" -del /S *vcredist*.7z -del /S *qtcreator*.7z -del /S *1installer-changelog.7z -for /R %%F in (*.7z) do "%EnvSevenZipExe%" x -y -o"%EnvQtPath%" "%%F" -popd - -call "%ToolsPath%\remove-dir.bat" "%EnvTempPath%" - -call :get_mingw_version EnvQtMinGWVersion "%EnvQtPath%\%EnvQtBaseVersion%" - -%cecho% info "Prepare Qt %EnvQtVersion%" -echo [Paths]>"%EnvQtPath%\%EnvQtBaseVersion%\%EnvQtMinGWVersion%\bin\qt.conf" -echo Documentation=../../Docs/Qt-%EnvQtBaseVersion%>>"%EnvQtPath%\%EnvQtBaseVersion%\%EnvQtMinGWVersion%\bin\qt.conf" -echo Examples=../../Examples/Qt-%EnvQtBaseVersion%>>"%EnvQtPath%\%EnvQtBaseVersion%\%EnvQtMinGWVersion%\bin\qt.conf" -echo Prefix=..>>"%EnvQtPath%\%EnvQtBaseVersion%\%EnvQtMinGWVersion%\bin\qt.conf" - -call :replace "%EnvQtPath%\%EnvQtBaseVersion%\%EnvQtMinGWVersion%\mkspecs\qconfig.pri" "Enterprise" "OpenSource" - -for /R "%EnvQtPath%\%EnvQtBaseVersion%\%EnvQtMinGWVersion%\lib" %%A in (*.pc) do ( - call :replace "%%A" "c:/Users/qt/work/install" "%EnvQtPath:\=\\%\%EnvQtBaseVersion%\\%EnvQtMinGWVersion%" - call :replace "%%A" "c:\Users\qt\work\install" "%EnvQtPath:\=/%\%EnvQtBaseVersion%/%EnvQtMinGWVersion%" -) -for /R "%EnvQtPath%\%EnvQtBaseVersion%\%EnvQtMinGWVersion%\lib" %%A in (*.prl) do ( - call :replace "%%A" "c:/Users/qt/work/install" "%EnvQtPath:\=\\%\%EnvQtBaseVersion%\\%EnvQtMinGWVersion%" - call :replace "%%A" "c:\Users\qt\work\install" "%EnvQtPath:\=/%\%EnvQtBaseVersion%/%EnvQtMinGWVersion%" -) -goto exit diff -Nru retroshare-0.6.4/src/build_scripts/Windows/env/tools/prepare-tools.bat retroshare-0.6.4/src/build_scripts/Windows/env/tools/prepare-tools.bat --- retroshare-0.6.4/src/build_scripts/Windows/env/tools/prepare-tools.bat 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/build_scripts/Windows/env/tools/prepare-tools.bat 1970-01-01 00:00:00.000000000 +0000 @@ -1,169 +0,0 @@ -setlocal - -if "%EnvRootPath%"=="" exit /B 1 - -set CEchoUrl=https://github.com/lordmulder/cecho/releases/download/2015-10-10/cecho.2015-10-10.zip -set CEchoInstall=cecho.2015-10-10.zip -set SevenZipUrl=http://7-zip.org/a/7z1602.msi -set SevenZipInstall=7z1602.msi -::set CurlUrl=https://bintray.com/artifact/download/vszakats/generic/curl-7.50.1-win32-mingw.7z -::set CurlInstall=curl-7.50.1-win32-mingw.7z -set WgetUrl=https://eternallybored.org/misc/wget/1.19.4/32/wget.exe -set WgetInstall=wget.exe -set JomUrl=http://download.qt.io/official_releases/jom/jom.zip -set JomInstall=jom.zip -set DependsUrl=http://www.dependencywalker.com/depends22_x86.zip -set DependsInstall=depends22_x86.zip -set UnixToolsUrl=http://unxutils.sourceforge.net/UnxUpdates.zip -set UnixToolsInstall=UnxUpdates.zip -set NSISUrl=http://prdownloads.sourceforge.net/nsis/nsis-3.0-setup.exe?download -set NSISInstall=nsis-3.0-setup.exe -set NSISInstallPath=%EnvToolsPath%\NSIS - -if not exist "%EnvToolsPath%\7z.exe" ( - call "%ToolsPath%\remove-dir.bat" "%EnvTempPath%" - mkdir "%EnvTempPath%" - - echo Download 7z installation - - if not exist "%EnvDownloadPath%\%SevenZipInstall%" call "%ToolsPath%\winhttpjs.bat" %SevenZipUrl% -saveTo "%EnvDownloadPath%\%SevenZipInstall%" - if not exist "%EnvDownloadPath%\%SevenZipInstall%" echo Cannot download 7z installation& goto error - - echo Unpack 7z - msiexec /a "%EnvDownloadPath%\%SevenZipInstall%" /qb TARGETDIR="%EnvTempPath%" - copy "%EnvTempPath%\Files\7-Zip\7z.dll" "%EnvToolsPath%" - copy "%EnvTempPath%\Files\7-Zip\7z.exe" "%EnvToolsPath%" - - call "%ToolsPath%\remove-dir.bat" "%EnvTempPath%" -) - -if not exist "%EnvToolsPath%\cecho.exe" ( - call "%ToolsPath%\remove-dir.bat" "%EnvTempPath%" - mkdir "%EnvTempPath%" - - echo Download cecho installation - - if not exist "%EnvDownloadPath%\%CEchoInstall%" call "%ToolsPath%\winhttpjs.bat" "%CEchoUrl%" -saveTo "%EnvDownloadPath%\%CEchoInstall%" - if not exist "%EnvDownloadPath%\%cCEhoInstall%" echo Cannot download cecho installation& goto error - - echo Unpack cecho - "%EnvSevenZipExe%" x -o"%EnvTempPath%" "%EnvDownloadPath%\%CEchoInstall%" - copy "%EnvTempPath%\cecho.exe" "%EnvToolsPath%" - - call "%ToolsPath%\remove-dir.bat" "%EnvTempPath%" -) - -::if not exist "%EnvToolsPath%\curl.exe" ( -:: call "%ToolsPath%\remove-dir.bat" "%EnvTempPath%" -:: mkdir "%EnvTempPath%" -:: -:: echo Download Curl installation -:: -:: if not exist "%EnvDownloadPath%\%CurlInstall%" call "%ToolsPath%\winhttpjs.bat" %CurlUrl% -saveTo "%EnvDownloadPath%\%CurlInstall%" -:: if not exist "%EnvDownloadPath%\%CurlInstall%" echo Cannot download Curl installation& goto error -:: -:: echo Unpack Curl -:: "%EnvSevenZipExe%" x -o"%EnvTempPath%" "%EnvDownloadPath%\%CurlInstall%" -:: copy "%EnvTempPath%\curl-7.50.1-win32-mingw\bin\curl.exe" "%EnvToolsPath%" -:: -:: call "%ToolsPath%\remove-dir.bat" "%EnvTempPath%" -::) - -if not exist "%EnvToolsPath%\wget.exe" ( - %cecho% info "Download Wget installation" - - if not exist "%EnvDownloadPath%\%WgetInstall%" call "%ToolsPath%\winhttpjs.bat" %WgetUrl% -saveTo "%EnvDownloadPath%\%WgetInstall%" - if not exist "%EnvDownloadPath%\%WgetInstall%" %cecho% error "Cannot download Wget installation" & goto error - - %cecho% info "Copy Wget" - copy "%EnvDownloadPath%\wget.exe" "%EnvToolsPath%" -) - -if not exist "%EnvToolsPath%\jom.exe" ( - call "%ToolsPath%\remove-dir.bat" "%EnvTempPath%" - mkdir "%EnvTempPath%" - - %cecho% info "Download jom installation" - - if not exist "%EnvDownloadPath%\%JomInstall%" call "%ToolsPath%\winhttpjs.bat" %JomUrl% -saveTo "%EnvDownloadPath%\%JomInstall%" - if not exist "%EnvDownloadPath%\%JomInstall%" %cecho% error "Cannot download jom installation" & goto error - - %cecho% info "Unpack jom" - "%EnvSevenZipExe%" x -o"%EnvTempPath%" "%EnvDownloadPath%\%JomInstall%" - copy "%EnvTempPath%\jom.exe" "%EnvToolsPath%" - - call "%ToolsPath%\remove-dir.bat" "%EnvTempPath%" -) - -if not exist "%EnvToolsPath%\depends.exe" ( - call "%ToolsPath%\remove-dir.bat" "%EnvTempPath%" - mkdir "%EnvTempPath%" - - %cecho% info "Download Dependency Walker installation" - - if not exist "%EnvDownloadPath%\%DependsInstall%" call "%ToolsPath%\winhttpjs.bat" %DependsUrl% -saveTo "%EnvDownloadPath%\%DependsInstall%" - if not exist "%EnvDownloadPath%\%DependsInstall%" %cecho% error "Cannot download Dependendy Walker installation" & goto error - - %cecho% info "Unpack Dependency Walker" - "%EnvSevenZipExe%" x -o"%EnvTempPath%" "%EnvDownloadPath%\%DependsInstall%" - copy "%EnvTempPath%\*" "%EnvToolsPath%" - - call "%ToolsPath%\remove-dir.bat" "%EnvTempPath%" -) - -if not exist "%EnvToolsPath%\cut.exe" ( - call "%ToolsPath%\remove-dir.bat" "%EnvTempPath%" - mkdir "%EnvTempPath%" - - %cecho% info "Download Unix Tools installation" - - if not exist "%EnvDownloadPath%\%UnixToolsInstall%" call "%ToolsPath%\winhttpjs.bat" %UnixToolsUrl% -saveTo "%EnvDownloadPath%\%UnixToolsInstall%" - if not exist "%EnvDownloadPath%\%UnixToolsInstall%" %cecho% error "Cannot download Unix Tools installation" & goto error - - %cecho% info "Unpack Unix Tools" - "%EnvSevenZipExe%" x -o"%EnvTempPath%" "%EnvDownloadPath%\%UnixToolsInstall%" - copy "%EnvTempPath%\cut.exe" "%EnvToolsPath%" - - call "%ToolsPath%\remove-dir.bat" "%EnvTempPath%" -) - -if not exist "%EnvToolsPath%\sed.exe" ( - call "%ToolsPath%\remove-dir.bat" "%EnvTempPath%" - mkdir "%EnvTempPath%" - - %cecho% info "Download Unix Tools installation" - - if not exist "%EnvDownloadPath%\%UnixToolsInstall%" call "%ToolsPath%\winhttpjs.bat" %UnixToolsUrl% -saveTo "%EnvDownloadPath%\%UnixToolsInstall%" - if not exist "%EnvDownloadPath%\%UnixToolsInstall%" %cecho% error "Cannot download Unix Tools installation" & goto error - - %cecho% info "Unpack Unix Tools" - "%EnvSevenZipExe%" x -o"%EnvTempPath%" "%EnvDownloadPath%\%UnixToolsInstall%" - copy "%EnvTempPath%\sed.exe" "%EnvToolsPath%" - - call "%ToolsPath%\remove-dir.bat" "%EnvTempPath%" -) - -if not exist "%EnvToolsPath%\NSIS\nsis.exe" ( - call "%ToolsPath%\remove-dir.bat" "%EnvTempPath%" - mkdir "%EnvTempPath%" - - %cecho% info "Download NSIS installation" - - if not exist "%EnvDownloadPath%\%NSISInstall%" call "%ToolsPath%\download-file.bat" "%NSISUrl%" "%EnvDownloadPath%\%NSISInstall%" - if not exist "%EnvDownloadPath%\%NSISInstall%" %cecho% error "Cannot download NSIS installation" & goto error - - %cecho% info "Unpack NSIS" - "%EnvSevenZipExe%" x -o"%EnvTempPath%" "%EnvDownloadPath%\%NSISInstall%" - if not exist "%NSISInstallPath%" mkdir "%NSISInstallPath%" - xcopy /s "%EnvTempPath%" "%NSISInstallPath%" - - call "%ToolsPath%\remove-dir.bat" "%EnvTempPath%" -) - -:exit -endlocal -exit /B 0 - -:error -endlocal -exit /B 1 diff -Nru retroshare-0.6.4/src/build_scripts/Windows/env/tools/root/update-msys.bat retroshare-0.6.4/src/build_scripts/Windows/env/tools/root/update-msys.bat --- retroshare-0.6.4/src/build_scripts/Windows/env/tools/root/update-msys.bat 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/build_scripts/Windows/env/tools/root/update-msys.bat 1970-01-01 00:00:00.000000000 +0000 @@ -1,15 +0,0 @@ -@echo off - -setlocal - -set MSYSPath=%~dp0msys - -if not exist "%MSYSPath%\bin\mingw-get.exe" echo MSYS is not installed& exit /B 0 - -echo Update MSYS -pushd "%MSYSPath%\bin" -mingw-get.exe update -mingw-get.exe upgrade -popd - -exit /B %ERRORLEVEL% diff -Nru retroshare-0.6.4/src/build_scripts/Windows/env.bat retroshare-0.6.4/src/build_scripts/Windows/env.bat --- retroshare-0.6.4/src/build_scripts/Windows/env.bat 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/build_scripts/Windows/env.bat 1970-01-01 00:00:00.000000000 +0000 @@ -1,19 +0,0 @@ -call :make_path SourcePath "%~dp0..\.." -call :make_path RootPath "%SourcePath%\.." -call :source_name SourceName "%SourcePath%" -set ToolsPath=%~dp0tools -set EnvPath=%~dp0env - -exit /B 0 - -:make_path -setlocal -set Var=%~1 -pushd %2 -set CD=%cd% -popd -endlocal & set %Var%=%CD% -goto :EOF - -:source_name -set %~1=%~nx2 diff -Nru retroshare-0.6.4/src/build_scripts/Windows/.gitignore retroshare-0.6.4/src/build_scripts/Windows/.gitignore --- retroshare-0.6.4/src/build_scripts/Windows/.gitignore 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/build_scripts/Windows/.gitignore 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -/build/env-mod.bat \ No newline at end of file Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/build_scripts/Windows/installer/HeaderImage.bmp and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/build_scripts/Windows/installer/HeaderImage.bmp differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/build_scripts/Windows/installer/HeaderImageEmpty.bmp and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/build_scripts/Windows/installer/HeaderImageEmpty.bmp differ diff -Nru retroshare-0.6.4/src/build_scripts/Windows/installer/lang/ca_ES.nsh retroshare-0.6.4/src/build_scripts/Windows/installer/lang/ca_ES.nsh --- retroshare-0.6.4/src/build_scripts/Windows/installer/lang/ca_ES.nsh 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/build_scripts/Windows/installer/lang/ca_ES.nsh 1970-01-01 00:00:00.000000000 +0000 @@ -1,29 +0,0 @@ -!insertmacro LANG_STRING Section_Main "${APPNAME}" -!insertmacro LANG_STRING Section_Main_Desc "Instal·la ${APPNAME} i els components necessaris." -!insertmacro LANG_STRING Section_Data "Pells" -!insertmacro LANG_STRING Section_Data_Desc "Instal·la pells." -!insertmacro LANG_STRING Section_Shortcuts "Icones d'accés directe" -!insertmacro LANG_STRING Section_Shortcuts_Desc "Afegir icones d'accés directe." -!insertmacro LANG_STRING Section_StartMenu "Icona del menú d'inici" -!insertmacro LANG_STRING Section_StartMenu_Desc "Afegir icona en el menú d'inici" -!insertmacro LANG_STRING Section_Desktop "Icona d'escriptori" -!insertmacro LANG_STRING Section_Desktop_Desc "Afegir icona a l'escriptori" -!insertmacro LANG_STRING Section_QuickLaunch "Icona de la barra ràpida d'accés" -!insertmacro LANG_STRING Section_QuickLaunch_Desc "Afegir icona a la barra ràpida d'accés" -!insertmacro LANG_STRING Section_Plugins "Complements opcionals" -!insertmacro LANG_STRING Section_Plugins_Desc "Components opcionals per afegir funcionalitat." -!insertmacro LANG_STRING Section_Plugin_FeedReader "LectorFonts" -!insertmacro LANG_STRING Section_Plugin_FeedReader_Desc "Instal·lar complement LectorFonts." -!insertmacro LANG_STRING Section_Plugin_LinksCloud "NúvolEnllaços" -!insertmacro LANG_STRING Section_Plugin_LinksCloud_Desc "Instal·lar complement NúvolEnllaços." -!insertmacro LANG_STRING Section_Plugin_VOIP "VeuIP" -!insertmacro LANG_STRING Section_Plugin_VOIP_Desc "Instal·lar complement VeuIP." -!insertmacro LANG_STRING Section_AutoStart "Posada en marxa automàtica" -!insertmacro LANG_STRING Section_AutoStart_Desc "Autoengegar al arrencar." -!insertmacro LANG_STRING Page_InstallMode "Mode instal·lació" -!insertmacro LANG_STRING Page_InstallMode_Desc "Escull com vols instal·lar ${APPNAME}." -!insertmacro LANG_STRING Page_InstallMode_Standard "Instal·lació e&stàndard" -!insertmacro LANG_STRING Page_InstallMode_Standard_Desc "Instal·la ${APPNAME} per la sessió d'usuari actual." -!insertmacro LANG_STRING Page_InstallMode_Portable "Instal·lació &portable." -!insertmacro LANG_STRING Page_InstallMode_Portable_Desc "En mode portable les dades de configuració s'emmagatzemen a la carpeta d'aplicació i no s'escriu informació al registre del sistema." -!insertmacro LANG_STRING Link_Uninstall "Desinstal·lar." diff -Nru retroshare-0.6.4/src/build_scripts/Windows/installer/lang/de.nsh retroshare-0.6.4/src/build_scripts/Windows/installer/lang/de.nsh --- retroshare-0.6.4/src/build_scripts/Windows/installer/lang/de.nsh 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/build_scripts/Windows/installer/lang/de.nsh 1970-01-01 00:00:00.000000000 +0000 @@ -1,29 +0,0 @@ -!insertmacro LANG_STRING Section_Main "${APPNAME}" -!insertmacro LANG_STRING Section_Main_Desc "Installiert ${APPNAME} und die benötigten Komponenten." -!insertmacro LANG_STRING Section_Data "Skins" -!insertmacro LANG_STRING Section_Data_Desc "Skins installieren." -!insertmacro LANG_STRING Section_Shortcuts "Verknüpfungssymbole" -!insertmacro LANG_STRING Section_Shortcuts_Desc "Verküpfungssymbole hinzufügen." -!insertmacro LANG_STRING Section_StartMenu "Startmenüsymbol" -!insertmacro LANG_STRING Section_StartMenu_Desc "Fügt Symbol zum Startmenü hinzu." -!insertmacro LANG_STRING Section_Desktop "Desktopsymbol" -!insertmacro LANG_STRING Section_Desktop_Desc "Fügt Symbol zum Desktop hinzu." -!insertmacro LANG_STRING Section_QuickLaunch "Schnellstartsymbol" -!insertmacro LANG_STRING Section_QuickLaunch_Desc "Fügt Symbol zur Schnellstartleiste hinzu." -!insertmacro LANG_STRING Section_Plugins "Optionale Plug-ins" -!insertmacro LANG_STRING Section_Plugins_Desc "Optionale Plug-ins zum Erweitern der Funktionalität." -!insertmacro LANG_STRING Section_Plugin_FeedReader "FeedReader" -!insertmacro LANG_STRING Section_Plugin_FeedReader_Desc "Installiert das Plug-in Feedreader." -!insertmacro LANG_STRING Section_Plugin_LinksCloud "Verknüpfungswolke" -!insertmacro LANG_STRING Section_Plugin_LinksCloud_Desc "Installiert das Plug-in Verknüpfungswolke." -!insertmacro LANG_STRING Section_Plugin_VOIP "VOIP" -!insertmacro LANG_STRING Section_Plugin_VOIP_Desc "Installiert das Plug-in VOIP" -!insertmacro LANG_STRING Section_AutoStart "Automatischer Programmstart" -!insertmacro LANG_STRING Section_AutoStart_Desc "Beim Start automatisch ausführen." -!insertmacro LANG_STRING Page_InstallMode "Installationsmodus" -!insertmacro LANG_STRING Page_InstallMode_Desc "Wähle wie du ${APPNAME} installieren willst." -!insertmacro LANG_STRING Page_InstallMode_Standard "&Standardinstallation" -!insertmacro LANG_STRING Page_InstallMode_Standard_Desc "Installiere ${APPNAME} für den derzeitigen Benutzer dieses Geräts." -!insertmacro LANG_STRING Page_InstallMode_Portable "&Portable Installation" -!insertmacro LANG_STRING Page_InstallMode_Portable_Desc "Im portablen Modus werden alle Konfigurationsdaten im Verzeichnis der Anwendung gespeichert und keine Informationen in der Registry abgelegt." -!insertmacro LANG_STRING Link_Uninstall "Deinstallieren" diff -Nru retroshare-0.6.4/src/build_scripts/Windows/installer/lang/en.nsh retroshare-0.6.4/src/build_scripts/Windows/installer/lang/en.nsh --- retroshare-0.6.4/src/build_scripts/Windows/installer/lang/en.nsh 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/build_scripts/Windows/installer/lang/en.nsh 1970-01-01 00:00:00.000000000 +0000 @@ -1,29 +0,0 @@ -!insertmacro LANG_STRING Section_Main "${APPNAME}" -!insertmacro LANG_STRING Section_Main_Desc "Installs ${APPNAME} and required components." -!insertmacro LANG_STRING Section_Data "Skins" -!insertmacro LANG_STRING Section_Data_Desc "Installs skins." -!insertmacro LANG_STRING Section_Shortcuts "Shortcut icons" -!insertmacro LANG_STRING Section_Shortcuts_Desc "Adds shortcut icons." -!insertmacro LANG_STRING Section_StartMenu "Start Menu icon" -!insertmacro LANG_STRING Section_StartMenu_Desc "Adds icon to start menu." -!insertmacro LANG_STRING Section_Desktop "Desktop icon" -!insertmacro LANG_STRING Section_Desktop_Desc "Adds icon to desktop." -!insertmacro LANG_STRING Section_QuickLaunch "Quick Launch icon" -!insertmacro LANG_STRING Section_QuickLaunch_Desc "Adds icon to Quick Launch toolbar." -!insertmacro LANG_STRING Section_Plugins "Optional plugins" -!insertmacro LANG_STRING Section_Plugins_Desc "Optional plugins to extend functionality." -!insertmacro LANG_STRING Section_Plugin_FeedReader "FeedReader" -!insertmacro LANG_STRING Section_Plugin_FeedReader_Desc "Installs plugin FeedReader." -!insertmacro LANG_STRING Section_Plugin_VOIP "VOIP" -!insertmacro LANG_STRING Section_Plugin_VOIP_Desc "Installs plugin VOIP." -;!insertmacro LANG_STRING Section_Link "File Association" -;!insertmacro LANG_STRING Section_Link_Desc "Associate ${APPNAME} with .pqi file extension." -!insertmacro LANG_STRING Section_AutoStart "Auto Startup" -!insertmacro LANG_STRING Section_AutoStart_Desc "Auto-Run at startup." -!insertmacro LANG_STRING Page_InstallMode "Installation Mode" -!insertmacro LANG_STRING Page_InstallMode_Desc "Choose how you want to install ${APPNAME}." -!insertmacro LANG_STRING Page_InstallMode_Standard "&Standard installation" -!insertmacro LANG_STRING Page_InstallMode_Standard_Desc "Install ${APPNAME} for the current user of this machine." -!insertmacro LANG_STRING Page_InstallMode_Portable "&Portable installation" -!insertmacro LANG_STRING Page_InstallMode_Portable_Desc "In portable mode all configuration data is stored in the application folder and no information is written to the registry." -!insertmacro LANG_STRING Link_Uninstall "Uninstall" \ No newline at end of file diff -Nru retroshare-0.6.4/src/build_scripts/Windows/installer/lang/es.nsh retroshare-0.6.4/src/build_scripts/Windows/installer/lang/es.nsh --- retroshare-0.6.4/src/build_scripts/Windows/installer/lang/es.nsh 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/build_scripts/Windows/installer/lang/es.nsh 1970-01-01 00:00:00.000000000 +0000 @@ -1,29 +0,0 @@ -!insertmacro LANG_STRING Section_Main "${APPNAME}" -!insertmacro LANG_STRING Section_Main_Desc "Instala ${APPNAME} y los componentes requeridos." -!insertmacro LANG_STRING Section_Data "Coberturas (skins)" -!insertmacro LANG_STRING Section_Data_Desc "Instalar coberturas" -!insertmacro LANG_STRING Section_Shortcuts "Iconos de accesos directos" -!insertmacro LANG_STRING Section_Shortcuts_Desc "Añade iconos de accesos directos." -!insertmacro LANG_STRING Section_StartMenu "Icono de menú de inicio" -!insertmacro LANG_STRING Section_StartMenu_Desc "Añade icono al menú de inicio." -!insertmacro LANG_STRING Section_Desktop "Icono del escritorio" -!insertmacro LANG_STRING Section_Desktop_Desc "Añade icono al escritorio" -!insertmacro LANG_STRING Section_QuickLaunch "Icono de inicio rápido" -!insertmacro LANG_STRING Section_QuickLaunch_Desc "Añade icono a la Barra de Inicio Rápido" -!insertmacro LANG_STRING Section_Plugins "Complementos opcionales" -!insertmacro LANG_STRING Section_Plugins_Desc "Complementos opcionales para expandir la funcionalidad." -!insertmacro LANG_STRING Section_Plugin_FeedReader "FeedReader" -!insertmacro LANG_STRING Section_Plugin_FeedReader_Desc "Instala el complemento FeedReader." -!insertmacro LANG_STRING Section_Plugin_LinksCloud "LinksCloud" -!insertmacro LANG_STRING Section_Plugin_LinksCloud_Desc "Instala el complemento LinksCloud." -!insertmacro LANG_STRING Section_Plugin_VOIP "VOIP" -!insertmacro LANG_STRING Section_Plugin_VOIP_Desc "Instala el complemento VOIP" -!insertmacro LANG_STRING Section_AutoStart "Auto iniciar" -!insertmacro LANG_STRING Section_AutoStart_Desc "Auto-ejecutar al incio." -!insertmacro LANG_STRING Page_InstallMode "Modo de instalación" -!insertmacro LANG_STRING Page_InstallMode_Desc "Elija cómo quiere instalar ${APPNAME}." -!insertmacro LANG_STRING Page_InstallMode_Standard "Instalación &Estándar" -!insertmacro LANG_STRING Page_InstallMode_Standard_Desc "Instalar ${APPNAME} para el usuario actual de esta máquina." -!insertmacro LANG_STRING Page_InstallMode_Portable "Instalación &Portable" -!insertmacro LANG_STRING Page_InstallMode_Portable_Desc "En modo portable, todos los datos de configuración se almacenan en la carpeta de la aplicación y no se escribe ninguna información en el registro." -!insertmacro LANG_STRING Link_Uninstall "Desinstalar" diff -Nru retroshare-0.6.4/src/build_scripts/Windows/installer/lang/fr.nsh retroshare-0.6.4/src/build_scripts/Windows/installer/lang/fr.nsh --- retroshare-0.6.4/src/build_scripts/Windows/installer/lang/fr.nsh 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/build_scripts/Windows/installer/lang/fr.nsh 1970-01-01 00:00:00.000000000 +0000 @@ -1,29 +0,0 @@ -!insertmacro LANG_STRING Section_Main "${APPNAME}" -!insertmacro LANG_STRING Section_Main_Desc "Installe ${APPNAME} et les composants requis." -!insertmacro LANG_STRING Section_Data "Habillages" -!insertmacro LANG_STRING Section_Data_Desc "Installe des habillages." -!insertmacro LANG_STRING Section_Shortcuts "Icônes de raccourci" -!insertmacro LANG_STRING Section_Shortcuts_Desc "Ajoute les icônes de raccourci." -!insertmacro LANG_STRING Section_StartMenu "Icône de menu démarrage" -!insertmacro LANG_STRING Section_StartMenu_Desc "Ajoute l'icône au menu démarrer." -!insertmacro LANG_STRING Section_Desktop "Icônes de bureau" -!insertmacro LANG_STRING Section_Desktop_Desc "Ajoute l'icône sur le bureau." -!insertmacro LANG_STRING Section_QuickLaunch "Icône de lancement rapide" -!insertmacro LANG_STRING Section_QuickLaunch_Desc "Ajoute une icône à la barre d'outils de lancement rapide." -!insertmacro LANG_STRING Section_Plugins "Plug-ins optionnels" -!insertmacro LANG_STRING Section_Plugins_Desc "Plug-ins optionnels destinés à étendre les fonctionnalités." -!insertmacro LANG_STRING Section_Plugin_FeedReader "FeedReader" -!insertmacro LANG_STRING Section_Plugin_FeedReader_Desc "Installe le plug-in FeedReader." -!insertmacro LANG_STRING Section_Plugin_LinksCloud "LinksCloud" -!insertmacro LANG_STRING Section_Plugin_LinksCloud_Desc "Installe le plug-in LinksCloud." -!insertmacro LANG_STRING Section_Plugin_VOIP "VOIP" -!insertmacro LANG_STRING Section_Plugin_VOIP_Desc "Installe le plug-in VOIP." -!insertmacro LANG_STRING Section_AutoStart "Démarrage automatique" -!insertmacro LANG_STRING Section_AutoStart_Desc "Démarrage automatique au démarrage." -!insertmacro LANG_STRING Page_InstallMode "Mode d'installation" -!insertmacro LANG_STRING Page_InstallMode_Desc "Choisissez comment vous voulez installer ${APPNAME}." -!insertmacro LANG_STRING Page_InstallMode_Standard "&Installation standard" -!insertmacro LANG_STRING Page_InstallMode_Standard_Desc "Installer ${APPNAME} pour l'utilisateur actuel de cette machine." -!insertmacro LANG_STRING Page_InstallMode_Portable "&Installation portable" -!insertmacro LANG_STRING Page_InstallMode_Portable_Desc "En mode portable toutes les données de configuration sont stockées dans le dossier de l'application et aucune information n'est écrite dans la base de registre." -!insertmacro LANG_STRING Link_Uninstall "Désinstaller" diff -Nru retroshare-0.6.4/src/build_scripts/Windows/installer/lang/pl.nsh retroshare-0.6.4/src/build_scripts/Windows/installer/lang/pl.nsh --- retroshare-0.6.4/src/build_scripts/Windows/installer/lang/pl.nsh 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/build_scripts/Windows/installer/lang/pl.nsh 1970-01-01 00:00:00.000000000 +0000 @@ -1,29 +0,0 @@ -!insertmacro LANG_STRING Section_Main "${APPNAME}" -!insertmacro LANG_STRING Section_Main_Desc "Instaluje ${APPNAME} oraz wymagane komponenty." -!insertmacro LANG_STRING Section_Data "Skórki" -!insertmacro LANG_STRING Section_Data_Desc "Instaluje skórki." -!insertmacro LANG_STRING Section_Shortcuts "Ikony skrótów" -!insertmacro LANG_STRING Section_Shortcuts_Desc "Dodaje skróty ikon." -!insertmacro LANG_STRING Section_StartMenu "Start Menu icon" -!insertmacro LANG_STRING Section_StartMenu_Desc "Dodaje ikonę do menu start." -!insertmacro LANG_STRING Section_Desktop "Ikona na pulpicie" -!insertmacro LANG_STRING Section_Desktop_Desc "Dodawanie ikony na pulpicie" -!insertmacro LANG_STRING Section_QuickLaunch "Ikona szybkiego uruchamiania" -!insertmacro LANG_STRING Section_QuickLaunch_Desc "Dodaje ikonę do paska Szybkiego Uruchamiania." -!insertmacro LANG_STRING Section_Plugins "Wtyczki opcjonalne" -!insertmacro LANG_STRING Section_Plugins_Desc "Wtyczki opcjonalne rozszerzające funkcjonalność." -!insertmacro LANG_STRING Section_Plugin_FeedReader "FeedReader" -!insertmacro LANG_STRING Section_Plugin_FeedReader_Desc "Instaluje wtyczki FeedReader" -!insertmacro LANG_STRING Section_Plugin_LinksCloud "LinksCloud" -!insertmacro LANG_STRING Section_Plugin_LinksCloud_Desc "Instaluje wtyczki LinksCloud." -!insertmacro LANG_STRING Section_Plugin_VOIP "VOIP" -!insertmacro LANG_STRING Section_Plugin_VOIP_Desc "Instaluje wtyczki VOIP." -!insertmacro LANG_STRING Section_AutoStart "Auto Startup" -!insertmacro LANG_STRING Section_AutoStart_Desc "Automatyczne uruchamianie przy starcie." -!insertmacro LANG_STRING Page_InstallMode "Tryb instalacji" -!insertmacro LANG_STRING Page_InstallMode_Desc "Wybierz jak chcesz zainstalować ${APPNAME}." -!insertmacro LANG_STRING Page_InstallMode_Standard "&Standardowa instalacja" -!insertmacro LANG_STRING Page_InstallMode_Standard_Desc "Zainstaluj ${APPNAME} dla bieżącego użytkownika tej maszyny." -!insertmacro LANG_STRING Page_InstallMode_Portable "&Portable installation" -!insertmacro LANG_STRING Page_InstallMode_Portable_Desc "W trybie przenośnym wszystkie dane konfiguracyjne są przechowywane w folderze aplikacji i nie są zapisywane w rejestrze." -!insertmacro LANG_STRING Link_Uninstall "Odinstaluj" diff -Nru retroshare-0.6.4/src/build_scripts/Windows/installer/lang/ru.nsh retroshare-0.6.4/src/build_scripts/Windows/installer/lang/ru.nsh --- retroshare-0.6.4/src/build_scripts/Windows/installer/lang/ru.nsh 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/build_scripts/Windows/installer/lang/ru.nsh 1970-01-01 00:00:00.000000000 +0000 @@ -1,29 +0,0 @@ -!insertmacro LANG_STRING Section_Main "${APPNAME}" -!insertmacro LANG_STRING Section_Main_Desc "Установка ${APPNAME} и необходимых компонентов." -!insertmacro LANG_STRING Section_Data "Оболочки" -!insertmacro LANG_STRING Section_Data_Desc "Установка оболочек." -!insertmacro LANG_STRING Section_Shortcuts "Ярлыки" -!insertmacro LANG_STRING Section_Shortcuts_Desc "Добавление ярлыков." -!insertmacro LANG_STRING Section_StartMenu "Ярлык в меню Пуск" -!insertmacro LANG_STRING Section_StartMenu_Desc "Добавление ярлыка в меню Пуск." -!insertmacro LANG_STRING Section_Desktop "Ярлык на рабочем столе" -!insertmacro LANG_STRING Section_Desktop_Desc "Добавление ярлыка на рабочий стол." -!insertmacro LANG_STRING Section_QuickLaunch "Ярлык в панели быстрого запуска" -!insertmacro LANG_STRING Section_QuickLaunch_Desc "Добавление ярлыка на панель быстрого запуска." -!insertmacro LANG_STRING Section_Plugins "Дополнительные плагины" -!insertmacro LANG_STRING Section_Plugins_Desc "Дополнительные плагины для расширения функциональности." -!insertmacro LANG_STRING Section_Plugin_FeedReader "FeedReader – RSS-агрегатор" -!insertmacro LANG_STRING Section_Plugin_FeedReader_Desc "Установка плагина FeedReader." -!insertmacro LANG_STRING Section_Plugin_LinksCloud "LinksCloud – Облако ссылок" -!insertmacro LANG_STRING Section_Plugin_LinksCloud_Desc "Установка плагина LinksCloud." -!insertmacro LANG_STRING Section_Plugin_VOIP "VoIP" -!insertmacro LANG_STRING Section_Plugin_VOIP_Desc "Установка плагина VoIP." -!insertmacro LANG_STRING Section_AutoStart "Автозапуск" -!insertmacro LANG_STRING Section_AutoStart_Desc "Автозапуск при загрузке системы." -!insertmacro LANG_STRING Page_InstallMode "Режим установки" -!insertmacro LANG_STRING Page_InstallMode_Desc "Выберите метод установки ${APPNAME}." -!insertmacro LANG_STRING Page_InstallMode_Standard "Стандартная установка" -!insertmacro LANG_STRING Page_InstallMode_Standard_Desc "Установка ${APPNAME} для текущего пользователя компьютера." -!insertmacro LANG_STRING Page_InstallMode_Portable "Портативная установка" -!insertmacro LANG_STRING Page_InstallMode_Portable_Desc "В режиме портативной установки все конфигурационные файлы сохраняются в папку приложения и в системный реестр не записывается никакой информации." -!insertmacro LANG_STRING Link_Uninstall "Удаление программы" diff -Nru retroshare-0.6.4/src/build_scripts/Windows/installer/lang/tr.nsh retroshare-0.6.4/src/build_scripts/Windows/installer/lang/tr.nsh --- retroshare-0.6.4/src/build_scripts/Windows/installer/lang/tr.nsh 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/build_scripts/Windows/installer/lang/tr.nsh 1970-01-01 00:00:00.000000000 +0000 @@ -1,29 +0,0 @@ -!insertmacro LANG_STRING Section_Main "${APPNAME}" -!insertmacro LANG_STRING Section_Main_Desc "${APPNAME} ve gerekli bileşenleri kurar." -!insertmacro LANG_STRING Section_Data "Temalar" -!insertmacro LANG_STRING Section_Data_Desc "Tema yükleyin." -!insertmacro LANG_STRING Section_Shortcuts "Kısayol simgeleri" -!insertmacro LANG_STRING Section_Shortcuts_Desc "Kısayol simgesi ekleyin." -!insertmacro LANG_STRING Section_StartMenu "Başlat Menüsü simgesi" -!insertmacro LANG_STRING Section_StartMenu_Desc "Başlat menüsüne simge ekleyin." -!insertmacro LANG_STRING Section_Desktop "Masaüstü simgesi" -!insertmacro LANG_STRING Section_Desktop_Desc "Masaüstüne simge ekleyin." -!insertmacro LANG_STRING Section_QuickLaunch "Hızlı Başlat simgesi" -!insertmacro LANG_STRING Section_QuickLaunch_Desc "Hızlı Başlat araç çubuğuna simge ekleyin." -!insertmacro LANG_STRING Section_Plugins "İsteğe bağlı eklentiler" -!insertmacro LANG_STRING Section_Plugins_Desc "İşlevselliği artırmak için isteğe bağlı eklentiler." -!insertmacro LANG_STRING Section_Plugin_FeedReader "AkışOkuyucu" -!insertmacro LANG_STRING Section_Plugin_FeedReader_Desc "AkışOkuyucu eklentisini yükleyin." -!insertmacro LANG_STRING Section_Plugin_LinksCloud "BağlantıBulutu" -!insertmacro LANG_STRING Section_Plugin_LinksCloud_Desc "BağlantıBulutu eklentisini yükleyin." -!insertmacro LANG_STRING Section_Plugin_VOIP "VOIP" -!insertmacro LANG_STRING Section_Plugin_VOIP_Desc "VOIP eklentisini yükleyin." -!insertmacro LANG_STRING Section_AutoStart "Otomatik Başlat" -!insertmacro LANG_STRING Section_AutoStart_Desc "Açılışta otomatik başlatın." -!insertmacro LANG_STRING Page_InstallMode "Kurulum Yöntemi" -!insertmacro LANG_STRING Page_InstallMode_Desc "${APPNAME} kurulum şeklini seçin" -!insertmacro LANG_STRING Page_InstallMode_Standard "&Normal kurulum" -!insertmacro LANG_STRING Page_InstallMode_Standard_Desc "${APPNAME} yalnızca şimdiki kullanıcı için kurulsun." -!insertmacro LANG_STRING Page_InstallMode_Portable "&Taşınabilir kurulum" -!insertmacro LANG_STRING Page_InstallMode_Portable_Desc "Taşınabilir kipte tüm ayarlar uygulama klasörüne depolanır ve kayıt defterine hiçbir bilgi yazılmaz." -!insertmacro LANG_STRING Link_Uninstall "Kaldırın" diff -Nru retroshare-0.6.4/src/build_scripts/Windows/installer/lang/ts/ca_ES.ts retroshare-0.6.4/src/build_scripts/Windows/installer/lang/ts/ca_ES.ts --- retroshare-0.6.4/src/build_scripts/Windows/installer/lang/ts/ca_ES.ts 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/build_scripts/Windows/installer/lang/ts/ca_ES.ts 1970-01-01 00:00:00.000000000 +0000 @@ -1,205 +0,0 @@ - - - Section_Main - - ${APPNAME} - ${APPNAME} - - - - Section_Main_Desc - - Installs ${APPNAME} and required components. - Instal·la ${APPNAME} i els components necessaris. - - - - Section_Data - - Skins - Pells - - - - Section_Data_Desc - - Installs skins. - Instal·la pells. - - - - Section_Shortcuts - - Shortcut icons - Icones d'accés directe - - - - Section_Shortcuts_Desc - - Adds shortcut icons. - Afegir icones d'accés directe. - - - - Section_StartMenu - - Start Menu icon - Icona del menú d'inici - - - - Section_StartMenu_Desc - - Adds icon to start menu. - Afegir icona en el menú d'inici - - - - Section_Desktop - - Desktop icon - Icona d'escriptori - - - - Section_Desktop_Desc - - Adds icon to desktop. - Afegir icona a l'escriptori - - - - Section_QuickLaunch - - Quick Launch icon - Icona de la barra ràpida d'accés - - - - Section_QuickLaunch_Desc - - Adds icon to Quick Launch toolbar. - Afegir icona a la barra ràpida d'accés - - - - Section_Plugins - - Optional plugins - Complements opcionals - - - - Section_Plugins_Desc - - Optional plugins to extend functionality. - Components opcionals per afegir funcionalitat. - - - - Section_Plugin_FeedReader - - FeedReader - LectorFonts - - - - Section_Plugin_FeedReader_Desc - - Installs plugin FeedReader. - Instal·lar complement LectorFonts. - - - - Section_Plugin_LinksCloud - - LinksCloud - NúvolEnllaços - - - - Section_Plugin_LinksCloud_Desc - - Installs plugin LinksCloud. - Instal·lar complement NúvolEnllaços. - - - - Section_Plugin_VOIP - - VOIP - VeuIP - - - - Section_Plugin_VOIP_Desc - - Installs plugin VOIP. - Instal·lar complement VeuIP. - - - - Section_AutoStart - - Auto Startup - Posada en marxa automàtica - - - - Section_AutoStart_Desc - - Auto-Run at startup. - Autoengegar al arrencar. - - - - Page_InstallMode - - Installation Mode - Mode instal·lació - - - - Page_InstallMode_Desc - - Choose how you want to install ${APPNAME}. - Escull com vols instal·lar ${APPNAME}. - - - - Page_InstallMode_Standard - - &Standard installation - Instal·lació e&stàndard - - - - Page_InstallMode_Standard_Desc - - Install ${APPNAME} for the current user of this machine. - Instal·la ${APPNAME} per la sessió d'usuari actual. - - - - Page_InstallMode_Portable - - &Portable installation - Instal·lació &portable. - - - - Page_InstallMode_Portable_Desc - - In portable mode all configuration data is stored in the application folder and no information is written to the registry. - En mode portable les dades de configuració s'emmagatzemen a la carpeta d'aplicació i no s'escriu informació al registre del sistema. - - - - Link_Uninstall - - Uninstall - Desinstal·lar. - - - \ No newline at end of file diff -Nru retroshare-0.6.4/src/build_scripts/Windows/installer/lang/ts/convert_from_ts.bat retroshare-0.6.4/src/build_scripts/Windows/installer/lang/ts/convert_from_ts.bat --- retroshare-0.6.4/src/build_scripts/Windows/installer/lang/ts/convert_from_ts.bat 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/build_scripts/Windows/installer/lang/ts/convert_from_ts.bat 1970-01-01 00:00:00.000000000 +0000 @@ -1,27 +0,0 @@ -@echo off - -:: Very simple conversion from *.ts to *.nsh using xslt - -pushd "%~dp0" - -if "%1"=="" ( - for %%F in (*.ts) do if "%%F" NEQ "en.ts" call :convert %%~nF - goto :exit -) - -call :convert %1 - -:exit -popd - -goto :EOF - -:convert -if not exist "%~1.ts" ( - echo File "%~1.ts" not found. - goto :EOF -) - -echo %~1 - -"%~dp0xsltproc.exe" --output "%~dp0..\%~1.nsh" "%~dp0convert_from_ts.xsl" "%~1.ts" diff -Nru retroshare-0.6.4/src/build_scripts/Windows/installer/lang/ts/convert_from_ts.xsl retroshare-0.6.4/src/build_scripts/Windows/installer/lang/ts/convert_from_ts.xsl --- retroshare-0.6.4/src/build_scripts/Windows/installer/lang/ts/convert_from_ts.xsl 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/build_scripts/Windows/installer/lang/ts/convert_from_ts.xsl 1970-01-01 00:00:00.000000000 +0000 @@ -1,20 +0,0 @@ - - - - - - - - !insertmacro LANG_STRING - - " - - - - - " - - - - \ No newline at end of file diff -Nru retroshare-0.6.4/src/build_scripts/Windows/installer/lang/ts/convert_to_ts.bat retroshare-0.6.4/src/build_scripts/Windows/installer/lang/ts/convert_to_ts.bat --- retroshare-0.6.4/src/build_scripts/Windows/installer/lang/ts/convert_to_ts.bat 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/build_scripts/Windows/installer/lang/ts/convert_to_ts.bat 1970-01-01 00:00:00.000000000 +0000 @@ -1,50 +0,0 @@ -@echo off - -:: Very simple conversion from *.nsh to *.ts - -setlocal - -set Language=en -if "%1" NEQ "" set Language=%1 - -set InputFile=%~dp0..\%Language%.nsh -set OutputFile=%~dp0%Language%.ts - -if not exist "%InputFile%" ( - echo File %InputFile% not found. - goto :exit -) - -echo ^ >"%OutputFile%" -echo ^ >>"%OutputFile%" -echo ^ >>"%OutputFile%" - -for /F "tokens=1,2,3,*" %%A in (%InputFile%) do if "%%A"=="!insertmacro" call :context %%C %%D - -echo ^ >>"%OutputFile%" - -:exit -endlocal -goto :EOF - -:context - -setlocal EnableDelayedExpansion - -:: Simple replace of & to & -set Text=%2 -set Text=%Text:&=^&% -set Text=%Text:~1,-1% - -echo !Text! - -echo ^ >>"%OutputFile%" -echo ^%~1^ >>"%OutputFile%" -echo ^ >>"%OutputFile%" -echo ^!Text!^ >>"%OutputFile%" -echo ^^ >>"%OutputFile%" -echo ^ >>"%OutputFile%" -echo ^ >>"%OutputFile%" - -endlocal -goto :EOF diff -Nru retroshare-0.6.4/src/build_scripts/Windows/installer/lang/ts/de.ts retroshare-0.6.4/src/build_scripts/Windows/installer/lang/ts/de.ts --- retroshare-0.6.4/src/build_scripts/Windows/installer/lang/ts/de.ts 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/build_scripts/Windows/installer/lang/ts/de.ts 1970-01-01 00:00:00.000000000 +0000 @@ -1,205 +0,0 @@ - - - Section_Main - - ${APPNAME} - ${APPNAME} - - - - Section_Main_Desc - - Installs ${APPNAME} and required components. - Installiert ${APPNAME} und die benötigten Komponenten. - - - - Section_Data - - Skins - Skins - - - - Section_Data_Desc - - Installs skins. - Skins installieren. - - - - Section_Shortcuts - - Shortcut icons - Verknüpfungssymbole - - - - Section_Shortcuts_Desc - - Adds shortcut icons. - Verküpfungssymbole hinzufügen. - - - - Section_StartMenu - - Start Menu icon - Startmenüsymbol - - - - Section_StartMenu_Desc - - Adds icon to start menu. - Fügt Symbol zum Startmenü hinzu. - - - - Section_Desktop - - Desktop icon - Desktopsymbol - - - - Section_Desktop_Desc - - Adds icon to desktop. - Fügt Symbol zum Desktop hinzu. - - - - Section_QuickLaunch - - Quick Launch icon - Schnellstartsymbol - - - - Section_QuickLaunch_Desc - - Adds icon to Quick Launch toolbar. - Fügt Symbol zur Schnellstartleiste hinzu. - - - - Section_Plugins - - Optional plugins - Optionale Plug-ins - - - - Section_Plugins_Desc - - Optional plugins to extend functionality. - Optionale Plug-ins zum Erweitern der Funktionalität. - - - - Section_Plugin_FeedReader - - FeedReader - FeedReader - - - - Section_Plugin_FeedReader_Desc - - Installs plugin FeedReader. - Installiert das Plug-in Feedreader. - - - - Section_Plugin_LinksCloud - - LinksCloud - Verknüpfungswolke - - - - Section_Plugin_LinksCloud_Desc - - Installs plugin LinksCloud. - Installiert das Plug-in Verknüpfungswolke. - - - - Section_Plugin_VOIP - - VOIP - VOIP - - - - Section_Plugin_VOIP_Desc - - Installs plugin VOIP. - Installiert das Plug-in VOIP - - - - Section_AutoStart - - Auto Startup - Automatischer Programmstart - - - - Section_AutoStart_Desc - - Auto-Run at startup. - Beim Start automatisch ausführen. - - - - Page_InstallMode - - Installation Mode - Installationsmodus - - - - Page_InstallMode_Desc - - Choose how you want to install ${APPNAME}. - Wähle wie du ${APPNAME} installieren willst. - - - - Page_InstallMode_Standard - - &Standard installation - &Standardinstallation - - - - Page_InstallMode_Standard_Desc - - Install ${APPNAME} for the current user of this machine. - Installiere ${APPNAME} für den derzeitigen Benutzer dieses Geräts. - - - - Page_InstallMode_Portable - - &Portable installation - &Portable Installation - - - - Page_InstallMode_Portable_Desc - - In portable mode all configuration data is stored in the application folder and no information is written to the registry. - Im portablen Modus werden alle Konfigurationsdaten im Verzeichnis der Anwendung gespeichert und keine Informationen in der Registry abgelegt. - - - - Link_Uninstall - - Uninstall - Deinstallieren - - - \ No newline at end of file diff -Nru retroshare-0.6.4/src/build_scripts/Windows/installer/lang/ts/en.ts retroshare-0.6.4/src/build_scripts/Windows/installer/lang/ts/en.ts --- retroshare-0.6.4/src/build_scripts/Windows/installer/lang/ts/en.ts 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/build_scripts/Windows/installer/lang/ts/en.ts 1970-01-01 00:00:00.000000000 +0000 @@ -1,186 +0,0 @@ - - - - - Section_Main_Desc - - Installs ${APPNAME} and required components. - - - - - Section_Data - - Skins - - - - - Section_Data_Desc - - Installs skins. - - - - - Section_Shortcuts - - Shortcut icons - - - - - Section_Shortcuts_Desc - - Adds shortcut icons. - - - - - Section_StartMenu - - Start Menu icon - - - - - Section_StartMenu_Desc - - Adds icon to start menu. - - - - - Section_Desktop - - Desktop icon - - - - - Section_Desktop_Desc - - Adds icon to desktop. - - - - - Section_QuickLaunch - - Quick Launch icon - - - - - Section_QuickLaunch_Desc - - Adds icon to Quick Launch toolbar. - - - - - Section_Plugins - - Optional plugins - - - - - Section_Plugins_Desc - - Optional plugins to extend functionality. - - - - - Section_Plugin_FeedReader - - FeedReader - - - - - Section_Plugin_FeedReader_Desc - - Installs plugin FeedReader. - - - - - Section_Plugin_VOIP - - VOIP - - - - - Section_Plugin_VOIP_Desc - - Installs plugin VOIP. - - - - - Section_AutoStart - - Auto Startup - - - - - Section_AutoStart_Desc - - Auto-Run at startup. - - - - - Page_InstallMode - - Installation Mode - - - - - Page_InstallMode_Desc - - Choose how you want to install ${APPNAME}. - - - - - Page_InstallMode_Standard - - &Standard installation - - - - - Page_InstallMode_Standard_Desc - - Install ${APPNAME} for the current user of this machine. - - - - - Page_InstallMode_Portable - - &Portable installation - - - - - Page_InstallMode_Portable_Desc - - In portable mode all configuration data is stored in the application folder and no information is written to the registry. - - - - - Link_Uninstall - - Uninstall - - - - diff -Nru retroshare-0.6.4/src/build_scripts/Windows/installer/lang/ts/es.ts retroshare-0.6.4/src/build_scripts/Windows/installer/lang/ts/es.ts --- retroshare-0.6.4/src/build_scripts/Windows/installer/lang/ts/es.ts 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/build_scripts/Windows/installer/lang/ts/es.ts 1970-01-01 00:00:00.000000000 +0000 @@ -1,205 +0,0 @@ - - - Section_Main - - ${APPNAME} - ${APPNAME} - - - - Section_Main_Desc - - Installs ${APPNAME} and required components. - Instala ${APPNAME} y los componentes requeridos. - - - - Section_Data - - Skins - Coberturas (skins) - - - - Section_Data_Desc - - Installs skins. - Instalar coberturas - - - - Section_Shortcuts - - Shortcut icons - Iconos de accesos directos - - - - Section_Shortcuts_Desc - - Adds shortcut icons. - Añade iconos de accesos directos. - - - - Section_StartMenu - - Start Menu icon - Icono de menú de inicio - - - - Section_StartMenu_Desc - - Adds icon to start menu. - Añade icono al menú de inicio. - - - - Section_Desktop - - Desktop icon - Icono del escritorio - - - - Section_Desktop_Desc - - Adds icon to desktop. - Añade icono al escritorio - - - - Section_QuickLaunch - - Quick Launch icon - Icono de inicio rápido - - - - Section_QuickLaunch_Desc - - Adds icon to Quick Launch toolbar. - Añade icono a la Barra de Inicio Rápido - - - - Section_Plugins - - Optional plugins - Complementos opcionales - - - - Section_Plugins_Desc - - Optional plugins to extend functionality. - Complementos opcionales para expandir la funcionalidad. - - - - Section_Plugin_FeedReader - - FeedReader - FeedReader - - - - Section_Plugin_FeedReader_Desc - - Installs plugin FeedReader. - Instala el complemento FeedReader. - - - - Section_Plugin_LinksCloud - - LinksCloud - LinksCloud - - - - Section_Plugin_LinksCloud_Desc - - Installs plugin LinksCloud. - Instala el complemento LinksCloud. - - - - Section_Plugin_VOIP - - VOIP - VOIP - - - - Section_Plugin_VOIP_Desc - - Installs plugin VOIP. - Instala el complemento VOIP - - - - Section_AutoStart - - Auto Startup - Auto iniciar - - - - Section_AutoStart_Desc - - Auto-Run at startup. - Auto-ejecutar al incio. - - - - Page_InstallMode - - Installation Mode - Modo de instalación - - - - Page_InstallMode_Desc - - Choose how you want to install ${APPNAME}. - Elija cómo quiere instalar ${APPNAME}. - - - - Page_InstallMode_Standard - - &Standard installation - Instalación &Estándar - - - - Page_InstallMode_Standard_Desc - - Install ${APPNAME} for the current user of this machine. - Instalar ${APPNAME} para el usuario actual de esta máquina. - - - - Page_InstallMode_Portable - - &Portable installation - Instalación &Portable - - - - Page_InstallMode_Portable_Desc - - In portable mode all configuration data is stored in the application folder and no information is written to the registry. - En modo portable, todos los datos de configuración se almacenan en la carpeta de la aplicación y no se escribe ninguna información en el registro. - - - - Link_Uninstall - - Uninstall - Desinstalar - - - \ No newline at end of file diff -Nru retroshare-0.6.4/src/build_scripts/Windows/installer/lang/ts/fr.ts retroshare-0.6.4/src/build_scripts/Windows/installer/lang/ts/fr.ts --- retroshare-0.6.4/src/build_scripts/Windows/installer/lang/ts/fr.ts 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/build_scripts/Windows/installer/lang/ts/fr.ts 1970-01-01 00:00:00.000000000 +0000 @@ -1,205 +0,0 @@ - - - Section_Main - - ${APPNAME} - ${APPNAME} - - - - Section_Main_Desc - - Installs ${APPNAME} and required components. - Installe ${APPNAME} et les composants requis. - - - - Section_Data - - Skins - Habillages - - - - Section_Data_Desc - - Installs skins. - Installe des habillages. - - - - Section_Shortcuts - - Shortcut icons - Icônes de raccourci - - - - Section_Shortcuts_Desc - - Adds shortcut icons. - Ajoute les icônes de raccourci. - - - - Section_StartMenu - - Start Menu icon - Icône de menu démarrage - - - - Section_StartMenu_Desc - - Adds icon to start menu. - Ajoute l'icône au menu démarrer. - - - - Section_Desktop - - Desktop icon - Icônes de bureau - - - - Section_Desktop_Desc - - Adds icon to desktop. - Ajoute l'icône sur le bureau. - - - - Section_QuickLaunch - - Quick Launch icon - Icône de lancement rapide - - - - Section_QuickLaunch_Desc - - Adds icon to Quick Launch toolbar. - Ajoute une icône à la barre d'outils de lancement rapide. - - - - Section_Plugins - - Optional plugins - Plug-ins optionnels - - - - Section_Plugins_Desc - - Optional plugins to extend functionality. - Plug-ins optionnels destinés à étendre les fonctionnalités. - - - - Section_Plugin_FeedReader - - FeedReader - FeedReader - - - - Section_Plugin_FeedReader_Desc - - Installs plugin FeedReader. - Installe le plug-in FeedReader. - - - - Section_Plugin_LinksCloud - - LinksCloud - LinksCloud - - - - Section_Plugin_LinksCloud_Desc - - Installs plugin LinksCloud. - Installe le plug-in LinksCloud. - - - - Section_Plugin_VOIP - - VOIP - VOIP - - - - Section_Plugin_VOIP_Desc - - Installs plugin VOIP. - Installe le plug-in VOIP. - - - - Section_AutoStart - - Auto Startup - Démarrage automatique - - - - Section_AutoStart_Desc - - Auto-Run at startup. - Démarrage automatique au démarrage. - - - - Page_InstallMode - - Installation Mode - Mode d'installation - - - - Page_InstallMode_Desc - - Choose how you want to install ${APPNAME}. - Choisissez comment vous voulez installer ${APPNAME}. - - - - Page_InstallMode_Standard - - &Standard installation - &Installation standard - - - - Page_InstallMode_Standard_Desc - - Install ${APPNAME} for the current user of this machine. - Installer ${APPNAME} pour l'utilisateur actuel de cette machine. - - - - Page_InstallMode_Portable - - &Portable installation - &Installation portable - - - - Page_InstallMode_Portable_Desc - - In portable mode all configuration data is stored in the application folder and no information is written to the registry. - En mode portable toutes les données de configuration sont stockées dans le dossier de l'application et aucune information n'est écrite dans la base de registre. - - - - Link_Uninstall - - Uninstall - Désinstaller - - - \ No newline at end of file diff -Nru retroshare-0.6.4/src/build_scripts/Windows/installer/lang/ts/pl.ts retroshare-0.6.4/src/build_scripts/Windows/installer/lang/ts/pl.ts --- retroshare-0.6.4/src/build_scripts/Windows/installer/lang/ts/pl.ts 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/build_scripts/Windows/installer/lang/ts/pl.ts 1970-01-01 00:00:00.000000000 +0000 @@ -1,205 +0,0 @@ - - - Section_Main - - ${APPNAME} - ${APPNAME} - - - - Section_Main_Desc - - Installs ${APPNAME} and required components. - Instaluje ${APPNAME} oraz wymagane komponenty. - - - - Section_Data - - Skins - Skórki - - - - Section_Data_Desc - - Installs skins. - Instaluje skórki. - - - - Section_Shortcuts - - Shortcut icons - Ikony skrótów - - - - Section_Shortcuts_Desc - - Adds shortcut icons. - Dodaje skróty ikon. - - - - Section_StartMenu - - Start Menu icon - - - - - Section_StartMenu_Desc - - Adds icon to start menu. - Dodaje ikonę do menu start. - - - - Section_Desktop - - Desktop icon - Ikona na pulpicie - - - - Section_Desktop_Desc - - Adds icon to desktop. - Dodawanie ikony na pulpicie - - - - Section_QuickLaunch - - Quick Launch icon - Ikona szybkiego uruchamiania - - - - Section_QuickLaunch_Desc - - Adds icon to Quick Launch toolbar. - Dodaje ikonę do paska Szybkiego Uruchamiania. - - - - Section_Plugins - - Optional plugins - Wtyczki opcjonalne - - - - Section_Plugins_Desc - - Optional plugins to extend functionality. - Wtyczki opcjonalne rozszerzające funkcjonalność. - - - - Section_Plugin_FeedReader - - FeedReader - FeedReader - - - - Section_Plugin_FeedReader_Desc - - Installs plugin FeedReader. - Instaluje wtyczki FeedReader - - - - Section_Plugin_LinksCloud - - LinksCloud - - - - - Section_Plugin_LinksCloud_Desc - - Installs plugin LinksCloud. - Instaluje wtyczki LinksCloud. - - - - Section_Plugin_VOIP - - VOIP - VOIP - - - - Section_Plugin_VOIP_Desc - - Installs plugin VOIP. - Instaluje wtyczki VOIP. - - - - Section_AutoStart - - Auto Startup - - - - - Section_AutoStart_Desc - - Auto-Run at startup. - Automatyczne uruchamianie przy starcie. - - - - Page_InstallMode - - Installation Mode - Tryb instalacji - - - - Page_InstallMode_Desc - - Choose how you want to install ${APPNAME}. - Wybierz jak chcesz zainstalować ${APPNAME}. - - - - Page_InstallMode_Standard - - &Standard installation - &Standardowa instalacja - - - - Page_InstallMode_Standard_Desc - - Install ${APPNAME} for the current user of this machine. - Zainstaluj ${APPNAME} dla bieżącego użytkownika tej maszyny. - - - - Page_InstallMode_Portable - - &Portable installation - - - - - Page_InstallMode_Portable_Desc - - In portable mode all configuration data is stored in the application folder and no information is written to the registry. - W trybie przenośnym wszystkie dane konfiguracyjne są przechowywane w folderze aplikacji i nie są zapisywane w rejestrze. - - - - Link_Uninstall - - Uninstall - Odinstaluj - - - \ No newline at end of file diff -Nru retroshare-0.6.4/src/build_scripts/Windows/installer/lang/ts/ru.ts retroshare-0.6.4/src/build_scripts/Windows/installer/lang/ts/ru.ts --- retroshare-0.6.4/src/build_scripts/Windows/installer/lang/ts/ru.ts 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/build_scripts/Windows/installer/lang/ts/ru.ts 1970-01-01 00:00:00.000000000 +0000 @@ -1,205 +0,0 @@ - - - Section_Main - - ${APPNAME} - ${APPNAME} - - - - Section_Main_Desc - - Installs ${APPNAME} and required components. - Установка ${APPNAME} и необходимых компонентов. - - - - Section_Data - - Skins - Оболочки - - - - Section_Data_Desc - - Installs skins. - Установка оболочек. - - - - Section_Shortcuts - - Shortcut icons - Ярлыки - - - - Section_Shortcuts_Desc - - Adds shortcut icons. - Добавление ярлыков. - - - - Section_StartMenu - - Start Menu icon - Ярлык в меню Пуск - - - - Section_StartMenu_Desc - - Adds icon to start menu. - Добавление ярлыка в меню Пуск. - - - - Section_Desktop - - Desktop icon - Ярлык на рабочем столе - - - - Section_Desktop_Desc - - Adds icon to desktop. - Добавление ярлыка на рабочий стол. - - - - Section_QuickLaunch - - Quick Launch icon - Ярлык в панели быстрого запуска - - - - Section_QuickLaunch_Desc - - Adds icon to Quick Launch toolbar. - Добавление ярлыка на панель быстрого запуска. - - - - Section_Plugins - - Optional plugins - Дополнительные плагины - - - - Section_Plugins_Desc - - Optional plugins to extend functionality. - Дополнительные плагины для расширения функциональности. - - - - Section_Plugin_FeedReader - - FeedReader - FeedReader – RSS-агрегатор - - - - Section_Plugin_FeedReader_Desc - - Installs plugin FeedReader. - Установка плагина FeedReader. - - - - Section_Plugin_LinksCloud - - LinksCloud - LinksCloud – Облако ссылок - - - - Section_Plugin_LinksCloud_Desc - - Installs plugin LinksCloud. - Установка плагина LinksCloud. - - - - Section_Plugin_VOIP - - VOIP - VoIP - - - - Section_Plugin_VOIP_Desc - - Installs plugin VOIP. - Установка плагина VoIP. - - - - Section_AutoStart - - Auto Startup - Автозапуск - - - - Section_AutoStart_Desc - - Auto-Run at startup. - Автозапуск при загрузке системы. - - - - Page_InstallMode - - Installation Mode - Режим установки - - - - Page_InstallMode_Desc - - Choose how you want to install ${APPNAME}. - Выберите метод установки ${APPNAME}. - - - - Page_InstallMode_Standard - - &Standard installation - Стандартная установка - - - - Page_InstallMode_Standard_Desc - - Install ${APPNAME} for the current user of this machine. - Установка ${APPNAME} для текущего пользователя компьютера. - - - - Page_InstallMode_Portable - - &Portable installation - Портативная установка - - - - Page_InstallMode_Portable_Desc - - In portable mode all configuration data is stored in the application folder and no information is written to the registry. - В режиме портативной установки все конфигурационные файлы сохраняются в папку приложения и в системный реестр не записывается никакой информации. - - - - Link_Uninstall - - Uninstall - Удаление программы - - - \ No newline at end of file diff -Nru retroshare-0.6.4/src/build_scripts/Windows/installer/lang/ts/tr.ts retroshare-0.6.4/src/build_scripts/Windows/installer/lang/ts/tr.ts --- retroshare-0.6.4/src/build_scripts/Windows/installer/lang/ts/tr.ts 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/build_scripts/Windows/installer/lang/ts/tr.ts 1970-01-01 00:00:00.000000000 +0000 @@ -1,205 +0,0 @@ - - - Section_Main - - ${APPNAME} - ${APPNAME} - - - - Section_Main_Desc - - Installs ${APPNAME} and required components. - ${APPNAME} ve gerekli bileşenleri kurar. - - - - Section_Data - - Skins - Temalar - - - - Section_Data_Desc - - Installs skins. - Tema yükleyin. - - - - Section_Shortcuts - - Shortcut icons - Kısayol simgeleri - - - - Section_Shortcuts_Desc - - Adds shortcut icons. - Kısayol simgesi ekleyin. - - - - Section_StartMenu - - Start Menu icon - Başlat Menüsü simgesi - - - - Section_StartMenu_Desc - - Adds icon to start menu. - Başlat menüsüne simge ekleyin. - - - - Section_Desktop - - Desktop icon - Masaüstü simgesi - - - - Section_Desktop_Desc - - Adds icon to desktop. - Masaüstüne simge ekleyin. - - - - Section_QuickLaunch - - Quick Launch icon - Hızlı Başlat simgesi - - - - Section_QuickLaunch_Desc - - Adds icon to Quick Launch toolbar. - Hızlı Başlat araç çubuğuna simge ekleyin. - - - - Section_Plugins - - Optional plugins - İsteğe bağlı eklentiler - - - - Section_Plugins_Desc - - Optional plugins to extend functionality. - İşlevselliği artırmak için isteğe bağlı eklentiler. - - - - Section_Plugin_FeedReader - - FeedReader - AkışOkuyucu - - - - Section_Plugin_FeedReader_Desc - - Installs plugin FeedReader. - AkışOkuyucu eklentisini yükleyin. - - - - Section_Plugin_LinksCloud - - LinksCloud - BağlantıBulutu - - - - Section_Plugin_LinksCloud_Desc - - Installs plugin LinksCloud. - BağlantıBulutu eklentisini yükleyin. - - - - Section_Plugin_VOIP - - VOIP - VOIP - - - - Section_Plugin_VOIP_Desc - - Installs plugin VOIP. - VOIP eklentisini yükleyin. - - - - Section_AutoStart - - Auto Startup - Otomatik Başlat - - - - Section_AutoStart_Desc - - Auto-Run at startup. - Açılışta otomatik başlatın. - - - - Page_InstallMode - - Installation Mode - Kurulum Yöntemi - - - - Page_InstallMode_Desc - - Choose how you want to install ${APPNAME}. - ${APPNAME} kurulum şeklini seçin - - - - Page_InstallMode_Standard - - &Standard installation - &Normal kurulum - - - - Page_InstallMode_Standard_Desc - - Install ${APPNAME} for the current user of this machine. - ${APPNAME} yalnızca şimdiki kullanıcı için kurulsun. - - - - Page_InstallMode_Portable - - &Portable installation - &Taşınabilir kurulum - - - - Page_InstallMode_Portable_Desc - - In portable mode all configuration data is stored in the application folder and no information is written to the registry. - Taşınabilir kipte tüm ayarlar uygulama klasörüne depolanır ve kayıt defterine hiçbir bilgi yazılmaz. - - - - Link_Uninstall - - Uninstall - Kaldırın - - - \ No newline at end of file Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/build_scripts/Windows/installer/lang/ts/xsltproc.exe and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/build_scripts/Windows/installer/lang/ts/xsltproc.exe differ diff -Nru retroshare-0.6.4/src/build_scripts/Windows/installer/lang/ts/zh_CN.ts retroshare-0.6.4/src/build_scripts/Windows/installer/lang/ts/zh_CN.ts --- retroshare-0.6.4/src/build_scripts/Windows/installer/lang/ts/zh_CN.ts 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/build_scripts/Windows/installer/lang/ts/zh_CN.ts 1970-01-01 00:00:00.000000000 +0000 @@ -1,205 +0,0 @@ - - - Section_Main - - ${APPNAME} - - - - - Section_Main_Desc - - Installs ${APPNAME} and required components. - - - - - Section_Data - - Skins - 皮肤 - - - - Section_Data_Desc - - Installs skins. - 安装皮肤 - - - - Section_Shortcuts - - Shortcut icons - 快捷方式图标 - - - - Section_Shortcuts_Desc - - Adds shortcut icons. - 添加快捷方式图标 - - - - Section_StartMenu - - Start Menu icon - 开始菜单图标 - - - - Section_StartMenu_Desc - - Adds icon to start menu. - 添加图标至开始菜单 - - - - Section_Desktop - - Desktop icon - 桌面图标 - - - - Section_Desktop_Desc - - Adds icon to desktop. - 添加图标至桌面 - - - - Section_QuickLaunch - - Quick Launch icon - 快速启动栏图标 - - - - Section_QuickLaunch_Desc - - Adds icon to Quick Launch toolbar. - 添加图标至快速启动栏 - - - - Section_Plugins - - Optional plugins - - - - - Section_Plugins_Desc - - Optional plugins to extend functionality. - - - - - Section_Plugin_FeedReader - - FeedReader - RSS订阅 - - - - Section_Plugin_FeedReader_Desc - - Installs plugin FeedReader. - 安装RSS订阅插件 - - - - Section_Plugin_LinksCloud - - LinksCloud - LinksCloud - - - - Section_Plugin_LinksCloud_Desc - - Installs plugin LinksCloud. - 安装插件LinksCloud - - - - Section_Plugin_VOIP - - VOIP - 语音 - - - - Section_Plugin_VOIP_Desc - - Installs plugin VOIP. - 安装语音插件 - - - - Section_AutoStart - - Auto Startup - - - - - Section_AutoStart_Desc - - Auto-Run at startup. - - - - - Page_InstallMode - - Installation Mode - 安装模式 - - - - Page_InstallMode_Desc - - Choose how you want to install ${APPNAME}. - - - - - Page_InstallMode_Standard - - &Standard installation - - - - - Page_InstallMode_Standard_Desc - - Install ${APPNAME} for the current user of this machine. - - - - - Page_InstallMode_Portable - - &Portable installation - - - - - Page_InstallMode_Portable_Desc - - In portable mode all configuration data is stored in the application folder and no information is written to the registry. - - - - - Link_Uninstall - - Uninstall - 卸载 - - - \ No newline at end of file diff -Nru retroshare-0.6.4/src/build_scripts/Windows/installer/lang/zh_CN.nsh retroshare-0.6.4/src/build_scripts/Windows/installer/lang/zh_CN.nsh --- retroshare-0.6.4/src/build_scripts/Windows/installer/lang/zh_CN.nsh 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/build_scripts/Windows/installer/lang/zh_CN.nsh 1970-01-01 00:00:00.000000000 +0000 @@ -1,29 +0,0 @@ -!insertmacro LANG_STRING Section_Main "${APPNAME}" -!insertmacro LANG_STRING Section_Main_Desc "Installs ${APPNAME} and required components." -!insertmacro LANG_STRING Section_Data "皮肤" -!insertmacro LANG_STRING Section_Data_Desc "安装皮肤" -!insertmacro LANG_STRING Section_Shortcuts "快捷方式图标" -!insertmacro LANG_STRING Section_Shortcuts_Desc "添加快捷方式图标" -!insertmacro LANG_STRING Section_StartMenu "开始菜单图标" -!insertmacro LANG_STRING Section_StartMenu_Desc "添加图标至开始菜单" -!insertmacro LANG_STRING Section_Desktop "桌面图标" -!insertmacro LANG_STRING Section_Desktop_Desc "添加图标至桌面" -!insertmacro LANG_STRING Section_QuickLaunch "快速启动栏图标" -!insertmacro LANG_STRING Section_QuickLaunch_Desc "添加图标至快速启动栏" -!insertmacro LANG_STRING Section_Plugins "Optional plugins" -!insertmacro LANG_STRING Section_Plugins_Desc "Optional plugins to extend functionality." -!insertmacro LANG_STRING Section_Plugin_FeedReader "RSS订阅" -!insertmacro LANG_STRING Section_Plugin_FeedReader_Desc "安装RSS订阅插件" -!insertmacro LANG_STRING Section_Plugin_LinksCloud "LinksCloud" -!insertmacro LANG_STRING Section_Plugin_LinksCloud_Desc "安装插件LinksCloud" -!insertmacro LANG_STRING Section_Plugin_VOIP "语音" -!insertmacro LANG_STRING Section_Plugin_VOIP_Desc "安装语音插件" -!insertmacro LANG_STRING Section_AutoStart "Auto Startup" -!insertmacro LANG_STRING Section_AutoStart_Desc "Auto-Run at startup." -!insertmacro LANG_STRING Page_InstallMode "安装模式" -!insertmacro LANG_STRING Page_InstallMode_Desc "Choose how you want to install ${APPNAME}." -!insertmacro LANG_STRING Page_InstallMode_Standard "&Standard installation" -!insertmacro LANG_STRING Page_InstallMode_Standard_Desc "Install ${APPNAME} for the current user of this machine." -!insertmacro LANG_STRING Page_InstallMode_Portable "&Portable installation" -!insertmacro LANG_STRING Page_InstallMode_Portable_Desc "In portable mode all configuration data is stored in the application folder and no information is written to the registry." -!insertmacro LANG_STRING Link_Uninstall "卸载" diff -Nru retroshare-0.6.4/src/build_scripts/Windows/installer/retroshare-Qt4.nsi retroshare-0.6.4/src/build_scripts/Windows/installer/retroshare-Qt4.nsi --- retroshare-0.6.4/src/build_scripts/Windows/installer/retroshare-Qt4.nsi 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/build_scripts/Windows/installer/retroshare-Qt4.nsi 1970-01-01 00:00:00.000000000 +0000 @@ -1,471 +0,0 @@ -; Script generated with the Venis Install Wizard & modified by defnax -; Reworked by Thunder - -# Needed defines -;!define BUILDADD "" -;!define RELEASEDIR "" -;!define QTDIR "" -;!define MINGWDIR "" - -# Optional defines -;!define OUTDIR "" - -# Check needed defines -!ifndef BUILDADD -!error "BUILDADD is not defined" -!endif - -!ifndef RELEASEDIR -!error "RELEASEDIR is not defined" -!endif -!ifndef QTDIR -!error "QTDIR is not defined" -!endif -!ifndef MINGWDIR -!error "MINGWDIR is not defined" -!endif - -# Check optional defines -!ifdef OUTDIR -!define OUTDIR_ "${OUTDIR}\" -!else -!define OUTDIR "" -!define OUTDIR_ "" -!endif - -!ifndef INSTALLERADD -!define INSTALLERADD "" -!endif - -# Source directory -!define SOURCEDIR "..\..\.." - -# Get version from executable -!GetDllVersion "${RELEASEDIR}\retroshare-gui\src\release\retroshare.exe" VERSION_ -!define VERSION ${VERSION_1}.${VERSION_2}.${VERSION_3}${BUILDADD} -;!define REVISION ${VERSION_4} - -# Get version of Qt -!GetDllVersion "${QTDIR}\bin\QtCore4.dll" QTVERSION_ -!define QTVERSION ${QTVERSION_1}.${QTVERSION_2}.${QTVERSION_3} - -# Check version -!ifndef REVISION -!error "REVISION is not defined" -!endif - -!ifndef REVISION -!error "REVISION is not defined" -!endif - -# Date -!define /date Date "%Y%m%d" - -# Application name and version -!define APPNAME "RetroShare" -!define APPNAMEANDVERSION "${APPNAME} ${VERSION}" -!define PUBLISHER "RetroShare Team" - -# Install path -!define INSTDIR_NORMAL "$ProgramFiles\${APPNAME}" -!define INSTDIR_PORTABLE "$Desktop\${APPNAME}" - -!define DATADIR_NORMAL "$APPDATA\${APPNAME}" -!define DATADIR_PORTABLE "$INSTDIR\Data" - -# Main Install settings -Name "${APPNAMEANDVERSION}" -InstallDirRegKey HKLM "Software\${APPNAME}" "" -OutFile "${OUTDIR_}RetroShare-${VERSION}-${Date}-${REVISION}-Qt-${QTVERSION}${INSTALLERADD}-setup.exe" -BrandingText "${APPNAMEANDVERSION}" -RequestExecutionlevel highest -# Use compression -SetCompressor /SOLID LZMA - -# Global variables -Var PortableMode -Var InstDirNormal -Var InstDirPortable -Var DataDir -Var StyleSheetDir - -# Modern interface settings -!include Sections.nsh -!include nsDialogs.nsh -!include "MUI.nsh" - -# Interface Settings -!define MUI_ABORTWARNING -!define MUI_HEADERIMAGE -!define MUI_HEADERIMAGE_BITMAP "${SOURCEDIR}\build_scripts\Windows\installer\HeaderImage.bmp" -;!define MUI_WELCOMEFINISHPAGE_BITMAP "...bmp" - -# MUI defines -!define MUI_ICON "${NSISDIR}\Contrib\Graphics\Icons\orange-install.ico" -!define MUI_FINISHPAGE_NOAUTOCLOSE -!define MUI_LICENSEPAGE_RADIOBUTTONS -!define MUI_COMPONENTSPAGE_SMALLDESC -!define MUI_FINISHPAGE_LINK "Visit the RetroShare forum for the latest news and support" -!define MUI_FINISHPAGE_LINK_LOCATION "http://retroshare.sourceforge.net/forum/" -!define MUI_FINISHPAGE_RUN "$INSTDIR\retroshare.exe" -!define MUI_FINISHPAGE_SHOWREADME $INSTDIR\changelog.txt -!define MUI_FINISHPAGE_SHOWREADME_TEXT changelog.txt -!define MUI_FINISHPAGE_SHOWREADME_NOTCHECKED -!define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\orange-uninstall.ico" -!define MUI_UNFINISHPAGE_NOAUTOCLOSE -;!define MUI_LANGDLL_REGISTRY_ROOT HKLM -;!define MUI_LANGDLL_REGISTRY_KEY ${REGKEY} -;!define MUI_LANGDLL_REGISTRY_VALUENAME InstallerLanguage - -# Defines the un-/installer logo of RetroShare -!insertmacro MUI_DEFAULT MUI_WELCOMEFINISHPAGE_BITMAP "${NSISDIR}\Contrib\Graphics\Wizard\orange.bmp" -!insertmacro MUI_DEFAULT MUI_UNWELCOMEFINISHPAGE_BITMAP "${NSISDIR}\Contrib\Graphics\Wizard\orange-uninstall.bmp" - -# Installer pages -!insertmacro MUI_PAGE_WELCOME -!insertmacro MUI_PAGE_LICENSE "$(myLicenseData)" -Page Custom PortableModePageCreate PortableModePageLeave -!define MUI_PAGE_CUSTOMFUNCTION_LEAVE dir_leave -!insertmacro MUI_PAGE_DIRECTORY -!insertmacro MUI_PAGE_COMPONENTS -!insertmacro MUI_PAGE_INSTFILES -!insertmacro MUI_PAGE_FINISH -!insertmacro MUI_UNPAGE_CONFIRM -!insertmacro MUI_UNPAGE_INSTFILES - -# Set languages (first is default language) -!insertmacro MUI_RESERVEFILE_LANGDLL - -# Installer languages -!define MUI_LANGDLL_ALLLANGUAGES - -# Translations -!macro LANG_LOAD LANGUAGE LANGCODE LANGID LICENCEFILE - !insertmacro MUI_LANGUAGE "${LANGUAGE}" -; !verbose off - !define LANG "${LANGUAGE}" - !include "lang\${LANGCODE}.nsh" - LangString LANGUAGEID "${LANG_${LANG}}" "1031" - LicenseLangString myLicenseData ${LANGCODE} ${LICENCEFILE} -; !verbose on - !undef LANG -!macroend - -!macro LANG_STRING NAME VALUE - LangString "${NAME}" "${LANG_${LANG}}" "${VALUE}" -!macroend - -!insertmacro LANG_LOAD "English" "en" "1033" "${SOURCEDIR}\retroshare-gui\src\license\license.txt" -!insertmacro LANG_LOAD "French" "fr" "1036" "${SOURCEDIR}\retroshare-gui\src\license\license-FR.txt" -!insertmacro LANG_LOAD "German" "de" "1031" "${SOURCEDIR}\retroshare-gui\src\license\license-GER.txt" -!insertmacro LANG_LOAD "Turkish" "tr" "1055" "${SOURCEDIR}\retroshare-gui\src\license\license-TR.txt" -!insertmacro LANG_LOAD "SimpChinese" "zh_CN" "2052" "${SOURCEDIR}\retroshare-gui\src\license\license.txt" -!insertmacro LANG_LOAD "Polish" "pl" "1045" "${SOURCEDIR}\retroshare-gui\src\license\license.txt" -!insertmacro LANG_LOAD "Spanish" "es" "1034" "${SOURCEDIR}\retroshare-gui\src\license\license.txt" -!insertmacro LANG_LOAD "Russian" "ru" "1049" "${SOURCEDIR}\retroshare-gui\src\license\license.txt" -!insertmacro LANG_LOAD "Catalan" "ca_ES" "1027" "${SOURCEDIR}\retroshare-gui\src\license\license.txt" - -LicenseData $(myLicenseData) - -# Main binaries -Section $(Section_Main) Section_Main - ;Set Section required - SectionIn RO - - ; Set Section properties - SetOverwrite on - - ; Clears previous error logs -; Delete "$INSTDIR\*.log" - - ; Main binaries - SetOutPath "$INSTDIR" - File /oname=retroshare.exe "${RELEASEDIR}\retroshare-gui\src\release\retroshare.exe" - File /oname=retroshare-nogui.exe "${RELEASEDIR}\retroshare-nogui\src\release\retroshare-nogui.exe" - - ; Qt binaries - File "${QTDIR}\bin\QtCore4.dll" - File "${QTDIR}\bin\QtGui4.dll" - File "${QTDIR}\bin\QtMultimedia4.dll" - File "${QTDIR}\bin\QtNetwork4.dll" - File "${QTDIR}\bin\QtSvg4.dll" - File "${QTDIR}\bin\QtXml4.dll" - - ; MinGW binaries - File "${MINGWDIR}\bin\libstdc++-6.dll" - File "${MINGWDIR}\bin\libgcc_s_dw2-1.dll" - File "${MINGWDIR}\bin\libwinpthread-1.dll" - - ; External binaries - File "${SOURCEDIR}\..\libs\bin\miniupnpc.dll" - File "${SOURCEDIR}\..\libs\bin\libeay32.dll" - File "${SOURCEDIR}\..\libs\bin\ssleay32.dll" - - ; Other files - File "${SOURCEDIR}\retroshare-gui\src\changelog.txt" - File "${SOURCEDIR}\libbitdht\src\bitdht\bdboot.txt" - - ; Image formats - SetOutPath "$INSTDIR\imageformats" - File /r "${QTDIR}\plugins\imageformats\qgif4.dll" - File /r "${QTDIR}\plugins\imageformats\qico4.dll" - File /r "${QTDIR}\plugins\imageformats\qjpeg4.dll" - File /r "${QTDIR}\plugins\imageformats\qmng4.dll" - File /r "${QTDIR}\plugins\imageformats\qsvg4.dll" - File /r "${QTDIR}\plugins\imageformats\qtga4.dll" - File /r "${QTDIR}\plugins\imageformats\qtiff4.dll" - - ; Sounds - SetOutPath "$INSTDIR\sounds" - File /r "${SOURCEDIR}\retroshare-gui\src\sounds\*.*" - - ; Translations - SetOutPath "$INSTDIR\translations" - File /r "${SOURCEDIR}\retroshare-gui\src\translations\*.qm" - File /r "${QTDIR}\translations\qt_*.qm" - - ; WebUI - SetOutPath "$INSTDIR\webui" - File /r "${SOURCEDIR}\libresapi\src\webui\*.*" - - ; License - SetOutPath "$INSTDIR\license" - File /r "${SOURCEDIR}\retroshare-gui\src\license\*.*" -SectionEnd - -# Plugins -SectionGroup $(Section_Plugins) Section_Plugins -Section $(Section_Plugin_FeedReader) Section_Plugin_FeedReader - SetOutPath "$DataDir\extensions6" - File "${RELEASEDIR}\plugins\FeedReader\release\FeedReader.dll" -SectionEnd - -Section $(Section_Plugin_VOIP) Section_Plugin_VOIP - SetOutPath "$DataDir\extensions6" - File "${RELEASEDIR}\plugins\VOIP\release\VOIP.dll" -SectionEnd -SectionGroupEnd - -# Data (Styles) -Section $(Section_Data) Section_Data - ; Set Section properties - SetOverwrite on - - ; Chat style - SetOutPath "$StyleSheetDir\stylesheets\Bubble" - File /r "${SOURCEDIR}\retroshare-gui\src\gui\qss\chat\Bubble\*.*" - SetOutPath "$StyleSheetDir\stylesheets\Bubble_Compact" - File /r "${SOURCEDIR}\retroshare-gui\src\gui\qss\chat\Bubble_Compact\*.*" - - ; Stylesheets - SetOutPath "$INSTDIR\qss" - File /r "${SOURCEDIR}\retroshare-gui\src\qss\*.*" -SectionEnd - -;Section $(Section_Link) Section_Link - ; Delete any existing keys - - ; Write the file association -; WriteRegStr HKCR .pqi "" retroshare -; WriteRegStr HKCR retroshare "" "PQI File" -; WriteRegBin HKCR retroshare EditFlags 00000100 -; WriteRegStr HKCR "retroshare\shell" "" open -; WriteRegStr HKCR "retroshare\shell\open\command" "" `"$INSTDIR\retroshare.exe" "%1"` -;SectionEnd - -# Shortcuts -SectionGroup $(Section_Shortcuts) Section_Shortcuts -Section $(Section_StartMenu) Section_StartMenu - SetOutPath "$INSTDIR" - CreateDirectory "$SMPROGRAMS\${APPNAME}" - CreateShortCut "$SMPROGRAMS\${APPNAME}\$(Link_Uninstall).lnk" "$INSTDIR\uninstall.exe" "" "$INSTDIR\uninstall.exe" 0 - CreateShortCut "$SMPROGRAMS\${APPNAME}\${APPNAME}.lnk" "$INSTDIR\retroshare.exe" "" "$INSTDIR\retroshare.exe" 0 -SectionEnd - -Section $(Section_Desktop) Section_Desktop - CreateShortCut "$DESKTOP\${APPNAME}.lnk" "$INSTDIR\retroshare.exe" "" "$INSTDIR\retroshare.exe" 0 -SectionEnd - -Section $(Section_QuickLaunch) Section_QuickLaunch - CreateShortCut "$QUICKLAUNCH\${APPNAME}.lnk" "$INSTDIR\retroshare.exe" "" "$INSTDIR\retroshare.exe" 0 -SectionEnd -SectionGroupEnd - -Section $(Section_AutoStart) Section_AutoStart - WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Run" "RetroShare" "$INSTDIR\retroshare.exe -m" -SectionEnd - -;Section $(Section_AutoStart) Section_AutoStart -; CreateShortCut "$SMSTARTUP\${APPNAME}.lnk" "$INSTDIR\retroshare.exe" "" "$INSTDIR\retroshare.exe -m" 0 -;SectionEnd - -Section -FinishSection - ${If} $PortableMode = 0 - WriteRegStr HKLM "Software\${APPNAME}" "" "$INSTDIR" - WriteRegStr HKLM "Software\${APPNAME}" "Version" "${VERSION}" - WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "DisplayName" "${APPNAME}" - WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "DisplayVersion" "${VERSION}" - WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "DisplayIcon" "$INSTDIR\retroshare.exe" - WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "Publisher" "${PUBLISHER}" - WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "NoModify" "1" - WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "NoRepair" "1" - WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "UninstallString" "$INSTDIR\uninstall.exe" - WriteUninstaller "$INSTDIR\uninstall.exe" - ${Else} - ; Create the file the application uses to detect portable mode - FileOpen $0 "$INSTDIR\portable" w - FileClose $0 - ${EndIf} -SectionEnd - -# Descriptions -!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN - !insertmacro MUI_DESCRIPTION_TEXT ${Section_Main} $(Section_Main_Desc) - !insertmacro MUI_DESCRIPTION_TEXT ${Section_Data} $(Section_Data_Desc) - !insertmacro MUI_DESCRIPTION_TEXT ${Section_Shortcuts} $(Section_Shortcuts_Desc) - !insertmacro MUI_DESCRIPTION_TEXT ${Section_StartMenu} $(Section_StartMenu_Desc) - !insertmacro MUI_DESCRIPTION_TEXT ${Section_Desktop} $(Section_Desktop_Desc) - !insertmacro MUI_DESCRIPTION_TEXT ${Section_QuickLaunch} $(Section_QuickLaunch_Desc) - !insertmacro MUI_DESCRIPTION_TEXT ${Section_Plugins} $(Section_Plugins_Desc) - !insertmacro MUI_DESCRIPTION_TEXT ${Section_Plugin_FeedReader} $(Section_Plugin_FeedReader_Desc) - !insertmacro MUI_DESCRIPTION_TEXT ${Section_Plugin_VOIP} $(Section_Plugin_VOIP_Desc) -; !insertmacro MUI_DESCRIPTION_TEXT ${Section_Link} $(Section_Link_Desc) - !insertmacro MUI_DESCRIPTION_TEXT ${Section_AutoStart} $(Section_AutoStart_Desc) -!insertmacro MUI_FUNCTION_DESCRIPTION_END - -# Uninstall -Section "Uninstall" - ; Remove file association registry keys -; DeleteRegKey HKCR .pqi - DeleteRegKey HKCR RetroShare - - ; Remove program/uninstall regsitry keys - DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" - DeleteRegKey HKLM SOFTWARE\${APPNAME} - - DeleteRegValue HKCU "Software\Microsoft\Windows\CurrentVersion\Run" "RetroShare" - - ; Remove shortcuts, if any - Delete "$SMPROGRAMS\${APPNAME}\*.*" - - ; Remove desktop shortcut - Delete "$DESKTOP\${APPNAME}.lnk" - - ; Remove Quicklaunch shortcut - Delete "$QUICKLAUNCH\${APPNAME}.lnk" - - ; Remove Autstart - Delete "$SMSTARTUP\${APPNAME}.lnk" - - ; Remove directories used - RMDir "$SMPROGRAMS\${APPNAME}" - RMDir /r "$INSTDIR" - - ; Don't remove the directory, otherwise - ; we lose the XPGP keys. - ; Should make this an option though... - RMDir /r "${DATADIR_NORMAL}\extensions6" - RMDir /r "${DATADIR_NORMAL}\stylesheets" -SectionEnd - -Function .onInit - StrCpy $InstDirNormal "${INSTDIR_NORMAL}" - StrCpy $InstDirPortable "${INSTDIR_PORTABLE}" - - StrCpy $PortableMode 0 - StrCpy $INSTDIR "$InstDirNormal" - StrCpy $DataDir "${DATADIR_NORMAL}" - - InitPluginsDir - Push $R1 - File /oname=$PLUGINSDIR\spltmp.bmp "${SOURCEDIR}\retroshare-gui\src\gui\images\logo\logo_splash.png" - advsplash::show 1200 1000 1000 -1 $PLUGINSDIR\spltmp - Pop $R1 - Pop $R1 - !insertmacro MUI_LANGDLL_DISPLAY -FunctionEnd - -# Installation mode - -Function RequireAdmin - UserInfo::GetAccountType - Pop $8 - ${If} $8 != "admin" - MessageBox MB_ICONSTOP "You need administrator rights to install ${APPNAME}" - SetErrorLevel 740 ;ERROR_ELEVATION_REQUIRED - Abort - ${EndIf} -FunctionEnd - -Function SetModeDestinationFromInstdir - ${If} $PortableMode = 0 - StrCpy $InstDirNormal $INSTDIR - ${Else} - StrCpy $InstDirPortable $INSTDIR - ${EndIf} -FunctionEnd - -Function PortableModePageCreate - Call SetModeDestinationFromInstdir ; If the user clicks BACK on the directory page we will remember their mode specific directory - !insertmacro MUI_HEADER_TEXT $(Page_InstallMode) $(Page_InstallMode_Desc) - nsDialogs::Create 1018 - Pop $0 - ${NSD_CreateRadioButton} 5u 25u -10u 8u $(Page_InstallMode_Standard) - Pop $1 - ${NSD_CreateLabel} 18u 40u -10u 24u $(Page_InstallMode_Standard_Desc) - Pop $0 - ${NSD_CreateRadioButton} 5u 75u -10u 8u $(Page_InstallMode_Portable) - Pop $2 - ${NSD_CreateLabel} 18u 90u -10u 24u $(Page_InstallMode_Portable_Desc) - Pop $0 - ${If} $PortableMode = 0 - SendMessage $1 ${BM_SETCHECK} ${BST_CHECKED} 0 - ${Else} - SendMessage $2 ${BM_SETCHECK} ${BST_CHECKED} 0 - ${EndIf} - nsDialogs::Show -FunctionEnd - -Function PortableModePageLeave - ${NSD_GetState} $1 $0 - ${If} $0 <> ${BST_UNCHECKED} - StrCpy $PortableMode 0 - StrCpy $INSTDIR $InstDirNormal - Call RequireAdmin - ; Enable sections - SectionSetText ${Section_Shortcuts} $(Section_Shortcuts) - SectionSetText ${Section_StartMenu} $(Section_StartMenu) - SectionSetText ${Section_Desktop} $(Section_Desktop) - SectionSetText ${Section_QuickLaunch} $(Section_QuickLaunch) - SectionSetText ${Section_AutoStart} $(Section_AutoStart) - !insertmacro SelectSection ${Section_Shortcuts} - !insertmacro SelectSection ${Section_AutoStart} - !insertmacro SelectSection ${Section_StartMenu} - !insertmacro SelectSection ${Section_Desktop} - !insertmacro SelectSection ${Section_QuickLaunch} - ${Else} - StrCpy $PortableMode 1 - StrCpy $INSTDIR $InstDirPortable - ; Disable sections - !insertmacro UnselectSection ${Section_Shortcuts} - !insertmacro UnselectSection ${Section_AutoStart} - !insertmacro UnselectSection ${Section_StartMenu} - !insertmacro UnselectSection ${Section_Desktop} - !insertmacro UnselectSection ${Section_QuickLaunch} - SectionSetText ${Section_Shortcuts} "" - SectionSetText ${Section_StartMenu} "" - SectionSetText ${Section_Desktop} "" - SectionSetText ${Section_QuickLaunch} "" - SectionSetText ${Section_AutoStart} "" - ${EndIf} -FunctionEnd - -Function dir_leave - ${If} $PortableMode = 0 - StrCpy $DataDir "${DATADIR_NORMAL}" - StrCpy $StyleSheetDir $DataDir - ${Else} - StrCpy $DataDir "${DATADIR_PORTABLE}" - StrCpy $StyleSheetDir $INSTDIR - ${EndIf} -FunctionEnd diff -Nru retroshare-0.6.4/src/build_scripts/Windows/installer/retroshare-Qt5.nsi retroshare-0.6.4/src/build_scripts/Windows/installer/retroshare-Qt5.nsi --- retroshare-0.6.4/src/build_scripts/Windows/installer/retroshare-Qt5.nsi 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/build_scripts/Windows/installer/retroshare-Qt5.nsi 1970-01-01 00:00:00.000000000 +0000 @@ -1,493 +0,0 @@ -; Script generated with the Venis Install Wizard & modified by defnax -; Reworked by Thunder - -# Needed defines -;!define BUILDADD "" -;!define RELEASEDIR "" -;!define QTDIR "" -;!define MINGWDIR "" - -# Optional defines -;!define OUTDIR "" - -# Check needed defines -!ifndef BUILDADD -!error "BUILDADD is not defined" -!endif - -!ifndef RELEASEDIR -!error "RELEASEDIR is not defined" -!endif -!ifndef QTDIR -!error "QTDIR is not defined" -!endif -!ifndef MINGWDIR -!error "MINGWDIR is not defined" -!endif - -# Check optional defines -!ifdef OUTDIR -!define OUTDIR_ "${OUTDIR}\" -!else -!define OUTDIR "" -!define OUTDIR_ "" -!endif - -!ifndef INSTALLERADD -!define INSTALLERADD "" -!endif - -# Source directory -!define SOURCEDIR "..\..\.." - -# Get version from executable -!GetDllVersion "${RELEASEDIR}\retroshare-gui\src\release\retroshare.exe" VERSION_ -!define VERSION ${VERSION_1}.${VERSION_2}.${VERSION_3}${BUILDADD} -;!define REVISION ${VERSION_4} - -# Get version of Qt -!GetDllVersion "${QTDIR}\bin\Qt5Core.dll" QTVERSION_ -!define QTVERSION ${QTVERSION_1}.${QTVERSION_2}.${QTVERSION_3} - -# Check version -!ifndef REVISION -!error "REVISION is not defined" -!endif - -!ifndef REVISION -!error "REVISION is not defined" -!endif - -# Date -!define /date Date "%Y%m%d" - -# Application name and version -!define APPNAME "RetroShare" -!define APPNAMEANDVERSION "${APPNAME} ${VERSION}" -!define PUBLISHER "RetroShare Team" - -# Install path -!define INSTDIR_NORMAL "$ProgramFiles\${APPNAME}" -!define INSTDIR_PORTABLE "$Desktop\${APPNAME}" - -!define DATADIR_NORMAL "$APPDATA\${APPNAME}" -!define DATADIR_PORTABLE "$INSTDIR\Data" - -# Main Install settings -Name "${APPNAMEANDVERSION}" -InstallDirRegKey HKLM "Software\${APPNAME}" "" -OutFile "${OUTDIR_}RetroShare-${VERSION}-${Date}-${REVISION}-Qt-${QTVERSION}${INSTALLERADD}-setup.exe" -BrandingText "${APPNAMEANDVERSION}" -RequestExecutionlevel highest -# Use compression -SetCompressor /SOLID LZMA - -# Global variables -Var PortableMode -Var InstDirNormal -Var InstDirPortable -Var DataDir -Var StyleSheetDir - -# Modern interface settings -!include Sections.nsh -!include nsDialogs.nsh -!include "MUI.nsh" - -# Interface Settings -!define MUI_ABORTWARNING -!define MUI_HEADERIMAGE -!define MUI_HEADERIMAGE_BITMAP "${SOURCEDIR}\build_scripts\Windows\installer\HeaderImage.bmp" -;!define MUI_WELCOMEFINISHPAGE_BITMAP "...bmp" - -# MUI defines -!define MUI_ICON "${NSISDIR}\Contrib\Graphics\Icons\orange-install.ico" -!define MUI_FINISHPAGE_NOAUTOCLOSE -!define MUI_LICENSEPAGE_RADIOBUTTONS -!define MUI_COMPONENTSPAGE_SMALLDESC -!define MUI_FINISHPAGE_LINK "Visit the RetroShare forum for the latest news and support" -!define MUI_FINISHPAGE_LINK_LOCATION "http://retroshare.sourceforge.net/forum/" -!define MUI_FINISHPAGE_RUN "$INSTDIR\retroshare.exe" -!define MUI_FINISHPAGE_SHOWREADME $INSTDIR\changelog.txt -!define MUI_FINISHPAGE_SHOWREADME_TEXT changelog.txt -!define MUI_FINISHPAGE_SHOWREADME_NOTCHECKED -!define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\orange-uninstall.ico" -!define MUI_UNFINISHPAGE_NOAUTOCLOSE -;!define MUI_LANGDLL_REGISTRY_ROOT HKLM -;!define MUI_LANGDLL_REGISTRY_KEY ${REGKEY} -;!define MUI_LANGDLL_REGISTRY_VALUENAME InstallerLanguage - -# Defines the un-/installer logo of RetroShare -!insertmacro MUI_DEFAULT MUI_WELCOMEFINISHPAGE_BITMAP "${NSISDIR}\Contrib\Graphics\Wizard\orange.bmp" -!insertmacro MUI_DEFAULT MUI_UNWELCOMEFINISHPAGE_BITMAP "${NSISDIR}\Contrib\Graphics\Wizard\orange-uninstall.bmp" - -# Installer pages -!insertmacro MUI_PAGE_WELCOME -!insertmacro MUI_PAGE_LICENSE "$(myLicenseData)" -Page Custom PortableModePageCreate PortableModePageLeave -!define MUI_PAGE_CUSTOMFUNCTION_LEAVE dir_leave -!insertmacro MUI_PAGE_DIRECTORY -!insertmacro MUI_PAGE_COMPONENTS -!insertmacro MUI_PAGE_INSTFILES -!insertmacro MUI_PAGE_FINISH -!insertmacro MUI_UNPAGE_CONFIRM -!insertmacro MUI_UNPAGE_INSTFILES - -# Set languages (first is default language) -!insertmacro MUI_RESERVEFILE_LANGDLL - -# Installer languages -!define MUI_LANGDLL_ALLLANGUAGES - -# Translations -!macro LANG_LOAD LANGUAGE LANGCODE LANGID LICENCEFILE - !insertmacro MUI_LANGUAGE "${LANGUAGE}" -; !verbose off - !define LANG "${LANGUAGE}" - !include "lang\${LANGCODE}.nsh" - LangString LANGUAGEID "${LANG_${LANG}}" "1031" - LicenseLangString myLicenseData ${LANGCODE} ${LICENCEFILE} -; !verbose on - !undef LANG -!macroend - -!macro LANG_STRING NAME VALUE - LangString "${NAME}" "${LANG_${LANG}}" "${VALUE}" -!macroend - -!insertmacro LANG_LOAD "English" "en" "1033" "${SOURCEDIR}\retroshare-gui\src\license\license.txt" -!insertmacro LANG_LOAD "French" "fr" "1036" "${SOURCEDIR}\retroshare-gui\src\license\license-FR.txt" -!insertmacro LANG_LOAD "German" "de" "1031" "${SOURCEDIR}\retroshare-gui\src\license\license-GER.txt" -!insertmacro LANG_LOAD "Turkish" "tr" "1055" "${SOURCEDIR}\retroshare-gui\src\license\license-TR.txt" -!insertmacro LANG_LOAD "SimpChinese" "zh_CN" "2052" "${SOURCEDIR}\retroshare-gui\src\license\license.txt" -!insertmacro LANG_LOAD "Polish" "pl" "1045" "${SOURCEDIR}\retroshare-gui\src\license\license.txt" -!insertmacro LANG_LOAD "Spanish" "es" "1034" "${SOURCEDIR}\retroshare-gui\src\license\license.txt" -!insertmacro LANG_LOAD "Russian" "ru" "1049" "${SOURCEDIR}\retroshare-gui\src\license\license.txt" -!insertmacro LANG_LOAD "Catalan" "ca_ES" "1027" "${SOURCEDIR}\retroshare-gui\src\license\license.txt" - -LicenseData $(myLicenseData) - -# Main binaries -Section $(Section_Main) Section_Main - ;Set Section required - SectionIn RO - - ; Set Section properties - SetOverwrite on - - ; Clears previous error logs -; Delete "$INSTDIR\*.log" - - ; Main binaries - SetOutPath "$INSTDIR" - File /oname=retroshare.exe "${RELEASEDIR}\retroshare-gui\src\release\retroshare.exe" - File /oname=retroshare-nogui.exe "${RELEASEDIR}\retroshare-nogui\src\release\retroshare-nogui.exe" - - ; Qt binaries - File "${QTDIR}\bin\Qt5Core.dll" - File "${QTDIR}\bin\Qt5Gui.dll" - File "${QTDIR}\bin\Qt5Multimedia.dll" - File "${QTDIR}\bin\Qt5Network.dll" - File "${QTDIR}\bin\Qt5PrintSupport.dll" - File "${QTDIR}\bin\Qt5Svg.dll" - File "${QTDIR}\bin\Qt5Widgets.dll" - File "${QTDIR}\bin\Qt5Xml.dll" - - ; Qt audio - SetOutPath "$INSTDIR\audio" - File "${QTDIR}\plugins\audio\qtaudio_windows.dll" - - ; Qt platforms - SetOutPath "$INSTDIR\platforms" - File "${QTDIR}\plugins\platforms\qwindows.dll" - - ; Qt styles - SetOutPath "$INSTDIR\styles" - File /NONFATAL "${QTDIR}\plugins\styles\qwindowsvistastyle.dll" - - ; MinGW binaries - SetOutPath "$INSTDIR" - File "${MINGWDIR}\bin\libstdc++-6.dll" - File "${MINGWDIR}\bin\libgcc_s_dw2-1.dll" - File "${MINGWDIR}\bin\libwinpthread-1.dll" - - ; External binaries - File "${SOURCEDIR}\..\libs\bin\miniupnpc.dll" - File "${SOURCEDIR}\..\libs\bin\libeay32.dll" - File "${SOURCEDIR}\..\libs\bin\ssleay32.dll" - - ; Other files - File "${SOURCEDIR}\retroshare-gui\src\changelog.txt" - File "${SOURCEDIR}\libbitdht\src\bitdht\bdboot.txt" - - ; Image formats - SetOutPath "$INSTDIR\imageformats" - File /r "${QTDIR}\plugins\imageformats\qgif.dll" - File /r "${QTDIR}\plugins\imageformats\qicns.dll" - File /r "${QTDIR}\plugins\imageformats\qico.dll" - File /r "${QTDIR}\plugins\imageformats\qjpeg.dll" - File /r "${QTDIR}\plugins\imageformats\qsvg.dll" - File /r "${QTDIR}\plugins\imageformats\qtga.dll" - File /r "${QTDIR}\plugins\imageformats\qtiff.dll" - File /r "${QTDIR}\plugins\imageformats\qwbmp.dll" - File /r "${QTDIR}\plugins\imageformats\qwebp.dll" - - ; Sounds - SetOutPath "$INSTDIR\sounds" - File /r "${SOURCEDIR}\retroshare-gui\src\sounds\*.*" - - ; Translations - SetOutPath "$INSTDIR\translations" - File /r "${SOURCEDIR}\retroshare-gui\src\translations\*.qm" - File /r "${QTDIR}\translations\qt_*.qm" - File /r "${QTDIR}\translations\qtbase_*.qm" - File /r "${QTDIR}\translations\qtscript_*.qm" - File /r "${QTDIR}\translations\qtquick1_*.qm" - File /r "${QTDIR}\translations\qtmultimedia_*.qm" - File /r "${QTDIR}\translations\qtxmlpatterns_*.qm" - - ; WebUI - SetOutPath "$INSTDIR\webui" - File /r "${SOURCEDIR}\libresapi\src\webui\*.*" - - ; License - SetOutPath "$INSTDIR\license" - File /r "${SOURCEDIR}\retroshare-gui\src\license\*.*" -SectionEnd - -# Plugins -SectionGroup $(Section_Plugins) Section_Plugins -Section $(Section_Plugin_FeedReader) Section_Plugin_FeedReader - SetOutPath "$DataDir\extensions6" - File "${RELEASEDIR}\plugins\FeedReader\release\FeedReader.dll" -SectionEnd - -Section $(Section_Plugin_VOIP) Section_Plugin_VOIP - SetOutPath "$DataDir\extensions6" - File "${RELEASEDIR}\plugins\VOIP\release\VOIP.dll" -SectionEnd -SectionGroupEnd - -# Data (Styles) -Section $(Section_Data) Section_Data - ; Set Section properties - SetOverwrite on - - ; Chat style - SetOutPath "$StyleSheetDir\stylesheets\Bubble" - File /r "${SOURCEDIR}\retroshare-gui\src\gui\qss\chat\Bubble\*.*" - SetOutPath "$StyleSheetDir\stylesheets\Bubble_Compact" - File /r "${SOURCEDIR}\retroshare-gui\src\gui\qss\chat\Bubble_Compact\*.*" - - ; Stylesheets - SetOutPath "$INSTDIR\qss" - File /r "${SOURCEDIR}\retroshare-gui\src\qss\*.*" -SectionEnd - -;Section $(Section_Link) Section_Link - ; Delete any existing keys - - ; Write the file association -; WriteRegStr HKCR .pqi "" retroshare -; WriteRegStr HKCR retroshare "" "PQI File" -; WriteRegBin HKCR retroshare EditFlags 00000100 -; WriteRegStr HKCR "retroshare\shell" "" open -; WriteRegStr HKCR "retroshare\shell\open\command" "" `"$INSTDIR\retroshare.exe" "%1"` -;SectionEnd - -# Shortcuts -SectionGroup $(Section_Shortcuts) Section_Shortcuts -Section $(Section_StartMenu) Section_StartMenu - SetOutPath "$INSTDIR" - CreateDirectory "$SMPROGRAMS\${APPNAME}" - CreateShortCut "$SMPROGRAMS\${APPNAME}\$(Link_Uninstall).lnk" "$INSTDIR\uninstall.exe" "" "$INSTDIR\uninstall.exe" 0 - CreateShortCut "$SMPROGRAMS\${APPNAME}\${APPNAME}.lnk" "$INSTDIR\retroshare.exe" "" "$INSTDIR\retroshare.exe" 0 -SectionEnd - -Section $(Section_Desktop) Section_Desktop - CreateShortCut "$DESKTOP\${APPNAME}.lnk" "$INSTDIR\retroshare.exe" "" "$INSTDIR\retroshare.exe" 0 -SectionEnd - -Section $(Section_QuickLaunch) Section_QuickLaunch - CreateShortCut "$QUICKLAUNCH\${APPNAME}.lnk" "$INSTDIR\retroshare.exe" "" "$INSTDIR\retroshare.exe" 0 -SectionEnd -SectionGroupEnd - -Section $(Section_AutoStart) Section_AutoStart - WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Run" "RetroShare" "$INSTDIR\retroshare.exe -m" -SectionEnd - -;Section $(Section_AutoStart) Section_AutoStart -; CreateShortCut "$SMSTARTUP\${APPNAME}.lnk" "$INSTDIR\retroshare.exe" "" "$INSTDIR\retroshare.exe -m" 0 -;SectionEnd - -Section -FinishSection - ${If} $PortableMode = 0 - WriteRegStr HKLM "Software\${APPNAME}" "" "$INSTDIR" - WriteRegStr HKLM "Software\${APPNAME}" "Version" "${VERSION}" - WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "DisplayName" "${APPNAME}" - WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "DisplayVersion" "${VERSION}" - WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "DisplayIcon" "$INSTDIR\retroshare.exe" - WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "Publisher" "${PUBLISHER}" - WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "NoModify" "1" - WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "NoRepair" "1" - WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "UninstallString" "$INSTDIR\uninstall.exe" - WriteUninstaller "$INSTDIR\uninstall.exe" - ${Else} - ; Create the file the application uses to detect portable mode - FileOpen $0 "$INSTDIR\portable" w - FileClose $0 - ${EndIf} -SectionEnd - -# Descriptions -!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN - !insertmacro MUI_DESCRIPTION_TEXT ${Section_Main} $(Section_Main_Desc) - !insertmacro MUI_DESCRIPTION_TEXT ${Section_Data} $(Section_Data_Desc) - !insertmacro MUI_DESCRIPTION_TEXT ${Section_Shortcuts} $(Section_Shortcuts_Desc) - !insertmacro MUI_DESCRIPTION_TEXT ${Section_StartMenu} $(Section_StartMenu_Desc) - !insertmacro MUI_DESCRIPTION_TEXT ${Section_Desktop} $(Section_Desktop_Desc) - !insertmacro MUI_DESCRIPTION_TEXT ${Section_QuickLaunch} $(Section_QuickLaunch_Desc) - !insertmacro MUI_DESCRIPTION_TEXT ${Section_Plugins} $(Section_Plugins_Desc) - !insertmacro MUI_DESCRIPTION_TEXT ${Section_Plugin_FeedReader} $(Section_Plugin_FeedReader_Desc) - !insertmacro MUI_DESCRIPTION_TEXT ${Section_Plugin_VOIP} $(Section_Plugin_VOIP_Desc) -; !insertmacro MUI_DESCRIPTION_TEXT ${Section_Link} $(Section_Link_Desc) - !insertmacro MUI_DESCRIPTION_TEXT ${Section_AutoStart} $(Section_AutoStart_Desc) -!insertmacro MUI_FUNCTION_DESCRIPTION_END - -# Uninstall -Section "Uninstall" - ; Remove file association registry keys -; DeleteRegKey HKCR .pqi - DeleteRegKey HKCR RetroShare - - ; Remove program/uninstall regsitry keys - DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" - DeleteRegKey HKLM SOFTWARE\${APPNAME} - - DeleteRegValue HKCU "Software\Microsoft\Windows\CurrentVersion\Run" "RetroShare" - - ; Remove shortcuts, if any - Delete "$SMPROGRAMS\${APPNAME}\*.*" - - ; Remove desktop shortcut - Delete "$DESKTOP\${APPNAME}.lnk" - - ; Remove Quicklaunch shortcut - Delete "$QUICKLAUNCH\${APPNAME}.lnk" - - ; Remove Autstart - Delete "$SMSTARTUP\${APPNAME}.lnk" - - ; Remove directories used - RMDir "$SMPROGRAMS\${APPNAME}" - RMDir /r "$INSTDIR" - - ; Don't remove the directory, otherwise - ; we lose the XPGP keys. - ; Should make this an option though... - RMDir /r "${DATADIR_NORMAL}\extensions6" - RMDir /r "${DATADIR_NORMAL}\stylesheets" -SectionEnd - -Function .onInit - StrCpy $InstDirNormal "${INSTDIR_NORMAL}" - StrCpy $InstDirPortable "${INSTDIR_PORTABLE}" - - StrCpy $PortableMode 0 - StrCpy $INSTDIR "$InstDirNormal" - StrCpy $DataDir "${DATADIR_NORMAL}" - - InitPluginsDir - Push $R1 - File /oname=$PLUGINSDIR\spltmp.bmp "${SOURCEDIR}\retroshare-gui\src\gui\images\logo\logo_splash.png" - advsplash::show 1200 1000 1000 -1 $PLUGINSDIR\spltmp - Pop $R1 - Pop $R1 - !insertmacro MUI_LANGDLL_DISPLAY -FunctionEnd - -# Installation mode - -Function RequireAdmin - UserInfo::GetAccountType - Pop $8 - ${If} $8 != "admin" - MessageBox MB_ICONSTOP "You need administrator rights to install ${APPNAME}" - SetErrorLevel 740 ;ERROR_ELEVATION_REQUIRED - Abort - ${EndIf} -FunctionEnd - -Function SetModeDestinationFromInstdir - ${If} $PortableMode = 0 - StrCpy $InstDirNormal $INSTDIR - ${Else} - StrCpy $InstDirPortable $INSTDIR - ${EndIf} -FunctionEnd - -Function PortableModePageCreate - Call SetModeDestinationFromInstdir ; If the user clicks BACK on the directory page we will remember their mode specific directory - !insertmacro MUI_HEADER_TEXT $(Page_InstallMode) $(Page_InstallMode_Desc) - nsDialogs::Create 1018 - Pop $0 - ${NSD_CreateRadioButton} 5u 25u -10u 8u $(Page_InstallMode_Standard) - Pop $1 - ${NSD_CreateLabel} 18u 40u -10u 24u $(Page_InstallMode_Standard_Desc) - Pop $0 - ${NSD_CreateRadioButton} 5u 75u -10u 8u $(Page_InstallMode_Portable) - Pop $2 - ${NSD_CreateLabel} 18u 90u -10u 24u $(Page_InstallMode_Portable_Desc) - Pop $0 - ${If} $PortableMode = 0 - SendMessage $1 ${BM_SETCHECK} ${BST_CHECKED} 0 - ${Else} - SendMessage $2 ${BM_SETCHECK} ${BST_CHECKED} 0 - ${EndIf} - nsDialogs::Show -FunctionEnd - -Function PortableModePageLeave - ${NSD_GetState} $1 $0 - ${If} $0 <> ${BST_UNCHECKED} - StrCpy $PortableMode 0 - StrCpy $INSTDIR $InstDirNormal - Call RequireAdmin - ; Enable sections - SectionSetText ${Section_Shortcuts} $(Section_Shortcuts) - SectionSetText ${Section_StartMenu} $(Section_StartMenu) - SectionSetText ${Section_Desktop} $(Section_Desktop) - SectionSetText ${Section_QuickLaunch} $(Section_QuickLaunch) - SectionSetText ${Section_AutoStart} $(Section_AutoStart) - !insertmacro SelectSection ${Section_Shortcuts} - !insertmacro SelectSection ${Section_AutoStart} - !insertmacro SelectSection ${Section_StartMenu} - !insertmacro SelectSection ${Section_Desktop} - !insertmacro SelectSection ${Section_QuickLaunch} - ${Else} - StrCpy $PortableMode 1 - StrCpy $INSTDIR $InstDirPortable - ; Disable sections - !insertmacro UnselectSection ${Section_Shortcuts} - !insertmacro UnselectSection ${Section_AutoStart} - !insertmacro UnselectSection ${Section_StartMenu} - !insertmacro UnselectSection ${Section_Desktop} - !insertmacro UnselectSection ${Section_QuickLaunch} - SectionSetText ${Section_Shortcuts} "" - SectionSetText ${Section_StartMenu} "" - SectionSetText ${Section_Desktop} "" - SectionSetText ${Section_QuickLaunch} "" - SectionSetText ${Section_AutoStart} "" - ${EndIf} -FunctionEnd - -Function dir_leave - ${If} $PortableMode = 0 - StrCpy $DataDir "${DATADIR_NORMAL}" - StrCpy $StyleSheetDir $DataDir - ${Else} - StrCpy $DataDir "${DATADIR_PORTABLE}" - StrCpy $StyleSheetDir $INSTDIR - ${EndIf} -FunctionEnd diff -Nru retroshare-0.6.4/src/build_scripts/Windows/qt-cmd.bat retroshare-0.6.4/src/build_scripts/Windows/qt-cmd.bat --- retroshare-0.6.4/src/build_scripts/Windows/qt-cmd.bat 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/build_scripts/Windows/qt-cmd.bat 1970-01-01 00:00:00.000000000 +0000 @@ -1,27 +0,0 @@ -:: Usage: -:: call qt-cmd.bat [command] - -@echo off - -setlocal - -set QtVersion=%~1 - -:: Initialize environment -call "%~dp0env.bat" -if errorlevel 1 goto error_env -call "%EnvPath%\env-qt.bat" %QtVersion% -if errorlevel 1 goto error_env - -if "%~2"=="" ( - "%ComSpec%" -) else ( - "%ComSpec%" /c %2 %3 %4 %5 %6 %7 %8 %9 -) - -exit /B %ERRORLEVEL% - -:error_env -echo Failed to initialize environment. -endlocal -exit /B 1 diff -Nru retroshare-0.6.4/src/build_scripts/Windows/tools/cecho.bat retroshare-0.6.4/src/build_scripts/Windows/tools/cecho.bat --- retroshare-0.6.4/src/build_scripts/Windows/tools/cecho.bat 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/build_scripts/Windows/tools/cecho.bat 1970-01-01 00:00:00.000000000 +0000 @@ -1,6 +0,0 @@ -:: Usage: -:: call cecho.bat [info|error|std] "text" - -if "%~1"=="std" echo %~2 -if "%~1"=="info" "%EnvCEchoExe%" green "%~2" -if "%~1"=="error" "%EnvCEchoExe%" red "%~2" diff -Nru retroshare-0.6.4/src/build_scripts/Windows/tools/depends.bat retroshare-0.6.4/src/build_scripts/Windows/tools/depends.bat --- retroshare-0.6.4/src/build_scripts/Windows/tools/depends.bat 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/build_scripts/Windows/tools/depends.bat 1970-01-01 00:00:00.000000000 +0000 @@ -1,37 +0,0 @@ -:: Usage: -:: call depends.bat [list^|missing] file - -setlocal - -if "%2"=="" ( - echo Usage: %~nx0 [list^|missing] File - goto :exit -) - -if not exist "%EnvDependsExe%" echo depends.exe not found in %EnvToolsPath%.& goto exit -if not exist "%EnvCutExe%" echo cut.exe not found in %EnvToolsPath%.& goto exit - -start /wait "" "%EnvDependsExe%" /c /oc:"%~dp0depends.tmp" %2 -if "%1"=="missing" ( - "%EnvCutExe%" --delimiter=, --fields=1,2 "%~dp0depends.tmp" >"%~dp0depends1.tmp" - for /F "tokens=1,2 delims=," %%A in (%~sdp0depends1.tmp) do ( - if "%%A"=="?" ( - echo %%~B - ) - ) -) - -if "%1"=="list" ( - "%EnvCutExe%" --delimiter=, --fields=2 "%~dp0depends.tmp" >"%~dp0depends1.tmp" - for /F "tokens=1 delims=," %%A in (%~sdp0depends1.tmp) do ( - if "%%A" NEQ "Module" ( - echo %%~A - ) - ) -) - -if exist "%~dp0depends.tmp" del /Q "%~dp0depends.tmp" -if exist "%~dp0depends1.tmp" del /Q "%~dp0depends1.tmp" - -:exit -endlocal diff -Nru retroshare-0.6.4/src/build_scripts/Windows/tools/download-file.bat retroshare-0.6.4/src/build_scripts/Windows/tools/download-file.bat --- retroshare-0.6.4/src/build_scripts/Windows/tools/download-file.bat 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/build_scripts/Windows/tools/download-file.bat 1970-01-01 00:00:00.000000000 +0000 @@ -1,13 +0,0 @@ -:: Usage: -:: call download-file.bat url file - -if "%~2"=="" ( - echo. - echo Parameter error. - exit /B 1 -) - -::"%EnvCurlExe%" -L -k "%~1" -o "%~2" -"%EnvWgetExe%" --continue "%~1" --output-document="%~2" - -exit /B %ERRORLEVEL% diff -Nru retroshare-0.6.4/src/build_scripts/Windows/tools/download-file-wildcard.bat.bat retroshare-0.6.4/src/build_scripts/Windows/tools/download-file-wildcard.bat.bat --- retroshare-0.6.4/src/build_scripts/Windows/tools/download-file-wildcard.bat.bat 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/build_scripts/Windows/tools/download-file-wildcard.bat.bat 1970-01-01 00:00:00.000000000 +0000 @@ -1,46 +0,0 @@ -:: Usage: -:: call download-file-wildcard.bat url file-wildcard download-path variable - -if "%~4"=="" ( - echo. - echo Parameter error. - exit /B 1 -) - -if "%EnvTempPath%"=="" ( - echo. - echo Environment error. - exit /B 1 -) - -setlocal - -set Url=%~1 -set FileWildcard=%~2 -set DownloadPath=%~3 -set Var=%~4 -set File= - -call "%~dp0remove-dir.bat" "%EnvTempPath%" -mkdir "%EnvTempPath%" - -"%EnvWgetExe%" --recursive --continue --no-directories --no-parent -A "%FileWildcard%" --directory-prefix="%EnvTempPath%" "%Url%" - -if errorlevel 1 ( - call "%~dp0remove-dir.bat" "%EnvTempPath%" - endlocal & set %Var%= - exit /B %ERRORLEVEL% -) - -for %%A in (%EnvTempPath%\%FileWildcard%) do set File=%%~nxA -if "%File%"=="" ( - call "%~dp0remove-dir.bat" "%EnvTempPath%" - endlocal & set %Var%= - exit /B %ERRORLEVEL% -) - -move "%EnvTempPath%\%File%" "%DownloadPath%" -call "%~dp0remove-dir.bat" "%EnvTempPath%" - -endlocal & set %Var%=%File% -exit /B 0 diff -Nru retroshare-0.6.4/src/build_scripts/Windows/tools/find-in-path.bat retroshare-0.6.4/src/build_scripts/Windows/tools/find-in-path.bat --- retroshare-0.6.4/src/build_scripts/Windows/tools/find-in-path.bat 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/build_scripts/Windows/tools/find-in-path.bat 1970-01-01 00:00:00.000000000 +0000 @@ -1,26 +0,0 @@ -:: Usage: -:: call find-in-path.bat variable file - -setlocal - -set Var=%~1 -set File=%~2 - -if "%File%"=="" ( - echo. - echo Parameter error. - exit /B 1 -) - -set FoundPath= - -SET PathTemp="%Path:;=";"%" -FOR %%P IN (%PathTemp%) DO ( - IF EXIST "%%~P.\%File%" ( - set FoundPath=%%~P - goto :found - ) -) - -:found -endlocal & set %Var%=%FoundPath% diff -Nru retroshare-0.6.4/src/build_scripts/Windows/tools/get-gcc-version.bat retroshare-0.6.4/src/build_scripts/Windows/tools/get-gcc-version.bat --- retroshare-0.6.4/src/build_scripts/Windows/tools/get-gcc-version.bat 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/build_scripts/Windows/tools/get-gcc-version.bat 1970-01-01 00:00:00.000000000 +0000 @@ -1,42 +0,0 @@ -:: Usage: -:: call get-gcc-version.bat variable - -setlocal - -set Var=%~1 -if "%Var%"=="" ( - echo. - echo Parameter error. - exit /B 1 -) - -set GCCVersion= - -call "%~dp0find-in-path.bat" GCCPath gcc.exe -if "%GCCPath%"=="" ( - echo. - echo Cannot find gcc.exe in PATH. - goto exit -) - -gcc --version >"%~dp0gccversion.tmp" -for /F "tokens=1*" %%A in (%~sdp0gccversion.tmp) do ( - if "%%A"=="gcc" ( - call :find_version %%B - goto exit - ) -) - -:exit -if exist "%~dp0gccversion.tmp" del /Q "%~dp0gccversion.tmp" - -endlocal & set %Var%=%GCCVersion% -goto :EOF - -:find_version -:loop -if "%2" NEQ "" ( - shift - goto loop -) -set GCCVersion=%1 diff -Nru retroshare-0.6.4/src/build_scripts/Windows/tools/get-git-ref.bat retroshare-0.6.4/src/build_scripts/Windows/tools/get-git-ref.bat --- retroshare-0.6.4/src/build_scripts/Windows/tools/get-git-ref.bat 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/build_scripts/Windows/tools/get-git-ref.bat 1970-01-01 00:00:00.000000000 +0000 @@ -1,39 +0,0 @@ -REM Usage: -REM call get-git-ref.bat Variable [Branch] - -setlocal - -set Variable=%~1 -if "%Variable%"=="" ( - echo. - echo Parameter error - exit /B 1 -) - -set Ref= - -:: Check git executable -set GitPath= -call "%~dp0find-in-path.bat" GitPath git.exe -if "%GitPath%"=="" ( - echo. - echo Git executable not found in PATH. - goto exit -) - -set GitParameter= -set Branch=%~2 -if "%Branch%"=="" ( - set Branch=HEAD - set GitParameter=--head -) - -for /F "tokens=1*" %%A in ('git show-ref %GitParameter% %Branch%') do ( - if "%%B"=="%Branch%" ( - set Ref=%%A - ) -) - -:exit -endlocal & set %Variable%=%Ref% -exit /B 0 diff -Nru retroshare-0.6.4/src/build_scripts/Windows/tools/get-qt-version.bat retroshare-0.6.4/src/build_scripts/Windows/tools/get-qt-version.bat --- retroshare-0.6.4/src/build_scripts/Windows/tools/get-qt-version.bat 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/build_scripts/Windows/tools/get-qt-version.bat 1970-01-01 00:00:00.000000000 +0000 @@ -1,34 +0,0 @@ -:: Usage: -:: call get-qt-version.bat variable - -setlocal - -set Var=%~1 -if "%Var%"=="" ( - echo. - echo Parameter error. - exit /B 1 -) - -set QtVersion= - -call "%~dp0find-in-path.bat" QMakePath qmake.exe -if "%QMakePath%"=="" ( - echo. - echo Cannot find qmake.exe in PATH. - goto exit -) - -qmake.exe -version >"%~dp0qtversion.tmp" -for /F "tokens=1,2,3,4" %%A in (%~sdp0qtversion.tmp) do ( - if "%%A"=="Using" ( - set QtVersion=%%D - goto exit - ) -) - -:exit -if exist "%~dp0qtversion.tmp" del /Q "%~dp0qtversion.tmp" - -endlocal & set %Var%=%QtVersion% -exit /B 0 \ No newline at end of file diff -Nru retroshare-0.6.4/src/build_scripts/Windows/tools/get-rs-version.bat retroshare-0.6.4/src/build_scripts/Windows/tools/get-rs-version.bat --- retroshare-0.6.4/src/build_scripts/Windows/tools/get-rs-version.bat 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/build_scripts/Windows/tools/get-rs-version.bat 1970-01-01 00:00:00.000000000 +0000 @@ -1,33 +0,0 @@ -:: Usage: -:: call get-rs-version.bat Define Variable - -setlocal - -set Define=%~1 -set Variable=%~2 -if "%Variable%"=="" ( - echo. - echo Parameter error. - exit /B 1 -) - -set Result= -set VersionFile="%~dp0..\..\..\libretroshare\src\retroshare\rsversion.h" - -if not exist "%VersionFile%" ( - echo. - echo Version file doesn't exist. - echo %VersionFile% - exit /B1 -) - -for /F "usebackq tokens=1,2,3" %%A in (%VersionFile%) do ( - if "%%A"=="#define" ( - if "%%B"=="%Define%" ( - set Result=%%~C - ) - ) -) - -endlocal & set %Variable%=%Result% -exit /B 0 \ No newline at end of file diff -Nru retroshare-0.6.4/src/build_scripts/Windows/tools/msys-path.bat retroshare-0.6.4/src/build_scripts/Windows/tools/msys-path.bat --- retroshare-0.6.4/src/build_scripts/Windows/tools/msys-path.bat 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/build_scripts/Windows/tools/msys-path.bat 1970-01-01 00:00:00.000000000 +0000 @@ -1,20 +0,0 @@ -:: Usage: -:: call msys-path.bat path variable - -setlocal - -set WinPath=%~1 -set MSYSVar=%~2 - -if "%MSYSVar%"=="" ( - echo. - echo Parameter error. - exit /B 1 -) - -set MSYSPath=/%WinPath:~0,1%/%WinPath:~3% -set MSYSPath=%MSYSPath:\=/% - -endlocal & set %MSYSVar%=%MSYSPath% - -exit /B 0 diff -Nru retroshare-0.6.4/src/build_scripts/Windows/tools/remove-dir.bat retroshare-0.6.4/src/build_scripts/Windows/tools/remove-dir.bat --- retroshare-0.6.4/src/build_scripts/Windows/tools/remove-dir.bat 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/build_scripts/Windows/tools/remove-dir.bat 1970-01-01 00:00:00.000000000 +0000 @@ -1,15 +0,0 @@ -:: Usage: -:: call remove-dir.bat path - -if "%~1"=="" ( - echo. - echo Parameter error. - exit /B 1 -) - -if exist %1 ( - del /s /f /q %1 >nul - rmdir /s /q %1 -) - -exit /B 0 diff -Nru retroshare-0.6.4/src/build_scripts/Windows/tools/winhttpjs.bat retroshare-0.6.4/src/build_scripts/Windows/tools/winhttpjs.bat --- retroshare-0.6.4/src/build_scripts/Windows/tools/winhttpjs.bat 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/build_scripts/Windows/tools/winhttpjs.bat 1970-01-01 00:00:00.000000000 +0000 @@ -1,584 +0,0 @@ -@if (@X) == (@Y) @end /* JScript comment - @echo off - - rem :: the first argument is the script name as it will be used for proper help message - cscript //E:JScript //nologo "%~f0" "%~nx0" %* - - exit /b %errorlevel% - -@if (@X)==(@Y) @end JScript comment */ - -// used resources - -// update 12.10.15 -// osvikvi(https://github.com/osvikvi) has nodited that the -password option is not set , so this is fixed - -//https://msdn.microsoft.com/en-us/library/windows/desktop/aa384058(v=vs.85).aspx -//https://msdn.microsoft.com/en-us/library/windows/desktop/aa384055(v=vs.85).aspx -//https://msdn.microsoft.com/en-us/library/windows/desktop/aa384059(v=vs.85).aspx - -// global variables and constants - - -// ---------------------------------- -// -- asynch requests not included -- -// ---------------------------------- - - -//todo - save responceStream instead of responceBody !! -//todo - set all winthttp options ->//https://msdn.microsoft.com/en-us/library/windows/desktop/aa384108(v=vs.85).aspx -//todo - log all options -//todo - improve help message . eventual verbose option - - -var ARGS = WScript.Arguments; -var scriptName = ARGS.Item(0); - -var url = ""; -var saveTo = ""; - -var user = 0; -var pass = 0; - -var proxy = 0; -var bypass = 0; -var proxy_user = 0; -var proxy_pass = 0; - -var certificate = 0; - -var force = true; - -var body = ""; - -//ActiveX objects -var WinHTTPObj = new ActiveXObject("WinHttp.WinHttpRequest.5.1"); -var FileSystemObj = new ActiveXObject("Scripting.FileSystemObject"); -var AdoDBObj = new ActiveXObject("ADODB.Stream"); - -// HttpRequest SetCredentials flags. -var proxy_settings = 0; - -// -HTTPREQUEST_SETCREDENTIALS_FOR_SERVER = 0; -HTTPREQUEST_SETCREDENTIALS_FOR_PROXY = 1; - -//timeouts and their default values -var RESOLVE_TIMEOUT = 0; -var CONNECT_TIMEOUT = 90000; -var SEND_TIMEOUT = 90000; -var RECEIVE_TIMEOUT = 90000; - -//HttpRequestMethod -var http_method = 'GET'; - -//header -var header_file = ""; - -//report -var reportfile = ""; - -//test-this: -var use_stream = false; - -//autologon policy -var autologon_policy = 1; //0,1,2 - - -//headers will be stored as multi-dimensional array -var headers = []; - -//user-agent -var ua = ""; - -//escape URL -var escape = false; - -function printHelp() { - WScript.Echo(scriptName + " - sends HTTP request and saves the request body as a file and/or a report of the sent request"); - WScript.Echo(scriptName + " url [-force yes|no] [-user username -password password] [-proxy proxyserver:port] [-bypass bypass_list]"); - WScript.Echo(" [-proxyuser proxy_username -proxypassword proxy_password] [-certificate certificateString]"); - WScript.Echo(" [-method GET|POST|PATCH|DELETE|HEAD|OPTIONS|CONNECT]"); - WScript.Echo(" [-saveTo file] - to print response to console use con"); - - WScript.Echo(" [-sendTimeout int(milliseconds)]"); - WScript.Echo(" [-resolveTimeout int(milliseconds)]"); - WScript.Echo(" [-connectTimeout int(milliseconds)]"); - WScript.Echo(" [-receiveTimeout int(milliseconds)]"); - - WScript.Echo(" [-autologonPolicy 1|2|3]"); - WScript.Echo(" [-proxySettings 1|2|3] (https://msdn.microsoft.com/en-us/library/windows/desktop/aa384059(v=vs.85).aspx)"); - - //header - WScript.Echo(" [-headers-file header_file]"); - //reportfile - WScript.Echo(" [-reportfile reportfile]"); - WScript.Echo(" [-ua user-agent]"); - WScript.Echo(" [-ua-file user-agent-file]"); - - WScript.Echo(" [-escape yes|no]"); - - WScript.Echo(" [-body body-string]"); - WScript.Echo(" [-body-file body-file]"); - - WScript.Echo("-force - decide to not or to overwrite if the local files exists"); - - WScript.Echo("proxyserver:port - the proxy server"); - WScript.Echo("bypass- bypass list"); - WScript.Echo("proxy_user , proxy_password - credentials for proxy server"); - WScript.Echo("user , password - credentials for the server"); - WScript.Echo("certificate - location of SSL certificate"); - WScript.Echo("method - what HTTP method will be used.Default is GET"); - WScript.Echo("saveTo - save the responce as binary file"); - WScript.Echo(" "); - WScript.Echo("Header file should contain key:value pairs.Lines starting with \"#\" will be ignored."); - WScript.Echo("value should NOT be enclosed with quotes"); - WScript.Echo(" "); - WScript.Echo("Examples:"); - - WScript.Echo(scriptName + " http://somelink.com/somefile.zip -saveTo c:\\somefile.zip -certificate \"LOCAL_MACHINE\\Personal\\My Middle-Tier Certificate\""); - WScript.Echo(scriptName + " http://somelink.com/something.html -method POST -certificate \"LOCAL_MACHINE\\Personal\\My Middle-Tier Certificate\" -header c:\\header_file -reportfile c:\\reportfile.txt"); - WScript.Echo(scriptName + "\"http://somelink\" -method POST -header hdrs.txt -reportfile reportfile2.txt -saveTo responsefile2 -ua \"Mozilla/5.0 (Windows NT 6.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/41.0.2228.0 Safari/537.36\" -body-file some.json"); - -} - -function parseArgs() { - // - if (ARGS.Length < 2) { - WScript.Echo("insufficient arguments"); - printHelp(); - WScript.Quit(43); - } - // !!! - url = ARGS.Item(1); - // !!! - if (ARGS.Length % 2 != 0) { - WScript.Echo("illegal arguments"); - printHelp(); - WScript.Quit(44); - } - - for (var i = 2; i < ARGS.Length - 1; i = i + 2) { - var arg = ARGS.Item(i).toLowerCase(); - var next = ARGS.Item(i + 1); - - - try { - switch (arg) { // the try-catch is set mainly because of the parseInts - case "-force": - if (next == "no") { - force = false; - } - break; - case "-escape": - if (next == "yes") { - escape = true; - } - break; - case "-saveto": - saveTo = next; - break; - case "-user": - case "-u": - user = next; - break; - case "-pass": - case "-password": - case "-p": - pass = next; - break; - case "-proxy": - proxy = next; - break; - case "-bypass": - bypass = next; - break; - case "-proxyuser": - case "-pu": - proxy_user = next; - break; - case "-proxypassword": - case "-pp": - proxy_pass = next; - break; - case "-ua": - ua = next; - break; - case "-ua-file": - ua = readFile(next); - break; - case "-body": - body = next; - break; - case "-usestream": - //WScript.Echo("~~"); - if (next.toLowerCase() === "yes") { - use_stream = true - }; - break; - case "-body-file": - body = readFile(next); - break; - case "-certificate": - certificate = next; - break; - case "-method": - switch (next.toLowerCase()) { - case "post": - http_method = 'POST'; - break; - case "get": - http_method = 'GET'; - break; - case "head": - http_method = 'HEAD'; - break; - case "put": - http_method = 'PUT'; - break; - case "options": - http_method = 'OPTIONS'; - break; - case "connect": - http_method = 'CONNECT'; - break; - case "patch": - http_method = 'PATCH'; - break; - case "delete": - http_method = 'DELETE'; - break; - default: - WScript.Echo("Invalid http method passed " + next); - WScript.Echo("possible values are GET,POST,DELETE,PUT,CONNECT,PATCH,HEAD,OPTIONS"); - WScript.Quit(1326); - break; - } - break; - case "-headers-file": - case "-header": - headers = readPropFile(next); - break; - case "-reportfile": - reportfile = next; - break; - //timeouts - case "-sendtimeout": - SEND_TIMEOUT = parseInt(next); - break; - case "-connecttimeout": - CONNECT_TIMEOUT = parseint(next); - break; - case "-resolvetimeout": - RESOLVE_TIMEOUT = parseInt(next); - break; - case "-receivetimeout": - RECEIVE_TIMEOUT = parseInt(next); - break; - - case "-autologonpolicy": - autologon_policy = parseInt(next); - if (autologon_policy > 2 || autologon_policy < 0) { - WScript.Echo("out of autologon policy range"); - WScript.Quit(87); - }; - break; - case "-proxysettings": - proxy_settings = parseInt(next); - if (proxy_settings > 2 || proxy_settings < 0) { - WScript.Echo("out of proxy settings range"); - WScript.Quit(87); - }; - break; - default: - WScript.Echo("Invalid command line switch: " + arg); - WScript.Quit(1405); - break; - } - } catch (err) { - WScript.Echo(err.message); - WScript.Quit(1348); - } - } -} - -stripTrailingSlash = function(path) { - while (path.substr(path.length - 1, path.length) == '\\') { - path = path.substr(0, path.length - 1); - } - return path; -} - -function existsItem(path) { - return FileSystemObj.FolderExists(path) || FileSystemObj.FileExists(path); -} - -function deleteItem(path) { - if (FileSystemObj.FileExists(path)) { - FileSystemObj.DeleteFile(path); - return true; - } else if (FileSystemObj.FolderExists(path)) { - FileSystemObj.DeleteFolder(stripTrailingSlash(path)); - return true; - } else { - return false; - } -} - -//------------------------------- -//---------------------- -//---------- -//----- -//-- -function request(url) { - - try { - - WinHTTPObj.Open(http_method, url, false); - if (proxy != 0 && bypass != 0) { - WinHTTPObj.SetProxy(proxy_settings, proxy, bypass); - } - - if (proxy != 0) { - WinHTTPObj.SetProxy(proxy_settings, proxy); - } - - if (user != 0 && pass != 0) { - WinHTTPObj.SetCredentials(user, pass, HTTPREQUEST_SETCREDENTIALS_FOR_SERVER); - } - - if (proxy_user != 0 && proxy_pass != 0) { - WinHTTPObj.SetCredentials(proxy_user, proxy_pass, HTTPREQUEST_SETCREDENTIALS_FOR_PROXY); - } - - if (certificate != 0) { - WinHTTPObj.SetClientCertificate(certificate); - } - - //set autologin policy - WinHTTPObj.SetAutoLogonPolicy(autologon_policy); - //set timeouts - WinHTTPObj.SetTimeouts(RESOLVE_TIMEOUT, CONNECT_TIMEOUT, SEND_TIMEOUT, RECEIVE_TIMEOUT); - - if (headers.length !== 0) { - WScript.Echo("Sending with headers:"); - for (var i = 0; i < headers.length; i++) { - WinHTTPObj.SetRequestHeader(headers[i][0], headers[i][1]); - WScript.Echo(headers[i][0] + ":" + headers[i][1]); - } - WScript.Echo(""); - } - - if (ua !== "") { - //user-agent option from: - //WinHttpRequestOption enumeration - // other options can be added like bellow - //https://msdn.microsoft.com/en-us/library/windows/desktop/aa384108(v=vs.85).aspx - WinHTTPObj.Option(0) = ua; - } - if (escape) { - WinHTTPObj.Option(3) = true; - } - if (trim(body) === "") { - WinHTTPObj.Send(); - } else { - WinHTTPObj.Send(body); - } - - var status = WinHTTPObj.Status - } catch (err) { - WScript.Echo(err.message); - WScript.Quit(666); - } - - //////////////////////// - // report // - //////////////////////// - - if (reportfile != "") { - - //var report_string=""; - var n = "\r\n"; - var report_string = "Status:" + n; - report_string = report_string + " " + WinHTTPObj.Status; - report_string = report_string + " " + WinHTTPObj.StatusText + n; - report_string = report_string + " " + n; - report_string = report_string + "Response:" + n; - report_string = report_string + WinHTTPObj.ResponseText + n; - report_string = report_string + " " + n; - report_string = report_string + "Headers:" + n; - report_string = report_string + WinHTTPObj.GetAllResponseHeaders() + n; - - WinHttpRequestOption_UserAgentString = 0; // Name of the user agent - WinHttpRequestOption_URL = 1; // Current URL - WinHttpRequestOption_URLCodePage = 2; // Code page - WinHttpRequestOption_EscapePercentInURL = 3; // Convert percents - // in the URL - // rest of the options can be seen and eventually added using this as reference - // https://msdn.microsoft.com/en-us/library/windows/desktop/aa384108(v=vs.85).aspx - - report_string = report_string + "URL:" + n; - report_string = report_string + WinHTTPObj.Option(WinHttpRequestOption_URL) + n; - - report_string = report_string + "URL Code Page:" + n; - report_string = report_string + WinHTTPObj.Option(WinHttpRequestOption_URLCodePage) + n; - - report_string = report_string + "User Agent:" + n; - report_string = report_string + WinHTTPObj.Option(WinHttpRequestOption_UserAgentString) + n; - - report_string = report_string + "Escapped URL:" + n; - report_string = report_string + WinHTTPObj.Option(WinHttpRequestOption_EscapePercentInURL) + n; - - prepareateFile(force, reportfile); - - WScript.Echo("Writing report to " + reportfile); - - writeFile(reportfile, report_string); - - } - - switch (status) { - case 200: - WScript.Echo("Status: 200 OK"); - break; - default: - WScript.Echo("Status: " + status); - WScript.Echo("Status was not OK. More info -> https://en.wikipedia.org/wiki/List_of_HTTP_status_codes"); - } - - //if as binary - if (saveTo.toLowerCase() === "con") { - WScript.Echo(WinHTTPObj.ResponseText); - } - if (saveTo !== "" && saveTo.toLowerCase() !== "con") { - prepareateFile(force, saveTo); - try { - - if (use_stream) { - writeBinFile(saveTo, WinHTTPObj.ResponseStream); - } else { - writeBinFile(saveTo, WinHTTPObj.ResponseBody); - } - - } catch (err) { - WScript.Echo("Failed to save the file as binary.Attempt to save it as text"); - AdoDBObj.Close(); - prepareateFile(true, saveTo); - writeFile(saveTo, WinHTTPObj.ResponseText); - } - } - WScript.Quit(status); -} - -//-- -//----- -//---------- -//---------------------- -//------------------------------- - -function prepareateFile(force, file) { - if (force && existsItem(file)) { - if (!deleteItem(file)) { - WScript.Echo("Unable to delete " + file); - WScript.Quit(8); - } - } else if (existsItem(file)) { - WScript.Echo("Item " + file + " already exist"); - WScript.Quit(9); - } -} - -function writeBinFile(fileName, data) { - AdoDBObj.Type = 1; - AdoDBObj.Open(); - AdoDBObj.Position = 0; - AdoDBObj.Write(data); - AdoDBObj.SaveToFile(fileName, 2); - AdoDBObj.Close(); -} - -function writeFile(fileName, data) { - AdoDBObj.Type = 2; - AdoDBObj.CharSet = "iso-8859-1"; - AdoDBObj.Open(); - AdoDBObj.Position = 0; - AdoDBObj.WriteText(data); - AdoDBObj.SaveToFile(fileName, 2); - AdoDBObj.Close(); -} - - -function readFile(fileName) { - //check existence - try { - if (!FileSystemObj.FileExists(fileName)) { - WScript.Echo("file " + fileName + " does not exist!"); - WScript.Quit(13); - } - if (FileSystemObj.GetFile(fileName).Size === 0) { - return ""; - } - var fileR = FileSystemObj.OpenTextFile(fileName, 1); - var content = fileR.ReadAll(); - fileR.Close(); - return content; - } catch (err) { - WScript.Echo("Error while reading file: " + fileName); - WScript.Echo(err.message); - WScript.Echo("Will return empty string"); - return ""; - } -} - -function readPropFile(fileName) { - //check existence - resultArray = []; - if (!FileSystemObj.FileExists(fileName)) { - WScript.Echo("(headers)file " + fileName + " does not exist!"); - WScript.Quit(15); - } - if (FileSystemObj.GetFile(fileName).Size === 0) { - return resultArray; - } - var fileR = FileSystemObj.OpenTextFile(fileName, 1); - var line = ""; - var k = ""; - var v = ""; - var lineN = 0; - var index = 0; - try { - WScript.Echo("parsing headers form " + fileName + " property file "); - while (!fileR.AtEndOfStream) { - line = fileR.ReadLine(); - lineN++; - index = line.indexOf(":"); - if (line.indexOf("#") === 0 || trim(line) === "") { - continue; - } - if (index === -1 || index === line.length - 1 || index === 0) { - WScript.Echo("Invalid line " + lineN); - WScript.Quit(93); - } - k = trim(line.substring(0, index)); - v = trim(line.substring(index + 1, line.length)); - resultArray.push([k, v]); - } - fileR.Close(); - return resultArray; - } catch (err) { - WScript.Echo("Error while reading headers file: " + fileName); - WScript.Echo(err.message); - WScript.Echo("Will return empty array"); - return resultArray; - } -} - -function trim(str) { - return str.replace(/^\s+/, '').replace(/\s+$/, ''); -} - -function main() { - parseArgs(); - request(url); -} -main(); diff -Nru retroshare-0.6.4/src/libbitdht/src/bitdht/bdmanager.cc retroshare-0.6.4/src/libbitdht/src/bitdht/bdmanager.cc --- retroshare-0.6.4/src/libbitdht/src/bitdht/bdmanager.cc 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/libbitdht/src/bitdht/bdmanager.cc 2018-06-01 20:36:00.000000000 +0000 @@ -72,7 +72,7 @@ :bdNode(id, dhtVersion, bootfile, filterfile, fns, this) { mMode = BITDHT_MGR_STATE_OFF; - mFns = fns; + mDhtFns = fns; mModeTS = 0 ; mStartTS = 0; mSearchingDone = false; @@ -87,7 +87,7 @@ #ifdef DEBUG_MGR std::cerr << "bdNodeManager::bdNodeManager() ID: "; - mFns->bdPrintNodeId(std::cerr, id); + mDhtFns->bdPrintNodeId(std::cerr, id); std::cerr << std::endl; #endif @@ -188,7 +188,7 @@ { #ifdef DEBUG_MGR std::cerr << "bdNodeManager::addFindNode() "; - mFns->bdPrintNodeId(std::cerr, id); + mDhtFns->bdPrintNodeId(std::cerr, id); std::cerr << std::endl; #endif /* check if exists already */ @@ -257,7 +257,7 @@ { #ifdef DEBUG_MGR std::cerr << "bdNodeManager::removeFindNode() "; - mFns->bdPrintNodeId(std::cerr, id); + mDhtFns->bdPrintNodeId(std::cerr, id); std::cerr << std::endl; #endif std::map::iterator it; @@ -525,7 +525,7 @@ else { /* calculate mid point */ - mFns->bdRandomMidId(&mOwnId, &(id.id), &targetNodeId); + mDhtFns->bdRandomMidId(&mOwnId, &(id.id), &targetNodeId); } /* do standard find_peer message */ @@ -534,13 +534,13 @@ #ifdef DEBUG_MGR std::cerr << "bdNodeManager::QueryRandomLocalNet() Querying : "; - mFns->bdPrintId(std::cerr, &id); + mDhtFns->bdPrintId(std::cerr, &id); std::cerr << " searching for : "; - mFns->bdPrintNodeId(std::cerr, &targetNodeId); + mDhtFns->bdPrintNodeId(std::cerr, &targetNodeId); bdMetric dist; - mFns->bdDistance(&targetNodeId, &(mOwnId), &dist); - int bucket = mFns->bdBucketDistance(&dist); + mDhtFns->bdDistance(&targetNodeId, &(mOwnId), &dist); + int bucket = mDhtFns->bdBucketDistance(&dist); std::cerr << " in Bucket: " << bucket; std::cerr << std::endl; #endif @@ -593,7 +593,7 @@ { #ifdef DEBUG_MGR std::cerr << "bdNodeManager::SearchForLocalNet() Existing Internal Search: "; - mFns->bdPrintNodeId(std::cerr, &(it->first)); + mDhtFns->bdPrintNodeId(std::cerr, &(it->first)); std::cerr << std::endl; #endif @@ -630,7 +630,7 @@ { #ifdef DEBUG_MGR std::cerr << "bdNodeManager::SearchForLocalNet() " << i << " Attempts to find OkNode: "; - mFns->bdPrintNodeId(std::cerr, &targetNodeId); + mDhtFns->bdPrintNodeId(std::cerr, &targetNodeId); std::cerr << std::endl; #endif } @@ -638,7 +638,7 @@ { #ifdef DEBUG_MGR std::cerr << "bdNodeManager::SearchForLocalNet() Failed to Find FilterOk this time: "; - mFns->bdPrintNodeId(std::cerr, &targetNodeId); + mDhtFns->bdPrintNodeId(std::cerr, &targetNodeId); std::cerr << std::endl; #endif } @@ -649,7 +649,7 @@ #ifdef DEBUG_MGR std::cerr << "bdNodeManager::SearchForLocalNet() Adding New Internal Search: "; - mFns->bdPrintNodeId(std::cerr, &(targetNodeId)); + mDhtFns->bdPrintNodeId(std::cerr, &(targetNodeId)); std::cerr << std::endl; #endif } @@ -709,7 +709,7 @@ { #ifdef DEBUG_MGR std::cerr << "bdNodeManager::checkStatus() Query in Progress id: "; - mFns->bdPrintNodeId(std::cerr, &(it->first)); + mDhtFns->bdPrintNodeId(std::cerr, &(it->first)); std::cerr << std::endl; #endif } @@ -719,7 +719,7 @@ { #ifdef DEBUG_MGR std::cerr << "bdNodeManager::checkStatus() Query Failed: id: "; - mFns->bdPrintNodeId(std::cerr, &(it->first)); + mDhtFns->bdPrintNodeId(std::cerr, &(it->first)); std::cerr << std::endl; #endif // BAD. @@ -733,7 +733,7 @@ { #ifdef DEBUG_MGR std::cerr << "bdNodeManager::checkStatus() Found Closest: id: "; - mFns->bdPrintNodeId(std::cerr, &(it->first)); + mDhtFns->bdPrintNodeId(std::cerr, &(it->first)); std::cerr << std::endl; #endif @@ -747,7 +747,7 @@ { #ifdef DEBUG_MGR std::cerr << "bdNodeManager::checkStatus() the Peer Online but Unreachable: id: "; - mFns->bdPrintNodeId(std::cerr, &(it->first)); + mDhtFns->bdPrintNodeId(std::cerr, &(it->first)); std::cerr << std::endl; #endif @@ -761,7 +761,7 @@ { #ifdef DEBUG_MGR std::cerr << "bdNodeManager::checkStatus() Found Query: id: "; - mFns->bdPrintNodeId(std::cerr, &(it->first)); + mDhtFns->bdPrintNodeId(std::cerr, &(it->first)); std::cerr << std::endl; #endif //foundId = @@ -803,7 +803,7 @@ doCallback = false; #ifdef DEBUG_MGR std::cerr << "bdNodeManager::checkStatus() Internal: no cb for id: "; - mFns->bdPrintNodeId(std::cerr, &(it->first)); + mDhtFns->bdPrintNodeId(std::cerr, &(it->first)); std::cerr << std::endl; #endif } @@ -1024,7 +1024,7 @@ { #ifdef DEBUG_MGR std::cerr << "bdNodeManager::getDhtPeerAddress() Id: "; - mFns->bdPrintNodeId(std::cerr, id); + mDhtFns->bdPrintNodeId(std::cerr, id); std::cerr << " ... ? TODO" << std::endl; #else (void) id; @@ -1034,7 +1034,7 @@ pit = mActivePeers.find(*id); std::cerr << "bdNodeManager::getDhtPeerAddress() Id: "; - mFns->bdPrintNodeId(std::cerr, id); + mDhtFns->bdPrintNodeId(std::cerr, id); std::cerr << std::endl; if (pit != mActivePeers.end()) @@ -1061,7 +1061,7 @@ { #ifdef DEBUG_MGR std::cerr << "bdNodeManager::getDhtValue() Id: "; - mFns->bdPrintNodeId(std::cerr, id); + mDhtFns->bdPrintNodeId(std::cerr, id); std::cerr << " key: " << key; std::cerr << " ... ? TODO" << std::endl; #else @@ -1144,7 +1144,7 @@ { #ifdef DEBUG_MGR std::cerr << "bdNodeManager::doNodeCallback() "; - mFns->bdPrintId(std::cerr, id); + mDhtFns->bdPrintId(std::cerr, id); std::cerr << "peerflags: " << peerflags; std::cerr << std::endl; #endif @@ -1163,7 +1163,7 @@ #ifdef DEBUG_MGR std::cerr << "bdNodeManager::doPeerCallback()"; - mFns->bdPrintId(std::cerr, id); + mDhtFns->bdPrintId(std::cerr, id); std::cerr << "status: " << status; std::cerr << std::endl; #endif diff -Nru retroshare-0.6.4/src/libbitdht/src/bitdht/bdmanager.h retroshare-0.6.4/src/libbitdht/src/bitdht/bdmanager.h --- retroshare-0.6.4/src/libbitdht/src/bitdht/bdmanager.h 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/libbitdht/src/bitdht/bdmanager.h 2018-06-01 20:36:00.000000000 +0000 @@ -184,7 +184,7 @@ time_t mSearchTS; bool mSearchingDone; - bdDhtFunctions *mFns; + bdDhtFunctions *mDhtFns; uint32_t mNetworkSize; uint32_t mBdNetworkSize; diff -Nru retroshare-0.6.4/src/libresapi/src/api/ApiServer.cpp retroshare-0.6.4/src/libresapi/src/api/ApiServer.cpp --- retroshare-0.6.4/src/libresapi/src/api/ApiServer.cpp 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/libresapi/src/api/ApiServer.cpp 2018-06-01 20:36:00.000000000 +0000 @@ -240,7 +240,7 @@ mTransfersHandler(sts, ifaces.mFiles, ifaces.mPeers, *ifaces.mNotify), mChatHandler(sts, ifaces.mNotify, ifaces.mMsgs, ifaces.mPeers, ifaces.mIdentity, &mPeersHandler), mApiPluginHandler(sts, ifaces), - mChannelsHandler(ifaces.mGxsChannels), + mChannelsHandler(*ifaces.mGxsChannels), mStatsHandler() #ifdef LIBRESAPI_SETTINGS ,mSettingsHandler(sts) diff -Nru retroshare-0.6.4/src/libresapi/src/api/ChannelsHandler.cpp retroshare-0.6.4/src/libresapi/src/api/ChannelsHandler.cpp --- retroshare-0.6.4/src/libresapi/src/api/ChannelsHandler.cpp 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/libresapi/src/api/ChannelsHandler.cpp 2018-06-01 20:36:00.000000000 +0000 @@ -1,8 +1,29 @@ +/* + * RetroShare JSON API + * Copyright (C) 2018 Gioacchino Mazzurco + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + #include "ChannelsHandler.h" #include #include +#include #include +#include + #include "Operators.h" namespace resource_api @@ -21,22 +42,347 @@ { double size = 0; left << makeKeyValueReference("size", size); - file.mSize = size; + file.mSize = size; } return left; } -ChannelsHandler::ChannelsHandler(RsGxsChannels *channels): - mChannels(channels) +ChannelsHandler::ChannelsHandler(RsGxsChannels& channels): mChannels(channels) +{ + addResourceHandler("list_channels", this, + &ChannelsHandler::handleListChannels); + addResourceHandler("get_channel", this, &ChannelsHandler::handleGetChannel); + addResourceHandler("toggle_subscribe", this, &ChannelsHandler::handleToggleSubscription); + addResourceHandler("toggle_auto_download", this, &ChannelsHandler::handleToggleAutoDownload); + addResourceHandler("toggle_read", this, &ChannelsHandler::handleTogglePostRead); + addResourceHandler("create_channel", this, &ChannelsHandler::handleCreateChannel); + addResourceHandler("create_post", this, &ChannelsHandler::handleCreatePost); +} + +void ChannelsHandler::handleListChannels(Request& /*req*/, Response& resp) +{ + RsTokReqOptions opts; + opts.mReqType = GXS_REQUEST_TYPE_GROUP_DATA; + uint32_t token; + + RsTokenService& tChannels = *mChannels.getTokenService(); + + tChannels.requestGroupInfo(token, RS_TOKREQ_ANSTYPE_DATA, opts); + + time_t start = time(NULL); + while((tChannels.requestStatus(token) != RsTokenService::GXS_REQUEST_V2_STATUS_COMPLETE) + &&(tChannels.requestStatus(token) != RsTokenService::GXS_REQUEST_V2_STATUS_FAILED) + &&((time(NULL) < (start+10)))) rstime::rs_usleep(500*1000); + + std::vector grps; + if( tChannels.requestStatus(token) == RsTokenService::GXS_REQUEST_V2_STATUS_COMPLETE + && mChannels.getGroupData(token, grps) ) + { + for( std::vector::iterator vit = grps.begin(); + vit != grps.end(); ++vit ) + { + RsGxsChannelGroup& grp = *vit; + KeyValueReference id("channel_id", grp.mMeta.mGroupId); + KeyValueReference vis_msg("visible_msg_count", grp.mMeta.mVisibleMsgCount); + bool own = (grp.mMeta.mSubscribeFlags & GXS_SERV::GROUP_SUBSCRIBE_ADMIN); + bool subscribed = IS_GROUP_SUBSCRIBED(grp.mMeta.mSubscribeFlags); + std::string lastPostTsStr = std::to_string(grp.mMeta.mLastPost); + std::string publishTsStr = std::to_string(grp.mMeta.mPublishTs); + std::string thumbnail_base64; + Radix64::encode(grp.mImage.mData, grp.mImage.mSize, thumbnail_base64); + resp.mDataStream.getStreamToMember() + << id + << makeKeyValueReference("name", grp.mMeta.mGroupName) + << makeKeyValueReference("last_post_ts", lastPostTsStr) + << makeKeyValueReference("popularity", grp.mMeta.mPop) + << makeKeyValueReference("publish_ts", publishTsStr) + << vis_msg + << makeKeyValueReference("group_status", grp.mMeta.mGroupStatus) + << makeKeyValueReference("author_id", grp.mMeta.mAuthorId) + << makeKeyValueReference("parent_grp_id", grp.mMeta.mParentGrpId) + << makeKeyValueReference("description", grp.mDescription) + << makeKeyValueReference("own", own) + << makeKeyValueReference("subscribed", subscribed) + << makeKeyValueReference("thumbnail_base64_png", thumbnail_base64) + << makeKeyValueReference("auto_download", grp.mAutoDownload); + } + + resp.setOk(); + } + else resp.setFail("Cant get data from GXS!"); +} + +void ChannelsHandler::handleGetChannel(Request& req, Response& resp) +{ + std::string chanIdStr; + req.mStream << makeKeyValueReference("channel_id", chanIdStr); + if(chanIdStr.empty()) + { + resp.setFail("channel_id required!"); + return; + + } + + RsGxsGroupId chanId(chanIdStr); + if(chanId.isNull()) + { + resp.setFail("Invalid channel_id:" + chanIdStr); + return; + } + + std::list groupIds; groupIds.push_back(chanId); + uint32_t token; + RsTokReqOptions opts; + opts.mReqType = GXS_REQUEST_TYPE_MSG_DATA; + + if(! mChannels.getTokenService()-> + requestMsgInfo(token, RS_TOKREQ_ANSTYPE_DATA, opts, groupIds) ) + { + resp.setFail("Unknown GXS error!"); + return; + } + + time_t start = time(NULL); + while((mChannels.getTokenService()->requestStatus(token) != RsTokenService::GXS_REQUEST_V2_STATUS_COMPLETE) + &&(mChannels.getTokenService()->requestStatus(token) != RsTokenService::GXS_REQUEST_V2_STATUS_FAILED) + &&((time(NULL) < (start+10)))) rstime::rs_usleep(500*1000); + + std::vector posts; + std::vector comments; + if( mChannels.getTokenService()->requestStatus(token) == + RsTokenService::GXS_REQUEST_V2_STATUS_COMPLETE && + mChannels.getPostData(token, posts, comments) ) + { + for( std::vector::iterator vit = posts.begin(); + vit != posts.end(); ++vit ) + { + RsGxsChannelPost& post = *vit; + RsMsgMetaData& pMeta = post.mMeta; + resp.mDataStream.getStreamToMember() + << makeKeyValueReference("channel_id", pMeta.mGroupId) + << makeKeyValueReference("name", pMeta.mMsgName) + << makeKeyValueReference("post_id", pMeta.mMsgId) + << makeKeyValueReference("parent_id", pMeta.mParentId) + << makeKeyValueReference("author_id", pMeta.mAuthorId) + << makeKeyValueReference("orig_msg_id", pMeta.mOrigMsgId) + << makeKeyValueReference("thread_id", pMeta.mThreadId) + << makeKeyValueReference("message", post.mMsg); + } + + for( std::vector::iterator vit = comments.begin(); + vit != comments.end(); ++vit ) + { + RsGxsComment& comment = *vit; + RsMsgMetaData& cMeta = comment.mMeta; + std::string scoreStr = std::to_string(comment.mScore); + resp.mDataStream.getStreamToMember() + << makeKeyValueReference("channel_id", cMeta.mGroupId) + << makeKeyValueReference("name", cMeta.mMsgName) + << makeKeyValueReference("comment_id", cMeta.mMsgId) + << makeKeyValueReference("parent_id", cMeta.mParentId) + << makeKeyValueReference("author_id", cMeta.mAuthorId) + << makeKeyValueReference("orig_msg_id", cMeta.mOrigMsgId) + << makeKeyValueReference("thread_id", cMeta.mThreadId) + << makeKeyValueReference("score", scoreStr) + << makeKeyValueReference("message", comment.mComment); + } + + resp.setOk(); + } + else resp.setFail("Cant get data from GXS!"); +} + +void ChannelsHandler::handleToggleSubscription(Request& req, Response& resp) +{ + std::string chanIdStr; + bool subscribe = true; + + req.mStream << makeKeyValueReference("channel_id", chanIdStr) + << makeKeyValueReference("subscribe", subscribe); + + if(chanIdStr.empty()) + { + resp.setFail("channel_id required!"); + return; + } + + RsGxsGroupId chanId(chanIdStr); + if(chanId.isNull()) + { + resp.setFail("Invalid channel_id:" + chanIdStr); + return; + } + + uint32_t token; + if(mChannels.subscribeToGroup(token, chanId, subscribe)) + { + RsTokenService& tChannels = *mChannels.getTokenService(); + + time_t start = time(NULL); + while((tChannels.requestStatus(token) != RsTokenService::GXS_REQUEST_V2_STATUS_COMPLETE) + &&(tChannels.requestStatus(token) != RsTokenService::GXS_REQUEST_V2_STATUS_FAILED) + &&((time(NULL) < (start+10)))) rstime::rs_usleep(500*1000); + + if(tChannels.requestStatus(token) == RsTokenService::GXS_REQUEST_V2_STATUS_COMPLETE) + resp.setOk(); + else resp.setFail("Unknown GXS error!"); + } + else resp.setFail("Unknown GXS error!"); +} + +void ChannelsHandler::handleCreateChannel(Request& req, Response& resp) +{ + RsGxsChannelGroup chan; + RsGroupMetaData& cMeta = chan.mMeta; + std::string authorIdStr; + std::string thumbnail_base64; + + req.mStream << makeKeyValueReference("author_id", authorIdStr) + << makeKeyValueReference("name", cMeta.mGroupName) + << makeKeyValueReference("description", chan.mDescription) + << makeKeyValueReference("thumbnail_base64_png", thumbnail_base64); + + if(cMeta.mGroupName.empty()) + { + resp.setFail("Channel name required!"); + return; + } + + if(thumbnail_base64.empty()) chan.mImage.clear(); + else + { + std::vector png_data = Radix64::decode(thumbnail_base64); + if(!png_data.empty()) + { + if(png_data.size() < 8) + { + resp.setFail("Decoded thumbnail_base64_png is smaller than 8 byte. This can't be a valid png file!"); + return; + } + uint8_t png_magic_number[] = {0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a}; + if(!std::equal(&png_magic_number[0],&png_magic_number[8],png_data.begin())) + { + resp.setFail("Decoded thumbnail_base64_png does not seem to be a png file. (Header is missing magic number)"); + return; + } + chan.mImage.copy(png_data.data(), png_data.size()); + } + } + + if(!authorIdStr.empty()) cMeta.mAuthorId = RsGxsId(authorIdStr); + + // ATM supports creating only public channels + cMeta.mGroupFlags = GXS_SERV::FLAG_PRIVACY_PUBLIC; + + // I am not sure about those flags I have reversed them with the debugger + // that gives 520 as value of this member when a channel with default + // options is created from Qt Gui + cMeta.mSignFlags = GXS_SERV::MSG_AUTHEN_CHILD_AUTHOR_SIGN | + GXS_SERV::FLAG_AUTHOR_AUTHENTICATION_REQUIRED; + + uint32_t token; + if(mChannels.createGroup(token, chan)) + { + RsTokenService& tChannels = *mChannels.getTokenService(); + + time_t start = time(NULL); + while((tChannels.requestStatus(token) != RsTokenService::GXS_REQUEST_V2_STATUS_COMPLETE) + &&(tChannels.requestStatus(token) != RsTokenService::GXS_REQUEST_V2_STATUS_FAILED) + &&((time(NULL) < (start+10)))) rstime::rs_usleep(500*1000); + + if(tChannels.requestStatus(token) == RsTokenService::GXS_REQUEST_V2_STATUS_COMPLETE) + resp.setOk(); + else resp.setFail("Unknown GXS error!"); + } + else resp.setFail("Unkown GXS error!"); +} + +void ChannelsHandler::handleToggleAutoDownload(Request& req, Response& resp) +{ + + std::string chanIdStr; + bool autoDownload = true; + + req.mStream << makeKeyValueReference("channel_id", chanIdStr) + << makeKeyValueReference("auto_download", autoDownload); + + if(chanIdStr.empty()) + { + resp.setFail("channel_id required!"); + return; + } + + RsGxsGroupId chanId(chanIdStr); + if(chanId.isNull()) + { + resp.setFail("Invalid channel_id:" + chanIdStr); + return; + } + + if(mChannels.setChannelAutoDownload(chanId, autoDownload)) + resp.setOk(); + else resp.setFail(); +} + +void ChannelsHandler::handleTogglePostRead(Request& req, Response& resp) { - addResourceHandler("create_post", this, &ChannelsHandler::handleCreatePost); + std::string chanIdStr; + std::string postIdStr; + bool read = true; + + req.mStream << makeKeyValueReference("channel_id", chanIdStr) + << makeKeyValueReference("post_id", postIdStr) + << makeKeyValueReference("read", read); + + if(chanIdStr.empty()) + { + resp.setFail("channel_id required!"); + return; + } + + RsGxsGroupId chanId(chanIdStr); + if(chanId.isNull()) + { + resp.setFail("Invalid channel_id:" + chanIdStr); + return; + } + + if(postIdStr.empty()) + { + resp.setFail("post_id required!"); + return; + } + + RsGxsMessageId postId(postIdStr); + if(postId.isNull()) + { + resp.setFail("Invalid post_id:" + postIdStr); + return; + } + + std::cerr << __PRETTY_FUNCTION__ << " " << chanIdStr << " " << postIdStr + << " " << read << std::endl; + + uint32_t token; + mChannels.setMessageReadStatus(token, std::make_pair(chanId,postId), read); + + RsTokenService& tChannels = *mChannels.getTokenService(); + + time_t start = time(NULL); + while((tChannels.requestStatus(token) != RsTokenService::GXS_REQUEST_V2_STATUS_COMPLETE) + &&(tChannels.requestStatus(token) != RsTokenService::GXS_REQUEST_V2_STATUS_FAILED) + &&((time(NULL) < (start+10)))) rstime::rs_usleep(500*1000); + + if(tChannels.requestStatus(token) == RsTokenService::GXS_REQUEST_V2_STATUS_COMPLETE) + resp.setOk(); + else resp.setFail("Unknown GXS error!"); } -ResponseTask* ChannelsHandler::handleCreatePost(Request &req, Response &resp) +void ChannelsHandler::handleCreatePost(Request &req, Response &resp) { RsGxsChannelPost post; - req.mStream << makeKeyValueReference("group_id", post.mMeta.mGroupId); + req.mStream << makeKeyValueReference("channel_id", post.mMeta.mGroupId); req.mStream << makeKeyValueReference("subject", post.mMeta.mMsgName); req.mStream << makeKeyValueReference("message", post.mMsg); @@ -53,36 +399,36 @@ if(post.mMeta.mGroupId.isNull()) { - resp.setFail("groupd_id is null"); - return 0; + resp.setFail("groupd_id is null"); + return; } if(post.mMeta.mMsgName.empty()) { - resp.setFail("subject is empty"); - return 0; + resp.setFail("subject is empty"); + return; } if(post.mMsg.empty()) { - resp.setFail("msg text is empty"); - return 0; + resp.setFail("msg text is empty"); + return; } // empty file list is ok, but files have to be valid for(std::list::iterator lit = post.mFiles.begin(); lit != post.mFiles.end(); ++lit) { if(lit->mHash.isNull()) { - resp.setFail("at least one file hash is empty"); - return 0; + resp.setFail("at least one file hash is empty"); + return; } if(lit->mName.empty()) { - resp.setFail("at leats one file name is empty"); - return 0; + resp.setFail("at leats one file name is empty"); + return; } if(lit->mSize == 0) { - resp.setFail("at least one file size is empty"); - return 0; + resp.setFail("at least one file size is empty"); + return; } } @@ -91,22 +437,33 @@ { if(png_data.size() < 8) { - resp.setFail("Decoded thumbnail_base64_png is smaller than 8 byte. This can't be a valid png file!"); - return 0; + resp.setFail("Decoded thumbnail_base64_png is smaller than 8 byte. This can't be a valid png file!"); + return; } uint8_t png_magic_number[] = {0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a}; if(!std::equal(&png_magic_number[0],&png_magic_number[8],png_data.begin())) { - resp.setFail("Decoded thumbnail_base64_png does not seem to be a png file. (Header is missing magic number)"); - return 0; + resp.setFail("Decoded thumbnail_base64_png does not seem to be a png file. (Header is missing magic number)"); + return; } post.mThumbnail.copy(png_data.data(), png_data.size()); } uint32_t token; - mChannels->createPost(token, post); - // TODO: grp creation acknowledge - return 0; + if(mChannels.createPost(token, post)) + { + RsTokenService& tChannels = *mChannels.getTokenService(); + + time_t start = time(NULL); + while((tChannels.requestStatus(token) != RsTokenService::GXS_REQUEST_V2_STATUS_COMPLETE) + &&(tChannels.requestStatus(token) != RsTokenService::GXS_REQUEST_V2_STATUS_FAILED) + &&((time(NULL) < (start+10)))) rstime::rs_usleep(500*1000); + + if(tChannels.requestStatus(token) == RsTokenService::GXS_REQUEST_V2_STATUS_COMPLETE) + resp.setOk(); + else resp.setFail("Unknown GXS error!"); + } + else resp.setFail("Unknown GXS error!"); } } // namespace resource_api diff -Nru retroshare-0.6.4/src/libresapi/src/api/ChannelsHandler.h retroshare-0.6.4/src/libresapi/src/api/ChannelsHandler.h --- retroshare-0.6.4/src/libresapi/src/api/ChannelsHandler.h 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/libresapi/src/api/ChannelsHandler.h 2018-06-01 20:36:00.000000000 +0000 @@ -1,4 +1,21 @@ #pragma once +/* + * RetroShare JSON API + * Copyright (C) 2018 Gioacchino Mazzurco + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ #include "ResourceRouter.h" @@ -7,15 +24,20 @@ namespace resource_api { -class ChannelsHandler : public ResourceRouter +struct ChannelsHandler : ResourceRouter { -public: - ChannelsHandler(RsGxsChannels* channels); + ChannelsHandler(RsGxsChannels& channels); private: - ResponseTask* handleCreatePost(Request& req, Response& resp); + void handleListChannels(Request& req, Response& resp); + void handleGetChannel(Request& req, Response& resp); + void handleToggleSubscription(Request& req, Response& resp); + void handleCreateChannel(Request& req, Response& resp); + void handleToggleAutoDownload(Request& req, Response& resp); + void handleTogglePostRead(Request& req, Response& resp); + void handleCreatePost(Request& req, Response& resp); - RsGxsChannels* mChannels; + RsGxsChannels& mChannels; }; } // namespace resource_api diff -Nru retroshare-0.6.4/src/libresapi/src/libresapi.pro retroshare-0.6.4/src/libresapi/src/libresapi.pro --- retroshare-0.6.4/src/libresapi/src/libresapi.pro 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/libresapi/src/libresapi.pro 2018-06-01 20:36:00.000000000 +0000 @@ -13,6 +13,7 @@ # in the meantime, they are part of the RS directory so that it is always possible to find them INCLUDEPATH += ../../rapidjson-1.1.0 +INCLUDEPATH += ../../libretroshare/src libresapilocalserver { CONFIG *= qt @@ -105,20 +106,13 @@ DEFINES *= WINDOWS_SYS INCLUDEPATH += . $$INC_DIR - greaterThan(QT_MAJOR_VERSION, 4) { - # Qt 5 - PRO_PATH=$$shell_path($$_PRO_FILE_PWD_) - MAKE_SRC=$$shell_path($$PRO_PATH/webui-src/make-src) - } else { - # Qt 4 - PRO_PATH=$$replace(_PRO_FILE_PWD_, /, \\) - MAKE_SRC=$$PRO_PATH\\webui-src\\make-src - } - - #create_webfiles.commands = $$MAKE_SRC\\build.bat $$PRO_PATH - #QMAKE_EXTRA_TARGETS += create_webfiles - #PRE_TARGETDEPS += create_webfiles - QMAKE_POST_LINK=$$MAKE_SRC\\build.bat $$PRO_PATH + PRO_PATH=$$shell_path($$_PRO_FILE_PWD_) + MAKE_SRC=$$shell_path($$PRO_PATH/webui-src/make-src) + + #create_webfiles.commands = $$MAKE_SRC\\build.bat $$PRO_PATH + #QMAKE_EXTRA_TARGETS += create_webfiles + #PRE_TARGETDEPS += create_webfiles + QMAKE_POST_LINK=$$MAKE_SRC\\build.bat $$PRO_PATH # create dummy files system($$MAKE_SRC\\init.bat .) diff -Nru retroshare-0.6.4/src/libretroshare/src/file_sharing/directory_storage.cc retroshare-0.6.4/src/libretroshare/src/file_sharing/directory_storage.cc --- retroshare-0.6.4/src/libretroshare/src/file_sharing/directory_storage.cc 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/libretroshare/src/file_sharing/directory_storage.cc 2018-06-01 20:36:00.000000000 +0000 @@ -623,7 +623,7 @@ if(it == mLocalDirs.end()) { - std::cerr << "(EE) very weird bug: base directory \"" << base_dir << "\" not found in shared dir list." << std::endl; + std::cerr << "(II) base directory \"" << base_dir << "\" not found in shared dir list." << std::endl; return false ; } diff -Nru retroshare-0.6.4/src/libretroshare/src/file_sharing/directory_updater.cc retroshare-0.6.4/src/libretroshare/src/file_sharing/directory_updater.cc --- retroshare-0.6.4/src/libretroshare/src/file_sharing/directory_updater.cc 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/libretroshare/src/file_sharing/directory_updater.cc 2018-06-01 20:36:00.000000000 +0000 @@ -73,10 +73,23 @@ { if(now > mDelayBetweenDirectoryUpdates + mLastSweepTime) { - if(sweepSharedDirectories()) + bool some_files_not_ready = false ; + + if(sweepSharedDirectories(some_files_not_ready)) { - mNeedsFullRecheck = false; - mLastSweepTime = now ; + if(some_files_not_ready) + { + mNeedsFullRecheck = true ; + mLastSweepTime = now - mDelayBetweenDirectoryUpdates + 60 ; // retry 20 secs from now + + std::cerr << "(II) some files being modified. Will re-scan in 60 secs." << std::endl; + } + else + { + mNeedsFullRecheck = false ; + mLastSweepTime = now ; + } + mSharedDirectories->notifyTSChanged(); mForceUpdate = false ; } @@ -111,7 +124,7 @@ mHashCache->togglePauseHashingProcess(); } -bool LocalDirectoryUpdater::sweepSharedDirectories() +bool LocalDirectoryUpdater::sweepSharedDirectories(bool& some_files_not_ready) { if(mHashSalt.isNull()) { @@ -158,8 +171,8 @@ #endif existing_dirs.insert(RsDirUtil::removeSymLinks(stored_dir_it.name())); - recursUpdateSharedDir(stored_dir_it.name(), *stored_dir_it,existing_dirs,1) ; // here we need to use the list that was stored, instead of the shared dir list, because the two - // are not necessarily in the same order. + recursUpdateSharedDir(stored_dir_it.name(), *stored_dir_it,existing_dirs,1,some_files_not_ready) ; // here we need to use the list that was stored, instead of the shared dir list, because the two + // are not necessarily in the same order. } RsServer::notify()->notifyListChange(NOTIFY_LIST_DIRLIST_LOCAL, 0); @@ -168,7 +181,7 @@ return true ; } -void LocalDirectoryUpdater::recursUpdateSharedDir(const std::string& cumulated_path, DirectoryStorage::EntryIndex indx,std::set& existing_directories,uint32_t current_depth) +void LocalDirectoryUpdater::recursUpdateSharedDir(const std::string& cumulated_path, DirectoryStorage::EntryIndex indx,std::set& existing_directories,uint32_t current_depth,bool& some_files_not_ready) { #ifdef DEBUG_LOCAL_DIR_UPDATER std::cerr << "[directory storage] parsing directory " << cumulated_path << ", index=" << indx << std::endl; @@ -187,6 +200,8 @@ return; } + time_t now = time(NULL) ; + if(mNeedsFullRecheck || dirIt.dir_modtime() > dir_local_mod_time) // the > is because we may have changed the virtual name, and therefore the TS wont match. // we only want to detect when the directory has changed on the disk { @@ -200,11 +215,23 @@ { switch(dirIt.file_type()) { - case librs::util::FolderIterator::TYPE_FILE: subfiles[dirIt.file_name()].modtime = dirIt.file_modtime() ; - subfiles[dirIt.file_name()].size = dirIt.file_size(); + case librs::util::FolderIterator::TYPE_FILE: + + if(dirIt.file_modtime() + MIN_TIME_AFTER_LAST_MODIFICATION < now) + { + subfiles[dirIt.file_name()].modtime = dirIt.file_modtime() ; + subfiles[dirIt.file_name()].size = dirIt.file_size(); #ifdef DEBUG_LOCAL_DIR_UPDATER - std::cerr << " adding sub-file \"" << dirIt.file_name() << "\"" << std::endl; + std::cerr << " adding sub-file \"" << dirIt.file_name() << "\"" << std::endl; #endif + } + else + { + some_files_not_ready = true ; + + std::cerr << "(WW) file " << dirIt.file_fullpath() << " is probably being modified. Keeping it for later." << std::endl; + } + break; case librs::util::FolderIterator::TYPE_DIR: @@ -276,7 +303,7 @@ #ifdef DEBUG_LOCAL_DIR_UPDATER std::cerr << " recursing into " << stored_dir_it.name() << std::endl; #endif - recursUpdateSharedDir(cumulated_path + "/" + stored_dir_it.name(), *stored_dir_it,existing_directories,current_depth+1) ; + recursUpdateSharedDir(cumulated_path + "/" + stored_dir_it.name(), *stored_dir_it,existing_directories,current_depth+1,some_files_not_ready) ; } } diff -Nru retroshare-0.6.4/src/libretroshare/src/file_sharing/directory_updater.h retroshare-0.6.4/src/libretroshare/src/file_sharing/directory_updater.h --- retroshare-0.6.4/src/libretroshare/src/file_sharing/directory_updater.h 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/libretroshare/src/file_sharing/directory_updater.h 2018-06-01 20:36:00.000000000 +0000 @@ -70,8 +70,8 @@ virtual void hash_callback(uint32_t client_param, const std::string& name, const RsFileHash& hash, uint64_t size); virtual bool hash_confirm(uint32_t client_param) ; - void recursUpdateSharedDir(const std::string& cumulated_path, DirectoryStorage::EntryIndex indx, std::set& existing_directories, uint32_t current_depth); - bool sweepSharedDirectories(); + void recursUpdateSharedDir(const std::string& cumulated_path, DirectoryStorage::EntryIndex indx, std::set& existing_directories, uint32_t current_depth,bool& files_not_ready); + bool sweepSharedDirectories(bool &some_files_not_ready); private: bool filterFile(const std::string& fname) const ; // reponds true if the file passes the ignore lists test. diff -Nru retroshare-0.6.4/src/libretroshare/src/file_sharing/file_sharing_defaults.h retroshare-0.6.4/src/libretroshare/src/file_sharing/file_sharing_defaults.h --- retroshare-0.6.4/src/libretroshare/src/file_sharing/file_sharing_defaults.h 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/libretroshare/src/file_sharing/file_sharing_defaults.h 2018-06-01 20:36:00.000000000 +0000 @@ -34,16 +34,16 @@ static const uint32_t DELAY_BEFORE_DELETE_NON_EMPTY_REMOTE_DIR = 60*24*86400 ; // delete non empty remoe directories after 60 days of inactivity static const uint32_t DELAY_BEFORE_DELETE_EMPTY_REMOTE_DIR = 5*24*86400 ; // delete empty remote directories after 5 days of inactivity -static const std::string HASH_CACHE_DURATION_SS = "HASH_CACHE_DURATION" ; // key string to store hash remembering time -static const std::string WATCH_FILE_DURATION_SS = "WATCH_FILES_DELAY" ; // key to store delay before re-checking for new files -static const std::string WATCH_FILE_ENABLED_SS = "WATCH_FILES_ENABLED"; // key to store ON/OFF flags for file whatch -static const std::string FOLLOW_SYMLINKS_SS = "FOLLOW_SYMLINKS"; // dereference symbolic links, or just ignore them. -static const std::string IGNORE_DUPLICATES = "IGNORE_DUPLICATES"; // do not index files that are referenced multiple times because of links -static const std::string WATCH_HASH_SALT_SS = "WATCH_HASH_SALT"; // Salt that is used to hash directory names -static const std::string IGNORED_PREFIXES_SS = "IGNORED_PREFIXES"; // ignore file prefixes -static const std::string IGNORED_SUFFIXES_SS = "IGNORED_SUFFIXES"; // ignore file suffixes -static const std::string IGNORE_LIST_FLAGS_SS = "IGNORED_FLAGS"; // ignore file flags -static const std::string MAX_SHARE_DEPTH = "MAX_SHARE_DEPTH"; // maximum depth of shared directories +static const std::string HASH_CACHE_DURATION_SS = "HASH_CACHE_DURATION" ; // key string to store hash remembering time +static const std::string WATCH_FILE_DURATION_SS = "WATCH_FILES_DELAY" ; // key to store delay before re-checking for new files +static const std::string WATCH_FILE_ENABLED_SS = "WATCH_FILES_ENABLED"; // key to store ON/OFF flags for file whatch +static const std::string FOLLOW_SYMLINKS_SS = "FOLLOW_SYMLINKS"; // dereference symbolic links, or just ignore them. +static const std::string IGNORE_DUPLICATES = "IGNORE_DUPLICATES"; // do not index files that are referenced multiple times because of links +static const std::string WATCH_HASH_SALT_SS = "WATCH_HASH_SALT"; // Salt that is used to hash directory names +static const std::string IGNORED_PREFIXES_SS = "IGNORED_PREFIXES"; // ignore file prefixes +static const std::string IGNORED_SUFFIXES_SS = "IGNORED_SUFFIXES"; // ignore file suffixes +static const std::string IGNORE_LIST_FLAGS_SS = "IGNORED_FLAGS"; // ignore file flags +static const std::string MAX_SHARE_DEPTH = "MAX_SHARE_DEPTH"; // maximum depth of shared directories static const std::string FILE_SHARING_DIR_NAME = "file_sharing" ; // hard-coded directory name to store friend file lists, hash cache, etc. static const std::string HASH_CACHE_FILE_NAME = "hash_cache.bin" ; // hard-coded directory name to store encrypted hash cache. @@ -51,6 +51,7 @@ static const uint32_t MIN_INTERVAL_BETWEEN_HASH_CACHE_SAVE = 20 ; // never save hash cache more often than every 20 secs. static const uint32_t MIN_INTERVAL_BETWEEN_REMOTE_DIRECTORY_SAVE = 23 ; // never save remote directories more often than this +static const uint32_t MIN_TIME_AFTER_LAST_MODIFICATION = 20 ; // never hash a file that is just being modified, otherwise we end up with a corrupted hash static const uint32_t MAX_DIR_SYNC_RESPONSE_DATA_SIZE = 20000 ; // Maximum RsItem data size in bytes for serialised directory transmission static const uint32_t DEFAULT_HASH_STORAGE_DURATION_DAYS = 30 ; // remember deleted/inaccessible files for 30 days diff -Nru retroshare-0.6.4/src/libretroshare/src/file_sharing/file_tree.h retroshare-0.6.4/src/libretroshare/src/file_sharing/file_tree.h --- retroshare-0.6.4/src/libretroshare/src/file_sharing/file_tree.h 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/libretroshare/src/file_sharing/file_tree.h 2018-06-01 20:36:00.000000000 +0000 @@ -1,3 +1,28 @@ +/* + * RetroShare C++ File lists IO methods. + * + * file_sharing/file_tree.h + * + * Copyright 2017 by csoler + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License Version 2 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + * USA. + * + * Please report all bugs and problems to "retroshare.project@gmail.com". + * + */ + #include "retroshare/rsfiles.h" class FileTreeImpl: public FileTree diff -Nru retroshare-0.6.4/src/libretroshare/src/ft/ftcontroller.cc retroshare-0.6.4/src/libretroshare/src/ft/ftcontroller.cc --- retroshare-0.6.4/src/libretroshare/src/ft/ftcontroller.cc 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/libretroshare/src/ft/ftcontroller.cc 2018-06-01 20:36:00.000000000 +0000 @@ -88,16 +88,13 @@ return; } -ftFileControl::ftFileControl(std::string fname, - std::string tmppath, std::string dest, - uint64_t size, const RsFileHash &hash, TransferRequestFlags flags, - ftFileCreator *fc, ftTransferModule *tm) - :mName(fname), mCurrentPath(tmppath), mDestination(dest), - mTransfer(tm), mCreator(fc), mState(DOWNLOADING), mHash(hash), - mSize(size), mFlags(flags), mCreateTime(0), mQueuePriority(0), mQueuePosition(0) -{ - return; -} +ftFileControl::ftFileControl(const std::string& fname, const std::string& tmppath, const std::string& dest + , uint64_t size, const RsFileHash &hash, TransferRequestFlags flags + , ftFileCreator *fc, ftTransferModule *tm) + : mName(fname), mCurrentPath(tmppath), mDestination(dest) + , mTransfer(tm), mCreator(fc), mState(DOWNLOADING), mHash(hash) + , mSize(size), mFlags(flags), mCreateTime(0), mQueuePriority(0), mQueuePosition(0) +{} ftController::ftController(ftDataMultiplex *dm, p3ServiceControl *sc, uint32_t ftServiceId) : p3Config(), @@ -1475,24 +1472,24 @@ /* check it is not a subdir of download / shared directories (BAD) - TODO */ { - RsStackMutex stack(ctrlMutex); + RsStackMutex stack(ctrlMutex); - path = RsDirUtil::convertPathToUnix(path); + path = RsDirUtil::convertPathToUnix(path); - if (!path.find(mDownloadPath)) { - return false; - } + if (path.find(mDownloadPath) != std::string::npos) { + return false; + } - if (rsFiles) { - std::list::iterator it; - std::list dirs; - rsFiles->getSharedDirectories(dirs); - for (it = dirs.begin(); it != dirs.end(); ++it) { - if (!path.find((*it).filename)) { - return false; - } - } - } + if (rsFiles) { + std::list::iterator it; + std::list dirs; + rsFiles->getSharedDirectories(dirs); + for (it = dirs.begin(); it != dirs.end(); ++it) { + if (path.find((*it).filename) != std::string::npos) { + return false; + } + } + } } /* check if it exists */ diff -Nru retroshare-0.6.4/src/libretroshare/src/ft/ftcontroller.h retroshare-0.6.4/src/libretroshare/src/ft/ftcontroller.h --- retroshare-0.6.4/src/libretroshare/src/ft/ftcontroller.h 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/libretroshare/src/ft/ftcontroller.h 2018-06-01 20:36:00.000000000 +0000 @@ -73,9 +73,9 @@ }; ftFileControl(); - ftFileControl(std::string fname, std::string tmppath, std::string dest, - uint64_t size, const RsFileHash& hash, TransferRequestFlags flags, - ftFileCreator *fc, ftTransferModule *tm); + ftFileControl( const std::string& fname, const std::string& tmppath, const std::string& dest + , uint64_t size, const RsFileHash& hash, TransferRequestFlags flags + , ftFileCreator *fc, ftTransferModule *tm); std::string mName; std::string mCurrentPath; /* current full path (including name) */ @@ -175,8 +175,8 @@ void FileDownloads(std::list &hashs); /* Directory Handling */ - bool setDownloadDirectory(std::string path); - bool setPartialsDirectory(std::string path); + bool setDownloadDirectory(std::string path); + bool setPartialsDirectory(std::string path); std::string getDownloadDirectory(); std::string getPartialsDirectory(); bool FileDetails(const RsFileHash &hash, FileInfo &info); diff -Nru retroshare-0.6.4/src/libretroshare/src/ft/ftserver.cc retroshare-0.6.4/src/libretroshare/src/ft/ftserver.cc --- retroshare-0.6.4/src/libretroshare/src/ft/ftserver.cc 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/libretroshare/src/ft/ftserver.cc 2018-06-01 20:36:00.000000000 +0000 @@ -23,35 +23,40 @@ * */ -#include -#include -#include "util/rsdebug.h" -#include "util/rsdir.h" -#include "util/rsprint.h" #include "crypto/chacha20.h" -#include "retroshare/rstypes.h" -#include "retroshare/rspeers.h" //const int ftserverzone = 29539; #include "file_sharing/p3filelists.h" -#include "ft/ftturtlefiletransferitem.h" -#include "ft/ftserver.h" -#include "ft/ftextralist.h" -#include "ft/ftfilesearch.h" #include "ft/ftcontroller.h" -#include "ft/ftfileprovider.h" #include "ft/ftdatamultiplex.h" //#include "ft/ftdwlqueue.h" -#include "turtle/p3turtle.h" -#include "pqi/p3notify.h" -#include "rsserver/p3face.h" +#include "ft/ftextralist.h" +#include "ft/ftfileprovider.h" +#include "ft/ftfilesearch.h" +#include "ft/ftserver.h" +#include "ft/ftturtlefiletransferitem.h" -#include "pqi/pqi.h" #include "pqi/p3linkmgr.h" +#include "pqi/p3notify.h" +#include "pqi/pqi.h" + +#include "retroshare/rstypes.h" +#include "retroshare/rspeers.h" #include "rsitems/rsfiletransferitems.h" #include "rsitems/rsserviceids.h" +#include "rsserver/p3face.h" +#include "rsserver/rsaccounts.h" +#include "turtle/p3turtle.h" + +#include "util/rsdebug.h" +#include "util/rsdir.h" +#include "util/rsprint.h" + +#include +#include + /*** * #define SERVER_DEBUG 1 * #define SERVER_DEBUG_CACHE 1 @@ -145,9 +150,19 @@ /* make Controller */ mFtController = new ftController(mFtDataplex, mServiceCtrl, getServiceInfo().mServiceType); mFtController -> setFtSearchNExtra(mFtSearch, mFtExtra); - std::string tmppath = "."; - mFtController->setPartialsDirectory(tmppath); - mFtController->setDownloadDirectory(tmppath); + + std::string emergencySaveDir = rsAccounts->PathAccountDirectory(); + std::string emergencyPartialsDir = rsAccounts->PathAccountDirectory(); + if (emergencySaveDir != "") + { + emergencySaveDir += "/"; + emergencyPartialsDir += "/"; + } + emergencySaveDir += "Downloads"; + emergencyPartialsDir += "Partials"; + + mFtController->setDownloadDirectory(emergencySaveDir); + mFtController->setPartialsDirectory(emergencyPartialsDir); /* complete search setup */ mFtSearch->addSearchMode(mFtExtra, RS_FILE_HINTS_EXTRA); @@ -412,9 +427,9 @@ } /* Directory Handling */ -void ftServer::setDownloadDirectory(std::string path) +bool ftServer::setDownloadDirectory(std::string path) { - mFtController->setDownloadDirectory(path); + return mFtController->setDownloadDirectory(path); } std::string ftServer::getDownloadDirectory() @@ -422,9 +437,9 @@ return mFtController->getDownloadDirectory(); } -void ftServer::setPartialsDirectory(std::string path) +bool ftServer::setPartialsDirectory(std::string path) { - mFtController->setPartialsDirectory(path); + return mFtController->setPartialsDirectory(path); } std::string ftServer::getPartialsDirectory() diff -Nru retroshare-0.6.4/src/libretroshare/src/ft/ftserver.h retroshare-0.6.4/src/libretroshare/src/ft/ftserver.h --- retroshare-0.6.4/src/libretroshare/src/ft/ftserver.h 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/libretroshare/src/ft/ftserver.h 2018-06-01 20:36:00.000000000 +0000 @@ -202,8 +202,8 @@ * Directory Handling ***/ virtual void requestDirUpdate(void *ref) ; // triggers the update of the given reference. Used when browsing. - virtual void setDownloadDirectory(std::string path); - virtual void setPartialsDirectory(std::string path); + virtual bool setDownloadDirectory(std::string path); + virtual bool setPartialsDirectory(std::string path); virtual std::string getDownloadDirectory(); virtual std::string getPartialsDirectory(); diff -Nru retroshare-0.6.4/src/libretroshare/src/grouter/p3grouter.cc retroshare-0.6.4/src/libretroshare/src/grouter/p3grouter.cc --- retroshare-0.6.4/src/libretroshare/src/grouter/p3grouter.cc 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/libretroshare/src/grouter/p3grouter.cc 2018-06-01 20:36:00.000000000 +0000 @@ -540,7 +540,7 @@ void GRouterTunnelInfo::removeVirtualPeer(const TurtleVirtualPeerId& vpid) { - std::set::iterator it = virtual_peers.find(vpid) ; + std::set::iterator it = virtual_peers.find(vpid) ; if(it == virtual_peers.end()) { diff -Nru retroshare-0.6.4/src/libretroshare/src/gxs/rsdataservice.cc retroshare-0.6.4/src/libretroshare/src/gxs/rsdataservice.cc --- retroshare-0.6.4/src/libretroshare/src/gxs/rsdataservice.cc 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/libretroshare/src/gxs/rsdataservice.cc 2018-06-01 20:36:00.000000000 +0000 @@ -952,6 +952,8 @@ if(it != mGrpMetaDataCache.end()) *(it->second) = meta ; + else + mGrpMetaDataCache[meta.mGroupId] = new RsGxsGrpMetaData(meta) ; } void RsDataService::locked_clearGrpMetaCache(const RsGxsGroupId& gid) diff -Nru retroshare-0.6.4/src/libretroshare/src/pqi/p3historymgr.cc retroshare-0.6.4/src/libretroshare/src/pqi/p3historymgr.cc --- retroshare-0.6.4/src/libretroshare/src/pqi/p3historymgr.cc 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/libretroshare/src/pqi/p3historymgr.cc 2018-06-01 20:36:00.000000000 +0000 @@ -67,7 +67,7 @@ /***** p3HistoryMgr *****/ -//void p3HistoryMgr::addMessage(bool incoming, const RsPeerId &chatPeerId, const RsPeerId &peerId, const RsChatMsgItem *chatItem) +//void p3HistoryMgr::addMessage(bool incoming, const RsPeerId &chatPeerId, const RsPeerId &msgPeerId, const RsChatMsgItem *chatItem) void p3HistoryMgr::addMessage(const ChatMessage& cm) { uint32_t addMsgId = 0; @@ -84,48 +84,48 @@ RsStackMutex stack(mHistoryMtx); /********** STACK LOCKED MTX ******/ - RsPeerId peerId; // id of sending peer - RsPeerId chatPeerId; // id of chat endpoint - std::string peerName; //name of sending peer - - bool enabled = false; - if (cm.chat_id.isBroadcast() && mPublicEnable == true) { - peerName = rsPeers->getPeerName(cm.broadcast_peer_id); - enabled = true; + RsPeerId msgPeerId; // id of sending peer + RsPeerId chatPeerId; // id of chat endpoint + std::string peerName; //name of sending peer + + bool enabled = false; + if (cm.chat_id.isBroadcast() && mPublicEnable == true) { + peerName = rsPeers->getPeerName(cm.broadcast_peer_id); + enabled = true; + } + if (cm.chat_id.isPeerId() && mPrivateEnable == true) { + msgPeerId = cm.incoming ? cm.chat_id.toPeerId() : rsPeers->getOwnId(); + peerName = rsPeers->getPeerName(msgPeerId); + enabled = true; + } + if (cm.chat_id.isLobbyId() && mLobbyEnable == true) { + peerName = cm.lobby_peer_gxs_id.toStdString(); + enabled = true; } - if (cm.chat_id.isPeerId() && mPrivateEnable == true) { - peerId = cm.incoming ? cm.chat_id.toPeerId() : rsPeers->getOwnId(); - peerName = rsPeers->getPeerName(peerId); - enabled = true; - } - if (cm.chat_id.isLobbyId() && mLobbyEnable == true) { - peerName = cm.lobby_peer_gxs_id.toStdString(); - enabled = true; - } - if(cm.chat_id.isDistantChatId()) - { - DistantChatPeerInfo dcpinfo; - if (rsMsgs->getDistantChatStatus(cm.chat_id.toDistantChatId(), dcpinfo)) - peerName = cm.chat_id.toPeerId().toStdString(); - enabled = true; - } + if(cm.chat_id.isDistantChatId()) + { + DistantChatPeerInfo dcpinfo; + if (rsMsgs->getDistantChatStatus(cm.chat_id.toDistantChatId(), dcpinfo)) + peerName = cm.chat_id.toPeerId().toStdString(); + enabled = true; + } - if(enabled == false) - return; + if(enabled == false) + return; - if(!chatIdToVirtualPeerId(cm.chat_id, chatPeerId)) - return; + if(!chatIdToVirtualPeerId(cm.chat_id, chatPeerId)) + return; RsHistoryMsgItem* item = new RsHistoryMsgItem; item->chatPeerId = chatPeerId; - item->incoming = cm.incoming; - item->peerId = peerId; - item->peerName = peerName; - item->sendTime = cm.sendTime; - item->recvTime = cm.recvTime; + item->incoming = cm.incoming; + item->msgPeerId = msgPeerId; + item->peerName = peerName; + item->sendTime = cm.sendTime; + item->recvTime = cm.recvTime; - item->message = cm.msg ; + item->message = cm.msg ; //librs::util::ConvertUtf16ToUtf8(chatItem->message, item->message); std::map >::iterator mit = mMessages.find(item->chatPeerId); @@ -138,7 +138,7 @@ uint32_t limit; if (chatPeerId.isNull()) limit = mPublicSaveCount; - else if (cm.chat_id.isLobbyId()) + else if (cm.chat_id.isLobbyId()) limit = mLobbySaveCount; else limit = mPrivateSaveCount; @@ -424,7 +424,7 @@ msg.msgId = item->msgId; msg.chatPeerId = item->chatPeerId; msg.incoming = item->incoming; - msg.peerId = item->peerId; + msg.peerId = item->msgPeerId; msg.peerName = item->peerName; msg.sendTime = item->sendTime; msg.recvTime = item->recvTime; diff -Nru retroshare-0.6.4/src/libretroshare/src/pqi/p3netmgr.cc retroshare-0.6.4/src/libretroshare/src/pqi/p3netmgr.cc --- retroshare-0.6.4/src/libretroshare/src/pqi/p3netmgr.cc 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/libretroshare/src/pqi/p3netmgr.cc 2018-06-01 20:36:00.000000000 +0000 @@ -987,8 +987,8 @@ bool addrChanged = false; bool validAddr = false; - struct sockaddr_storage prefAddr; - struct sockaddr_storage oldAddr; + sockaddr_storage prefAddr; + sockaddr_storage oldAddr; if (mNetMode & RS_NET_MODE_TRY_LOOPBACK) { @@ -996,7 +996,7 @@ std::cerr << "p3NetMgrIMPL::checkNetAddress() LOOPBACK ... forcing to 127.0.0.1"; std::cerr << std::endl; #endif - sockaddr_storage_ipv4_aton(prefAddr, "127.0.0.1"); + sockaddr_storage_ipv4_aton(prefAddr, "127.0.0.1"); validAddr = true; } else @@ -1012,7 +1012,7 @@ std::vector addrs; if (getLocalAddresses(addrs)) { - for (auto it = addrs.begin(); it!=addrs.end(); ++it) + for (auto it = addrs.begin(); it != addrs.end(); ++it) { sockaddr_storage& addr(*it); if( sockaddr_storage_isValidNet(addr) && @@ -1060,8 +1060,8 @@ { RS_STACK_MUTEX(mNetMtx); - - oldAddr = mLocalAddr; + + sockaddr_storage_copy(mLocalAddr, oldAddr); addrChanged = !sockaddr_storage_sameip(prefAddr, mLocalAddr); #ifdef NETMGR_DEBUG_TICK @@ -1087,7 +1087,7 @@ // update address. sockaddr_storage_copyip(mLocalAddr, prefAddr); - mNetFlags.mLocalAddr = mLocalAddr; + sockaddr_storage_copy(mLocalAddr, mNetFlags.mLocalAddr); if(sockaddr_storage_isLoopbackNet(mLocalAddr)) { @@ -1137,6 +1137,7 @@ if (sockaddr_storage_sameip(mLocalAddr, mExtAddr)) { sockaddr_storage_setport(mExtAddr, sockaddr_storage_port(mLocalAddr)); + addrChanged = true; } // ensure that address family is set, otherwise windows Barfs. diff -Nru retroshare-0.6.4/src/libretroshare/src/pqi/p3peermgr.cc retroshare-0.6.4/src/libretroshare/src/pqi/p3peermgr.cc --- retroshare-0.6.4/src/libretroshare/src/pqi/p3peermgr.cc 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/libretroshare/src/pqi/p3peermgr.cc 2018-06-01 20:36:00.000000000 +0000 @@ -1239,11 +1239,11 @@ sockaddr_storage_copy(pExtAddr, extAddr); sockaddr_storage_ipv6_to_ipv4(extAddr); -#ifdef PEER_DEBUG +//#ifdef PEER_DEBUG std::cerr << "p3PeerMgrIMPL::UpdateOwnAddress(" << sockaddr_storage_tostring(localAddr) << ", " << sockaddr_storage_tostring(extAddr) << ")" << std::endl; -#endif +//#endif if( rsBanList && !rsBanList->isAddressAccepted(localAddr, @@ -1428,21 +1428,25 @@ return changed; } -bool p3PeerMgrIMPL::setExtAddress(const RsPeerId &id, const struct sockaddr_storage &addr) +bool p3PeerMgrIMPL::setExtAddress( const RsPeerId &id, + const sockaddr_storage &addr ) { - bool changed = false; - uint32_t check_res = 0 ; + bool changed = false; + uint32_t check_res = 0; - if(rsBanList!=NULL && !rsBanList->isAddressAccepted(addr,RSBANLIST_CHECKING_FLAGS_BLACKLIST,&check_res)) - { - std::cerr << "(SS) trying to set external contact address for peer " << id << " to a banned address " << sockaddr_storage_iptostring(addr )<< std::endl; - return false ; - } + if( rsBanList!=NULL && !rsBanList->isAddressAccepted( + addr, RSBANLIST_CHECKING_FLAGS_BLACKLIST, &check_res) ) + { + std::cerr << "(SS) trying to set external contact address for peer " + << id << " to a banned address " + << sockaddr_storage_iptostring(addr) << std::endl; + return false; + } if (id == AuthSSL::getAuthSSL()->OwnId()) { { - RsStackMutex stack(mPeerMtx); /****** STACK LOCK MUTEX *******/ + RS_STACK_MUTEX(mPeerMtx); if (!sockaddr_storage_same(mOwnState.serveraddr, addr)) { mOwnState.serveraddr = addr; @@ -1455,7 +1459,7 @@ return changed; } - RsStackMutex stack(mPeerMtx); /****** STACK LOCK MUTEX *******/ + RS_STACK_MUTEX(mPeerMtx); /* check if it is a friend */ std::map::iterator it; if (mFriendList.end() == (it = mFriendList.find(id))) @@ -1463,7 +1467,9 @@ if (mOthersList.end() == (it = mOthersList.find(id))) { #ifdef PEER_DEBUG - std::cerr << "p3PeerMgrIMPL::setLocalAddress() cannot add addres info : peer id not found in friend list id: " << id << std::endl; + std::cerr << "p3PeerMgrIMPL::setLocalAddress() cannot add addres " + << "info : peer id not found in friend list id: " << id + << std::endl; #endif return false; } @@ -2014,7 +2020,7 @@ RsPeerNetItem *item = new RsPeerNetItem(); item->clear(); - item->peerId = getOwnId(); + item->nodePeerId = getOwnId(); item->pgpId = mOwnState.gpg_id; item->location = mOwnState.location; @@ -2065,7 +2071,7 @@ item = new RsPeerNetItem(); item->clear(); - item->peerId = it->first; + item->nodePeerId = it->first; item->pgpId = (it->second).gpg_id; item->location = (it->second).location; item->netMode = (it->second).netMode; @@ -2265,7 +2271,7 @@ RsPeerNetItem *pitem = dynamic_cast(*it); if (pitem) { - RsPeerId peer_id = pitem->peerId ; + RsPeerId peer_id = pitem->nodePeerId ; RsPgpId peer_pgp_id = pitem->pgpId ; if (peer_id == ownId) @@ -2292,7 +2298,7 @@ /* ************* */ // permission flags is used as a mask for the existing perms, so we set it to 0xffff addFriend(peer_id, peer_pgp_id, pitem->netMode, pitem->vs_disc, pitem->vs_dht, pitem->lastContact, RS_NODE_PERM_ALL); - setLocation(pitem->peerId, pitem->location); + setLocation(pitem->nodePeerId, pitem->location); } if (pitem->netMode == RS_NET_MODE_HIDDEN) diff -Nru retroshare-0.6.4/src/libretroshare/src/pqi/pqissludp.cc retroshare-0.6.4/src/libretroshare/src/pqi/pqissludp.cc --- retroshare-0.6.4/src/libretroshare/src/pqi/pqissludp.cc 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/libretroshare/src/pqi/pqissludp.cc 2018-06-01 20:36:00.000000000 +0000 @@ -227,6 +227,15 @@ return -1; } + if(!sockaddr_storage_ipv6_to_ipv4(remote_addr)) + { + std::cerr << __PRETTY_FUNCTION__ << "Error: remote_addr is not " + << "valid IPv4!" << std::endl; + sockaddr_storage_dump(remote_addr); + print_stacktrace(); + return -EINVAL; + } + mTimeoutTS = time(NULL) + mConnectTimeout; //std::cerr << "Setting Connect Timeout " << mConnectTimeout << " Seconds into Future " << std::endl; //std::cerr << " Connect Period is:" << mConnectPeriod << std::endl; @@ -254,32 +263,22 @@ struct sockaddr_in proxyaddr; struct sockaddr_in remoteaddr; - bool nonIpV4 = false; - if(!sockaddr_storage_ipv6_to_ipv4(remote_addr)) - { - nonIpV4 = true; - std::cerr << __PRETTY_FUNCTION__ << "Error: remote_addr is not " - << "valid IPv4!" << std::endl; - sockaddr_storage_dump(remote_addr); - } if(!sockaddr_storage_ipv6_to_ipv4(mConnectSrcAddr)) { - nonIpV4 = true; std::cerr << __PRETTY_FUNCTION__ << "Error: mConnectSrcAddr is " << "not valid IPv4!" << std::endl; sockaddr_storage_dump(mConnectSrcAddr); + print_stacktrace(); + return -EINVAL; } if(!sockaddr_storage_ipv6_to_ipv4(mConnectProxyAddr)) { - nonIpV4 = true; std::cerr << __PRETTY_FUNCTION__ << "Error: mConnectProxyAddr " << "is not valid IPv4!" << std::endl; sockaddr_storage_dump(mConnectProxyAddr); - } - if(!nonIpV4) - { print_stacktrace(); return -EINVAL; + } struct sockaddr_in *rap = (struct sockaddr_in *) &remote_addr; @@ -301,7 +300,6 @@ err = tou_connect_via_relay(sockfd, &srcaddr, &proxyaddr, &remoteaddr); } - /*** It seems that the UDP Layer sees x 1.2 the traffic of the SSL layer. * We need to compensate somewhere... we drop the maximum traffic to 75% of limit diff -Nru retroshare-0.6.4/src/libretroshare/src/retroshare/rsfiles.h retroshare-0.6.4/src/libretroshare/src/retroshare/rsfiles.h --- retroshare-0.6.4/src/libretroshare/src/retroshare/rsfiles.h 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/libretroshare/src/retroshare/rsfiles.h 2018-06-01 20:36:00.000000000 +0000 @@ -278,8 +278,8 @@ ***/ virtual void requestDirUpdate(void *ref) =0 ; // triggers the update of the given reference. Used when browsing. - virtual void setDownloadDirectory(std::string path) = 0; - virtual void setPartialsDirectory(std::string path) = 0; + virtual bool setDownloadDirectory(std::string path) = 0; + virtual bool setPartialsDirectory(std::string path) = 0; virtual std::string getDownloadDirectory() = 0; virtual std::string getPartialsDirectory() = 0; diff -Nru retroshare-0.6.4/src/libretroshare/src/retroshare/rsgxscommon.h retroshare-0.6.4/src/libretroshare/src/retroshare/rsgxscommon.h --- retroshare-0.6.4/src/libretroshare/src/retroshare/rsgxscommon.h 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/libretroshare/src/retroshare/rsgxscommon.h 2018-06-01 20:36:00.000000000 +0000 @@ -124,24 +124,27 @@ }; -class RsGxsCommentService +struct RsGxsCommentService { - public: - - RsGxsCommentService() { return; } -virtual ~RsGxsCommentService() { return; } - -virtual bool getCommentData(const uint32_t &token, std::vector &comments) = 0; -virtual bool getRelatedComments(const uint32_t &token, std::vector &comments) = 0; - -//virtual bool getDetailedCommentData(const uint32_t &token, std::vector &comments); - -virtual bool createComment(uint32_t &token, RsGxsComment &comment) = 0; -virtual bool createVote(uint32_t &token, RsGxsVote &vote) = 0; - -virtual bool acknowledgeComment(const uint32_t& token, std::pair& msgId) = 0; -virtual bool acknowledgeVote(const uint32_t& token, std::pair& msgId) = 0; + RsGxsCommentService() {} + virtual ~RsGxsCommentService() {} + /** Get previously requested comment data with token */ + virtual bool getCommentData( uint32_t token, + std::vector &comments ) = 0; + virtual bool getRelatedComments( uint32_t token, + std::vector &comments ) = 0; + + virtual bool createComment(uint32_t &token, RsGxsComment &comment) = 0; + virtual bool createVote(uint32_t &token, RsGxsVote &vote) = 0; + + virtual bool acknowledgeComment( + uint32_t token, + std::pair& msgId ) = 0; + + virtual bool acknowledgeVote( + uint32_t token, + std::pair& msgId ) = 0; }; diff -Nru retroshare-0.6.4/src/libretroshare/src/retroshare/rsversion.h retroshare-0.6.4/src/libretroshare/src/retroshare/rsversion.h --- retroshare-0.6.4/src/libretroshare/src/retroshare/rsversion.h 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/libretroshare/src/retroshare/rsversion.h 2018-06-01 20:36:00.000000000 +0000 @@ -6,7 +6,7 @@ // The revision number should be the 4 first bytes of the git revision hash, which is obtained using: // git log --pretty="%H" | head -1 | cut -c1-8 // -// Do not forget the 0x, since the RS_REVISION_NUMBER 0x676c0701 +// Do not forget the 0x, since the RS_REVISION_NUMBER 0x6bb1d3c5 // #define RS_REVISION_STRING "$REV$" -#define RS_REVISION_NUMBER 0x676c0701 +#define RS_REVISION_NUMBER 0x6bb1d3c5 diff -Nru retroshare-0.6.4/src/libretroshare/src/rsitems/rsbanlistitems.cc retroshare-0.6.4/src/libretroshare/src/rsitems/rsbanlistitems.cc --- retroshare-0.6.4/src/libretroshare/src/rsitems/rsbanlistitems.cc 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/libretroshare/src/rsitems/rsbanlistitems.cc 2018-06-01 20:36:00.000000000 +0000 @@ -48,8 +48,8 @@ void RsBanListConfigItem::serial_process(RsGenericSerializer::SerializeJob j,RsGenericSerializer::SerializeContext& ctx) { - RsTypeSerializer::serial_process(j,ctx,type,"type") ; - RsTypeSerializer::serial_process (j,ctx,peerId,"peerId") ; + RsTypeSerializer::serial_process(j,ctx,banListType,"type") ; + RsTypeSerializer::serial_process (j,ctx,banListPeerId,"peerId") ; RsTypeSerializer::serial_process (j,ctx,update_time,"update_time") ; RsTypeSerializer::serial_process (j,ctx,banned_peers,"banned_peers") ; } diff -Nru retroshare-0.6.4/src/libretroshare/src/rsitems/rsbanlistitems.h retroshare-0.6.4/src/libretroshare/src/rsitems/rsbanlistitems.h --- retroshare-0.6.4/src/libretroshare/src/rsitems/rsbanlistitems.h 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/libretroshare/src/rsitems/rsbanlistitems.h 2018-06-01 20:36:00.000000000 +0000 @@ -60,18 +60,20 @@ class RsBanListConfigItem: public RsItem { public: - RsBanListConfigItem() - :RsItem(RS_PKT_VERSION_SERVICE, RS_SERVICE_TYPE_BANLIST, RS_PKT_SUBTYPE_BANLIST_CONFIG_ITEM) {} + RsBanListConfigItem() + : RsItem(RS_PKT_VERSION_SERVICE, RS_SERVICE_TYPE_BANLIST, RS_PKT_SUBTYPE_BANLIST_CONFIG_ITEM) + , banListType(0), update_time(0) + {} - virtual ~RsBanListConfigItem(){} - virtual void clear() { banned_peers.TlvClear() ; } + virtual ~RsBanListConfigItem(){} + virtual void clear() { banned_peers.TlvClear() ; } void serial_process(RsGenericSerializer::SerializeJob j,RsGenericSerializer::SerializeContext& ctx); - uint32_t type ; - RsPeerId peerId ; - time_t update_time ; - RsTlvBanList banned_peers; + uint32_t banListType ; + RsPeerId banListPeerId ; + time_t update_time ; + RsTlvBanList banned_peers; }; class RsBanListSerialiser: public RsServiceSerializer diff -Nru retroshare-0.6.4/src/libretroshare/src/rsitems/rsconfigitems.cc retroshare-0.6.4/src/libretroshare/src/rsitems/rsconfigitems.cc --- retroshare-0.6.4/src/libretroshare/src/rsitems/rsconfigitems.cc 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/libretroshare/src/rsitems/rsconfigitems.cc 2018-06-01 20:36:00.000000000 +0000 @@ -137,9 +137,9 @@ void RsPeerNetItem::clear() { - peerId.clear(); - pgpId.clear(); - location.clear(); + nodePeerId.clear(); + pgpId.clear(); + location.clear(); netMode = 0; vs_disc = 0; vs_dht = 0; @@ -160,7 +160,7 @@ } void RsPeerNetItem::serial_process(RsGenericSerializer::SerializeJob j,RsGenericSerializer::SerializeContext& ctx) { - RsTypeSerializer::serial_process(j,ctx,peerId,"peerId") ; + RsTypeSerializer::serial_process(j,ctx,nodePeerId,"peerId") ; RsTypeSerializer::serial_process(j,ctx,pgpId,"pgpId") ; RsTypeSerializer::serial_process(j,ctx,TLV_TYPE_STR_LOCATION,location,"location") ; diff -Nru retroshare-0.6.4/src/libretroshare/src/rsitems/rsconfigitems.h retroshare-0.6.4/src/libretroshare/src/rsitems/rsconfigitems.h --- retroshare-0.6.4/src/libretroshare/src/rsitems/rsconfigitems.h 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/libretroshare/src/rsitems/rsconfigitems.h 2018-06-01 20:36:00.000000000 +0000 @@ -84,7 +84,7 @@ virtual void serial_process(RsGenericSerializer::SerializeJob j,RsGenericSerializer::SerializeContext& ctx); /* networking information */ - RsPeerId peerId; /* Mandatory */ + RsPeerId nodePeerId; /* Mandatory */ RsPgpId pgpId; /* Mandatory */ std::string location; /* Mandatory */ uint32_t netMode; /* Mandatory */ diff -Nru retroshare-0.6.4/src/libretroshare/src/rsitems/rshistoryitems.cc retroshare-0.6.4/src/libretroshare/src/rsitems/rshistoryitems.cc --- retroshare-0.6.4/src/libretroshare/src/rsitems/rshistoryitems.cc 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/libretroshare/src/rsitems/rshistoryitems.cc 2018-06-01 20:36:00.000000000 +0000 @@ -44,7 +44,7 @@ RsTypeSerializer::serial_process(j,ctx,version,"version") ; RsTypeSerializer::serial_process (j,ctx,chatPeerId,"chatPeerId") ; RsTypeSerializer::serial_process (j,ctx,incoming,"incoming") ; - RsTypeSerializer::serial_process (j,ctx,peerId,"peerId") ; + RsTypeSerializer::serial_process (j,ctx,msgPeerId,"peerId") ; RsTypeSerializer::serial_process (j,ctx,TLV_TYPE_STR_NAME,peerName,"peerName") ; RsTypeSerializer::serial_process(j,ctx,sendTime,"sendTime") ; RsTypeSerializer::serial_process(j,ctx,recvTime,"recvTime") ; diff -Nru retroshare-0.6.4/src/libretroshare/src/rsitems/rshistoryitems.h retroshare-0.6.4/src/libretroshare/src/rsitems/rshistoryitems.h --- retroshare-0.6.4/src/libretroshare/src/rsitems/rshistoryitems.h 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/libretroshare/src/rsitems/rshistoryitems.h 2018-06-01 20:36:00.000000000 +0000 @@ -46,7 +46,7 @@ RsPeerId chatPeerId; // empty for global chat bool incoming; - RsPeerId peerId; + RsPeerId msgPeerId; std::string peerName; uint32_t sendTime; uint32_t recvTime; diff -Nru retroshare-0.6.4/src/libretroshare/src/rsitems/rsphotoitems.cc retroshare-0.6.4/src/libretroshare/src/rsitems/rsphotoitems.cc --- retroshare-0.6.4/src/libretroshare/src/rsitems/rsphotoitems.cc 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/libretroshare/src/rsitems/rsphotoitems.cc 2018-06-01 20:36:00.000000000 +0000 @@ -61,24 +61,23 @@ RsTypeSerializer::serial_process(j,ctx,TLV_TYPE_STR_LOCATION, album.mWhere, "mWhere"); RsTypeSerializer::serial_process(j,ctx,TLV_TYPE_STR_PIC_TYPE, album.mThumbnail.type,"mThumbnail.type"); - RsTlvBinaryDataRef b(RS_SERVICE_GXS_TYPE_PHOTO, album.mThumbnail.data,album.mThumbnail.size); - - RsTypeSerializer::serial_process(j,ctx,b,"thumbnail binary data") ; + RsTlvBinaryDataRef b(RS_SERVICE_GXS_TYPE_PHOTO, album.mThumbnail.data, album.mThumbnail.size); + RsTypeSerializer::serial_process(j, ctx, b, "thumbnail binary data") ; } void RsGxsPhotoPhotoItem::serial_process(RsGenericSerializer::SerializeJob j,RsGenericSerializer::SerializeContext& ctx) { - RsTypeSerializer::serial_process(j,ctx, TLV_TYPE_STR_CAPTION, photo.mCaption); - RsTypeSerializer::serial_process(j,ctx, TLV_TYPE_STR_CATEGORY, photo.mCategory); - RsTypeSerializer::serial_process(j,ctx, TLV_TYPE_STR_DESCR, photo.mDescription); - RsTypeSerializer::serial_process(j,ctx, TLV_TYPE_STR_HASH_TAG, photo.mHashTags); - RsTypeSerializer::serial_process(j,ctx, TLV_TYPE_STR_MSG, photo.mOther); - RsTypeSerializer::serial_process(j,ctx, TLV_TYPE_STR_PIC_AUTH, photo.mPhotographer); - RsTypeSerializer::serial_process(j,ctx, TLV_TYPE_STR_DATE, photo.mWhen); - RsTypeSerializer::serial_process(j,ctx, TLV_TYPE_STR_LOCATION, photo.mWhere); - RsTypeSerializer::serial_process(j,ctx, TLV_TYPE_STR_PIC_TYPE, photo.mThumbnail.type); + RsTypeSerializer::serial_process(j, ctx, TLV_TYPE_STR_CAPTION, photo.mCaption, "mCaption"); + RsTypeSerializer::serial_process(j, ctx, TLV_TYPE_STR_CATEGORY, photo.mCategory, "mCategory"); + RsTypeSerializer::serial_process(j, ctx, TLV_TYPE_STR_DESCR, photo.mDescription, "mDescription"); + RsTypeSerializer::serial_process(j, ctx, TLV_TYPE_STR_HASH_TAG, photo.mHashTags, "mHashTags"); + RsTypeSerializer::serial_process(j, ctx, TLV_TYPE_STR_MSG, photo.mOther, "mOther"); + RsTypeSerializer::serial_process(j, ctx, TLV_TYPE_STR_PIC_AUTH, photo.mPhotographer, "mPhotographer"); + RsTypeSerializer::serial_process(j, ctx, TLV_TYPE_STR_DATE, photo.mWhen, "mWhen"); + RsTypeSerializer::serial_process(j, ctx, TLV_TYPE_STR_LOCATION, photo.mWhere, "mWhere"); + RsTypeSerializer::serial_process(j, ctx, TLV_TYPE_STR_PIC_TYPE, photo.mThumbnail.type, "mThumbnail.type"); - RsTlvBinaryDataRef b(RS_SERVICE_GXS_TYPE_PHOTO,photo.mThumbnail.data, photo.mThumbnail.size); - RsTypeSerializer::serial_process(j,ctx, b, "mThumbnail") ; + RsTlvBinaryDataRef b(RS_SERVICE_GXS_TYPE_PHOTO, photo.mThumbnail.data, photo.mThumbnail.size); + RsTypeSerializer::serial_process(j, ctx, b, "mThumbnail") ; } void RsGxsPhotoCommentItem::serial_process(RsGenericSerializer::SerializeJob j,RsGenericSerializer::SerializeContext& ctx) { diff -Nru retroshare-0.6.4/src/libretroshare/src/rsitems/rsphotoitems.h retroshare-0.6.4/src/libretroshare/src/rsitems/rsphotoitems.h --- retroshare-0.6.4/src/libretroshare/src/rsitems/rsphotoitems.h 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/libretroshare/src/rsitems/rsphotoitems.h 2018-06-01 20:36:00.000000000 +0000 @@ -50,7 +50,7 @@ virtual ~RsGxsPhotoAlbumItem() { return;} void clear(); - std::ostream &print(std::ostream &out, uint16_t indent = 0); +// std::ostream &print(std::ostream &out, uint16_t indent = 0); virtual void serial_process(RsGenericSerializer::SerializeJob j,RsGenericSerializer::SerializeContext& ctx); diff -Nru retroshare-0.6.4/src/libretroshare/src/rsserver/p3peers.cc retroshare-0.6.4/src/libretroshare/src/rsserver/p3peers.cc --- retroshare-0.6.4/src/libretroshare/src/rsserver/p3peers.cc 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/libretroshare/src/rsserver/p3peers.cc 2018-06-01 20:36:00.000000000 +0000 @@ -336,8 +336,8 @@ if(!sockaddr_storage_isnull(ps.localaddr)) { sockaddr_storage_ipv6_to_ipv4(ps.localaddr); - d.localAddr = sockaddr_storage_iptostring(ps.localaddr); - d.localPort = sockaddr_storage_port(ps.localaddr); + d.localAddr = sockaddr_storage_iptostring(ps.localaddr); + d.localPort = sockaddr_storage_port(ps.localaddr); } else { diff -Nru retroshare-0.6.4/src/libretroshare/src/rsserver/rsinit.cc retroshare-0.6.4/src/libretroshare/src/rsserver/rsinit.cc --- retroshare-0.6.4/src/libretroshare/src/rsserver/rsinit.cc 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/libretroshare/src/rsserver/rsinit.cc 2018-06-01 20:36:00.000000000 +0000 @@ -1351,11 +1351,11 @@ p3Wiki *mWiki = new p3Wiki(wiki_ds, NULL, mGxsIdService); // create GXS wiki service - RsGxsNetService* wiki_ns = new RsGxsNetService( - RS_SERVICE_GXS_TYPE_WIKI, wiki_ds, nxsMgr, - mWiki, mWiki->getServiceInfo(), - mGxsIdService, mGxsCircles, - pgpAuxUtils); + RsGxsNetService* wiki_ns = new RsGxsNetService( + RS_SERVICE_GXS_TYPE_WIKI, wiki_ds, nxsMgr, + mWiki, mWiki->getServiceInfo(), + mReputations, mGxsCircles, mGxsIdService, + pgpAuxUtils); mWiki->setNetworkExchangeService(wiki_ns) ; #endif diff -Nru retroshare-0.6.4/src/libretroshare/src/rsserver/rsloginhandler.cc retroshare-0.6.4/src/libretroshare/src/rsserver/rsloginhandler.cc --- retroshare-0.6.4/src/libretroshare/src/rsserver/rsloginhandler.cc 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/libretroshare/src/rsserver/rsloginhandler.cc 2018-06-01 20:36:00.000000000 +0000 @@ -109,6 +109,19 @@ NULL, NULL }; +#elif defined(HAS_LIBSECRET) +#include +const SecretSchema *libsecret_get_schema(void) +{ + static const SecretSchema the_schema = { + "org.Retroshare.Password", SECRET_SCHEMA_NONE, + { + { "RetroShare SSL Id", SECRET_SCHEMA_ATTRIBUTE_STRING }, + { "NULL", (SecretSchemaAttributeType)0 }, + } + }; + return &the_schema; +} #endif @@ -209,7 +222,7 @@ #endif if( gnome_keyring_find_password_sync(&my_schema, &passwd,"RetroShare SSL Id",ssl_id.toStdString().c_str(),NULL) == GNOME_KEYRING_RESULT_OK ) { - std::cerr << "Got SSL passwd ********************" /*<< passwd*/ << " from gnome keyring" << std::endl; + std::cout << "Got SSL passwd ********************" /*<< passwd*/ << " from gnome keyring" << std::endl; ssl_passwd = std::string(passwd); return true ; } @@ -220,7 +233,41 @@ #endif return false ; } +#elif defined(HAS_LIBSECRET) + // do synchronous lookup + +#ifdef DEBUG_RSLOGINHANDLER + std::cerr << "Using attribute: " << ssl_id << std::endl; +#endif + + GError *error = NULL; + gchar *password = secret_password_lookup_sync (libsecret_get_schema(), NULL, &error, + "RetroShare SSL Id", ssl_id.toStdString().c_str(), + NULL); + + if (error != NULL) { + g_error_free (error); +#ifdef DEBUG_RSLOGINHANDLER + std::cerr << "Could not get passwd using libsecret: error" << std::endl; +#endif + return false; + } else if (password == NULL) { + /* password will be null, if no matching password found */ +#ifdef DEBUG_RSLOGINHANDLER + std::cerr << "Could not get passwd using libsecret: not found" << std::endl; +#endif + return false; + } else { + std::cout << "Got SSL passwd ********************" /*<< passwd*/ << " using libsecret" << std::endl; + ssl_passwd = std::string(password); + secret_password_free (password); + return true; + } +#ifdef DEBUG_RSLOGINHANDLER + std::cerr << "Could not get passwd from gnome keyring: unknown" << std::endl; +#endif + return false; #else /******************** OSX KeyChain stuff *****************************/ #ifdef __APPLE__ @@ -281,7 +328,7 @@ /******************** OSX KeyChain stuff *****************************/ #endif // APPLE -#endif // HAS_GNOME_KEYRING +#endif // HAS_GNOME_KEYRING / HAS_LIBSECRET #else /******* WINDOWS BELOW *****/ /* try to load from file */ @@ -405,9 +452,9 @@ #ifndef __HAIKU__ #ifndef WINDOWS_SYS /* UNIX */ #if defined(HAS_GNOME_KEYRING) || defined(__FreeBSD__) || defined(__OpenBSD__) - if(GNOME_KEYRING_RESULT_OK == gnome_keyring_store_password_sync(&my_schema, NULL, (gchar*)("RetroShare password for SSL Id "+ssl_id.toStdString()).c_str(),(gchar*)ssl_passwd.c_str(),"RetroShare SSL Id",ssl_id.toStdString().c_str(),NULL)) + if(GNOME_KEYRING_RESULT_OK == gnome_keyring_store_password_sync(&my_schema, NULL, (gchar*)("RetroShare password for SSL Id "+ssl_id.toStdString()).c_str(),(gchar*)ssl_passwd.c_str(),"RetroShare SSL Id",ssl_id.toStdString().c_str(),NULL)) { - std::cerr << "Stored passwd " << "************************" << " into gnome keyring" << std::endl; + std::cout << "Stored passwd " << "************************" << " into gnome keyring" << std::endl; return true ; } else @@ -415,6 +462,24 @@ std::cerr << "Could not store passwd into gnome keyring" << std::endl; return false ; } +#elif defined(HAS_LIBSECRET) + // do synchronous store + + GError *error = NULL; + secret_password_store_sync (libsecret_get_schema(), SECRET_COLLECTION_DEFAULT, + (gchar*)("RetroShare password for SSL Id " + ssl_id.toStdString()).c_str(), + (gchar*)ssl_passwd.c_str(), + NULL, &error, + "RetroShare SSL Id", ssl_id.toStdString().c_str(), + NULL); + + if (error != NULL) { + g_error_free (error); + std::cerr << "Could not store passwd using libsecret" << std::endl; + return false; + } + std::cout << "Stored passwd " << "************************" << " using libsecret" << std::endl; + return true; #else #ifdef __APPLE__ /***************** OSX KEYCHAIN ****************/ @@ -484,7 +549,7 @@ return true; #endif // TODO_CODE_ROTTEN #endif // __APPLE__ -#endif // HAS_GNOME_KEYRING. +#endif // HAS_GNOME_KEYRING / HAS_LIBSECRET #else /* windows */ /* store password encrypted in a file */ @@ -571,7 +636,7 @@ #ifdef HAS_GNOME_KEYRING if(GNOME_KEYRING_RESULT_OK == gnome_keyring_delete_password_sync(&my_schema,"RetroShare SSL Id", ssl_id.toStdString().c_str(),NULL)) { - std::cerr << "Successfully Cleared gnome keyring passwd for SSLID " << ssl_id << std::endl; + std::cout << "Successfully Cleared gnome keyring passwd for SSLID " << ssl_id << std::endl; return true ; } else @@ -579,7 +644,26 @@ std::cerr << "Could not clear gnome keyring passwd for SSLID " << ssl_id << std::endl; return false ; } -#else +#elif defined(HAS_LIBSECRET) + // do synchronous clear + + GError *error = NULL; + gboolean removed = secret_password_clear_sync (libsecret_get_schema(), NULL, &error, + "RetroShare SSL Id", ssl_id.toStdString().c_str(), + NULL); + + if (error != NULL) { + g_error_free (error); + std::cerr << "Could not clearpasswd for SSLID " << ssl_id << " using libsecret: error" << std::endl; + return false ; + } else if (removed == FALSE) { + std::cerr << "Could not clearpasswd for SSLID " << ssl_id << " using libsecret: false" << std::endl; + return false ; + } + + std::cout << "Successfully Cleared passwd for SSLID " << ssl_id << " using libsecret" << std::endl; + return true ; +#else // HAS_GNOME_KEYRING / HAS_LIBSECRET #ifdef __APPLE__ std::cerr << "clearAutoLogin() OSX Version" << std::endl; diff -Nru retroshare-0.6.4/src/libretroshare/src/services/p3banlist.cc retroshare-0.6.4/src/libretroshare/src/services/p3banlist.cc --- retroshare-0.6.4/src/libretroshare/src/services/p3banlist.cc 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/libretroshare/src/services/p3banlist.cc 2018-06-01 20:36:00.000000000 +0000 @@ -735,9 +735,9 @@ { RsBanListConfigItem *item = new RsBanListConfigItem ; - item->type = RSBANLIST_TYPE_PEERLIST ; - item->peerId = it->second.mPeerId ; - item->update_time = it->second.mLastUpdate ; + item->banListType = RSBANLIST_TYPE_PEERLIST ; + item->banListPeerId = it->second.mPeerId ; + item->update_time = it->second.mLastUpdate ; item->banned_peers.TlvClear() ; for(std::map::const_iterator it2 = it->second.mBanPeers.begin();it2!=it->second.mBanPeers.end();++it2) @@ -754,8 +754,8 @@ // Add whitelist RsBanListConfigItem *item = new RsBanListConfigItem ; - item->type = RSBANLIST_TYPE_WHITELIST ; - item->peerId.clear() ; + item->banListType = RSBANLIST_TYPE_WHITELIST ; + item->banListPeerId.clear() ; item->update_time = 0 ; item->banned_peers.TlvClear() ; @@ -773,8 +773,8 @@ item = new RsBanListConfigItem ; - item->type = RSBANLIST_TYPE_BLACKLIST ; - item->peerId.clear(); + item->banListType = RSBANLIST_TYPE_BLACKLIST ; + item->banListPeerId.clear(); item->update_time = 0 ; item->banned_peers.TlvClear() ; @@ -850,11 +850,11 @@ if(citem != NULL) { - if(citem->type == RSBANLIST_TYPE_PEERLIST) + if(citem->banListType == RSBANLIST_TYPE_PEERLIST) { - BanList& bl(mBanSources[citem->peerId]) ; + BanList& bl(mBanSources[citem->banListPeerId]) ; - bl.mPeerId = citem->peerId ; + bl.mPeerId = citem->banListPeerId ; bl.mLastUpdate = citem->update_time ; bl.mBanPeers.clear() ; @@ -870,7 +870,7 @@ std::cerr << "(WW) removed wrong address " << sockaddr_storage_iptostring(blp.addr) << std::endl; } } - else if(citem->type == RSBANLIST_TYPE_BLACKLIST) + else if(citem->banListType == RSBANLIST_TYPE_BLACKLIST) { mBanRanges.clear() ; @@ -885,7 +885,7 @@ std::cerr << "(WW) removed wrong address " << sockaddr_storage_iptostring(blp.addr) << std::endl; } } - else if(citem->type == RSBANLIST_TYPE_WHITELIST) + else if(citem->banListType == RSBANLIST_TYPE_WHITELIST) { mWhiteListedRanges.clear() ; @@ -903,7 +903,7 @@ } } else - std::cerr << "(EE) BanList item unknown type " << citem->type << ". This is a bug." << std::endl; + std::cerr << "(EE) BanList item unknown type " << citem->banListType << ". This is a bug." << std::endl; } delete *it ; diff -Nru retroshare-0.6.4/src/libretroshare/src/services/p3gxschannels.cc retroshare-0.6.4/src/libretroshare/src/services/p3gxschannels.cc --- retroshare-0.6.4/src/libretroshare/src/services/p3gxschannels.cc 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/libretroshare/src/services/p3gxschannels.cc 2018-06-01 20:36:00.000000000 +0000 @@ -1179,7 +1179,9 @@ setMsgStatusFlags(token, msgId, status, mask); } -void p3GxsChannels::setMessageReadStatus(uint32_t& token, const RsGxsGrpMsgIdPair& msgId, bool read) +void p3GxsChannels::setMessageReadStatus( uint32_t& token, + const RsGxsGrpMsgIdPair& msgId, + bool read ) { #ifdef GXSCHANNELS_DEBUG std::cerr << "p3GxsChannels::setMessageReadStatus()"; @@ -1189,10 +1191,8 @@ /* Always remove status unprocessed */ uint32_t mask = GXS_SERV::GXS_MSG_STATUS_GUI_NEW | GXS_SERV::GXS_MSG_STATUS_GUI_UNREAD; uint32_t status = GXS_SERV::GXS_MSG_STATUS_GUI_UNREAD; - if (read) - { - status = 0; - } + if (read) status = 0; + setMsgStatusFlags(token, msgId, status, mask); } diff -Nru retroshare-0.6.4/src/libretroshare/src/services/p3gxschannels.h retroshare-0.6.4/src/libretroshare/src/services/p3gxschannels.h --- retroshare-0.6.4/src/libretroshare/src/services/p3gxschannels.h 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/libretroshare/src/services/p3gxschannels.h 2018-06-01 20:36:00.000000000 +0000 @@ -108,15 +108,12 @@ virtual bool getChannelDownloadDirectory(const RsGxsGroupId &groupId, std::string& directory); /* Comment service - Provide RsGxsCommentService - redirect to p3GxsCommentService */ -virtual bool getCommentData(const uint32_t &token, std::vector &msgs) - { - return mCommentService->getGxsCommentData(token, msgs); - } + virtual bool getCommentData(uint32_t token, std::vector &msgs) + { return mCommentService->getGxsCommentData(token, msgs); } -virtual bool getRelatedComments(const uint32_t &token, std::vector &msgs) - { - return mCommentService->getGxsRelatedComments(token, msgs); - } + virtual bool getRelatedComments( uint32_t token, + std::vector &msgs ) + { return mCommentService->getGxsRelatedComments(token, msgs); } virtual bool createComment(uint32_t &token, RsGxsComment &msg) { @@ -128,13 +125,13 @@ return mCommentService->createGxsVote(token, msg); } -virtual bool acknowledgeComment(const uint32_t& token, std::pair& msgId) +virtual bool acknowledgeComment(uint32_t token, std::pair& msgId) { return acknowledgeMsg(token, msgId); } -virtual bool acknowledgeVote(const uint32_t& token, std::pair& msgId) +virtual bool acknowledgeVote(uint32_t token, std::pair& msgId) { if (mCommentService->acknowledgeVote(token, msgId)) { diff -Nru retroshare-0.6.4/src/libretroshare/src/services/p3posted.h retroshare-0.6.4/src/libretroshare/src/services/p3posted.h --- retroshare-0.6.4/src/libretroshare/src/services/p3posted.h 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/libretroshare/src/services/p3posted.h 2018-06-01 20:36:00.000000000 +0000 @@ -83,16 +83,14 @@ } - /* Comment service - Provide RsGxsCommentService - redirect to p3GxsCommentService */ -virtual bool getCommentData(const uint32_t &token, std::vector &msgs) - { - return mCommentService->getGxsCommentData(token, msgs); - } - -virtual bool getRelatedComments(const uint32_t &token, std::vector &msgs) - { - return mCommentService->getGxsRelatedComments(token, msgs); - } + /** Comment service - Provide RsGxsCommentService - + * redirect to p3GxsCommentService */ + virtual bool getCommentData(uint32_t token, std::vector &msgs) + { return mCommentService->getGxsCommentData(token, msgs); } + + virtual bool getRelatedComments( uint32_t token, + std::vector &msgs ) + { return mCommentService->getGxsRelatedComments(token, msgs); } virtual bool createComment(uint32_t &token, RsGxsComment &msg) { @@ -104,17 +102,14 @@ return mCommentService->createGxsVote(token, msg); } -virtual bool acknowledgeComment(const uint32_t& token, std::pair& msgId) - { - return acknowledgeMsg(token, msgId); - } + virtual bool acknowledgeComment( + uint32_t token, std::pair& msgId ) + { return acknowledgeMsg(token, msgId); } -virtual bool acknowledgeVote(const uint32_t& token, std::pair& msgId) + virtual bool acknowledgeVote( + uint32_t token, std::pair& msgId ) { - if (mCommentService->acknowledgeVote(token, msgId)) - { - return true; - } + if (mCommentService->acknowledgeVote(token, msgId)) return true; return acknowledgeMsg(token, msgId); } }; diff -Nru retroshare-0.6.4/src/plugins/VOIP/VOIP.pro retroshare-0.6.4/src/plugins/VOIP/VOIP.pro --- retroshare-0.6.4/src/plugins/VOIP/VOIP.pro 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/plugins/VOIP/VOIP.pro 2018-06-01 20:36:00.000000000 +0000 @@ -43,7 +43,7 @@ OPENCV_VERSION = "341" USE_PRECOMPILED_LIBS = - for(lib, LIB_DIR) { + for(lib, RS_LIB_DIR) { #message(Scanning $$lib) exists( $$lib/opencv/libopencv_core$${OPENCV_VERSION}.a) { isEmpty(USE_PRECOMPILED_LIBS) { diff -Nru retroshare-0.6.4/src/retroshare-gui/src/gui/chat/ChatLobbyDialog.cpp retroshare-0.6.4/src/retroshare-gui/src/gui/chat/ChatLobbyDialog.cpp --- retroshare-0.6.4/src/retroshare-gui/src/gui/chat/ChatLobbyDialog.cpp 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/retroshare-gui/src/gui/chat/ChatLobbyDialog.cpp 2018-06-01 20:36:00.000000000 +0000 @@ -33,6 +33,7 @@ #include "gui/ChatLobbyWidget.h" #include "gui/FriendsDialog.h" #include "gui/MainWindow.h" +#include "gui/chat/ChatWidget.h" #include "gui/common/html.h" #include "gui/common/FriendSelectionDialog.h" #include "gui/common/RSTreeWidgetItem.h" @@ -97,7 +98,7 @@ votePositiveAct = new QAction(QIcon(":/icons/png/thumbs-up.png"), tr("Give positive opinion"), this); distantChatAct = new QAction(QIcon(":/images/chat_24.png"), tr("Start private chat"), this); sendMessageAct = new QAction(QIcon(":/images/mail_new.png"), tr("Send Message"), this); - showinpeopleAct = new QAction(QIcon(), tr("Show author in people tab"), this); + showInPeopleAct = new QAction(QIcon(), tr("Show author in people tab"), this); QActionGroup *sortgrp = new QActionGroup(this); actionSortByName = new QAction(QIcon(), tr("Sort by Name"), this); @@ -111,17 +112,13 @@ actionSortByActivity->setActionGroup(sortgrp); - connect(muteAct, SIGNAL(triggered()), this, SLOT(changePartipationState())); + connect(muteAct, SIGNAL(triggered()), this, SLOT(changeParticipationState())); connect(distantChatAct, SIGNAL(triggered()), this, SLOT(distantChatParticipant())); connect(sendMessageAct, SIGNAL(triggered()), this, SLOT(sendMessage())); connect(votePositiveAct, SIGNAL(triggered()), this, SLOT(voteParticipant())); connect(voteNeutralAct, SIGNAL(triggered()), this, SLOT(voteParticipant())); connect(voteNegativeAct, SIGNAL(triggered()), this, SLOT(voteParticipant())); - connect(showinpeopleAct, SIGNAL(triggered()), this, SLOT(showInPeopleTab())); - - votePositiveAct->setData(RsReputations::OPINION_POSITIVE); - voteNeutralAct->setData(RsReputations::OPINION_NEUTRAL); - voteNegativeAct->setData(RsReputations::OPINION_NEGATIVE); + connect(showInPeopleAct, SIGNAL(triggered()), this, SLOT(showInPeopleTab())); connect(actionSortByName, SIGNAL(triggered()), this, SLOT(sortParcipants())); connect(actionSortByActivity, SIGNAL(triggered()), this, SLOT(sortParcipants())); @@ -172,7 +169,8 @@ ui.chatWidget->addToolsAction(checkableAction); //getChatWidget()->addChatBarWidget(ownIdChooser); - + connect(ui.chatWidget, SIGNAL(textBrowserAskContextMenu(QMenu*,QString,QPoint)), this, SLOT(textBrowserAskContextMenu(QMenu*,QString,QPoint))); + connect(ownIdChooser,SIGNAL(currentIndexChanged(int)),this,SLOT(changeNickname())) ; @@ -226,33 +224,76 @@ void ChatLobbyDialog::participantsTreeWidgetCustomPopupMenu(QPoint) { QList selectedItems = ui.participantsList->selectedItems(); + QList idList; + QList::iterator item; + for (item = selectedItems.begin(); item != selectedItems.end(); ++item) + { + RsGxsId gxs_id ; + dynamic_cast(*item)->getId(gxs_id) ; + idList.append(gxs_id); + } QMenu contextMnu(this); + contextMnu.addAction(actionSortByActivity); + contextMnu.addAction(actionSortByName); + + contextMnu.addSeparator(); + + initParticipantsContextMenu(&contextMnu, idList); + + contextMnu.exec(QCursor::pos()); +} + +void ChatLobbyDialog::textBrowserAskContextMenu(QMenu* contextMnu, QString anchorForPosition, const QPoint /*point*/) +{ + if (anchorForPosition.startsWith(PERSONID)){ + QString strId = anchorForPosition.replace(PERSONID,""); + if (strId.contains(" ")) + strId.truncate(strId.indexOf(" ")); + + contextMnu->addSeparator(); + + QList idList; + idList.append(RsGxsId(strId.toStdString())); + initParticipantsContextMenu(contextMnu, idList); + } +} - contextMnu.addAction(distantChatAct); - contextMnu.addAction(sendMessageAct); - contextMnu.addSeparator(); - contextMnu.addAction(actionSortByActivity); - contextMnu.addAction(actionSortByName); - contextMnu.addSeparator(); - contextMnu.addAction(muteAct); - contextMnu.addAction(votePositiveAct); - contextMnu.addAction(voteNeutralAct); - contextMnu.addAction(voteNegativeAct); - contextMnu.addAction(showinpeopleAct); +void ChatLobbyDialog::initParticipantsContextMenu(QMenu *contextMnu, QList idList) +{ + if (!contextMnu) + return; + + contextMnu->addAction(distantChatAct); + contextMnu->addAction(sendMessageAct); + contextMnu->addSeparator(); + contextMnu->addAction(muteAct); + contextMnu->addAction(votePositiveAct); + contextMnu->addAction(voteNeutralAct); + contextMnu->addAction(voteNegativeAct); + contextMnu->addAction(showInPeopleAct); distantChatAct->setEnabled(false); - sendMessageAct->setEnabled(selectedItems.count()==1); + sendMessageAct->setEnabled(true); + muteAct->setEnabled(false); muteAct->setCheckable(true); - muteAct->setEnabled(false); - muteAct->setChecked(false); - votePositiveAct->setEnabled(false); - voteNeutralAct->setEnabled(false); - voteNegativeAct->setEnabled(false); - showinpeopleAct->setEnabled(selectedItems.count()==1); - if(selectedItems.count()==1) - { - RsGxsId gxsid(selectedItems.at(0)->text(COLUMN_ID).toStdString()); + muteAct->setChecked(false); + votePositiveAct->setEnabled(false); + voteNeutralAct->setEnabled(false); + voteNegativeAct->setEnabled(false); + showInPeopleAct->setEnabled(idList.count()==1); + + distantChatAct->setData(QVariant::fromValue(idList)); + sendMessageAct->setData(QVariant::fromValue(idList)); + muteAct->setData(QVariant::fromValue(idList)); + votePositiveAct->setData(QVariant::fromValue(idList)); + voteNeutralAct->setData(QVariant::fromValue(idList)); + voteNegativeAct->setData(QVariant::fromValue(idList)); + showInPeopleAct->setData(QVariant::fromValue(idList)); + + if(idList.count()==1) + { + RsGxsId gxsid = idList.at(0); if(!gxsid.isNull() && !rsIdentity->isOwnId(gxsid)) { @@ -263,49 +304,56 @@ muteAct->setEnabled(true); muteAct->setChecked(isParticipantMuted(gxsid)); } - } - contextMnu.exec(QCursor::pos()); + } } void ChatLobbyDialog::voteParticipant() { - QList selectedItems = ui.participantsList->selectedItems(); - if (selectedItems.isEmpty()) - return; - QList::iterator item; + QAction *act = dynamic_cast(sender()) ; + if(!act) + { + std::cerr << "No sender! Some bug in the code." << std::endl; + return ; + } - QAction *act = dynamic_cast(sender()) ; - if(!act) - { - std::cerr << "No sender! Some bug in the code." << std::endl; - return ; - } + QList idList = act->data().value>(); - RsReputations::Opinion op = RsReputations::Opinion(act->data().toUInt()) ; + RsReputations::Opinion op = RsReputations::OPINION_NEUTRAL ; + if (act == votePositiveAct) + op = RsReputations::OPINION_POSITIVE; + if (act == voteNegativeAct) + op = RsReputations::OPINION_NEGATIVE; - for (item = selectedItems.begin(); item != selectedItems.end(); ++item) + for (QList::iterator item = idList.begin(); item != idList.end(); ++item) { - RsGxsId nickname; - dynamic_cast(*item)->getId(nickname) ; + rsReputations->setOwnOpinion(*item, op); + std::cerr << "Giving opinion to GXS id " << *item << " to " << op << std::endl; + } - rsReputations->setOwnOpinion(nickname, op); - std::cerr << "Giving opinion to GXS id " << nickname << " to " << op<< std::endl; - dynamic_cast(*item)->forceUpdate(); - } + updateParticipantsList(); } void ChatLobbyDialog::showInPeopleTab() { - QList selectedItems = ui.participantsList->selectedItems(); - if (selectedItems.count()!=1) - return; - RsGxsId nickname; - dynamic_cast(*selectedItems.begin())->getId(nickname); - IdDialog *idDialog = dynamic_cast(MainWindow::getPage(MainWindow::People)); - if (!idDialog) - return ; - MainWindow::showWindow(MainWindow::People); - idDialog->navigate(nickname); + QAction *act = dynamic_cast(sender()) ; + if(!act) + { + std::cerr << "No sender! Some bug in the code." << std::endl; + return ; + } + + QList idList = act->data().value>(); + if (idList.count() != 1) + return; + + RsGxsId nickname = idList.at(0); + + IdDialog *idDialog = dynamic_cast(MainWindow::getPage(MainWindow::People)); + if (!idDialog) + return ; + MainWindow::showWindow(MainWindow::People); + + idDialog->navigate(nickname); } void ChatLobbyDialog::init(const ChatId &/*id*/, const QString &/*title*/) @@ -586,34 +634,28 @@ } /** - * Called when a Participant in QTree get Clicked / Changed + * Called when a Participant get Clicked / Changed * * Check if the Checkbox altered and Mute User - * - * @todo auf rsid - * - * @param QTreeWidgetItem Participant to check */ -void ChatLobbyDialog::changePartipationState() +void ChatLobbyDialog::changeParticipationState() { - QList selectedItems = ui.participantsList->selectedItems(); - - if (selectedItems.isEmpty()) { - return; + QAction *act = dynamic_cast(sender()) ; + if(!act) + { + std::cerr << "No sender! Some bug in the code." << std::endl; + return ; } - QList::iterator item; - for (item = selectedItems.begin(); item != selectedItems.end(); ++item) { - - RsGxsId gxs_id ; - dynamic_cast(*item)->getId(gxs_id) ; + QList idList = act->data().value>(); - std::cerr << "check Partipation status for '" << gxs_id << std::endl; - - if (muteAct->isChecked()) { - muteParticipant(gxs_id); + for (QList::iterator item = idList.begin(); item != idList.end(); ++item) + { + std::cerr << "check Partipation status for '" << *item << std::endl; + if (act->isChecked()) { + muteParticipant(*item); } else { - unMuteParticipant(gxs_id); + unMuteParticipant(*item); } } @@ -650,75 +692,68 @@ void ChatLobbyDialog::distantChatParticipant() { - std::cerr << " initiating distant chat" << std::endl; - - QList selectedItems = ui.participantsList->selectedItems(); - - if (selectedItems.isEmpty()) - return; - - if(selectedItems.size() != 1) - return ; + QAction *act = dynamic_cast(sender()) ; + if(!act) + { + std::cerr << "No sender! Some bug in the code." << std::endl; + return ; + } - GxsIdRSTreeWidgetItem *item = dynamic_cast(selectedItems.front()); + std::cerr << " initiating distant chat" << std::endl; - if(!item) - return ; + QList idList = act->data().value>(); + if (idList.count() != 1) + return; - RsGxsId gxs_id ; - item->getId(gxs_id) ; - RsGxsId own_id; + RsGxsId gxs_id = idList.at(0); + if (gxs_id.isNull()) + return; - rsMsgs->getIdentityForChatLobby(lobbyId, own_id); + RsGxsId own_id; + rsMsgs->getIdentityForChatLobby(lobbyId, own_id); - uint32_t error_code ; - DistantChatPeerId tunnel_id; + DistantChatPeerId tunnel_id; + uint32_t error_code ; - if(! rsMsgs->initiateDistantChatConnexion(gxs_id,own_id,tunnel_id,error_code)) - { - QString error_str ; - switch(error_code) - { - case RS_DISTANT_CHAT_ERROR_DECRYPTION_FAILED : error_str = tr("Decryption failed.") ; break ; - case RS_DISTANT_CHAT_ERROR_SIGNATURE_MISMATCH : error_str = tr("Signature mismatch") ; break ; - case RS_DISTANT_CHAT_ERROR_UNKNOWN_KEY : error_str = tr("Unknown key") ; break ; - case RS_DISTANT_CHAT_ERROR_UNKNOWN_HASH : error_str = tr("Unknown hash") ; break ; - default: - error_str = tr("Unknown error.") ; - } - QMessageBox::warning(NULL,tr("Cannot start distant chat"),tr("Distant chat cannot be initiated:")+" "+error_str - +QString::number(error_code)) ; - } + if(! rsMsgs->initiateDistantChatConnexion(gxs_id,own_id,tunnel_id,error_code)) + { + QString error_str ; + switch(error_code) + { + case RS_DISTANT_CHAT_ERROR_DECRYPTION_FAILED : error_str = tr("Decryption failed.") ; break ; + case RS_DISTANT_CHAT_ERROR_SIGNATURE_MISMATCH : error_str = tr("Signature mismatch") ; break ; + case RS_DISTANT_CHAT_ERROR_UNKNOWN_KEY : error_str = tr("Unknown key") ; break ; + case RS_DISTANT_CHAT_ERROR_UNKNOWN_HASH : error_str = tr("Unknown hash") ; break ; + default: + error_str = tr("Unknown error.") ; + } + QMessageBox::warning(NULL,tr("Cannot start distant chat"),tr("Distant chat cannot be initiated:")+" "+error_str + +QString::number(error_code)) ; + } } void ChatLobbyDialog::sendMessage() { + QAction *act = dynamic_cast(sender()) ; + if(!act) + { + std::cerr << "No sender! Some bug in the code." << std::endl; + return ; + } - QList selectedItems = ui.participantsList->selectedItems(); - - if (selectedItems.isEmpty()) - return; - - QList::iterator item; - for (item = selectedItems.begin(); item != selectedItems.end(); ++item) { - - RsGxsId gxs_id ; - dynamic_cast(*item)->getId(gxs_id) ; - + QList idList = act->data().value>(); - MessageComposer *nMsgDialog = MessageComposer::newMsg(); - if (nMsgDialog == NULL) { - return; - } + MessageComposer *nMsgDialog = MessageComposer::newMsg(); + if (nMsgDialog == NULL) + return; - nMsgDialog->addRecipient(MessageComposer::TO, RsGxsId(gxs_id)); - nMsgDialog->show(); - nMsgDialog->activateWindow(); + for (QList::iterator item = idList.begin(); item != idList.end(); ++item) + nMsgDialog->addRecipient(MessageComposer::TO, *item); - /* window will destroy itself! */ - - } + nMsgDialog->show(); + nMsgDialog->activateWindow(); + /* window will destroy itself! */ } diff -Nru retroshare-0.6.4/src/retroshare-gui/src/gui/chat/ChatLobbyDialog.h retroshare-0.6.4/src/retroshare-gui/src/gui/chat/ChatLobbyDialog.h --- retroshare-0.6.4/src/retroshare-gui/src/gui/chat/ChatLobbyDialog.h 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/retroshare-gui/src/gui/chat/ChatLobbyDialog.h 2018-06-01 20:36:00.000000000 +0000 @@ -27,6 +27,8 @@ #include "gui/common/RSTreeWidgetItem.h" #include "ChatDialog.h" +Q_DECLARE_METATYPE(RsGxsId) + class GxsIdChooser ; class QToolButton; class QWidgetAction; @@ -51,6 +53,7 @@ private slots: void participantsTreeWidgetCustomPopupMenu( QPoint point ); + void textBrowserAskContextMenu(QMenu* contextMnu, QString anchorForPosition, const QPoint point); void inviteFriends() ; void leaveLobby() ; void filterChanged(const QString &text); @@ -77,7 +80,7 @@ protected slots: void changeNickname(); - void changePartipationState(); + void changeParticipationState(); void distantChatParticipant(); void participantsTreeWidgetDoubleClicked(QTreeWidgetItem *item, int column); void sendMessage(); @@ -85,6 +88,7 @@ private: void updateParticipantsList(); + void initParticipantsContextMenu(QMenu* contextMnu, QList idList); void filterIds(); @@ -117,8 +121,8 @@ QAction *actionSortByActivity; QWidgetAction *checkableAction; QAction *sendMessageAct; - QAction *showinpeopleAct; - + QAction *showInPeopleAct; + GxsIdChooser *ownIdChooser ; //icons cache QIcon bullet_red_128, bullet_grey_128, bullet_green_128, bullet_yellow_128; diff -Nru retroshare-0.6.4/src/retroshare-gui/src/gui/chat/ChatTabWidget.cpp retroshare-0.6.4/src/retroshare-gui/src/gui/chat/ChatTabWidget.cpp --- retroshare-0.6.4/src/retroshare-gui/src/gui/chat/ChatTabWidget.cpp 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/retroshare-gui/src/gui/chat/ChatTabWidget.cpp 2018-06-01 20:36:00.000000000 +0000 @@ -20,6 +20,8 @@ * Boston, MA 02110-1301, USA. ****************************************************************/ +#include + #include "ChatTabWidget.h" #include "ui_ChatTabWidget.h" #include "ChatDialog.h" diff -Nru retroshare-0.6.4/src/retroshare-gui/src/gui/chat/ChatWidget.cpp retroshare-0.6.4/src/retroshare-gui/src/gui/chat/ChatWidget.cpp --- retroshare-0.6.4/src/retroshare-gui/src/gui/chat/ChatWidget.cpp 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/retroshare-gui/src/gui/chat/ChatWidget.cpp 2018-06-01 20:36:00.000000000 +0000 @@ -66,8 +66,6 @@ #define FMM 2.5//fontMetricsMultiplicator -#define PERSONID "PersonId:" - /***** * #define CHAT_DEBUG 1 *****/ @@ -389,7 +387,7 @@ name = QString::fromUtf8(historyIt->peerName.c_str()); } - addChatMsg(historyIt->incoming, name, QDateTime::fromTime_t(historyIt->sendTime), QDateTime::fromTime_t(historyIt->recvTime), QString::fromUtf8(historyIt->message.c_str()), MSGTYPE_HISTORY); + addChatMsg(historyIt->incoming, name, RsGxsId(historyIt->peerName.c_str()), QDateTime::fromTime_t(historyIt->sendTime), QDateTime::fromTime_t(historyIt->recvTime), QString::fromUtf8(historyIt->message.c_str()), MSGTYPE_HISTORY); } } } @@ -594,31 +592,15 @@ if (event->type() == QEvent::ToolTip) { QHelpEvent* helpEvent = static_cast(event); - QTextCursor cursor = ui->textBrowser->cursorForPosition(helpEvent->pos()); - cursor.select(QTextCursor::WordUnderCursor); - QString toolTipText = ""; - if (!cursor.selectedText().isEmpty()){ - QRegExp rx("textBrowser->getShowImages()){ - QString imageStr; - if (ui->textBrowser->checkImage(helpEvent->pos(), imageStr)) { - toolTipText = imageStr; - } - } else if (toolTipText.startsWith(PERSONID)){ - toolTipText = toolTipText.replace(PERSONID, tr("Person id: ") ); - toolTipText = toolTipText.append(tr("\nDouble click on it to add his name on text writer.") ); + QString toolTipText = ui->textBrowser->anchorForPosition(helpEvent->pos()); + if (toolTipText.isEmpty() && !ui->textBrowser->getShowImages()){ + QString imageStr; + if (ui->textBrowser->checkImage(helpEvent->pos(), imageStr)) { + toolTipText = imageStr; } + } else if (toolTipText.startsWith(PERSONID)){ + toolTipText = toolTipText.replace(PERSONID, tr("Person id: ") ); + toolTipText = toolTipText.append(tr("\nDouble click on it to add his name on text writer.") ); } if (!toolTipText.isEmpty()){ QToolTip::showText(helpEvent->globalPos(), toolTipText); @@ -710,32 +692,19 @@ if (event->type() == QEvent::MouseButtonDblClick) { QMouseEvent* mouseEvent = static_cast(event); - QTextCursor cursor = ui->textBrowser->cursorForPosition(mouseEvent->pos()); - cursor.select(QTextCursor::WordUnderCursor); - if (!cursor.selectedText().isEmpty()){ - QRegExp rx("getIdDetails(mId, details)){ - QString text = QString("@").append(GxsIdDetails::getName(details)).append(" "); - ui->chatTextEdit->textCursor().insertText(text); - } + QString anchor = ui->textBrowser->anchorForPosition(mouseEvent->pos()); + if (!anchor.isEmpty()){ + if (anchor.startsWith(PERSONID)){ + QString strId = anchor.replace(PERSONID,""); + if (strId.contains(" ")) + strId.truncate(strId.indexOf(" ")); + + RsGxsId mId = RsGxsId(strId.toStdString()); + if(!mId.isNull()) { + RsIdentityDetails details; + if (rsIdentity->getIdDetails(mId, details)){ + QString text = QString("@").append(GxsIdDetails::getName(details)).append(" "); + ui->chatTextEdit->textCursor().insertText(text); } } } @@ -1138,6 +1107,9 @@ contextMnu->addAction(ui->actionSave_image); } + QString anchor = ui->textBrowser->anchorForPosition(point); + emit textBrowserAskContextMenu(contextMnu, anchor, point); + contextMnu->exec(ui->textBrowser->viewport()->mapToGlobal(point)); delete(contextMnu); } diff -Nru retroshare-0.6.4/src/retroshare-gui/src/gui/chat/ChatWidget.h retroshare-0.6.4/src/retroshare-gui/src/gui/chat/ChatWidget.h --- retroshare-0.6.4/src/retroshare-gui/src/gui/chat/ChatWidget.h 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/retroshare-gui/src/gui/chat/ChatWidget.h 2018-06-01 20:36:00.000000000 +0000 @@ -37,6 +37,9 @@ #include #include +//For PersonId anchor. +#define PERSONID "PersonId:" + class QAction; class QTextEdit; class QPushButton; @@ -137,6 +140,7 @@ void infoChanged(ChatWidget*); void newMessage(ChatWidget*); void statusChanged(int); + void textBrowserAskContextMenu(QMenu* contextMnu, QString anchorForPosition, const QPoint point); protected: bool eventFilter(QObject *obj, QEvent *event); diff -Nru retroshare-0.6.4/src/retroshare-gui/src/gui/common/GroupTreeWidget.cpp retroshare-0.6.4/src/retroshare-gui/src/gui/common/GroupTreeWidget.cpp --- retroshare-0.6.4/src/retroshare-gui/src/gui/common/GroupTreeWidget.cpp 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/retroshare-gui/src/gui/common/GroupTreeWidget.cpp 2018-06-01 20:36:00.000000000 +0000 @@ -43,7 +43,8 @@ #define COLUMN_NAME 0 #define COLUMN_UNREAD 1 #define COLUMN_POPULARITY 2 -#define COLUMN_COUNT 3 +#define COLUMN_LAST_POST 3 +#define COLUMN_COUNT 4 #define COLUMN_DATA COLUMN_NAME #define ROLE_ID Qt::UserRole @@ -100,9 +101,12 @@ /* Initialize tree widget */ ui->treeWidget->setColumnCount(COLUMN_COUNT); + ui->treeWidget->enableColumnCustomize(true); + ui->treeWidget->setColumnCustomizable(COLUMN_NAME, false); int S = QFontMetricsF(font()).height() ; int W = QFontMetricsF(font()).width("999") ; + int D = QFontMetricsF(font()).width("9999-99-99[]") ; /* Set header resize modes and initial section sizes */ QHeaderView *header = ui->treeWidget->header (); @@ -113,6 +117,15 @@ header->resizeSection(COLUMN_UNREAD, W+4) ; QHeaderView_setSectionResizeModeColumn(header, COLUMN_POPULARITY, QHeaderView::Fixed); header->resizeSection(COLUMN_POPULARITY, 2*S) ; + QHeaderView_setSectionResizeModeColumn(header, COLUMN_LAST_POST, QHeaderView::Fixed); + header->resizeSection(COLUMN_LAST_POST, D+4) ; + header->setSectionHidden(COLUMN_LAST_POST, true); + + QTreeWidgetItem *headerItem = ui->treeWidget->headerItem(); + headerItem->setText(COLUMN_NAME, tr("Name")); + headerItem->setText(COLUMN_UNREAD, tr("Unread")); + headerItem->setText(COLUMN_POPULARITY, tr("Popularity")); + headerItem->setText(COLUMN_LAST_POST, tr("Last Post")); /* add filter actions */ ui->filterLineEdit->addFilter(QIcon(), tr("Title"), FILTER_NAME_INDEX , tr("Search Title")); @@ -192,9 +205,10 @@ ui->titleBarFrame->layout()->addWidget(toolButton); } -void GroupTreeWidget::processSettings(RshareSettings *settings, bool load) +// Load and save settings (group must be started from the caller) +void GroupTreeWidget::processSettings(bool load) { - if (settings == NULL) { + if (Settings == NULL) { return; } @@ -204,16 +218,18 @@ const int SORTBY_POSTS = 4; const int SORTBY_UNREAD = 5; + ui->treeWidget->processSettings(load); + if (load) { - // load settings + // load Settings // state of order - bool ascSort = settings->value("GroupAscSort", true).toBool(); + bool ascSort = Settings->value("GroupAscSort", true).toBool(); actionSortAscending->setChecked(ascSort); actionSortDescending->setChecked(!ascSort); // state of sort - int sortby = settings->value("GroupSortBy").toInt(); + int sortby = Settings->value("GroupSortBy").toInt(); switch (sortby) { case SORTBY_NAME: if (actionSortByName) { @@ -242,10 +258,10 @@ break; } } else { - // save settings + // save Settings // state of order - settings->setValue("GroupAscSort", !(actionSortDescending && actionSortDescending->isChecked())); //True by default + Settings->setValue("GroupAscSort", !(actionSortDescending && actionSortDescending->isChecked())); //True by default // state of sort int sortby = SORTBY_NAME; @@ -260,7 +276,7 @@ } else if (actionSortByUnread && actionSortByUnread->isChecked()) { sortby = SORTBY_UNREAD; } - settings->setValue("GroupSortBy", sortby); + Settings->setValue("GroupSortBy", sortby); } } @@ -453,6 +469,11 @@ /* Set last post */ qlonglong lastPost = itemInfo.lastpost.toTime_t(); item->setData(COLUMN_DATA, ROLE_LASTPOST, -lastPost); // negative for correct sorting + if(itemInfo.lastpost == QDateTime::fromTime_t(0)) + item->setText(COLUMN_LAST_POST, tr("Never")); + else + item->setText(COLUMN_LAST_POST, itemInfo.lastpost.toString(Qt::ISODate).replace("T"," ")); + /* Set visible posts */ item->setData(COLUMN_DATA, ROLE_POSTS, -itemInfo.max_visible_posts);// negative for correct sorting diff -Nru retroshare-0.6.4/src/retroshare-gui/src/gui/common/GroupTreeWidget.h retroshare-0.6.4/src/retroshare-gui/src/gui/common/GroupTreeWidget.h --- retroshare-0.6.4/src/retroshare-gui/src/gui/common/GroupTreeWidget.h 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/retroshare-gui/src/gui/common/GroupTreeWidget.h 2018-06-01 20:36:00.000000000 +0000 @@ -77,8 +77,8 @@ // Add a tool button to the tool area void addToolButton(QToolButton *toolButton); - // Load and save settings (group must be startet from the caller) - void processSettings(RshareSettings *settings, bool load); + // Load and save settings (group must be started from the caller) + void processSettings(bool load); // Add a new category item QTreeWidgetItem *addCategoryItem(const QString &name, const QIcon &icon, bool expand); diff -Nru retroshare-0.6.4/src/retroshare-gui/src/gui/common/RSTextBrowser.cpp retroshare-0.6.4/src/retroshare-gui/src/gui/common/RSTextBrowser.cpp --- retroshare-0.6.4/src/retroshare-gui/src/gui/common/RSTextBrowser.cpp 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/retroshare-gui/src/gui/common/RSTextBrowser.cpp 2018-06-01 20:36:00.000000000 +0000 @@ -243,3 +243,30 @@ } return false; } + +/** + * @brief RSTextBrowser::anchorForPosition Replace anchorAt that doesn't works as expected. + * @param pos Where to get anchor from text + * @return anchor If text at pos is inside anchor, else empty string. + */ +QString RSTextBrowser::anchorForPosition(const QPoint &pos) const +{ + QTextCursor cursor = cursorForPosition(pos); + cursor.select(QTextCursor::WordUnderCursor); + QString anchor = ""; + if (!cursor.selectedText().isEmpty()){ + QRegExp rx(" #include +#include #include "rshare.h" #include "GxsChannelPostItem.h" diff -Nru retroshare-0.6.4/src/retroshare-gui/src/gui/feeds/GxsForumMsgItem.cpp retroshare-0.6.4/src/retroshare-gui/src/gui/feeds/GxsForumMsgItem.cpp --- retroshare-0.6.4/src/retroshare-gui/src/gui/feeds/GxsForumMsgItem.cpp 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/retroshare-gui/src/gui/feeds/GxsForumMsgItem.cpp 2018-06-01 20:36:00.000000000 +0000 @@ -23,6 +23,7 @@ #include #include +#include #include "rshare.h" #include "GxsForumMsgItem.h" diff -Nru retroshare-0.6.4/src/retroshare-gui/src/gui/gxs/GxsGroupFrameDialog.cpp retroshare-0.6.4/src/retroshare-gui/src/gui/gxs/GxsGroupFrameDialog.cpp --- retroshare-0.6.4/src/retroshare-gui/src/gui/gxs/GxsGroupFrameDialog.cpp 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/retroshare-gui/src/gui/gxs/GxsGroupFrameDialog.cpp 2018-06-01 20:36:00.000000000 +0000 @@ -194,7 +194,7 @@ Settings->setValue("Splitter", ui->splitter->saveState()); } - ui->groupTreeWidget->processSettings(Settings, load); + ui->groupTreeWidget->processSettings(load); Settings->endGroup(); } @@ -253,95 +253,101 @@ void GxsGroupFrameDialog::groupTreeCustomPopupMenu(QPoint point) { + QMenu contextMnu(this); + QString id = ui->groupTreeWidget->itemIdAt(point); - if (id.isEmpty()) return; + if (!id.isEmpty()) + { - mGroupId = RsGxsGroupId(id.toStdString()); - int subscribeFlags = ui->groupTreeWidget->subscribeFlags(QString::fromStdString(mGroupId.toStdString())); + mGroupId = RsGxsGroupId(id.toStdString()); + int subscribeFlags = ui->groupTreeWidget->subscribeFlags(QString::fromStdString(mGroupId.toStdString())); - bool isAdmin = IS_GROUP_ADMIN(subscribeFlags); - bool isPublisher = IS_GROUP_PUBLISHER(subscribeFlags); - bool isSubscribed = IS_GROUP_SUBSCRIBED(subscribeFlags); + bool isAdmin = IS_GROUP_ADMIN(subscribeFlags); + bool isPublisher = IS_GROUP_PUBLISHER(subscribeFlags); + bool isSubscribed = IS_GROUP_SUBSCRIBED(subscribeFlags); - QMenu contextMnu(this); - QAction *action; - - if (mMessageWidget) { - action = contextMnu.addAction(QIcon(IMAGE_TABNEW), tr("Open in new tab"), this, SLOT(openInNewTab())); - if (mGroupId.isNull() || messageWidget(mGroupId, true)) { - action->setEnabled(false); + QAction *action; + + if (mMessageWidget) { + action = contextMnu.addAction(QIcon(IMAGE_TABNEW), tr("Open in new tab"), this, SLOT(openInNewTab())); + if (mGroupId.isNull() || messageWidget(mGroupId, true)) { + action->setEnabled(false); + } } - } - if (isSubscribed) { - action = contextMnu.addAction(QIcon(IMAGE_UNSUBSCRIBE), tr("Unsubscribe"), this, SLOT(unsubscribeGroup())); - action->setEnabled (!mGroupId.isNull() && IS_GROUP_SUBSCRIBED(subscribeFlags)); - } else { - action = contextMnu.addAction(QIcon(IMAGE_SUBSCRIBE), tr("Subscribe"), this, SLOT(subscribeGroup())); - action->setDisabled (mGroupId.isNull() || IS_GROUP_SUBSCRIBED(subscribeFlags)); - } + if (isSubscribed) { + action = contextMnu.addAction(QIcon(IMAGE_UNSUBSCRIBE), tr("Unsubscribe"), this, SLOT(unsubscribeGroup())); + action->setEnabled (!mGroupId.isNull() && IS_GROUP_SUBSCRIBED(subscribeFlags)); + } else { + action = contextMnu.addAction(QIcon(IMAGE_SUBSCRIBE), tr("Subscribe"), this, SLOT(subscribeGroup())); + action->setDisabled (mGroupId.isNull() || IS_GROUP_SUBSCRIBED(subscribeFlags)); + } - contextMnu.addSeparator(); + contextMnu.addSeparator(); - contextMnu.addAction(QIcon(icon(ICON_NEW)), text(TEXT_NEW), this, SLOT(newGroup())); + contextMnu.addAction(QIcon(icon(ICON_NEW)), text(TEXT_NEW), this, SLOT(newGroup())); - action = contextMnu.addAction(QIcon(IMAGE_INFO), tr("Show Details"), this, SLOT(showGroupDetails())); - action->setEnabled (!mGroupId.isNull()); + action = contextMnu.addAction(QIcon(IMAGE_INFO), tr("Show Details"), this, SLOT(showGroupDetails())); + action->setEnabled (!mGroupId.isNull()); - action = contextMnu.addAction(QIcon(IMAGE_EDIT), tr("Edit Details"), this, SLOT(editGroupDetails())); - action->setEnabled (!mGroupId.isNull() && isAdmin); - - uint32_t current_store_time = mInterface->getStoragePeriod(mGroupId)/86400 ; - uint32_t current_sync_time = mInterface->getSyncPeriod(mGroupId)/86400 ; - - std::cerr << "Got sync=" << current_sync_time << ". store=" << current_store_time << std::endl; - QAction *actnn = NULL; - - QMenu *ctxMenu2 = contextMnu.addMenu(tr("Synchronise posts of last...")) ; - actnn = ctxMenu2->addAction(tr(" 5 days" ),this,SLOT(setSyncPostsDelay())) ; actnn->setData(QVariant( 5)) ; if(current_sync_time == 5) { actnn->setEnabled(false);actnn->setIcon(QIcon(":/images/start.png"));} - actnn = ctxMenu2->addAction(tr(" 2 weeks" ),this,SLOT(setSyncPostsDelay())) ; actnn->setData(QVariant( 15)) ; if(current_sync_time == 15) { actnn->setEnabled(false);actnn->setIcon(QIcon(":/images/start.png"));} - actnn = ctxMenu2->addAction(tr(" 1 month" ),this,SLOT(setSyncPostsDelay())) ; actnn->setData(QVariant( 30)) ; if(current_sync_time == 30) { actnn->setEnabled(false);actnn->setIcon(QIcon(":/images/start.png"));} - actnn = ctxMenu2->addAction(tr(" 3 months" ),this,SLOT(setSyncPostsDelay())) ; actnn->setData(QVariant( 90)) ; if(current_sync_time == 90) { actnn->setEnabled(false);actnn->setIcon(QIcon(":/images/start.png"));} - actnn = ctxMenu2->addAction(tr(" 6 months" ),this,SLOT(setSyncPostsDelay())) ; actnn->setData(QVariant(180)) ; if(current_sync_time ==180) { actnn->setEnabled(false);actnn->setIcon(QIcon(":/images/start.png"));} - actnn = ctxMenu2->addAction(tr(" 1 year " ),this,SLOT(setSyncPostsDelay())) ; actnn->setData(QVariant(372)) ; if(current_sync_time ==372) { actnn->setEnabled(false);actnn->setIcon(QIcon(":/images/start.png"));} - actnn = ctxMenu2->addAction(tr(" Indefinitly"),this,SLOT(setSyncPostsDelay())) ; actnn->setData(QVariant( 0)) ; if(current_sync_time == 0) { actnn->setEnabled(false);actnn->setIcon(QIcon(":/images/start.png"));} - - ctxMenu2 = contextMnu.addMenu(tr("Store posts for at most...")) ; - actnn = ctxMenu2->addAction(tr(" 5 days" ),this,SLOT(setStorePostsDelay())) ; actnn->setData(QVariant( 5)) ; if(current_store_time == 5) { actnn->setEnabled(false);actnn->setIcon(QIcon(":/images/start.png"));} - actnn = ctxMenu2->addAction(tr(" 2 weeks" ),this,SLOT(setStorePostsDelay())) ; actnn->setData(QVariant( 15)) ; if(current_store_time == 15) { actnn->setEnabled(false);actnn->setIcon(QIcon(":/images/start.png"));} - actnn = ctxMenu2->addAction(tr(" 1 month" ),this,SLOT(setStorePostsDelay())) ; actnn->setData(QVariant( 30)) ; if(current_store_time == 30) { actnn->setEnabled(false);actnn->setIcon(QIcon(":/images/start.png"));} - actnn = ctxMenu2->addAction(tr(" 3 months" ),this,SLOT(setStorePostsDelay())) ; actnn->setData(QVariant( 90)) ; if(current_store_time == 90) { actnn->setEnabled(false);actnn->setIcon(QIcon(":/images/start.png"));} - actnn = ctxMenu2->addAction(tr(" 6 months" ),this,SLOT(setStorePostsDelay())) ; actnn->setData(QVariant(180)) ; if(current_store_time ==180) { actnn->setEnabled(false);actnn->setIcon(QIcon(":/images/start.png"));} - actnn = ctxMenu2->addAction(tr(" 1 year " ),this,SLOT(setStorePostsDelay())) ; actnn->setData(QVariant(372)) ; if(current_store_time ==372) { actnn->setEnabled(false);actnn->setIcon(QIcon(":/images/start.png"));} - actnn = ctxMenu2->addAction(tr(" Indefinitly"),this,SLOT(setStorePostsDelay())) ; actnn->setData(QVariant( 0)) ; if(current_store_time == 0) { actnn->setEnabled(false);actnn->setIcon(QIcon(":/images/start.png"));} - - if (shareKeyType()) { - action = contextMnu.addAction(QIcon(IMAGE_SHARE), tr("Share publish permissions"), this, SLOT(sharePublishKey())); - action->setEnabled(!mGroupId.isNull() && isPublisher); - } + action = contextMnu.addAction(QIcon(IMAGE_EDIT), tr("Edit Details"), this, SLOT(editGroupDetails())); + action->setEnabled (!mGroupId.isNull() && isAdmin); - if (getLinkType() != RetroShareLink::TYPE_UNKNOWN) { - action = contextMnu.addAction(QIcon(IMAGE_COPYLINK), tr("Copy RetroShare Link"), this, SLOT(copyGroupLink())); - action->setEnabled(!mGroupId.isNull()); - } + uint32_t current_store_time = mInterface->getStoragePeriod(mGroupId)/86400 ; + uint32_t current_sync_time = mInterface->getSyncPeriod(mGroupId)/86400 ; + + std::cerr << "Got sync=" << current_sync_time << ". store=" << current_store_time << std::endl; + QAction *actnn = NULL; + + QMenu *ctxMenu2 = contextMnu.addMenu(tr("Synchronise posts of last...")) ; + actnn = ctxMenu2->addAction(tr(" 5 days" ),this,SLOT(setSyncPostsDelay())) ; actnn->setData(QVariant( 5)) ; if(current_sync_time == 5) { actnn->setEnabled(false);actnn->setIcon(QIcon(":/images/start.png"));} + actnn = ctxMenu2->addAction(tr(" 2 weeks" ),this,SLOT(setSyncPostsDelay())) ; actnn->setData(QVariant( 15)) ; if(current_sync_time == 15) { actnn->setEnabled(false);actnn->setIcon(QIcon(":/images/start.png"));} + actnn = ctxMenu2->addAction(tr(" 1 month" ),this,SLOT(setSyncPostsDelay())) ; actnn->setData(QVariant( 30)) ; if(current_sync_time == 30) { actnn->setEnabled(false);actnn->setIcon(QIcon(":/images/start.png"));} + actnn = ctxMenu2->addAction(tr(" 3 months" ),this,SLOT(setSyncPostsDelay())) ; actnn->setData(QVariant( 90)) ; if(current_sync_time == 90) { actnn->setEnabled(false);actnn->setIcon(QIcon(":/images/start.png"));} + actnn = ctxMenu2->addAction(tr(" 6 months" ),this,SLOT(setSyncPostsDelay())) ; actnn->setData(QVariant(180)) ; if(current_sync_time ==180) { actnn->setEnabled(false);actnn->setIcon(QIcon(":/images/start.png"));} + actnn = ctxMenu2->addAction(tr(" 1 year " ),this,SLOT(setSyncPostsDelay())) ; actnn->setData(QVariant(372)) ; if(current_sync_time ==372) { actnn->setEnabled(false);actnn->setIcon(QIcon(":/images/start.png"));} + actnn = ctxMenu2->addAction(tr(" Indefinitly"),this,SLOT(setSyncPostsDelay())) ; actnn->setData(QVariant( 0)) ; if(current_sync_time == 0) { actnn->setEnabled(false);actnn->setIcon(QIcon(":/images/start.png"));} + + ctxMenu2 = contextMnu.addMenu(tr("Store posts for at most...")) ; + actnn = ctxMenu2->addAction(tr(" 5 days" ),this,SLOT(setStorePostsDelay())) ; actnn->setData(QVariant( 5)) ; if(current_store_time == 5) { actnn->setEnabled(false);actnn->setIcon(QIcon(":/images/start.png"));} + actnn = ctxMenu2->addAction(tr(" 2 weeks" ),this,SLOT(setStorePostsDelay())) ; actnn->setData(QVariant( 15)) ; if(current_store_time == 15) { actnn->setEnabled(false);actnn->setIcon(QIcon(":/images/start.png"));} + actnn = ctxMenu2->addAction(tr(" 1 month" ),this,SLOT(setStorePostsDelay())) ; actnn->setData(QVariant( 30)) ; if(current_store_time == 30) { actnn->setEnabled(false);actnn->setIcon(QIcon(":/images/start.png"));} + actnn = ctxMenu2->addAction(tr(" 3 months" ),this,SLOT(setStorePostsDelay())) ; actnn->setData(QVariant( 90)) ; if(current_store_time == 90) { actnn->setEnabled(false);actnn->setIcon(QIcon(":/images/start.png"));} + actnn = ctxMenu2->addAction(tr(" 6 months" ),this,SLOT(setStorePostsDelay())) ; actnn->setData(QVariant(180)) ; if(current_store_time ==180) { actnn->setEnabled(false);actnn->setIcon(QIcon(":/images/start.png"));} + actnn = ctxMenu2->addAction(tr(" 1 year " ),this,SLOT(setStorePostsDelay())) ; actnn->setData(QVariant(372)) ; if(current_store_time ==372) { actnn->setEnabled(false);actnn->setIcon(QIcon(":/images/start.png"));} + actnn = ctxMenu2->addAction(tr(" Indefinitly"),this,SLOT(setStorePostsDelay())) ; actnn->setData(QVariant( 0)) ; if(current_store_time == 0) { actnn->setEnabled(false);actnn->setIcon(QIcon(":/images/start.png"));} + + if (shareKeyType()) { + action = contextMnu.addAction(QIcon(IMAGE_SHARE), tr("Share publish permissions"), this, SLOT(sharePublishKey())); + action->setEnabled(!mGroupId.isNull() && isPublisher); + } - contextMnu.addSeparator(); + if (getLinkType() != RetroShareLink::TYPE_UNKNOWN) { + action = contextMnu.addAction(QIcon(IMAGE_COPYLINK), tr("Copy RetroShare Link"), this, SLOT(copyGroupLink())); + action->setEnabled(!mGroupId.isNull()); + } - action = contextMnu.addAction(QIcon(":/images/message-mail-read.png"), tr("Mark all as read"), this, SLOT(markMsgAsRead())); - action->setEnabled (!mGroupId.isNull() && isSubscribed); + contextMnu.addSeparator(); - action = contextMnu.addAction(QIcon(":/images/message-mail.png"), tr("Mark all as unread"), this, SLOT(markMsgAsUnread())); - action->setEnabled (!mGroupId.isNull() && isSubscribed); + action = contextMnu.addAction(QIcon(":/images/message-mail-read.png"), tr("Mark all as read"), this, SLOT(markMsgAsRead())); + action->setEnabled (!mGroupId.isNull() && isSubscribed); - /* Add special actions */ - QList actions; - groupTreeCustomActions(mGroupId, subscribeFlags, actions); - if (!actions.isEmpty()) { - contextMnu.addSeparator(); - contextMnu.addActions(actions); + action = contextMnu.addAction(QIcon(":/images/message-mail.png"), tr("Mark all as unread"), this, SLOT(markMsgAsUnread())); + action->setEnabled (!mGroupId.isNull() && isSubscribed); + + /* Add special actions */ + QList actions; + groupTreeCustomActions(mGroupId, subscribeFlags, actions); + if (!actions.isEmpty()) { + contextMnu.addSeparator(); + contextMnu.addActions(actions); + } } + //Add Standard Menu + ui->groupTreeWidget->treeWidget()->createStandardContextMenu(&contextMnu); + contextMnu.exec(QCursor::pos()); } diff -Nru retroshare-0.6.4/src/retroshare-gui/src/gui/gxs/RsGxsUpdateBroadcastBase.cpp retroshare-0.6.4/src/retroshare-gui/src/gui/gxs/RsGxsUpdateBroadcastBase.cpp --- retroshare-0.6.4/src/retroshare-gui/src/gui/gxs/RsGxsUpdateBroadcastBase.cpp 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/retroshare-gui/src/gui/gxs/RsGxsUpdateBroadcastBase.cpp 2018-06-01 20:36:00.000000000 +0000 @@ -67,6 +67,10 @@ /* Update only update when the widget is visible. */ if (mUpdateWhenInvisible || !widget || widget->isVisible()) { + + if (!mGrpIds.empty() || !mGrpIdsMeta.empty() || !mMsgIds.empty() || !mMsgIdsMeta.empty()) + mFillComplete = true ; + securedUpdateDisplay(); } } diff -Nru retroshare-0.6.4/src/retroshare-gui/src/gui/gxs/RsGxsUpdateBroadcastPage.h retroshare-0.6.4/src/retroshare-gui/src/gui/gxs/RsGxsUpdateBroadcastPage.h --- retroshare-0.6.4/src/retroshare-gui/src/gui/gxs/RsGxsUpdateBroadcastPage.h 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/retroshare-gui/src/gui/gxs/RsGxsUpdateBroadcastPage.h 2018-06-01 20:36:00.000000000 +0000 @@ -37,7 +37,7 @@ // This is overloaded in subclasses. virtual void updateDisplay(bool complete) = 0; -private slots: +public slots: void fillDisplay(bool complete); private: diff -Nru retroshare-0.6.4/src/retroshare-gui/src/gui/Identity/IdDialog.cpp retroshare-0.6.4/src/retroshare-gui/src/gui/Identity/IdDialog.cpp --- retroshare-0.6.4/src/retroshare-gui/src/gui/Identity/IdDialog.cpp 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/retroshare-gui/src/gui/Identity/IdDialog.cpp 2018-06-01 20:36:00.000000000 +0000 @@ -1994,7 +1994,8 @@ } case RsIdentityUsage::CHAT_LOBBY_MSG_VALIDATION: // Chat lobby msgs are signed, so each time one comes, or a chat lobby event comes, a signature verificaiton happens. { - RetroShareLink l = RetroShareLink::createChatRoom(ChatId(ChatLobbyId(u.mAdditionalId)),QString::number(u.mAdditionalId)); + ChatId id = ChatId(ChatLobbyId(u.mAdditionalId)); + RetroShareLink l = RetroShareLink::createChatRoom(id, QString::fromStdString(id.toStdString())); return tr("Message in chat room %1").arg(l.toHtml()) ; } case RsIdentityUsage::GLOBAL_ROUTER_SIGNATURE_CHECK: // Global router message validation diff -Nru retroshare-0.6.4/src/retroshare-gui/src/gui/MainWindow.cpp retroshare-0.6.4/src/retroshare-gui/src/gui/MainWindow.cpp --- retroshare-0.6.4/src/retroshare-gui/src/gui/MainWindow.cpp 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/retroshare-gui/src/gui/MainWindow.cpp 2018-06-01 20:36:00.000000000 +0000 @@ -733,16 +733,16 @@ if (ratesstatus) ratesstatus->getRatesStatus(downKb, upKb); - if(torstatus) - torstatus->getTorStatus(); + if(torstatus) + torstatus->getTorStatus(); if(!hiddenmode) { - if (natstatus) - natstatus->getNATStatus(); - - if (dhtstatus) - dhtstatus->getDHTStatus(); + if (natstatus) + natstatus->getNATStatus(); + + if (dhtstatus) + dhtstatus->getDHTStatus(); } if (discstatus) { @@ -1434,27 +1434,37 @@ void MainWindow::externalLinkActivated(const QUrl &url) { static bool already_warned = false ; + bool never_ask_me = Settings->value("NeverAskMeForExternalLinkActivated",false).toBool(); - if(!already_warned) + if(!already_warned && !never_ask_me) { QMessageBox mb(QObject::tr("Confirmation"), QObject::tr("Do you want this link to be handled by your system?")+"

"+ url.toString()+"

"+tr("Make sure this link has not been forged to drag you to a malicious website."), QMessageBox::Question, QMessageBox::Yes,QMessageBox::No, 0); - QCheckBox *checkbox = new QCheckBox(tr("Don't ask me again")) ; + QCheckBox *dontAsk_CB = new QCheckBox(tr("Don't ask me again")); + QCheckBox *neverAsk_CB = new QCheckBox(tr("Never ask me again")); + dontAsk_CB->setToolTip(tr("This will be saved only for this session.")); + neverAsk_CB->setToolTip(tr("This will be saved permanently. You'll need to clean RetroShare.conf to revert.")); QGridLayout* layout = qobject_cast(mb.layout()); if (layout) { - layout->addWidget(checkbox,layout->rowCount(),0,1, layout->columnCount(), Qt::AlignLeft); + layout->addWidget(dontAsk_CB,layout->rowCount(),0,1, layout->columnCount(), Qt::AlignLeft); + layout->addWidget(neverAsk_CB,layout->rowCount(),0,1, layout->columnCount(), Qt::AlignLeft); } else { //Not QGridLayout so add at end - mb.layout()->addWidget(checkbox) ; + mb.layout()->addWidget(dontAsk_CB); + mb.layout()->addWidget(neverAsk_CB); } int res = mb.exec() ; if (res == QMessageBox::No) return ; - else if(checkbox->isChecked()) + + if(dontAsk_CB->isChecked()) already_warned = true ; + + if(neverAsk_CB->isChecked()) + Settings->setValue("NeverAskMeForExternalLinkActivated",true); } QDesktopServices::openUrl(url) ; diff -Nru retroshare-0.6.4/src/retroshare-gui/src/gui/Posted/PostedItem.cpp retroshare-0.6.4/src/retroshare-gui/src/gui/Posted/PostedItem.cpp --- retroshare-0.6.4/src/retroshare-gui/src/gui/Posted/PostedItem.cpp 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/retroshare-gui/src/gui/Posted/PostedItem.cpp 2018-06-01 20:36:00.000000000 +0000 @@ -22,6 +22,7 @@ */ #include +#include #include "rshare.h" #include "PostedItem.h" diff -Nru retroshare-0.6.4/src/retroshare-gui/src/gui/qss/stylesheet/qss.default retroshare-0.6.4/src/retroshare-gui/src/gui/qss/stylesheet/qss.default --- retroshare-0.6.4/src/retroshare-gui/src/gui/qss/stylesheet/qss.default 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/retroshare-gui/src/gui/qss/stylesheet/qss.default 2018-06-01 20:36:00.000000000 +0000 @@ -244,9 +244,15 @@ background: #FFCCCC; } +/*Property Values at end to overwrite other settings*/ + [new=false] { background: #F8F8F8; } [new=true] { background: #DCECFD; } + +[WrongValue="true"] { + background-color: #FF8080; +} diff -Nru retroshare-0.6.4/src/retroshare-gui/src/gui/settings/ServerPage.cpp retroshare-0.6.4/src/retroshare-gui/src/gui/settings/ServerPage.cpp --- retroshare-0.6.4/src/retroshare-gui/src/gui/settings/ServerPage.cpp 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/retroshare-gui/src/gui/settings/ServerPage.cpp 2018-06-01 20:36:00.000000000 +0000 @@ -846,10 +846,15 @@ return; } - /* load up configuration from rsPeers */ - RsPeerDetails detail; - if (!rsPeers->getPeerDetails(rsPeers->getOwnId(), detail)) - return; + /* load up configuration from rsPeers */ + RsPeerDetails detail; + if (!rsPeers->getPeerDetails(rsPeers->getOwnId(), detail)) + { + std::cerr << __PRETTY_FUNCTION__ << " getPeerDetails(...) failed!" + << " This is unexpected report to developers please." + << std::endl; + return; + } /* only update if can't edit */ if (!ui.localPort->isEnabled()) diff -Nru retroshare-0.6.4/src/retroshare-gui/src/gui/settings/TransferPage.cpp retroshare-0.6.4/src/retroshare-gui/src/gui/settings/TransferPage.cpp --- retroshare-0.6.4/src/retroshare-gui/src/gui/settings/TransferPage.cpp 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/retroshare-gui/src/gui/settings/TransferPage.cpp 2018-06-01 20:36:00.000000000 +0000 @@ -22,14 +22,16 @@ #include "TransferPage.h" #include "rshare.h" +#include "gui/ShareManager.h" +#include "util/misc.h" -#include +#include "retroshare/rsiface.h" +#include "retroshare/rsfiles.h" +#include "retroshare/rspeers.h" + +#include -#include -#include -#include -#include -#include +#include TransferPage::TransferPage(QWidget * parent, Qt::WindowFlags flags) : ConfigPage(parent, flags) @@ -225,11 +227,23 @@ return; } - ui.incomingDir->setText(qdir); - std::string dir = ui.incomingDir->text().toUtf8().constData(); - - if(!dir.empty()) - rsFiles->setDownloadDirectory(dir); + std::string dir = qdir.toUtf8().constData(); + if(!dir.empty()) + { + if (!rsFiles->setDownloadDirectory(dir)) + { + ui.incomingDir->setToolTip( tr("Invalid Input. Have you got the right to write on it?") ); + ui.incomingDir->setProperty("WrongValue", true); + } + else + { + ui.incomingDir->setToolTip( "" ); + ui.incomingDir->setProperty("WrongValue", false); + } + } + ui.incomingDir->style()->unpolish(ui.incomingDir); + ui.incomingDir->style()->polish( ui.incomingDir); + whileBlocking(ui.incomingDir)->setText(QString::fromUtf8(rsFiles->getDownloadDirectory().c_str())); } void TransferPage::setPartialsDirectory() @@ -239,11 +253,25 @@ return; } - ui.partialsDir->setText(qdir); - std::string dir = ui.partialsDir->text().toUtf8().constData(); + std::string dir = qdir.toUtf8().constData(); if (!dir.empty()) - rsFiles->setPartialsDirectory(dir); + { + if (!rsFiles->setPartialsDirectory(dir)) + { + ui.partialsDir->setToolTip( tr("Invalid Input. It can't be an already shared directory.") ); + ui.partialsDir->setProperty("WrongValue", true); + } + else + { + ui.partialsDir->setToolTip( "" ); + ui.partialsDir->setProperty("WrongValue", false); + } + } + ui.partialsDir->style()->unpolish(ui.partialsDir); + ui.partialsDir->style()->polish( ui.partialsDir); + whileBlocking(ui.partialsDir)->setText(QString::fromUtf8(rsFiles->getPartialsDirectory().c_str())); } + void TransferPage::toggleAutoCheckDirectories(bool b) { ui.autoCheckDirectoriesDelay_SB->setEnabled(b); diff -Nru retroshare-0.6.4/src/retroshare-gui/src/gui/WikiPoos/WikiEditDialog.cpp retroshare-0.6.4/src/retroshare-gui/src/gui/WikiPoos/WikiEditDialog.cpp --- retroshare-0.6.4/src/retroshare-gui/src/gui/WikiPoos/WikiEditDialog.cpp 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/retroshare-gui/src/gui/WikiPoos/WikiEditDialog.cpp 2018-06-01 20:36:00.000000000 +0000 @@ -715,7 +715,7 @@ std::cerr << " ParentId: " << page.mMeta.mParentId; std::cerr << std::endl; - GxsIdRSTreeWidgetItem *modItem = new GxsIdRSTreeWidgetItem(mThreadCompareRole); + GxsIdRSTreeWidgetItem *modItem = new GxsIdRSTreeWidgetItem(mThreadCompareRole, GxsIdDetails::ICON_TYPE_AVATAR); modItem->setData(WET_DATA_COLUMN, WET_ROLE_ORIGPAGEID, QString::fromStdString(page.mMeta.mOrigMsgId.toStdString())); modItem->setData(WET_DATA_COLUMN, WET_ROLE_PAGEID, QString::fromStdString(page.mMeta.mMsgId.toStdString())); @@ -830,7 +830,7 @@ } /* create an Entry */ - GxsIdRSTreeWidgetItem *modItem = new GxsIdRSTreeWidgetItem(mThreadCompareRole); + GxsIdRSTreeWidgetItem *modItem = new GxsIdRSTreeWidgetItem(mThreadCompareRole, GxsIdDetails::ICON_TYPE_AVATAR); modItem->setData(WET_DATA_COLUMN, WET_ROLE_ORIGPAGEID, QString::fromStdString(snapshot.mMeta.mOrigMsgId.toStdString())); modItem->setData(WET_DATA_COLUMN, WET_ROLE_PAGEID, QString::fromStdString(snapshot.mMeta.mMsgId.toStdString())); modItem->setData(WET_DATA_COLUMN, WET_ROLE_PARENTID, QString::fromStdString(snapshot.mMeta.mParentId.toStdString())); diff -Nru retroshare-0.6.4/src/retroshare-gui/src/qss/blacknight.qss retroshare-0.6.4/src/retroshare-gui/src/qss/blacknight.qss --- retroshare-0.6.4/src/retroshare-gui/src/qss/blacknight.qss 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/retroshare-gui/src/qss/blacknight.qss 2018-06-01 20:36:00.000000000 +0000 @@ -293,9 +293,16 @@ background: #700000; } +/*Property Values at end to overwrite other settings*/ + [new=false] { background: #202020; } [new=true] { background: #005000; } + +[WrongValue=true] { + background-color: #702020; +} + diff -Nru retroshare-0.6.4/src/retroshare-gui/src/qss/qdarkstyle.qss retroshare-0.6.4/src/retroshare-gui/src/qss/qdarkstyle.qss --- retroshare-0.6.4/src/retroshare-gui/src/qss/qdarkstyle.qss 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/retroshare-gui/src/qss/qdarkstyle.qss 2018-06-01 20:36:00.000000000 +0000 @@ -1126,9 +1126,15 @@ background: #700000; } +/*Property Values at end to overwrite other settings*/ + [new=false] { background: #202020; } [new=true] { background: #005000; } + +[WrongValue="true"] { + background-color: #702020; +} diff -Nru retroshare-0.6.4/src/retroshare-nogui/src/retroshare-nogui.pro retroshare-0.6.4/src/retroshare-nogui/src/retroshare-nogui.pro --- retroshare-0.6.4/src/retroshare-nogui/src/retroshare-nogui.pro 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/retroshare-nogui/src/retroshare-nogui.pro 2018-06-01 20:36:00.000000000 +0000 @@ -23,14 +23,11 @@ ################################# Linux ########################################## linux-* { + CONFIG += link_pkgconfig #CONFIG += version_detail_bash_script QMAKE_CXXFLAGS *= -D_FILE_OFFSET_BITS=64 LIBS *= -rdynamic - - rs_autologin { - LIBS *= -lgnome-keyring - } } unix { diff -Nru retroshare-0.6.4/src/retroshare.pri retroshare-0.6.4/src/retroshare.pri --- retroshare-0.6.4/src/retroshare.pri 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/retroshare.pri 2018-06-01 20:36:00.000000000 +0000 @@ -160,6 +160,12 @@ ## RetroShare qmake functions goes here as all the rest may use them ########### ################################################################################ +## Qt versions older the 5 are not supported anymore, check if the user is +## attempting use them and fail accordingly with a proper error message +lessThan(QT_MAJOR_VERSION, 5) { + error(Qt 5.0.0 or newer is needed to build RetroShare) +} + ## This function is useful to look for the location of a file in a list of paths ## like the which command on linux, first paramether is the file name, ## second parameter is the name of a variable containing the list of folders @@ -226,7 +232,7 @@ ################################################################################ -## Statements and variables that depends on build options (CONFIG)goes here #### +## Statements and variables that depends on build options (CONFIG) goes here ### ################################################################################ ## ## Defining the following variables may be needed depending on platform and @@ -340,8 +346,17 @@ QMAKE_LIBDIR *= "$$RS_LIB_DIR" rs_autologin { - DEFINES *= HAS_GNOME_KEYRING - PKGCONFIG *= gnome-keyring-1 + # try libsecret first since it is not limited to gnome keyring and libgnome-keyring is deprecated + LIBSECRET_AVAILABLE = $$system(pkg-config --exists libsecret-1 && echo yes) + isEmpty(LIBSECRET_AVAILABLE) { + message("using libgnome-keyring for auto login") + DEFINES *= HAS_GNOME_KEYRING + PKGCONFIG *= gnome-keyring-1 + } else { + message("using libsecret for auto login") + DEFINES *= HAS_LIBSECRET + PKGCONFIG *= libsecret-1 + } } } @@ -366,6 +381,11 @@ } win32-g++ { + !isEmpty(EXTERNAL_LIB_DIR) { + message(Use pre-compiled libraries in $${EXTERNAL_LIB_DIR}.) + PREFIX = $$system_path($$EXTERNAL_LIB_DIR) + } + PREFIX_MSYS2 = $$(MINGW_PREFIX) isEmpty(PREFIX_MSYS2) { message("MINGW_PREFIX is not set, attempting MSYS2 autodiscovery.") @@ -380,22 +400,24 @@ PREFIX_MSYS2=$${TEMPTATIVE_MSYS2} } - isEmpty(PREFIX_MSYS2) { - error(Cannot find MSYS2 please set MINGW_PREFIX) - } else { + !isEmpty(PREFIX_MSYS2) { message(Found MSYS2: $${PREFIX_MSYS2}) + + isEmpty(PREFIX) { + PREFIX = $$system_path($${PREFIX_MSYS2}) + } } } isEmpty(PREFIX) { - PREFIX = $$system_path($${PREFIX_MSYS2}) + error(PREFIX is not set. Set either EXTERNAL_LIB_DIR or PREFIX_MSYS2.) } INCLUDEPATH *= $$system_path($${PREFIX}/include) - INCLUDEPATH *= $$system_path($${PREFIX_MSYS2}/include) + !isEmpty(PREFIX_MSYS2) : INCLUDEPATH *= $$system_path($${PREFIX_MSYS2}/include) QMAKE_LIBDIR *= $$system_path($${PREFIX}/lib) - QMAKE_LIBDIR *= $$system_path($${PREFIX_MSYS2}/lib) + !isEmpty(PREFIX_MSYS2) : QMAKE_LIBDIR *= $$system_path($${PREFIX_MSYS2}/lib) RS_BIN_DIR = $$system_path($${PREFIX}/bin) RS_INCLUDE_DIR = $$system_path($${PREFIX}/include) diff -Nru retroshare-0.6.4/src/retroshare-qml-app/src/AddTrustedNode.qml retroshare-0.6.4/src/retroshare-qml-app/src/AddTrustedNode.qml --- retroshare-0.6.4/src/retroshare-qml-app/src/AddTrustedNode.qml 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/retroshare-qml-app/src/AddTrustedNode.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,297 +0,0 @@ -/* - * RetroShare Android QML App - * Copyright (C) 2016-2017 Gioacchino Mazzurco - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ - -import QtQuick 2.7 -import QtQuick.Controls 2.0 -import org.retroshare.qml_components.LibresapiLocalClient 1.0 -import "." //Needed for ClipboardWrapper singleton -import "URI.js" as UriJs -import "components/." - -Item -{ - property ApplicationWindow mW - - property int infoIconHeight: 20 - - Column - { - anchors.fill: parent - spacing: 7 - - Text - { - text: qsTr("Import node from clipboard") - font.bold: true - wrapMode: Text.Wrap - anchors.horizontalCenter: parent.horizontalCenter - - font.pixelSize: 13 - - Rectangle - { - id: backgroundRectangle - anchors.fill: parent.fill - anchors.horizontalCenter: parent.horizontalCenter - width: parent.width + 20 - height: parent.height + 5 - - color:"transparent" - - Rectangle - { - id: borderBottom - width: parent.width - height: 1 - anchors.bottom: parent.bottom - anchors.right: parent.right - color: "lightgrey" - } - } - } - Row - { - anchors.horizontalCenter: parent.horizontalCenter - spacing: 5 - - ButtonIcon - { - height: infoIconHeight - anchors.verticalCenter: importButton.verticalCenter - width: height - imgUrl: "/icons/info.svg" - onClicked: - { - tooltipSpace.show(qsTr("Import a friend certificate from your clipboard.
"+ - "This will add him as trusted node.")) - - } - } - - ButtonText - { - id: importButton - text: qsTr("Import trusted node") - fontSize: 14 - - onClicked: - { - var cptext = ClipboardWrapper.getFromClipBoard() - - console.log("typeof(cptext)", typeof(cptext)) - if(cptext.search("://") > 0) - mainWindow.handleIntentUri(cptext) - else - rsApi.request( - "/peers/examine_cert/", - JSON.stringify({cert_string: cptext}), - function(par) - { - console.log("/peers/examine_cert/ CB", - par.response) - var resp = JSON.parse(par.response) - if(resp.returncode === "fail") - { - importErrorPop.text = resp.debug_msg - importErrorPop.open() - return - } - - var jData = resp.data - stackView.push( - "qrc:/TrustedNodeDetails.qml", - { - nodeCert: cptext, - pgpName: jData.name, - pgpId: jData.pgp_id, - locationName: jData.location, - sslIdTxt: jData.peer_id - } - ) - } - ) - } - } - } - - Text - { - text: qsTr("Export node") - font.bold: true - wrapMode: Text.Wrap - anchors.horizontalCenter: parent.horizontalCenter - - font.pixelSize: 13 - - Rectangle - { - anchors.fill: parent.fill - anchors.horizontalCenter: parent.horizontalCenter - width: parent.width + 20 - height: parent.height + 5 - - color:"transparent" - - Rectangle - { - width: parent.width - height: 1 - anchors.bottom: parent.bottom - anchors.right: parent.right - color: "lightgrey" - } - } - } - - Row - { - anchors.horizontalCenter: parent.horizontalCenter - spacing: 5 - - ButtonIcon - { - height: infoIconHeight - anchors.verticalCenter: btRsCert.verticalCenter - width: height - imgUrl: "/icons/info.svg" - onClicked: - { - tooltipSpace.show(qsTr("Share your RetroShare link!
"+ - "Send it to a friend and start talk!")) - - } - } - - ButtonText - { - id: btRsCert - text: qsTr("Export own certificate link") - fontSize: 14 - onClicked: - { - console.log("onClicked", text) - rsApi.request( - "/peers/self/certificate/", "", - function(par) - { - var radix = JSON.parse(par.response).data.cert_string - var name = mainWindow.user_name - var encodedName = UriJs.URI.encode(name) - var nodeUrl = ( - "retroshare://certificate?" + - "name=" + encodedName + - "&radix=" + UriJs.URI.encode(radix) + - "&location=" + encodedName ) - ClipboardWrapper.postToClipBoard(nodeUrl) - linkCopiedPopup.itemName = name - linkCopiedPopup.open() - platformGW.shareUrl(nodeUrl); - }) - } - } - } - - ButtonText - { - onClicked: plainCertificateRow.visible = !plainCertificateRow.visible - iconUrl: "/icons/options.svg" - anchors.horizontalCenter: parent.horizontalCenter - color: "white" - borderWidth: 1 - text: qsTr("Advanced") - - } - - Row - { - id: plainCertificateRow - anchors.horizontalCenter: parent.horizontalCenter - spacing: 5 - visible: false - - ButtonIcon - { - height: infoIconHeight - anchors.verticalCenter: btPlainCert.verticalCenter - width: height - imgUrl: "/icons/info.svg" - onClicked: - { - tooltipSpace.show(qsTr("This will copy your RetroShare plain certificate.
"+ - "Add it manually to your friend client.")) - - } - } - - ButtonText - { - id: btPlainCert - text: qsTr("Export own plain certificate") - fontSize: 14 - onClicked: - { - rsApi.request( - "/peers/self/certificate/", "", - function(par) - { - var radix = JSON.parse(par.response).data.cert_string - var name = mainWindow.user_name - ClipboardWrapper.postToClipBoard(radix) - - linkCopiedPopup.itemName = name - linkCopiedPopup.open() - }) - - } - } - } - - - } - - Rectangle - { - id: tooltipSpace - anchors.bottom: parent.bottom - anchors.horizontalCenter: parent.horizontalCenter - - ToolTip - { - id: infoTooltip - timeout: 5000 - Component.onCompleted: show("afafsaf",0) - } - function show (infoText) - { - infoTooltip.text = infoText - infoTooltip.open() - } - } - - TimedPopup - { - id: importErrorPop - property alias text: popText.text - - Text - { - id: popText - anchors.fill: parent - } - } -} diff -Nru retroshare-0.6.4/src/retroshare-qml-app/src/android/android.iml retroshare-0.6.4/src/retroshare-qml-app/src/android/android.iml --- retroshare-0.6.4/src/retroshare-qml-app/src/android/android.iml 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/retroshare-qml-app/src/android/android.iml 1970-01-01 00:00:00.000000000 +0000 @@ -1,94 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff -Nru retroshare-0.6.4/src/retroshare-qml-app/src/android/AndroidManifest.xml retroshare-0.6.4/src/retroshare-qml-app/src/android/AndroidManifest.xml --- retroshare-0.6.4/src/retroshare-qml-app/src/android/AndroidManifest.xml 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/retroshare-qml-app/src/android/AndroidManifest.xml 1970-01-01 00:00:00.000000000 +0000 @@ -1,214 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff -Nru retroshare-0.6.4/src/retroshare-qml-app/src/android/build.gradle retroshare-0.6.4/src/retroshare-qml-app/src/android/build.gradle --- retroshare-0.6.4/src/retroshare-qml-app/src/android/build.gradle 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/retroshare-qml-app/src/android/build.gradle 1970-01-01 00:00:00.000000000 +0000 @@ -1,57 +0,0 @@ -buildscript { - repositories { - jcenter() - } - - dependencies { - classpath 'com.android.tools.build:gradle:2.2.3' - } -} - -allprojects { - repositories { - jcenter() - } -} - -apply plugin: 'com.android.application' - -dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) -} - -android { - /******************************************************* - * The following variables: - * - androidBuildToolsVersion, - * - androidCompileSdkVersion - * - qt5AndroidDir - holds the path to qt android files - * needed to build any Qt application - * on Android. - * - * are defined in gradle.properties file. This file is - * updated by QtCreator and androiddeployqt tools. - * Changing them manually might break the compilation! - *******************************************************/ - - compileSdkVersion androidCompileSdkVersion.toInteger() - - buildToolsVersion androidBuildToolsVersion - - sourceSets { - main { - manifest.srcFile 'AndroidManifest.xml' - java.srcDirs = [qt5AndroidDir + '/src', 'src', 'java'] - aidl.srcDirs = [qt5AndroidDir + '/src', 'src', 'aidl'] - res.srcDirs = [qt5AndroidDir + '/res', 'res'] - resources.srcDirs = ['src'] - renderscript.srcDirs = ['src'] - assets.srcDirs = ['assets'] - jniLibs.srcDirs = ['libs'] - } - } - - lintOptions { - abortOnError false - } -} diff -Nru retroshare-0.6.4/src/retroshare-qml-app/src/android/captures/org.retroshare.android.qml_app_2016.08.22_16.56.txt retroshare-0.6.4/src/retroshare-qml-app/src/android/captures/org.retroshare.android.qml_app_2016.08.22_16.56.txt --- retroshare-0.6.4/src/retroshare-qml-app/src/android/captures/org.retroshare.android.qml_app_2016.08.22_16.56.txt 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/retroshare-qml-app/src/android/captures/org.retroshare.android.qml_app_2016.08.22_16.56.txt 1970-01-01 00:00:00.000000000 +0000 @@ -1,36 +0,0 @@ -Activity Resolver Table: - Non-Data Actions: - android.intent.action.MAIN: - 42420338 org.retroshare.android.qml_app/.RetroShareQmlActivity filter 42424830 - -Receiver Resolver Table: - Non-Data Actions: - android.intent.action.BOOT_COMPLETED: - 4245c230 org.retroshare.android.qml_app/.BootCompletedReceiver filter 4245c360 - -Packages: - Package [org.retroshare.android.qml_app] (4289b2f8): - userId=10168 gids=[3003, 1015, 1028] - pkg=Package{42244e18 org.retroshare.android.qml_app} - codePath=/data/app/org.retroshare.android.qml_app-2.apk - resourcePath=/data/app/org.retroshare.android.qml_app-2.apk - nativeLibraryPath=/data/app-lib/org.retroshare.android.qml_app-2 - versionCode=1 targetSdk=18 - versionName=1.0 - applicationInfo=ApplicationInfo{4232af50 org.retroshare.android.qml_app} - flags=[ DEBUGGABLE HAS_CODE ALLOW_CLEAR_USER_DATA ALLOW_BACKUP ] - dataDir=/data/data/org.retroshare.android.qml_app - supportsScreens=[small, medium, large, xlarge, resizeable, anyDensity] - timeStamp=2016-08-22 16:53:12 - firstInstallTime=2016-08-22 16:47:19 - lastUpdateTime=2016-08-22 16:53:30 - signatures=PackageSignatures{4233b1e0 [4265b018]} - permissionsFixed=true haveGids=true installStatus=1 - pkgFlags=[ DEBUGGABLE HAS_CODE ALLOW_CLEAR_USER_DATA ALLOW_BACKUP ] - User 0: installed=true stopped=false notLaunched=false enabled=0 - grantedPermissions: - android.permission.READ_EXTERNAL_STORAGE - android.permission.RECEIVE_BOOT_COMPLETED - android.permission.ACCESS_NETWORK_STATE - android.permission.WRITE_EXTERNAL_STORAGE - android.permission.INTERNET diff -Nru retroshare-0.6.4/src/retroshare-qml-app/src/android/.gitignore retroshare-0.6.4/src/retroshare-qml-app/src/android/.gitignore --- retroshare-0.6.4/src/retroshare-qml-app/src/android/.gitignore 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/retroshare-qml-app/src/android/.gitignore 1970-01-01 00:00:00.000000000 +0000 @@ -1,5 +0,0 @@ -.build -.gradle -.idea -captures -local.properties Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/android/gradle/wrapper/gradle-wrapper.jar and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/android/gradle/wrapper/gradle-wrapper.jar differ diff -Nru retroshare-0.6.4/src/retroshare-qml-app/src/android/gradle/wrapper/gradle-wrapper.properties retroshare-0.6.4/src/retroshare-qml-app/src/android/gradle/wrapper/gradle-wrapper.properties --- retroshare-0.6.4/src/retroshare-qml-app/src/android/gradle/wrapper/gradle-wrapper.properties 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/retroshare-qml-app/src/android/gradle/wrapper/gradle-wrapper.properties 1970-01-01 00:00:00.000000000 +0000 @@ -1,6 +0,0 @@ -#Fri Apr 07 17:55:25 CEST 2017 -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip diff -Nru retroshare-0.6.4/src/retroshare-qml-app/src/android/gradle.properties retroshare-0.6.4/src/retroshare-qml-app/src/android/gradle.properties --- retroshare-0.6.4/src/retroshare-qml-app/src/android/gradle.properties 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/retroshare-qml-app/src/android/gradle.properties 1970-01-01 00:00:00.000000000 +0000 @@ -1,9 +0,0 @@ -## This file is automatically generated by QtCreator. -# -# This file must *NOT* be checked into Version Control Systems, -# as it contains information specific to your local configuration. - -androidBuildToolsVersion=24.0.1 -androidCompileSdkVersion=23 -buildDir=.build -qt5AndroidDir=/opt/Qt/5.9.2/android_armv7/src/android/java diff -Nru retroshare-0.6.4/src/retroshare-qml-app/src/android/gradlew retroshare-0.6.4/src/retroshare-qml-app/src/android/gradlew --- retroshare-0.6.4/src/retroshare-qml-app/src/android/gradlew 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/retroshare-qml-app/src/android/gradlew 1970-01-01 00:00:00.000000000 +0000 @@ -1,164 +0,0 @@ -#!/usr/bin/env bash - -############################################################################## -## -## Gradle start up script for UN*X -## -############################################################################## - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS="" - -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` - -# Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" - -warn ( ) { - echo "$*" -} - -die ( ) { - echo - echo "$*" - echo - exit 1 -} - -# OS specific support (must be 'true' or 'false'). -cygwin=false -msys=false -darwin=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; -esac - -# For Cygwin, ensure paths are in UNIX format before anything is touched. -if $cygwin ; then - [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"` -fi - -# Attempt to set APP_HOME -# Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi -done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >&- -APP_HOME="`pwd -P`" -cd "$SAVED" >&- - -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar - -# Determine the Java command to use to start the JVM. -if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" - else - JAVACMD="$JAVA_HOME/bin/java" - fi - if [ ! -x "$JAVACMD" ] ; then - die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." - fi -else - JAVACMD="java" - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." -fi - -# Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi -fi - -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi - -# For Cygwin, switch paths to Windows format before running java -if $cygwin ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi - # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" - fi - i=$((i+1)) - done - case $i in - (0) set -- ;; - (1) set -- "$args0" ;; - (2) set -- "$args0" "$args1" ;; - (3) set -- "$args0" "$args1" "$args2" ;; - (4) set -- "$args0" "$args1" "$args2" "$args3" ;; - (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac -fi - -# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules -function splitJvmOpts() { - JVM_OPTS=("$@") -} -eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS -JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" - -exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" diff -Nru retroshare-0.6.4/src/retroshare-qml-app/src/android/gradlew.bat retroshare-0.6.4/src/retroshare-qml-app/src/android/gradlew.bat --- retroshare-0.6.4/src/retroshare-qml-app/src/android/gradlew.bat 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/retroshare-qml-app/src/android/gradlew.bat 1970-01-01 00:00:00.000000000 +0000 @@ -1,90 +0,0 @@ -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS= - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto init - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:init -@rem Get command-line arguments, handling Windowz variants - -if not "%OS%" == "Windows_NT" goto win9xME_args -if "%@eval[2+2]" == "4" goto 4NT_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* -goto execute - -:4NT_args -@rem Get arguments from the 4NT Shell from JP Software -set CMD_LINE_ARGS=%$ - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/android/res/drawable/retroshare_128x128.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/android/res/drawable/retroshare_128x128.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/android/res/drawable/retroshare_48x48.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/android/res/drawable/retroshare_48x48.png differ diff -Nru retroshare-0.6.4/src/retroshare-qml-app/src/android/res/values/libs.xml retroshare-0.6.4/src/retroshare-qml-app/src/android/res/values/libs.xml --- retroshare-0.6.4/src/retroshare-qml-app/src/android/res/values/libs.xml 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/retroshare-qml-app/src/android/res/values/libs.xml 1970-01-01 00:00:00.000000000 +0000 @@ -1,25 +0,0 @@ - - - - https://download.qt.io/ministro/android/qt5/qt-5.7 - - - - - - - - - - - - - - - - - - - - diff -Nru retroshare-0.6.4/src/retroshare-qml-app/src/android/src/NativeCalls.cpp retroshare-0.6.4/src/retroshare-qml-app/src/android/src/NativeCalls.cpp --- retroshare-0.6.4/src/retroshare-qml-app/src/android/src/NativeCalls.cpp 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/retroshare-qml-app/src/android/src/NativeCalls.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,43 +0,0 @@ -/* - * RetroShare Android QML App - * Copyright (C) 2017 Gioacchino Mazzurco - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ - -#include "NativeCalls.h" -#include "rsqmlappengine.h" - -#include -#include - -JNIEXPORT void JNICALL -Java_org_retroshare_android_qml_1app_jni_NativeCalls_notifyIntentUri -(JNIEnv* env, jclass, jstring uri) -{ - qDebug() << __PRETTY_FUNCTION__; - - const char *uriBytes = env->GetStringUTFChars(uri, NULL); - QString uriStr(uriBytes); - env->ReleaseStringUTFChars(uri, uriBytes); - - RsQmlAppEngine* engine = RsQmlAppEngine::mainInstance(); - if(engine) - QMetaObject::invokeMethod( - engine, "handleUri", - Qt::QueuedConnection, // BlockingQueuedConnection, AutoConnection - Q_ARG(QString, uriStr)); - else qCritical() << __PRETTY_FUNCTION__ << "RsQmlAppEngine::mainInstance()" - << "not initialized yet!"; -} diff -Nru retroshare-0.6.4/src/retroshare-qml-app/src/android/src/org/retroshare/android/qml_app/AppUpdatedReceiver.java retroshare-0.6.4/src/retroshare-qml-app/src/android/src/org/retroshare/android/qml_app/AppUpdatedReceiver.java --- retroshare-0.6.4/src/retroshare-qml-app/src/android/src/org/retroshare/android/qml_app/AppUpdatedReceiver.java 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/retroshare-qml-app/src/android/src/org/retroshare/android/qml_app/AppUpdatedReceiver.java 1970-01-01 00:00:00.000000000 +0000 @@ -1,43 +0,0 @@ -/* - * RetroShare Android Service - * Copyright (C) 2016-2017 Gioacchino Mazzurco - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ - -package org.retroshare.android.qml_app; - -import android.content.BroadcastReceiver; -import android.content.Context; -import android.content.Intent; -import android.util.Log; - -public class AppUpdatedReceiver extends BroadcastReceiver -{ - @Override - public void onReceive(Context context, Intent intent) - { - Log.i("AppUpdatedReceiver", "onReceive() Stopping RetroShareAndroidNotifyService After Update"); - Intent nsIntent = new Intent(context, RetroShareAndroidNotifyService.class); - context.stopService(nsIntent); - - Log.i("AppUpdatedReceiver", "onReceive() Restarting RetroShare Android Service After Update"); - Intent coreIntent = new Intent(context, RetroShareAndroidService.class); - context.stopService(coreIntent); - context.startService(coreIntent); - - Log.i("AppUpdatedReceiver", "onReceive() Starting RetroShareAndroidNotifyService After Update"); - context.startService(nsIntent); - } -} diff -Nru retroshare-0.6.4/src/retroshare-qml-app/src/android/src/org/retroshare/android/qml_app/BootCompletedReceiver.java retroshare-0.6.4/src/retroshare-qml-app/src/android/src/org/retroshare/android/qml_app/BootCompletedReceiver.java --- retroshare-0.6.4/src/retroshare-qml-app/src/android/src/org/retroshare/android/qml_app/BootCompletedReceiver.java 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/retroshare-qml-app/src/android/src/org/retroshare/android/qml_app/BootCompletedReceiver.java 1970-01-01 00:00:00.000000000 +0000 @@ -1,39 +0,0 @@ -/* - * RetroShare Android Service - * Copyright (C) 2016-2017 Gioacchino Mazzurco - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ - -package org.retroshare.android.qml_app; - -import android.content.BroadcastReceiver; -import android.content.Context; -import android.content.Intent; -import android.util.Log; - -public class BootCompletedReceiver extends BroadcastReceiver -{ - @Override - public void onReceive(Context context, Intent intent) - { - Log.i("BootCompletedReceiver", "onReceive() Starting RetroShareAndroidService on boot"); - Intent coreIntent = new Intent(context, RetroShareAndroidService.class); - context.startService(coreIntent); - - Log.i("BootCompletedReceiver", "onReceive() Starting RetroShareAndroidNotifyService on boot"); - Intent nsIntent = new Intent(context, RetroShareAndroidNotifyService.class); - context.startService(nsIntent); - } -} diff -Nru retroshare-0.6.4/src/retroshare-qml-app/src/android/src/org/retroshare/android/qml_app/jni/NativeCalls.java retroshare-0.6.4/src/retroshare-qml-app/src/android/src/org/retroshare/android/qml_app/jni/NativeCalls.java --- retroshare-0.6.4/src/retroshare-qml-app/src/android/src/org/retroshare/android/qml_app/jni/NativeCalls.java 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/retroshare-qml-app/src/android/src/org/retroshare/android/qml_app/jni/NativeCalls.java 1970-01-01 00:00:00.000000000 +0000 @@ -1,24 +0,0 @@ -/* - * RetroShare Android Service - * Copyright (C) 2017 Gioacchino Mazzurco - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ - -package org.retroshare.android.qml_app.jni; - -public class NativeCalls -{ - public static native void notifyIntentUri(String uri); -} diff -Nru retroshare-0.6.4/src/retroshare-qml-app/src/android/src/org/retroshare/android/qml_app/RetroShareAndroidNotifyService.java retroshare-0.6.4/src/retroshare-qml-app/src/android/src/org/retroshare/android/qml_app/RetroShareAndroidNotifyService.java --- retroshare-0.6.4/src/retroshare-qml-app/src/android/src/org/retroshare/android/qml_app/RetroShareAndroidNotifyService.java 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/retroshare-qml-app/src/android/src/org/retroshare/android/qml_app/RetroShareAndroidNotifyService.java 1970-01-01 00:00:00.000000000 +0000 @@ -1,62 +0,0 @@ -/* - * RetroShare Android Service - * Copyright (C) 2017 Gioacchino Mazzurco - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ - -package org.retroshare.android.qml_app; - -import android.app.Notification; -import android.app.NotificationManager; -import android.app.PendingIntent; -import android.content.Context; -import android.content.Intent; -import android.media.RingtoneManager; -import android.net.Uri; - -import org.qtproject.qt5.android.bindings.QtService; - -public class RetroShareAndroidNotifyService extends QtService -{ - @UsedByNativeCode @SuppressWarnings("unused") - public void notify(String title, String text, String uri) - { - Notification.Builder mBuilder = new Notification.Builder(this); - mBuilder.setSmallIcon(R.drawable.retroshare_48x48) - .setContentTitle(title) - .setContentText(text) - .setAutoCancel(true) - .setSound(RingtoneManager.getDefaultUri(RingtoneManager.TYPE_NOTIFICATION)); - - Intent intent = new Intent(this, RetroShareQmlActivity.class); - intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP); - intent.addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP); - - if(!uri.isEmpty()) intent.setData(Uri.parse(uri)); - - PendingIntent pendingIntent = PendingIntent.getActivity( - this, NOTIFY_REQ_CODE, intent, - PendingIntent.FLAG_UPDATE_CURRENT); - - mBuilder.setContentIntent(pendingIntent); - NotificationManager mNotificationManager = - (NotificationManager) this.getSystemService(Context.NOTIFICATION_SERVICE); - mNotificationManager.notify(0, mBuilder.build()); - } - - /** Must not be 0 otherwise a new activity may be created when should not - * (ex. the activity is already visible/on top) and deadlocks happens */ - private static final int NOTIFY_REQ_CODE = 2173; -} diff -Nru retroshare-0.6.4/src/retroshare-qml-app/src/android/src/org/retroshare/android/qml_app/RetroShareAndroidService.java retroshare-0.6.4/src/retroshare-qml-app/src/android/src/org/retroshare/android/qml_app/RetroShareAndroidService.java --- retroshare-0.6.4/src/retroshare-qml-app/src/android/src/org/retroshare/android/qml_app/RetroShareAndroidService.java 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/retroshare-qml-app/src/android/src/org/retroshare/android/qml_app/RetroShareAndroidService.java 1970-01-01 00:00:00.000000000 +0000 @@ -1,23 +0,0 @@ -/* - * RetroShare Android Service - * Copyright (C) 2016 Gioacchino Mazzurco - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ - -package org.retroshare.android.qml_app; - -import org.qtproject.qt5.android.bindings.QtService; - -public class RetroShareAndroidService extends QtService {} diff -Nru retroshare-0.6.4/src/retroshare-qml-app/src/android/src/org/retroshare/android/qml_app/RetroShareQmlActivity.java retroshare-0.6.4/src/retroshare-qml-app/src/android/src/org/retroshare/android/qml_app/RetroShareQmlActivity.java --- retroshare-0.6.4/src/retroshare-qml-app/src/android/src/org/retroshare/android/qml_app/RetroShareQmlActivity.java 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/retroshare-qml-app/src/android/src/org/retroshare/android/qml_app/RetroShareQmlActivity.java 1970-01-01 00:00:00.000000000 +0000 @@ -1,183 +0,0 @@ -/* - * RetroShare Android QML App - * Copyright (C) 2016-2017 Gioacchino Mazzurco - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ - -package org.retroshare.android.qml_app; - -import android.app.ActivityManager; -import android.content.ContentValues; -import android.content.Context; -import android.content.Intent; -import android.database.Cursor; -import android.os.Bundle; -import android.provider.MediaStore; -import android.util.Log; - -import android.net.Uri; - -import org.qtproject.qt5.android.bindings.QtActivity; - -import org.retroshare.android.qml_app.jni.NativeCalls; - -public class RetroShareQmlActivity extends QtActivity -{ - - static final int PICK_PHOTO = 1; - - @Override - public void onCreate(Bundle savedInstanceState) - { - Log.i("RetroShareQmlActivity", "onCreate()"); - - if (!isMyServiceRunning(RetroShareAndroidService.class)) - { - Log.i("RetroShareQmlActivity", "onCreate(): RetroShareAndroidService is not running, let's start it by Intent"); - Intent rsIntent = new Intent(this, RetroShareAndroidService.class); - startService(rsIntent); - } - else Log.v("RetroShareQmlActivity", "onCreate(): RetroShareAndroidService already running"); - - if (!isMyServiceRunning(RetroShareAndroidNotifyService.class)) - { - Log.i("RetroShareQmlActivity", "onCreate(): RetroShareAndroidNotifyService is not running, let's start it by Intent"); - Intent rsIntent = new Intent(this, RetroShareAndroidNotifyService.class); - startService(rsIntent); - } - else Log.v("RetroShareQmlActivity", "onCreate(): RetroShareAndroidNotifyService already running"); - - super.onCreate(savedInstanceState); - } - - @Override - public void onNewIntent(Intent intent) - { - Log.i("RetroShareQmlActivity", "on NewIntent(Intent intent)"); - - super.onNewIntent(intent); - - String uri = intent.getDataString(); - if (uri != null) - { - NativeCalls.notifyIntentUri(uri); - Log.i("RetroShareQmlActivity", "onNewIntent(Intent intent) Uri: " + uri); - } - } - - @UsedByNativeCode @SuppressWarnings("unused") - public void shareUrl(String urlStr) - { - Intent shareIntent = new Intent() - .setAction(Intent.ACTION_SEND) - .putExtra(Intent.EXTRA_TEXT, urlStr) - .setType("text/plain"); - startActivity(Intent.createChooser(shareIntent,"")); // TODO: Need proper title? - } - - - private boolean isMyServiceRunning(Class serviceClass) - { - ActivityManager manager = (ActivityManager) getSystemService(Context.ACTIVITY_SERVICE); - for (ActivityManager.RunningServiceInfo service : manager.getRunningServices(Integer.MAX_VALUE)) - if (serviceClass.getName().equals(service.service.getClassName())) - return true; - return false; - } - - private Uri capturedImageURI; - - public void openImagePicker() - { - Log.i("RetroShareQmlActivity", "openImagePicker()"); - - Intent pickIntent = new Intent(Intent.ACTION_PICK, android.provider.MediaStore.Images.Media.EXTERNAL_CONTENT_URI); - pickIntent.setType("image/*"); - - ContentValues values = new ContentValues(); - values.put(MediaStore.Images.Media.TITLE, "Retroshare Avatar"); - capturedImageURI = getContentResolver().insert(MediaStore.Images.Media.EXTERNAL_CONTENT_URI, values); - Intent takePicture = new Intent(MediaStore.ACTION_IMAGE_CAPTURE); - takePicture.putExtra(MediaStore.EXTRA_OUTPUT, capturedImageURI); - - Intent chooserIntent = Intent.createChooser(pickIntent, "Select Image"); - chooserIntent.putExtra(Intent.EXTRA_INITIAL_INTENTS, new Intent[] {takePicture}); - - startActivityForResult( chooserIntent, PICK_PHOTO); - }; - - public void onActivityResult(int requestCode, int resultCode, Intent data) - { - Log.i("RetroShareQmlActivity", "onActivityResult()" + String.valueOf(requestCode)); - - if (resultCode == RESULT_OK) - { - if (requestCode == PICK_PHOTO) - { - final boolean isCamera; - - if (data == null) - { - isCamera = true; - } - else - { - final String action = data.getAction(); - if (action == null) - { - isCamera = false; - } - else - { - isCamera = action.equals(android.provider.MediaStore.ACTION_IMAGE_CAPTURE); - } - } - - Uri selectedImageUri; - if (isCamera) - { - selectedImageUri = capturedImageURI; - } - else - { - selectedImageUri = data == null ? null : data.getData(); - } - - String uri = getRealPathFromURI(selectedImageUri); - if (uri != null) - { - Log.i("RetroShareQmlActivity", "Image path from uri found!" + uri); - NativeCalls.notifyIntentUri("//file"+uri); // Add the authority for get it on qml code - } - } - } - } - - public String getRealPathFromURI(Uri uri) { - String[] projection = { MediaStore.Images.Media.DATA }; - @SuppressWarnings("deprecation") - Cursor cursor = managedQuery(uri, projection, null, null, null); - int column_index = cursor - .getColumnIndexOrThrow(MediaStore.Images.Media.DATA); - cursor.moveToFirst(); - String result = cursor.getString(column_index); - return result; - } - - - - - -} diff -Nru retroshare-0.6.4/src/retroshare-qml-app/src/android/src/org/retroshare/android/qml_app/UsedByNativeCode.java retroshare-0.6.4/src/retroshare-qml-app/src/android/src/org/retroshare/android/qml_app/UsedByNativeCode.java --- retroshare-0.6.4/src/retroshare-qml-app/src/android/src/org/retroshare/android/qml_app/UsedByNativeCode.java 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/retroshare-qml-app/src/android/src/org/retroshare/android/qml_app/UsedByNativeCode.java 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -package org.retroshare.android.qml_app; - -public @interface UsedByNativeCode {} diff -Nru retroshare-0.6.4/src/retroshare-qml-app/src/android/src/org_retroshare_android_qml_app_jni_NativeCalls.h retroshare-0.6.4/src/retroshare-qml-app/src/android/src/org_retroshare_android_qml_app_jni_NativeCalls.h --- retroshare-0.6.4/src/retroshare-qml-app/src/android/src/org_retroshare_android_qml_app_jni_NativeCalls.h 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/retroshare-qml-app/src/android/src/org_retroshare_android_qml_app_jni_NativeCalls.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,21 +0,0 @@ -/* DO NOT EDIT THIS FILE - it is machine generated */ -#include -/* Header for class org_retroshare_android_qml_app_jni_NativeCalls */ - -#ifndef _Included_org_retroshare_android_qml_app_jni_NativeCalls -#define _Included_org_retroshare_android_qml_app_jni_NativeCalls -#ifdef __cplusplus -extern "C" { -#endif -/* - * Class: org_retroshare_android_qml_app_jni_NativeCalls - * Method: notifyIntentUri - * Signature: (Ljava/lang/String;)V - */ -JNIEXPORT void JNICALL Java_org_retroshare_android_qml_1app_jni_NativeCalls_notifyIntentUri - (JNIEnv *, jclass, jstring); - -#ifdef __cplusplus -} -#endif -#endif diff -Nru retroshare-0.6.4/src/retroshare-qml-app/src/androidimagepicker.h retroshare-0.6.4/src/retroshare-qml-app/src/androidimagepicker.h --- retroshare-0.6.4/src/retroshare-qml-app/src/androidimagepicker.h 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/retroshare-qml-app/src/androidimagepicker.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,95 +0,0 @@ -#pragma once - -#include -#include - -#include -#include -#include -#include -#include - -#include "qpainter.h" - - -#ifdef __ANDROID__ -# include -# include -#endif // __ANDROID__ - -struct AndroidImagePicker : QObject -{ - Q_OBJECT - -public slots: - - static void openPicker() - { - qDebug() << "Starting image picker intent"; - -#ifdef __ANDROID__ - QtAndroid::androidActivity().callMethod( - "openImagePicker", - "()V" ); -#endif // __ANDROID__ - - } - - // Used to convert a given image path into a png base64 string - static QString imageToBase64 (QString const& path) - { - // Get local path from uri - QUrl url (path); - QString localPath = url.toLocalFile(); - - qDebug() << "imageToBase64() local path:" << localPath ; - QImage image= getImage (localPath); - - image = image.scaled(96,96,Qt::KeepAspectRatio,Qt::SmoothTransformation); - - qDebug() << "imageToBase64() encoding" ; - - return imageToB64(image); - } - - static QString b64AvatarGen (QVariantList onloads, int size) - { - qDebug() << "Generating hash face avatar"; - - QImage result(size, size, QImage::Format_ARGB32_Premultiplied); - QPainter painter(&result); - - - int counter = 0; - for(QVariantList::iterator j = onloads.begin(); j != onloads.end(); ++j) - { - QImage image = getImage (":/"+(*j).toString()); - painter.drawImage(0, 0, image); // xi, yi is the position for imagei - ++counter; - } - painter.end(); - - return imageToB64(result); - } - - static QImage getImage (QString const& path) - { - QImageReader reader; - reader.setFileName(path); - return reader.read(); - } - - static QString imageToB64 (QImage image) - { - // Transform image into PNG format - QByteArray ba; - QBuffer buffer( &ba ); - buffer.open( QIODevice::WriteOnly ); - image.save( &buffer, "png" ); - - // Get Based 64 image string - return QString(ba.toBase64()); - } - - -}; diff -Nru retroshare-0.6.4/src/retroshare-qml-app/src/androidplatforminteracions.cpp retroshare-0.6.4/src/retroshare-qml-app/src/androidplatforminteracions.cpp --- retroshare-0.6.4/src/retroshare-qml-app/src/androidplatforminteracions.cpp 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/retroshare-qml-app/src/androidplatforminteracions.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,41 +0,0 @@ -/* - * RetroShare Android QML App - * Copyright (C) 2017 Gioacchino Mazzurco - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ - -#include "androidplatforminteracions.h" - -#include -#include - -AndroidPlatformInteracions::AndroidPlatformInteracions(QObject *parent) : - PlatformInteracions(parent) {} - -void AndroidPlatformInteracions::shareUrl(QUrl url) -{ - QString encUri = url.toString(QUrl::FullyEncoded); - QAndroidJniObject uriStr = QAndroidJniObject::fromString(encUri); - - QtAndroid::runOnAndroidThread( - [uriStr]() - { - QtAndroid::androidActivity() - .callMethod( - "shareUrl", - "(Ljava/lang/String;)V", - uriStr.object()); - }); -} diff -Nru retroshare-0.6.4/src/retroshare-qml-app/src/androidplatforminteracions.h retroshare-0.6.4/src/retroshare-qml-app/src/androidplatforminteracions.h --- retroshare-0.6.4/src/retroshare-qml-app/src/androidplatforminteracions.h 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/retroshare-qml-app/src/androidplatforminteracions.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,34 +0,0 @@ -#pragma once -/* - * RetroShare Android QML App - * Copyright (C) 2017 Gioacchino Mazzurco - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ - -#include -#include - -#include "platforminteracions.h" - -class AndroidPlatformInteracions : public PlatformInteracions -{ - Q_OBJECT - -public: - explicit AndroidPlatformInteracions(QObject *parent = nullptr); - -public slots: - virtual void shareUrl(QUrl url); -}; diff -Nru retroshare-0.6.4/src/retroshare-qml-app/src/ApiImageExample.qml retroshare-0.6.4/src/retroshare-qml-app/src/ApiImageExample.qml --- retroshare-0.6.4/src/retroshare-qml-app/src/ApiImageExample.qml 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/retroshare-qml-app/src/ApiImageExample.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,43 +0,0 @@ -/* - * RetroShare Android QML App - * Copyright (C) 2017 Gioacchino Mazzurco - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ - -import QtQuick 2.7 - - -Rectangle -{ - color: "red" - - Image - { - id: testImg - height: 300 - width: 300 - } - - Component.onCompleted: - { - rsApi.request( - "/peers/d441e8890164a0f335ad75acc59b5a49/avatar_image", - "", setImgCallback ) - } - function setImgCallback(par) - { - testImg.source = "data:image/png;base64," + par.response - } -} diff -Nru retroshare-0.6.4/src/retroshare-qml-app/src/AppSettings.qml retroshare-0.6.4/src/retroshare-qml-app/src/AppSettings.qml --- retroshare-0.6.4/src/retroshare-qml-app/src/AppSettings.qml 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/retroshare-qml-app/src/AppSettings.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,27 +0,0 @@ -/* - * RetroShare Android QML App - * Copyright (C) 2018 Gioacchino Mazzurco - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ - -pragma Singleton - -import Qt.labs.settings 1.0 - -Settings -{ - property string dhtMode: "Interactive" -} - diff -Nru retroshare-0.6.4/src/retroshare-qml-app/src/BusyOverlay.qml retroshare-0.6.4/src/retroshare-qml-app/src/BusyOverlay.qml --- retroshare-0.6.4/src/retroshare-qml-app/src/BusyOverlay.qml 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/retroshare-qml-app/src/BusyOverlay.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,44 +0,0 @@ -/* - * RetroShare Android QML App - * Copyright (C) 2017 Gioacchino Mazzurco - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ - -import QtQuick 2.7 -import QtQuick.Controls 2.0 - -Rectangle -{ - id: busyOverlay - - property string message - - enabled: false - anchors.fill: parent - - BusyIndicator - { - running: true - anchors.centerIn: parent - } - - Button - { - text: busyOverlay.message - anchors.horizontalCenter: parent.horizontalCenter - anchors.bottom: parent.bottom - } -} - diff -Nru retroshare-0.6.4/src/retroshare-qml-app/src/ChatBubbleDelegate.qml retroshare-0.6.4/src/retroshare-qml-app/src/ChatBubbleDelegate.qml --- retroshare-0.6.4/src/retroshare-qml-app/src/ChatBubbleDelegate.qml 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/retroshare-qml-app/src/ChatBubbleDelegate.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,128 +0,0 @@ -import QtQuick 2.7 -import QtQuick.Layouts 1.2 -import QtQuick.Controls 2.0 -import "." // To load styles -import "./components" -import "URI.js" as UriJs - -Item -{ - - id: chatBubbleDelegate - height: bubble.height - width: mainWindow.width - (styles.aditionalBubbleWidth - 10) - - property var styles: StyleChat.bubble - - - Rectangle - { - id: rootBubble - anchors.fill: parent - width: parent.width - height: parent.height - color: "transparent" - - Rectangle - { - id: bubble - width: Math.min ( - rootBubble.width * styles.bubbleMaxWidth, - Math.max(mesageText.implicitWidth, sendersName.implicitWidth ) - ) + timeText.implicitWidth + styles.aditionalBubbleWidth - height: mesageText.height + sendersName.height + styles.aditionalBubbleHeight - - - anchors.left: (model.incoming)? parent.left : undefined - anchors.right: (!model.incoming)? parent.right : undefined - - - color: (!model.incoming)? styles.colorOutgoing : styles.colorIncoming - radius: styles.radius - - - Text - { - id: sendersName - visible: model.incoming - text: (model.incoming)? model.author_name + ":" : "" - color: styles.colorSenderName - font.bold: true - - anchors.leftMargin: styles.lMarginBubble - anchors.rightMargin: styles.rMarginBubble - anchors.topMargin: styles.tMarginBubble - anchors.top: bubble.top - - anchors.left: (model.incoming)? parent.left : undefined - anchors.right:(!model.incoming)? parent.right : undefined - - // Used for give minimum heigh to time when the message is bigger than the bubble in sended messages - height: (model.incoming || !model.incoming && - mesageText.implicitWidth >= (rootBubble.width * styles.bubbleMaxWidth) )? implicitHeight : 0 - } - - Text - { - id: timeText - text: getMessageTime() - color: styles.colorMessageTime - - anchors.left: (!model.incoming)? parent.left : undefined - anchors.right:(model.incoming)? parent.right : undefined - - anchors.top: bubble.top - anchors.leftMargin: styles.lMarginBubble - anchors.rightMargin: styles.rMarginBubble - anchors.topMargin: styles.tMarginBubble - - } - - - Text - { - id: mesageText - text: UriJs.URI.withinString(model.msg, function(url) - { - return "" + url + ""; - }) - - width: rootBubble.width * styles.bubbleMaxWidth + timeText.width - anchors.left: (model.incoming)? parent.left : undefined - anchors.right:(!model.incoming)? parent.right : undefined - - anchors.top: sendersName.bottom - anchors.leftMargin: styles.lMarginBubble - anchors.rightMargin: styles.rMarginBubble - - - textFormat: Text.RichText - onLinkActivated: Qt.openUrlExternally(link) - - // Used for the correct alineation when the message must be on right - horizontalAlignment:(!model.incoming && - mesageText.implicitWidth <= (rootBubble.width * styles.bubbleMaxWidth) - )? Text.AlignRight : Text.AlignLeft - - wrapMode: Text.Wrap - font.pixelSize: styles.messageTextSize - - } - - } - - } - - function getMessageTime() - { - var timeFormat = "hh:mm"; - var recvDate = new Date(model.recv_time*1000) - - var timeString = Qt.formatDateTime(recvDate, timeFormat) - return timeString - } - - } - - - diff -Nru retroshare-0.6.4/src/retroshare-qml-app/src/ChatCache.qml retroshare-0.6.4/src/retroshare-qml-app/src/ChatCache.qml --- retroshare-0.6.4/src/retroshare-qml-app/src/ChatCache.qml 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/retroshare-qml-app/src/ChatCache.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,186 +0,0 @@ -pragma Singleton - -import QtQml 2.3 -import QtQuick.Controls 2.0 -import org.retroshare.qml_components.LibresapiLocalClient 1.0 -import Qt.labs.settings 1.0 - -QtObject -{ - - id: chatCache - - property QtObject lastMessageCache: QtObject - { - id: lastMessageCache - property var lastMessageList: ({}) - - signal lastMessageChanged(var chatI, var newLastMessage) - - - function updateLastMessageCache (chatId, chatModel) - { - console.log("updateLastMessageCache (chatId, chatModel)", chatId) - // First creates the chat id object for don't wait to work with the object if is needed to call RS api - if (!lastMessageList[chatId]) { - lastMessageList[chatId] = {} - console.log("Last message cache created!") - } - if (!chatModel) { - rsApi.request( "/chat/messages/"+chatId, "", function (par){ - updateLastMessage(chatId, par.response) - }) - } else { - updateLastMessage (chatId, chatModel) - } - } - - function updateLastMessage (chatId, chatModel) - { - console.log("updateLastMessage (chatId, chatModel)") - var lastMessage = findChatLastMessage (chatModel) - lastMessageList[chatId].lastMessage = lastMessage - lastMessageChanged(chatId, lastMessage) - } - - function findChatLastMessage (chatModel) - { - var messagesData = JSON.parse(chatModel).data - return messagesData.slice(-1)[0] - } - - function findChatFirstMessage (chatModel) - { - var messagesData = JSON.parse(chatModel).data - return messagesData.slice[0] - } - - function setRemoteGXS (chatId, remoteGXS) - { - if (!lastMessageList[chatId]) { - lastMessageList[chatId] = {} - console.log("Last message cache created!") - } - if (lastMessageList[chatId] && !lastMessageList[chatId].remoteGXS){ - lastMessageList[chatId].remoteGXS = remoteGXS - return true - } - else { - return false - } - } - - function getChatIdFromGxs (gxs) - { - for (var key in lastMessageList) { - if ( lastMessageList[key].remoteGXS && - lastMessageList[key].remoteGXS.gxs === gxs ) { - return key - } - } - return "" - } - - function getGxsFromChatId (chatId) - { - if (lastMessageList[chatId]) return lastMessageList[chatId].remoteGXS - return undefined - } - - function getChatLastMessage (chatId) - { - if (lastMessageList[chatId]) { - return lastMessageList[chatId].lastMessage - } - return "" - } - } - - property QtObject contactsCache: QtObject - { - id: contactsCache - property var contactsList - property var own - property var identityDetails: ({}) - - - function getContactFromGxsId (gxsId) - { - console.log("getContactFromGxsId (gxsId)", gxsId) - for(var i in contactsList) - { - if (contactsList[i].gxs_id == gxsId) return contactsList[i] - } - } - - function getIdentityDetails (gxsId) - { - if (identityDetails[gxsId]) return identityDetails[gxsId] - return "" - } - - function setIdentityDetails (jData) - { - identityDetails[jData.gxs_id] = jData - } - - function getIdentityAvatar (gxsId) - { - - if (identityDetails[gxsId] && identityDetails[gxsId].avatar !== undefined) - { - return identityDetails[gxsId].avatar - } - return "" - } - function delIdentityAvatar (gxsId) - { - if (identityDetails[gxsId] && identityDetails[gxsId].avatar !== undefined) - { - identityDetails[gxsId].avatar = "" - } - - } - } - - property QtObject facesCache: QtObject - { - id: facesCache - property var iconCache: ({}) - property var callbackCache: ({}) - - } - - property QtObject chatHelper: QtObject - { - id: chatHelper - property string gxs_id - property string name - property var cb - - function startDistantChat (own_gxs_id, gxs_id, name, cb) - { - console.log( "startDistantChat(own_gxs_id, gxs_id, name, cb)", - own_gxs_id, gxs_id, name, cb ) - chatHelper.gxs_id = gxs_id - chatHelper.name = name - chatHelper.cb = cb - var jsonData = { "own_gxs_hex": own_gxs_id, - "remote_gxs_hex": gxs_id } - rsApi.request("/chat/initiate_distant_chat", - JSON.stringify(jsonData), - startDistantChatCB) - - } - - function startDistantChatCB (par) - { - var chatId = JSON.parse(par.response).data.chat_id - lastMessageCache.setRemoteGXS(chatId, { gxs: gxs_id, name: name}) - cb(chatId) - } - } - - - -} diff -Nru retroshare-0.6.4/src/retroshare-qml-app/src/ChatView.qml retroshare-0.6.4/src/retroshare-qml-app/src/ChatView.qml --- retroshare-0.6.4/src/retroshare-qml-app/src/ChatView.qml 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/retroshare-qml-app/src/ChatView.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,388 +0,0 @@ -/* - * RetroShare Android QML App - * Copyright (C) 2016-2017 Gioacchino Mazzurco - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ - -import QtQuick 2.7 -import QtQuick.Controls 2.0 -import QtQuick.Layouts 1.2 -import org.retroshare.qml_components.LibresapiLocalClient 1.0 -import "." //Needed for TokensManager singleton -import "./components" -import "./components/emoji" - -Item -{ - id: chatView - property string chatId - property var gxsInfo: ({}) - property int token: 0 - - property string objectName:"chatView" - - - function refreshData() - { - console.log("chatView.refreshData()", visible) - if(!visible) return - - rsApi.request( "/chat/messages/"+chatId, "", function(par) - { - chatModel.json = par.response - token = JSON.parse(par.response).statetoken - TokensManager.registerToken(token, refreshData) - - ChatCache.lastMessageCache.updateLastMessageCache(chatId, chatModel.json) - - if(chatListView.visible) - { - chatListView.positionViewAtEnd() - rsApi.request("/chat/mark_chat_as_read/"+chatId) - } - }) - } - - Component.onCompleted: - { - refreshData() - } - onFocusChanged: focus && refreshData() - - function changeState () - { - toolBar.state = "CHATVIEW" - gxsInfo = ChatCache.lastMessageCache.getGxsFromChatId(chatView.chatId) - toolBar.gxsSource = gxsInfo.gxs - toolBar.titleText = gxsInfo.name - } - - - JSONListModel - { - id: chatModel - query: "$.data[*]" - } - - ListView - { - property var styles: StyleChat.chat - id: chatListView - width: parent.width - styles.bubbleMargin - height: parent.height - inferiorPanel.height - anchors.horizontalCenter: parent.horizontalCenter - model: chatModel.model - delegate: ChatBubbleDelegate {} - spacing: styles.bubbleSpacing - preferredHighlightBegin: 1 - - onHeightChanged: - { - chatListView.currentIndex = count - 1 - } - - } - - EmojiPicker { - id: emojiPicker - - anchors.fill: parent - anchors.topMargin: parent.height / 2 - anchors.bottomMargin: if(!androidMode) categorySelectorHeight - - property int categorySelectorHeight: 50 - - color: "white" - buttonWidth: 40 - textArea: inferiorPanel.textMessageArea //the TextArea in which EmojiPicker is pasting the Emoji into - - state: "EMOJI_HIDDEN" - states: [ - State { - name: "EMOJI_HIDDEN" - PropertyChanges { target: emojiPicker; anchors.topMargin: parent.height } - PropertyChanges { target: emojiPicker; anchors.bottomMargin: -1 } - PropertyChanges { target: emojiPicker; height: 0 } - }, - State { - name: "EMOJI_SHOWN" - PropertyChanges { target: emojiPicker; anchors.topMargin: parent.height / 2 } - PropertyChanges { target: emojiPicker; anchors.bottomMargin: categorySelectorHeight } - } - ] - } - - Item - { - - property var styles: StyleChat.inferiorPanel - property alias textMessageArea: msgComposer.textMessageArea - - id: inferiorPanel - height: ( msgComposer.height > styles.height)? msgComposer.height: styles.height - width: parent.width - anchors.bottom: emojiPicker.androidMode ? emojiPicker.top : parent.bottom - - Rectangle - { - id: backgroundRectangle - anchors.fill: parent.fill - width: parent.width - height: parent.height - color:inferiorPanel.styles.backgroundColor - border.color: inferiorPanel.styles.borderColor - } - - ButtonIcon - { - - id: attachButton - - property var styles: StyleChat.inferiorPanel.btnIcon - - height: styles.height - width: styles.width - - anchors.left: parent.left - anchors.bottom: parent.bottom - - anchors.margins: styles.margin - - imgUrl: styles.attachIconUrl - } - - - RowLayout - { - id: msgComposer - property var styles: StyleChat.inferiorPanel.msgComposer - property alias textMessageArea: flickable.msgField - - anchors.verticalCenter: parent.verticalCenter - anchors.left: attachButton.right - - width: chatView.width - - (sendButton.width + sendButton.anchors.margins) - - (attachButton.width + attachButton.anchors.margins) - - (emojiButton.width + emojiButton.anchors.margins) - - height: (flickable.contentHeight < styles.maxHeight)? flickable.contentHeight : styles.maxHeight - - Flickable - { - id: flickable - property alias msgField: msgField - - anchors.fill: parent - flickableDirection: Flickable.VerticalFlick - - width: parent.width - - contentWidth: msgField.width - contentHeight: msgField.height - contentY: contentHeight - height - - ScrollBar.vertical: ScrollBar {} - - clip: true - - TextArea - { - property var styles: StyleChat.inferiorPanel.msgComposer - id: msgField - - height: contentHeight + font.pixelSize - - width: parent.width - - placeholderText: styles.placeHolder - background: styles.background - - wrapMode: TextEdit.Wrap - - focus: true - - inputMethodHints: Qt.ImhMultiLine - - font.pixelSize: styles.messageBoxTextSize - - onTextChanged: - { - var msgLenght = (msgField.preeditText)? msgField.preeditText.length : msgField.length - - if (msgLenght == 0) - { - sendButton.state = "" - } - else if (msgLenght > 0 ) - { - sendButton.state = "SENDBTN" - } - } - - property bool shiftPressed: false - Keys.onPressed: - { - if ((event.key === Qt.Key_Return || event.key === Qt.Key_Enter) - && !shiftPressed) - { - if (sendButton.state == "SENDBTN" ) - { - chatView.sendMessage () - } - } - else if (event.key === Qt.Key_Shift) - { - shiftPressed = true - } - } - - Keys.onReleased: - { - if (event.key === Qt.Key_Shift) - { - shiftPressed = false - } - } - function reset () - { - msgField.text = "" - Qt.inputMethod.reset() - } - } - } - } - - ButtonIcon - { - - id: emojiButton - - property var styles: StyleChat.inferiorPanel.btnIcon - - height: styles.height - width: styles.width - - anchors.right: sendButton.left - anchors.bottom: parent.bottom - - anchors.margins: styles.margin - - imgUrl: styles.emojiIconUrl - - onClicked: { - if (emojiPicker.state == "EMOJI_HIDDEN") { - emojiPicker.state = "EMOJI_SHOWN" - } else { - emojiPicker.state = "EMOJI_HIDDEN" - } - } - - } - - ButtonIcon - { - - id: sendButton - - property var styles: StyleChat.inferiorPanel.btnIcon - property alias icon: sendButton.imgUrl - - height: styles.height - width: styles.width - - anchors.right: parent.right - anchors.bottom: parent.bottom - - anchors.margins: styles.margin - - imgUrl: styles.microIconUrl - - onClicked: - { - if (sendButton.state == "SENDBTN" ) - { - chatView.sendMessage () - } - } - - onPressed: - { - if (sendButton.state == "RECORDING" ) - { - sendButton.state = "" - } - else if (sendButton.state == "" ) - { - sendButton.state = "RECORDING" - } - } - - onReleased: - { - if (sendButton.state == "RECORDING" ) - { - sendButton.state = "" - } - - } - - states: - [ - State - { - name: "" - PropertyChanges { target: sendButton; icon: styles.microIconUrl} - }, - State - { - name: "RECORDING" - PropertyChanges { target: sendButton; icon: styles.microMuteIconUrl} - }, - State - { - name: "SENDBTN" - PropertyChanges { target: sendButton; icon: styles.sendIconUrl} - } - ] - } - } - - function sendMessage () - { - if (emojiPicker.state == "EMOJI_SHOWN") emojiPicker.state = "EMOJI_HIDDEN" - - msgField.text = getCompleteMessageText () + " " // Needed to prevent pre edit text problems - var msgText = msgField.text - - var jsonData = {"chat_id":chatView.chatId, "msg":msgText} - rsApi.request( "/chat/send_message", JSON.stringify(jsonData), - function(par) - { - msgField.reset(); - }) - } - - // This function is needed for the compatibility with auto predictive keyboards - function getCompleteMessageText (){ - var completeMsg - if (msgField.preeditText) completeMsg = msgField.text + msgField.preeditText - else completeMsg = msgField.text - return completeMsg - - - } - -} diff -Nru retroshare-0.6.4/src/retroshare-qml-app/src/ClipboardWrapper.qml retroshare-0.6.4/src/retroshare-qml-app/src/ClipboardWrapper.qml --- retroshare-0.6.4/src/retroshare-qml-app/src/ClipboardWrapper.qml 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/retroshare-qml-app/src/ClipboardWrapper.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,47 +0,0 @@ -/* - * RetroShare Android QML App - * Copyright (C) 2017 Gioacchino Mazzurco - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ - -pragma Singleton - -import QtQml 2.2 -import QtQuick 2.7 -import QtQuick.Controls 2.0 - -QtObject -{ - /// Public API - function postToClipBoard(str) - { - console.log("postToClipBoard(str)", str) - privTF.text = str - privTF.selectAll() - privTF.cut() - } - - /// Public API - function getFromClipBoard() - { - privTF.text = "getFromClipBoard()" // Need some text for selectAll() - privTF.selectAll() - privTF.paste() - return privTF.text.toString() - } - - /// Private - property TextInput privTF: TextInput { visible: false } -} diff -Nru retroshare-0.6.4/src/retroshare-qml-app/src/components/AvatarOrColorHash.qml retroshare-0.6.4/src/retroshare-qml-app/src/components/AvatarOrColorHash.qml --- retroshare-0.6.4/src/retroshare-qml-app/src/components/AvatarOrColorHash.qml 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/retroshare-qml-app/src/components/AvatarOrColorHash.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,159 +0,0 @@ -/* - * RetroShare Android QML App - * Copyright (C) 2017 Gioacchino Mazzurco - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ - -import QtQuick 2.7 -import "../" //Needed for Chat Cache - - -Item -{ - id: compRoot - - property string gxs_id - property bool onlyCached: false - signal clicked () - - height: 130 - width: height - - -////////////// The following should be considered privates ///////////////////// - - property bool has_avatar: false - property bool default_image: false - property int avatarAttemptCnt: 0 - property string noGxsImage: "/icons/retroshare.png" - - function getDetails() - { - console.log("getDetails() ", compRoot.gxs_id ) - ++compRoot.avatarAttemptCnt - if (gxs_id) - { - default_image = false - var hasAvatarCached = hasAvatar (ChatCache.contactsCache.getIdentityAvatar(gxs_id)) - if ( !hasAvatarCached ) - { - rsApi.request( - "/identity/get_identity_details", - JSON.stringify({ gxs_id: compRoot.gxs_id }), - function(par) - { - var jData = JSON.parse(par.response).data - saveDetails(jData) - if(!compRoot.has_avatar && - compRoot.avatarAttemptCnt < 3) getDetails() - }) - } - else - { - setImage(ChatCache.contactsCache.getIdentityDetails(gxs_id)) - } - } - else - { - has_avatar = true - default_image = true - contactAvatar.source = noGxsImage - } - } - function saveDetails(data) - { - ChatCache.contactsCache.setIdentityDetails(data) - setImage(data) - - } - function setImage (data) - { - compRoot.has_avatar = hasAvatar (data.avatar) - if(compRoot.has_avatar) - { - contactAvatar.source = - "data:image/png;base64," + data.avatar - } - } - - function hasAvatar (avatar) - { - return avatar.length > 0 - } - - function showDetails() - { - console.log("showDetails() ", gxs_id) - - if (stackView.currentItem.objectName != "contactDetails") - { - stackView.push( - "qrc:/ContactDetails.qml", - {md: ChatCache.contactsCache.getContactFromGxsId(gxs_id)}) - - } - } - function refresh() - { - ChatCache.contactsCache.delIdentityAvatar(gxs_id) - compRoot.avatarAttemptCnt = 0 - getDetails() - - } - - Component.onCompleted: startComponent () - - onVisibleChanged: startComponent () - - function startComponent () - { - if (onlyCached && hasAvatar (ChatCache.contactsCache.getIdentityAvatar(gxs_id) ) ) - { - console.log("load cached avatar") - setImage(ChatCache.contactsCache.getIdentityDetails(gxs_id)) - - } - else if (!onlyCached) - { - if(visible && (!has_avatar || default_image ) ) getDetails() - } - } - - Image - { - id: contactAvatar - anchors.fill: parent - visible: compRoot.has_avatar - fillMode: Image.PreserveAspectFit - } - - Faces - { - visible: !compRoot.has_avatar - hash: compRoot.gxs_id - anchors.fill: parent - iconSize: parent.height - } - - MouseArea - { - anchors.fill: parent - onClicked: - { - compRoot.clicked() - showDetails() - } - } -} diff -Nru retroshare-0.6.4/src/retroshare-qml-app/src/components/ButtonIcon.qml retroshare-0.6.4/src/retroshare-qml-app/src/components/ButtonIcon.qml --- retroshare-0.6.4/src/retroshare-qml-app/src/components/ButtonIcon.qml 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/retroshare-qml-app/src/components/ButtonIcon.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,28 +0,0 @@ -import QtQuick 2.0 - -Item { - - id: root - signal clicked - signal pressed - signal released - - property var imgUrl: "" - property alias fillMode: image.fillMode - - Image { - id: image - anchors.fill: parent - source: imgUrl - - height: parent.height - width: parent.width - } - - MouseArea { - anchors.fill: root - onClicked: { root.clicked() } - onPressed: { root.pressed() } - onReleased: { root.released() } - } -} diff -Nru retroshare-0.6.4/src/retroshare-qml-app/src/components/ButtonText.qml retroshare-0.6.4/src/retroshare-qml-app/src/components/ButtonText.qml --- retroshare-0.6.4/src/retroshare-qml-app/src/components/ButtonText.qml 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/retroshare-qml-app/src/components/ButtonText.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,130 +0,0 @@ -import QtQuick 2.0 -import QtQuick.Controls 2.0 - -Item -{ - id: button - property alias text: innerText.text; - property alias buttonTextPixelSize: innerText.font.pixelSize - property alias innerAnchors: innerElements.anchors; - property alias rectangleButton: rectangleButton; - - property var iconUrl - property int iconHeight: 20 - - property color color: "lightsteelblue" - property color hoverColor: color - property color pressColor: color - property int fontSize - property int borderWidth - property int borderRadius: 3 - property int innerMargin: 10 - - height: innerText.height + innerMargin + innerMargin - width: innerText.width + innerMargin + innerMargin + icon.width + icon.width - - scale: state === "Pressed" ? 0.96 : 1.0 - onEnabledChanged: state = "" - signal clicked - - Rectangle - { - id: rectangleButton - anchors.fill: parent - radius: borderRadius - color: button.enabled ? button.color : "lavender" - border.width: borderWidth - border.color: "black" - - ToolButton { - id: innerElements - - Image - { - id: icon - source: (iconUrl)? iconUrl: "" - height: (iconUrl)? iconHeight: 0 - width: (iconUrl)? iconHeight: 0 - - fillMode: Image.PreserveAspectFit - - visible: (iconUrl)? true: false - anchors.left: innerElements.left - - anchors.margins:(iconUrl)? innerMargin : 0 - anchors.verticalCenter: parent.verticalCenter - sourceSize.height: height - } - - Text - { - anchors.margins: innerMargin - id: innerText - font.pointSize: fontSize - anchors.left: icon.right - anchors.verticalCenter: parent.verticalCenter - color: button.enabled ? "black" : "grey" - } - } - } - - states: [ - State - { - name: "Hovering" - PropertyChanges - { - target: rectangleButton - color: hoverColor - } - }, - State - { - name: "Pressed" - PropertyChanges - { - target: rectangleButton - color: pressColor - } - } - ] - - transitions: [ - Transition - { - from: ""; to: "Hovering" - ColorAnimation { duration: 200 } - }, - Transition - { - from: "*"; to: "Pressed" - ColorAnimation { duration: 10 } - } - ] - - MouseArea - { - hoverEnabled: true - anchors.fill: button - onEntered: { button.state='Hovering'} - onExited: { button.state=''} - onClicked: { button.clicked();} - onPressed: { button.state="Pressed" } - onReleased: - { - if (containsMouse) - button.state="Hovering"; - else - button.state=""; - } - } - - Behavior on scale - { - NumberAnimation - { - duration: 100 - easing.type: Easing.InOutQuad - } - } -} diff -Nru retroshare-0.6.4/src/retroshare-qml-app/src/components/ColorHash.qml retroshare-0.6.4/src/retroshare-qml-app/src/components/ColorHash.qml --- retroshare-0.6.4/src/retroshare-qml-app/src/components/ColorHash.qml 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/retroshare-qml-app/src/components/ColorHash.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,72 +0,0 @@ -/* - * RetroShare Android QML App - * Copyright (C) 2017 Gioacchino Mazzurco - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ - -import QtQuick 2.7 - -Rectangle -{ - property string hash - - width: height - property int childHeight : height/2 - color: "white" - - Image - { - source: "qrc:/icons/edit-image-face-detect.svg" - anchors.centerIn: parent - height: parent.height - width: parent.width - sourceSize.height: height - sourceSize.width: width - fillMode: Image.PreserveAspectFit - } - - Rectangle - { - color: '#' + hash.substring(1, 9) - height: parent.childHeight - width: height - anchors.top: parent.top - anchors.left: parent.left - } - Rectangle - { - color: '#' + hash.substring(9, 17) - height: parent.childHeight - width: height - anchors.top: parent.top - anchors.right: parent.right - } - Rectangle - { - color: '#' + hash.substring(17, 25) - height: parent.childHeight - width: height - anchors.bottom: parent.bottom - anchors.left: parent.left - } - Rectangle - { - color: '#' + hash.slice(-8) - height: parent.childHeight - width: height - anchors.bottom: parent.bottom - anchors.right: parent.right - } -} diff -Nru retroshare-0.6.4/src/retroshare-qml-app/src/components/CustomFileChooser.qml retroshare-0.6.4/src/retroshare-qml-app/src/components/CustomFileChooser.qml --- retroshare-0.6.4/src/retroshare-qml-app/src/components/CustomFileChooser.qml 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/retroshare-qml-app/src/components/CustomFileChooser.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,60 +0,0 @@ -import QtQuick 2.7 -import QtQuick.Dialogs 1.2 - -import "../URI.js" as UriJs - -Item -{ - id: compRoot - - property var resultFile - - FileDialog - { - id: fileDialog - title: "Please choose a file" - folder: shortcuts.pictures - nameFilters: [ "Image files (*.png *.jpg)"] - visible: false - selectMultiple: false - onAccepted: { - console.log("You chose: " + fileDialog.fileUrl) - resultFile = fileDialog.fileUrl - } - onRejected: { - console.log("Canceled") - } - } - - - function open() - { - if (Qt.platform.os === "android") - { - console.log("ImagePicker Android platform detected") - mainWindow.addUriHandler("file", androidResult) - androidImagePicker.openPicker() - } - else - { - fileDialog.visible = true - } - } - - function androidResult (uri) - { - console.log("QML Android image uri found" , uri) - resultFile = normalizeUriToFilePath (uri) - mainWindow.delUriHandler("media", androidResult) - } - - function normalizeUriToFilePath (uriStr) - { - var uri = new UriJs.URI(uriStr) - var hPath = uri.path() - return "file:///"+hPath - - } - - -} diff -Nru retroshare-0.6.4/src/retroshare-qml-app/src/components/emoji/EmojiButton.qml retroshare-0.6.4/src/retroshare-qml-app/src/components/emoji/EmojiButton.qml --- retroshare-0.6.4/src/retroshare-qml-app/src/components/emoji/EmojiButton.qml 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/retroshare-qml-app/src/components/emoji/EmojiButton.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,68 +0,0 @@ -import QtQuick 2.7 -import QtQuick.Controls.Styles 1.2 - -Rectangle -{ - id: emojiButton - - property var fontName - - Text - { - id: emojiText - color: "gray" - text: qsTr(eCatText) - font.pixelSize: emojiButton.width - 8 - anchors.centerIn: parent - font.family: fontName - } - - - state: "RELEASED" - states: - [ - State - { - name: "PRESSED" - PropertyChanges - { - target: emojiText - font.pixelSize: emojiButton.width - 10 - } - }, - State - { - name: "RELEASED" - PropertyChanges - { - target: emojiText - font.pixelSize: emojiButton.width - 8 - } - } - ] - - - MouseArea - { - anchors.fill: parent - hoverEnabled: true - - onEntered: - { - emojiText.color = "black" - } - onExited: - { - emojiText.color = "gray" - } - onPressedChanged: - { - emojiButton.state = emojiButton.state == "PRESSED" ? "RELEASED" : "PRESSED" - } - onClicked: - { - Qt.emojiClickedHandler(emojiText.text) - } - } - -} diff -Nru retroshare-0.6.4/src/retroshare-qml-app/src/components/emoji/EmojiCategoryButton.qml retroshare-0.6.4/src/retroshare-qml-app/src/components/emoji/EmojiCategoryButton.qml --- retroshare-0.6.4/src/retroshare-qml-app/src/components/emoji/EmojiCategoryButton.qml 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/retroshare-qml-app/src/components/emoji/EmojiCategoryButton.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,98 +0,0 @@ -import QtQuick 2.7 -import QtQuick.Controls.Styles 1.2 - -Rectangle -{ - id: emojiCategoryButton - property string categoryName - - property var fontName - - - function completedHandler() - { - categoryName = eCatName - - //initialize - if (parent.currSelEmojiButton === undefined) - { - clickedHandler() - } - } - - function pressedHandler() - { - if (state != "SELECTED") - { - state = state == "PRESSED" ? "RELEASED" : "PRESSED" - } - } - - function clickedHandler() - { - if (parent.currSelEmojiButton !== undefined) - { - parent.currSelEmojiButton.state = "RELEASED" - } - - parent.currSelEmojiButton = emojiCategoryButton - state = "SELECTED" - Qt.emojiCategoryChangedHandler(emojiCategoryButton.categoryName) - } - - - Text - { - id: emojiText - color: "gray" - text: qsTr(eCatText) - font.pixelSize: emojiCategoryButton.width - 8 - anchors.centerIn: parent - font.family: fontName - } - - - state: "RELEASED" - states: - [ - State - { - name: "PRESSED" - PropertyChanges - { - target: emojiText - font.pixelSize: emojiCategoryButton.width - 10 - } - }, - State - { - name: "RELEASED" - PropertyChanges - { - target: emojiText - font.pixelSize: emojiCategoryButton.width - 8 - } - }, - State - { - name: "SELECTED" - PropertyChanges - { - target: emojiCategoryButton - color: "#ADD6FF" - } - } - ] - - MouseArea - { - anchors.fill: parent - hoverEnabled: true - onEntered: emojiText.color = "black" - onExited: emojiText.color = "gray" - onPressedChanged: pressedHandler() - onClicked: clickedHandler() - } - - Component.onCompleted: completedHandler() -} diff -Nru retroshare-0.6.4/src/retroshare-qml-app/src/components/emoji/emoji.js retroshare-0.6.4/src/retroshare-qml-app/src/components/emoji/emoji.js --- retroshare-0.6.4/src/retroshare-qml-app/src/components/emoji/emoji.js 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/retroshare-qml-app/src/components/emoji/emoji.js 1970-01-01 00:00:00.000000000 +0000 @@ -1,1068 +0,0 @@ -var emoji_json = { - "emoji_categories": [ - { - "name": "faces", - "emoji_unified": "😜", - "description": "Faces" - }, - { - "name": "cat_faces", - "emoji_unified": "😸", - "description": "Faces of Cats" - },{ - "name": "animals_and_plants", - "emoji_unified": "🐧", - "description": "Animals and Plants" - },{ - "name": "food_and_drink", - "emoji_unified": "🍻", - "description": "Food and Drinks" - },{ - "name": "places", - "emoji_unified": "🏯", - "description": "Places" - },{ - "name": "music_and_sport", - "emoji_unified": "🎧", - "description": "Music and Sport" - },{ - "name": "objects", - "emoji_unified": "💽", - "description": "Objects" - },{ - "name": "misc", - "emoji_unified": "👌", - "description": "Miscellaneous" - },{ - "name": "symbols", - "emoji_unified": "🔞", - "description": "Symbols" - },{ - "name": "transport", - "emoji_unified": "🚎", - "description": "Transport" - },{ - "name": "seven", - "emoji_unified": "🕴", - "description": "Unicode 7.0" - } - ], - "emoji_by_category": { - "animals_and_plants": [ - "🐶", - "🐺", - "🐱", - "🐭", - "🐹", - "🐰", - "🐸", - "🐯", - "🐨", - "🐻", - "🐷", - "🐽", - "🐮", - "🐗", - "🐵", - "🐒", - "🐴", - "🐑", - "🐘", - "🐼", - "🐧", - "🐦", - "🐤", - "🐥", - "🐣", - "🐔", - "🐍", - "🐢", - "🐛", - "🐝", - "🐜", - "🐞", - "🐌", - "🐙", - "🐚", - "🐠", - "🐟", - "🐬", - "🐳", - "🐋", - "🐄", - "🐏", - "🐀", - "🐃", - "🐅", - "🐇", - "🐉", - "🐎", - "🐐", - "🐓", - "🐕", - "🐖", - "🐁", - "🐂", - "🐲", - "🐡", - "🐊", - "🐫", - "🐪", - "🐆", - "🐈", - "🐩", - "🐾", - "💐", - "🌸", - "🌷", - "🍀", - "🌹", - "🌻", - "🌺", - "🍁", - "🍃", - "🍂", - "🌿", - "🌾", - "🍄", - "🌵", - "🌴", - "🌲", - "🌳", - "🌰", - "🌱", - "🌼" - ], - "cat_faces": [ - "😺", - "😸", - "😻", - "😽", - "😼", - "🙀", - "😿", - "😹", - "😾" - ], - "faces": [ - "😄", - "😃", - "😀", - "😊", - "☺", - "😉", - "😍", - "😘", - "😚", - "😗", - "😙", - "😜", - "😝", - "😛", - "😳", - "😁", - "😔", - "😌", - "😒", - "😞", - "😣", - "😢", - "😂", - "😭", - "😪", - "😥", - "😰", - "😅", - "😓", - "😩", - "😫", - "😨", - "😱", - "😠", - "😡", - "😤", - "😖", - "😆", - "😋", - "😷", - "😎", - "😴", - "😵", - "😲", - "😟", - "😦", - "😧", - "😈", - "👿", - "😮", - "😬", - "😐", - "😕", - "😯", - "😶", - "😇", - "😏", - "😑", - "👲", - "👳", - "👮", - "👷", - "💂", - "👶", - "👦", - "👧", - "👨", - "👩", - "👴", - "👵", - "👱", - "👼", - "👸", - "👹", - "👺", - "🙈", - "🙉", - "🙊", - "💀", - "👽", - "💩" - ], - "food_and_drink": [ - "☕", - "🍵", - "🍶", - "🍼", - "🍺", - "🍻", - "🍸", - "🍹", - "🍷", - "🍴", - "🍕", - "🍔", - "🍟", - "🍗", - "🍖", - "🍝", - "🍛", - "🍤", - "🍱", - "🍣", - "🍥", - "🍙", - "🍘", - "🍚", - "🍜", - "🍲", - "🍢", - "🍡", - "🍳", - "🍞", - "🍩", - "🍮", - "🍦", - "🍨", - "🍧", - "🎂", - "🍰", - "🍪", - "🍫", - "🍬", - "🍭", - "🍯", - "🍎", - "🍏", - "🍊", - "🍋", - "🍒", - "🍇", - "🍉", - "🍓", - "🍑", - "🍈", - "🍌", - "🍐", - "🍍", - "🍠", - "🍆", - "🍅", - "🌽" - ], - "misc": [ - "🔥", - "✨", - "🌟", - "💫", - "💥", - "💢", - "💦", - "💧", - "💤", - "💨", - "👂", - "👀", - "👃", - "👅", - "👄", - "👍", - "👎", - "👌", - "👊", - "✊", - "✌", - "👋", - "✋", - "👐", - "👆", - "👇", - "👉", - "👈", - "🙌", - "🙏", - "☝", - "👏", - "💪", - "🚶", - "🏃", - "💃", - "👫", - "👪", - "👬", - "👭", - "💏", - "💑", - "👯", - "🙆", - "🙅", - "💁", - "🙋", - "💆", - "💇", - "💅", - "👰", - "🙎", - "🙍", - "🙇" - ], - "music_and_sport": [ - "🎨", - "🎬", - "🎤", - "🎧", - "🎼", - "🎵", - "🎶", - "🎹", - "🎻", - "🎺", - "🎷", - "🎸", - "👾", - "🎮", - "🃏", - "🎴", - "🀄", - "🎲", - "🎯", - "🏈", - "🏀", - "⚽", - "⚾", - "🎾", - "🎱", - "🏉", - "🎳", - "⛳", - "🚵", - "🚴", - "🏁", - "🏇", - "🏆", - "🎿", - "🏂", - "🏊", - "🏄", - "🎣" - ], - "objects": [ - "🎍", - "💝", - "🎎", - "🎒", - "🎓", - "🎏", - "🎆", - "🎇", - "🎐", - "🎑", - "🎃", - "👻", - "🎅", - "🎄", - "🎁", - "🎋", - "🎉", - "🎊", - "🎈", - "🎌", - "🔮", - "🎥", - "📷", - "📹", - "📼", - "💿", - "📀", - "💽", - "💾", - "💻", - "📱", - "☎", - "📞", - "📟", - "📠", - "📡", - "📺", - "📻", - "🔊", - "🔉", - "🔈", - "🔇", - "🔔", - "🔕", - "📢", - "📣", - "⏳", - "⌛", - "⏰", - "⌚", - "🔓", - "🔒", - "🔏", - "🔐", - "🔑", - "🔎", - "💡", - "🔦", - "🔆", - "🔅", - "🔌", - "🔋", - "🔍", - "🛁", - "🛀", - "🚿", - "🚽", - "🔧", - "🔩", - "🔨", - "🚪", - "🚬", - "💣", - "🔫", - "🔪", - "💊", - "💉", - "💰", - "💴", - "💵", - "💷", - "💶", - "💳", - "💸", - "📲", - "📧", - "📥", - "📤", - "✉", - "📩", - "📨", - "📯", - "📫", - "📪", - "📬", - "📭", - "📮", - "📦", - "📝", - "📄", - "📃", - "📑", - "📊", - "📈", - "📉", - "📜", - "📋", - "📅", - "📆", - "📇", - "📁", - "📂", - "✂", - "📌", - "📎", - "✒", - "✏", - "📏", - "📐", - "📕", - "📗", - "📘", - "📙", - "📓", - "📔", - "📒", - "📚", - "📖", - "🔖", - "📛", - "🔬", - "🔭", - "📰" - ], - "places": [ - "🏠", - "🏡", - "🏫", - "🏢", - "🏣", - "🏥", - "🏦", - "🏪", - "🏩", - "🏨", - "💒", - "⛪", - "🏬", - "🏤", - "🌇", - "🌆", - "🏯", - "🏰", - "⛺", - "🏭", - "🗼", - "🗾", - "🗻", - "🌄", - "🌅", - "🌃", - "🗽", - "🌉", - "🎠", - "🎡", - "⛲", - "🎢", - "🚢" - ], - "seven": [ - "🌡", - "🌢", - "🌣", - "🌤", - "🌥", - "🌦", - "🌧", - "🌨", - "🌩", - "🌪", - "🌫", - "🌬", - "🌶", - "🍽", - "🎔", - "🎕", - "🎖", - "🎗", - "🎘", - "🎙", - "🎚", - "🎛", - "🎜", - "🎝", - "🎞", - "🎟", - "🏅", - "🏋", - "🏌", - "🏍", - "🏎", - "🏔", - "🏕", - "🏖", - "🏗", - "🏘", - "🏙", - "🏚", - "🏛", - "🏜", - "🏝", - "🏞", - "🏟", - "🏱", - "🏲", - "🏳", - "🏴", - "🏵", - "🏶", - "🏷", - "🐿", - "👁", - "📸", - "📽", - "📾", - "🔾", - "🔿", - "🕄", - "🕅", - "🕆", - "🕇", - "🕈", - "🕉", - "🕊", - "🕨", - "🕩", - "🕪", - "🕫", - "🕬", - "🕭", - "🕮", - "🕯", - "🕰", - "🕱", - "🕲", - "🕳", - "🕴", - "🕵", - "🕶", - "🕷", - "🕸", - "🕹", - "🕻", - "🕼", - "🕽", - "🕾", - "🕿", - "🖀", - "🖁", - "🖂", - "🖃", - "🖄", - "🖅", - "🖆", - "🖇", - "🖈", - "🖉", - "🖊", - "🖋", - "🖌", - "🖍", - "🖎", - "🖏", - "🖐", - "🖑", - "🖒", - "🖓", - "🖔", - "🖕", - "🖖", - "🖗", - "🖘", - "🖙", - "🖚", - "🖛", - "🖜", - "🖝", - "🖞", - "🖟", - "🖠", - "🖡", - "🖢", - "🖣", - "🖥", - "🖦", - "🖧", - "🖨", - "🖩", - "🖪", - "🖫", - "🖬", - "🖭", - "🖮", - "🖯", - "🖰", - "🖱", - "🖲", - "🖳", - "🖴", - "🖵", - "🖶", - "🖷", - "🖸", - "🖹", - "🖺", - "🖻", - "🖼", - "🖽", - "🖾", - "🖿", - "🗀", - "🗀", - "🗂", - "🗃", - "🗄", - "🗅", - "🗆", - "🗇", - "🗈", - "🗉", - "🗊", - "🗋", - "🗌", - "🗍", - "🗎", - "🗏", - "🗐", - "🗑", - "🗒", - "🗓", - "🗔", - "🗕", - "🗖", - "🗗", - "🗘", - "🗙", - "🗚", - "🗛", - "🗜", - "🗝", - "🗞", - "🗟", - "🗠", - "🗡", - "🗢", - "🗣", - "🗤", - "🗥", - "🗦", - "🗧", - "🗨", - "🗩", - "🗪", - "🗫", - "🗬", - "🗭", - "🗯", - "🗯", - "🗰", - "🗱", - "🗲", - "🗳", - "🗴", - "🗵", - "🗶", - "🗷", - "🗸", - "🗹", - "🗺", - "🙁", - "🙂", - "🛆", - "🛇", - "🛈", - "🛉", - "🛊", - "🛋", - "🛌", - "🛍", - "🛎", - "🛏", - "🛠", - "🛡", - "🛢", - "🛣", - "🛤", - "🛥", - "🛦", - "🛧", - "🛨", - "🛩", - "🛪", - "🛫", - "🛬", - "🛰", - "🛱", - "🛲", - "🛳" - ], - "symbols": [ - "1⃣", - "2⃣", - "3⃣", - "4⃣", - "5⃣", - "6⃣", - "7⃣", - "8⃣", - "9⃣", - "0⃣", - "🔟", - "🔢", - "#⃣", - "🔣", - "⬆", - "⬇", - "⬅", - "➡", - "🔠", - "🔡", - "🔤", - "↗", - "↖", - "↘", - "↙", - "↔", - "↕", - "🔄", - "◀", - "▶", - "🔼", - "🔽", - "↩", - "↪", - "ℹ", - "⏪", - "⏩", - "⏫", - "⏬", - "⤵", - "⤴", - "🆗", - "🔀", - "🔁", - "🔂", - "🆕", - "🆙", - "🆒", - "🆓", - "🆖", - "📶", - "🎦", - "🈁", - "🈯", - "🈳", - "🈵", - "🈴", - "🈲", - "🉐", - "🈹", - "🈺", - "🈶", - "🈚", - "🚻", - "🚹", - "🚺", - "🚼", - "🚾", - "🚰", - "🚮", - "🅿", - "♿", - "🚭", - "🈷", - "🈸", - "🈂", - "Ⓜ", - "🛂", - "🛄", - "🛅", - "🛃", - "🉑", - "㊙", - "㊗", - "🆑", - "🆘", - "🆔", - "🚫", - "🔞", - "📵", - "🚯", - "🚱", - "🚳", - "🚷", - "🚸", - "⛔", - "✳", - "❇", - "❎", - "✅", - "✴", - "💟", - "🆚", - "📳", - "📴", - "🅰", - "🅱", - "🆎", - "🅾", - "💠", - "➿", - "♻", - "♈", - "♉", - "♊", - "♋", - "♌", - "♍", - "♎", - "♏", - "♐", - "♑", - "♒", - "♓", - "⛎🔯", - "🏧", - "💹", - "💲", - "💱", - "©", - "®", - "™", - "❌", - "‼", - "⁉", - "❗", - "❓", - "❕", - "❔", - "⭕", - "🔝", - "🔚", - "🔙", - "🔛", - "🔜", - "🔃", - "🕛", - "🕧", - "🕐", - "🕜", - "🕑", - "🕝", - "🕒", - "🕞", - "🕓", - "🕟", - "🕔", - "🕠", - "🕕", - "🕖", - "🕗", - "🕘", - "🕙", - "🕚", - "🕡", - "🕢", - "🕣", - "🕤", - "🕥", - "🕦", - "✖", - "➕", - "➖", - "➗", - "♠", - "♥", - "♣", - "♦", - "💮", - "💯", - "✔", - "☑", - "🔘", - "🔗", - "➰", - "〰", - "〽", - "🔱", - "◼", - "◻", - "◾", - "◽", - "▪", - "▫", - "🔺", - "🔲", - "🔳", - "⚫", - "⚪", - "🔴", - "🔵", - "🔻", - "⬜", - "⬛", - "🔶", - "🔷", - "🔸", - "🔹" - ], - "transport": [ - "⛵", - "🚤", - "🚣", - "⚓", - "🚀", - "✈", - "💺", - "🚁", - "🚂", - "🚊", - "🚉", - "🚞", - "🚆", - "🚄", - "🚅", - "🚈", - "🚇", - "🚝", - "🚋", - "🚃", - "🚎", - "🚌", - "🚍", - "🚙", - "🚘", - "🚗", - "🚕", - "🚖", - "🚛", - "🚚", - "🚨", - "🚓", - "🚔", - "🚒", - "🚑", - "🚐", - "🚲", - "🚡", - "🚟", - "🚠", - "🚜", - "💈", - "🚏", - "🎫", - "🚦", - "🚥", - "⚠", - "🚧", - "🔰", - "⛽", - "🏮", - "🎰", - "♨", - "🗿", - "🎪", - "🎭", - "📍", - "🚩" - ] - } -}; diff -Nru retroshare-0.6.4/src/retroshare-qml-app/src/components/emoji/EmojiPicker.qml retroshare-0.6.4/src/retroshare-qml-app/src/components/emoji/EmojiPicker.qml --- retroshare-0.6.4/src/retroshare-qml-app/src/components/emoji/EmojiPicker.qml 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/retroshare-qml-app/src/components/emoji/EmojiPicker.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,165 +0,0 @@ -import QtQuick 2.7 -import QtQuick.Controls 2.0 -import "emoji.js" as EmojiJSON - -Rectangle -{ - id: emojiPicker - property EmojiCategoryButton currSelEmojiButton - property variant emojiParsedJson - property int buttonWidth: 40 - property TextArea textArea - - property bool androidMode: Qt.platform.os === "android" // On Desktop appears on top of text field, instead appears in place of virtual keyboard (under text field) - - - property var rootFontName: theme.emojiFontName - - //displays all Emoji of one categroy by modifying the ListModel of emojiGrid - function categoryChangedHandler (newCategoryName) - { - emojiByCategory.clear() - - for (var i = 0; i < emojiParsedJson.emoji_by_category[newCategoryName].length; i++) - { - var elem = emojiParsedJson.emoji_by_category[newCategoryName][i] - emojiByCategory.append({eCatName: newCategoryName, eCatText: elem}) - } - } - - //adds the clicked Emoji (and one ' ' if the previous character isn't an Emoji) to textArea - function emojiClickedHandler(selectedEmoji) - { - var strAppnd = "" - var plainText = textArea.getText(0, textArea.length) - - if (plainText.length > 0) { - var lastChar = plainText[plainText.length-1] - if ((lastChar !== ' ') && (lastChar.charCodeAt(0) < 255)) - { - strAppnd = " " - } - } - strAppnd += selectedEmoji - - textArea.insert(textArea.cursorPosition, strAppnd) - } - - //parses JSON, publishes button handlers and inits textArea - function completedHandler() - { -// emojiParsedJson = JSON.parse(EmojiJSON.emoji_json) - emojiParsedJson = EmojiJSON.emoji_json - for (var i = 0; i < emojiParsedJson.emoji_categories.length; i++) - { - var elem = emojiParsedJson.emoji_categories[i] - emojiCategoryButtons.append({eCatName: elem.name, eCatText: elem.emoji_unified}) - } - - Qt.emojiCategoryChangedHandler = categoryChangedHandler - Qt.emojiClickedHandler = emojiClickedHandler - - textArea.cursorPosition = textArea.length - textArea.Keys.pressed.connect(keyPressedHandler) - } - - - //checks if the previous character is an Emoji and adds a ' ' if that's the case - //this is necessary, because Emoji use a bigger font-size, and that font-size is kept using without a ' ' - function keyPressedHandler(event) - { - var testStr = textArea.getText(textArea.length-2, textArea.length) - var ptrn = new RegExp("[\uD800-\uDBFF][\uDC00-\uDFFF]") - if ((event.key !== Qt.Key_Backspace) && (ptrn.test(testStr))) - { - textArea.text += " " - textArea.cursorPosition = textArea.length - } - } - - //all emoji of one category - ListModel - { - id: emojiByCategory - } - - GridView - { - id: emojiGrid - width: parent.width - anchors.fill: parent - anchors - { - bottomMargin: if (!androidMode) buttonWidth - topMargin: if (androidMode) buttonWidth - } - - cellWidth: buttonWidth; cellHeight: buttonWidth - - model: emojiByCategory - delegate: EmojiButton - { - width: buttonWidth - height: buttonWidth - color: emojiPicker.color - fontName: rootFontName - } - } - - - //seperator - Rectangle - { - color: "gray" - anchors - { - bottom: if (!androidMode) parent.bottom - top: if (androidMode) parent.top - bottomMargin: if (!androidMode) buttonWidth - topMargin: if (androidMode) buttonWidth - } - - width: parent.width - height: 1 - } - Rectangle - { - color: emojiPicker.color - width: parent.width - height: buttonWidth - - anchors - { - bottom: if (!androidMode) parent.bottom - top: if (androidMode) parent.top - } - - //emoji category selector - ListView - { - width: parent.width - orientation: ListView.Horizontal - anchors.fill: parent - - model: emojiCategoryButtons - delegate: EmojiCategoryButton - { - width: buttonWidth - height: buttonWidth - color: emojiPicker.color - fontName: rootFontName - } - } - } - - ListModel - { - id: emojiCategoryButtons - } - - Component.onCompleted: - { - completedHandler() - } -} - diff -Nru retroshare-0.6.4/src/retroshare-qml-app/src/components/Faces.qml retroshare-0.6.4/src/retroshare-qml-app/src/components/Faces.qml --- retroshare-0.6.4/src/retroshare-qml-app/src/components/Faces.qml 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/retroshare-qml-app/src/components/Faces.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,137 +0,0 @@ -import QtQuick 2.7 -import Qt.labs.settings 1.0 -import "../" // Needed by ChatCache (where stores generated faces) - -Item -{ - id: faces - - property string hash - property var facesCache: ChatCache.facesCache - - Image - { - id: imageAvatar - width: height - height: iconSize - } - - Component.onCompleted: createFromHex(hash) - - /* TODO: Is there a reason why we are using var and not proper type for the - * following properties? */ - - property var facesPath: "/icons/faces/" - - property var iconSize: 32 - property var canvasSizes: iconSize > 32 ? 64 : 32; - - property var nPieces: 6 - property var pieces: [] - - // Number of image files corresponding to heach part: - // [background, face, hair|head, mouth, clothes, eye ] - property var total: - ({ - female: [5, 4, 33, 17, 59, 53], - male: [5, 4, 36, 26, 65, 32] - }) - - function src (gender, piece, random) - { - var head = gender === 'female' ? 'head' : 'hair'; - var pieces = ['background', 'face', head, 'mouth', 'clothes', 'eye']; - var num = random % total[gender][piece] + 1; - return facesPath+gender+canvasSizes+'/'+pieces[piece]+num+'.png'; - } - - function calcDataFromFingerprint(dataHex) - { - var females = total.female.reduce(function(previousValue, currentValue) - { - return previousValue * currentValue; - }); - var males = total.male.reduce(function(previousValue, currentValue) - { - return previousValue * currentValue; - }); - - var ret = []; - var data = parseInt(dataHex, 16) % (females+males); - if (data - females < 0) - { - var i = 0; - ret = ['female']; - while (data > 0 || i < total.female.length) - { - ret.push(data % total.female[i]); - data = parseInt(data / total.female[i]); - i++; - } - } - else - { - data = data - females; - var i = 0; - ret = ['male']; - while (data > 0 || i < total.male.length) - { - ret.push(data % total.male[i]); - data = parseInt(data / total.male[i]); - i++; - } - } - return ret; - } - - function generateImage(data, callback) - { - var gender = data[0]; - var onloads = []; - for (var i=0; i - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ - -import QtQuick 2.7 -import QtQuick.Controls 2.0 -import "." //Needed for ClipboardWrapper singleton -import "./components" -import "URI.js" as UriJs - -Item -{ - id: cntDt - property var md - property bool is_contact: cntDt.md.is_contact - property bool isOwn: cntDt.md.own - property string objectName: "contactDetails" - - ButtonText - { - id: avatarPicker - - text: (isOwn)? qsTr("Change your Avatar") : qsTr("Start Chat!") - - anchors.top: parent.top - anchors.horizontalCenter: parent.horizontalCenter - - buttonTextPixelSize: 14 - iconUrl: (isOwn)? "/icons/attach-image.svg": "/icons/chat-bubble.svg" - borderRadius: 0 - - - onClicked: - { - if (isOwn) fileChooser.open() - else startDistantChat () - } - function startDistantChat () - { - ChatCache.chatHelper.startDistantChat(ChatCache.contactsCache.own.gxs_id, - cntDt.md.gxs_id, - cntDt.md.name, - function (chatId) - { - stackView.push("qrc:/ChatView.qml", {'chatId': chatId}) - }) - } - CustomFileChooser - { - id: fileChooser - onResultFileChanged: - { - console.log("Result file changed! " , resultFile) - - var base64Image = androidImagePicker.imageToBase64(resultFile) - - rsApi.request("/identity/set_avatar", JSON.stringify({"gxs_id": cntDt.md.gxs_id, "avatar": base64Image }), - function (par) - { - var jP = JSON.parse(par.response) - if (jP.returncode === "ok") - { - console.log("Avatar changed! ") - topFace.refresh() - } - }) - } - } - } - - - AvatarOrColorHash - { - id: topFace - - gxs_id: cntDt.md.gxs_id - - anchors.top: avatarPicker.bottom - anchors.topMargin: 6 - anchors.horizontalCenter: parent.horizontalCenter - } - - Column - { - anchors.top: topFace.bottom - anchors.topMargin: 6 - anchors.horizontalCenter: parent.horizontalCenter - - spacing: 6 - - Row - { - height: 50 - anchors.horizontalCenter: parent.horizontalCenter - spacing: 6 - - ColorHash - { - hash: cntDt.md.gxs_id - height: parent.height - 10 - anchors.verticalCenter: parent.verticalCenter - } - - Text - { - text: cntDt.md.name - anchors.verticalCenter: parent.verticalCenter - } - - Image - { - source: cntDt.is_contact ? - "qrc:/icons/rating.svg" : - "qrc:/icons/rating-unrated.svg" - height: parent.height -4 - fillMode: Image.PreserveAspectFit - sourceSize.height: height - anchors.verticalCenter: parent.verticalCenter - - MouseArea - { - anchors.fill: parent - - onClicked: - { - var jDt = JSON.stringify({gxs_id: cntDt.md.gxs_id}) - if(cntDt.is_contact) - rsApi.request("/identity/remove_contact", jDt, tgCt) - else rsApi.request("/identity/add_contact", jDt, tgCt) - } - - function tgCt() { cntDt.is_contact = !cntDt.is_contact } - } - } - } - - Text - { - text: "

"+cntDt.md.gxs_id+"
" - anchors.horizontalCenter: parent.horizontalCenter - } - - Text - { - visible: cntDt.md.pgp_linked - text: qsTr("Owned by: %1").arg(cntDt.md.pgp_id) - anchors.horizontalCenter: parent.horizontalCenter - } - } - - Row - { - anchors.bottom: parent.bottom - anchors.horizontalCenter: parent.horizontalCenter - - spacing: 6 - - ButtonText - { - text: qsTr("Contact full link") - borderRadius: 0 - buttonTextPixelSize: 14 - onClicked: - { - rsApi.request( - "/identity/export_key", - JSON.stringify({ gxs_id: cntDt.md.gxs_id }), - function(par) - { - var jD = JSON.parse(par.response).data - var contactUrl = ( - "retroshare://" + - "identity?gxsid=" + - cntDt.md.gxs_id + - "&name=" + - UriJs.URI.encode(cntDt.md.name) + - "&groupdata=" + - UriJs.URI.encode(jD.radix) ) - ClipboardWrapper.postToClipBoard(contactUrl) - linkCopiedPopup.itemName = cntDt.md.name - linkCopiedPopup.visible = true - platformGW.shareUrl(contactUrl); - } - ) - } - } - - ButtonText - { - text: qsTr("Contact short link") - enabled: false - borderRadius: 0 - buttonTextPixelSize: 14 - } - } -} diff -Nru retroshare-0.6.4/src/retroshare-qml-app/src/ContactSort.js retroshare-0.6.4/src/retroshare-qml-app/src/ContactSort.js --- retroshare-0.6.4/src/retroshare-qml-app/src/ContactSort.js 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/retroshare-qml-app/src/ContactSort.js 1970-01-01 00:00:00.000000000 +0000 @@ -1,101 +0,0 @@ -/* - * RetroShare Android QML App - * Copyright (C) 2017 Gioacchino Mazzurco - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ - -function strcmp(left, right) -{ return ( left < right ? -1 : ( left > right ? 1:0 ) ) } - -var unreadMessages = {} -var contactsData = {} - -function cntcmp(left, right, searchText) -{ - if(typeof searchText !== 'undefined' && searchText.length > 0) - { - var mtc = searchText.toLowerCase() - var lfn = left.name.toLowerCase() - var rgn = right.name.toLowerCase() - var lfml = lfn.indexOf(mtc) - var rgml = rgn.indexOf(mtc) - if ( lfml !== rgml ) - { - lfml = lfml >= 0 ? lfml : Number.MAX_VALUE - rgml = rgml >= 0 ? rgml : Number.MAX_VALUE - return lfml - rgml - } - } - - var lfun = left.hasOwnProperty("unread_count") ? left.unread_count : 0 - var rgun = right.hasOwnProperty("unread_count") ? right.unread_count : 0 - if( lfun !== rgun ) return rgun - lfun - var lcon = left.is_contact - var rcon = right.is_contact - if( lcon !== rcon ) return rcon - lcon - var lname = left.name.toLowerCase() - var rname = right.name.toLowerCase() - if(lname !== rname) return strcmp(lname, rname) - return strcmp(left.gxs_id, right.gxs_id) -} - -function mergeContactsUnread() -{ - var jsonData = contactsData.data - var dataLen = jsonData.length - for ( var i=0; i - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ - -import QtQuick 2.7 -import QtQuick.Controls 2.0 -import org.retroshare.qml_components.LibresapiLocalClient 1.0 -import "." //Needed for TokensManager singleton -import Qt.labs.settings 1.0 - -Item -{ - id: contactsView - property string own_gxs_id: "" - property string own_nick: "" - property bool searching: false - onSearchingChanged: !searching && contactsSortWorker.sendMessage({}) - - property string objectName:"contactsView" - - Component.onCompleted: - { - refreshAll() - } - onFocusChanged: focus && refreshAll() - - function changeState () - { - toolBar.state = "CONTACTSVIEW" - toolBar.searchBtnCb = toggleSearchBox - } - - WorkerScript - { - id: contactsSortWorker - source: "qrc:/ContactSort.js" - onMessage: contactsListModel.json = JSON.stringify(messageObject) - } - - function toggleSearchBox (){ - if (searching) searching = false - else searching = true - } - - function refreshAll() - { - refreshOwn() - refreshContacts() - refreshUnread() - } - - function refreshContactsCallback(par) - { - console.log("contactsView.refreshContactsCB()", visible) - var token = JSON.parse(par.response).statetoken - ChatCache.contactsCache.contactsList = JSON.parse(par.response).data - TokensManager.registerToken(token, refreshContacts) - contactsSortWorker.sendMessage( - {'action': 'refreshContacts', 'response': par.response}) - } - function refreshContacts() - { - console.log("contactsView.refreshContacts()", visible) - if(!visible) return - rsApi.request("/identity/*/", "", refreshContactsCallback) - } - - function refreshOwnCallback(par) - { - console.log("contactsView.refreshOwnCallback(par)", visible) - var json = JSON.parse(par.response) - var token = json.statetoken - TokensManager.registerToken(token, refreshOwn) - - if(json.data.length > 0) - { - ChatCache.contactsCache.own = json.data[0] - contactsView.own_gxs_id = json.data[0].gxs_id - contactsView.own_nick = json.data[0].name - if(mainWindow.user_name.length === 0) - mainWindow.user_name = json.data[0].name - } - else if (!settings.defaultIdentityCreated) - { - console.log("refreshOwnCallback(par)", "creating new identity" ) - settings.defaultIdentityCreated = true - - var jsonData = { "name": mainWindow.user_name, "pgp_linked": false } - rsApi.request( - "/identity/create_identity", - JSON.stringify(jsonData), - refreshOwn) - } - } - function refreshOwn() - { - console.log("contactsView.refreshOwn()", visible) - rsApi.request("/identity/own", "", refreshOwnCallback) - } - - function refreshUnreadCallback(par) - { - console.log("contactsView.refreshUnreadCB()", visible) - var json = JSON.parse(par.response) - TokensManager.registerToken(json.statetoken, refreshUnread) - contactsSortWorker.sendMessage( - {'action': 'refreshUnread', 'response': par.response}) - json.data.forEach (function (chat) - { - ChatCache.lastMessageCache.updateLastMessageCache(chat.chat_id) - ChatCache.lastMessageCache.setRemoteGXS (chat.chat_id, { gxs: chat.remote_author_id, name: chat.remote_author_name}) - }) - } - function refreshUnread() - { - console.log("contactsView.refreshUnread()", visible) - if(!visible) return - rsApi.request("/chat/unread_msgs", "", refreshUnreadCallback) - } - - /** This must be equivalent to - p3GxsTunnelService::makeGxsTunnelId(...) */ - function getChatId(from_gxs, to_gxs) - { - return from_gxs < to_gxs ? from_gxs + to_gxs : to_gxs + from_gxs - } - - JSONListModel - { - id: contactsListModel - query: "$.data[*]" - } - - ListView - { - id: contactsListView - width: parent.width - height: contactsView.searching ? - parent.height - searchBox.height : parent.height - model: contactsListModel.model - anchors.top: contactsView.searching ? searchBox.bottom : parent.top - delegate: GxsIdentityDelegate {} - } - - Rectangle - { - id: searchBox -// visible: contactsView.searching - - height: searchText.height + 10 - width: parent.width * 0.9 - anchors.right: parent.right - anchors.top: parent.top - anchors.leftMargin: 5 - anchors.rightMargin: 5 - anchors.horizontalCenter: parent.horizontalCenter - color: "white" - - TextField - { - id: searchText - anchors.verticalCenter: parent.verticalCenter -// placeholderText : "Search contacts..." - width: parent.width - anchors.leftMargin: 5 - height: 0 - - background: Rectangle - { - border.width: 2 - radius: 5 - border.color: searchText.focus ? "cornflowerblue" : "lightgrey" - color: searchText.focus ? "white" : "ghostwhite" - } - - onTextChanged: - contactsSortWorker.sendMessage( - {'action': 'searchContact', 'sexp': text}) - } - - states: - [ - State - { - when: contactsView.searching; - PropertyChanges { target: searchText; height: implicitHeight } - PropertyChanges { target: searchText; placeholderText : "Search contacts..." } - PropertyChanges { target: searchBox; height: searchText.height + 10 } - }, - State - { - when: !contactsView.searching; - PropertyChanges { target: searchText; height: 0 } - PropertyChanges { target: searchBox; height: 0 } - } - ] - transitions: Transition - { - NumberAnimation { property: "height"; duration: 500; easing.type: Easing.InOutQuad} - } - } - - Text - { - id: selectedOwnIdentityView - color: "green" - anchors.bottom: parent.bottom - anchors.left: parent.left - width: parent.width - text: "Open Chat as: " + contactsView.own_nick + " " + contactsView.own_gxs_id - } - - Settings - { - id: settings - category: "contactsView" - - property bool defaultIdentityCreated: false - } - -} diff -Nru retroshare-0.6.4/src/retroshare-qml-app/src/defaultplatforminteracions.cpp retroshare-0.6.4/src/retroshare-qml-app/src/defaultplatforminteracions.cpp --- retroshare-0.6.4/src/retroshare-qml-app/src/defaultplatforminteracions.cpp 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/retroshare-qml-app/src/defaultplatforminteracions.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,25 +0,0 @@ -/* - * RetroShare Android QML App - * Copyright (C) 2017 Gioacchino Mazzurco - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ - -#include "defaultplatforminteracions.h" - -DefaultPlatformInteracions::DefaultPlatformInteracions(QObject *parent) : - PlatformInteracions(parent) {} - -// Do nothing as the url is pasted to clipboard directly in QML -void DefaultPlatformInteracions::shareUrl(QUrl /*url*/) {} diff -Nru retroshare-0.6.4/src/retroshare-qml-app/src/defaultplatforminteracions.h retroshare-0.6.4/src/retroshare-qml-app/src/defaultplatforminteracions.h --- retroshare-0.6.4/src/retroshare-qml-app/src/defaultplatforminteracions.h 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/retroshare-qml-app/src/defaultplatforminteracions.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,34 +0,0 @@ -#pragma once -/* - * RetroShare Android QML App - * Copyright (C) 2017 Gioacchino Mazzurco - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ - -#include -#include - -#include "platforminteracions.h" - -class DefaultPlatformInteracions : public PlatformInteracions -{ - Q_OBJECT - -public: - explicit DefaultPlatformInteracions(QObject *parent = nullptr); - -public slots: - virtual void shareUrl(QUrl url); -}; diff -Nru retroshare-0.6.4/src/retroshare-qml-app/src/deployment.pri retroshare-0.6.4/src/retroshare-qml-app/src/deployment.pri --- retroshare-0.6.4/src/retroshare-qml-app/src/deployment.pri 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/retroshare-qml-app/src/deployment.pri 1970-01-01 00:00:00.000000000 +0000 @@ -1,13 +0,0 @@ -unix:!android { - isEmpty(target.path) { - qnx { - target.path = /tmp/$${TARGET}/bin - } else { - target.path = /opt/$${TARGET}/bin - } - export(target.path) - } - INSTALLS += target -} - -export(INSTALLS) Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/fonts/OpenSansEmoji.ttf and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/fonts/OpenSansEmoji.ttf differ diff -Nru retroshare-0.6.4/src/retroshare-qml-app/src/GxsIdentityDelegate.qml retroshare-0.6.4/src/retroshare-qml-app/src/GxsIdentityDelegate.qml --- retroshare-0.6.4/src/retroshare-qml-app/src/GxsIdentityDelegate.qml 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/retroshare-qml-app/src/GxsIdentityDelegate.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,294 +0,0 @@ -/* - * RetroShare Android QML App - * Copyright (C) 2017 Gioacchino Mazzurco - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ - -import QtQuick 2.7 -import QtQuick.Controls 2.0 -import "." //Needed for ChatCache singleton -import "./components" - -Item -{ - id: delegateRoot - height: 57 - width: parent.width - - - property var chatId: undefined - property var lastMessageData: ({}) - property var locale: Qt.locale() - - Rectangle - { - id: contactItem - - anchors.fill: parent - color: contactItemArea.containsPress ? "lightgrey" : "transparent" - width: parent.width - height: parent.height - - MouseArea - { - id: contactItemArea - anchors.fill: parent - onClicked: - { - console.log("GxsIntentityDelegate onclicked:", model.name, - model.gxs_id) - contactsView.searching = false - if(model.own) - { - contactsView.own_gxs_id = model.gxs_id - stackView.push( - "qrc:/ContactDetails.qml", - {md: ChatCache.contactsCache.getContactFromGxsId(model.gxs_id)}) - - } - else - { - startDistantChat() - } - } - - onPressAndHold: showDetails() - hoverEnabled: true - } - - Rectangle - { - id: backgroundRectangle - anchors.fill: parent.fill - anchors.right: parent.right - width: parent.width - colorHash.width - 15 - height: parent.height - color:"transparent" - - Rectangle - { - id: borderBottom - width: parent.width - height: 1 - anchors.bottom: parent.bottom - anchors.right: parent.right - color: "lightgrey" - } - } - - Rectangle - { - anchors.fill: parent - color: "transparent" - anchors.margins: 5 - - AvatarOrColorHash - { - id: colorHash - - gxs_id: model.gxs_id - - height: parent.height - 4 - anchors.verticalCenter: parent.verticalCenter - anchors.left: parent.left - anchors.leftMargin: 2 - - onlyCached: true - } - - Column - { - - id: chatInfoRow - height: parent.height - width: parent.width - isContactRow.width - colorHash.width - anchors.left: colorHash.right - anchors.leftMargin: 10 - anchors.right: isContactRow.left - anchors.rightMargin: 5 - - - Item - { - width: parent.width - height: parent.height /2 - - Text - { - id: nickText - color: model.own ? "blue" : "black" - text: model.name - font.bold: true - anchors.bottom: parent.bottom - } - - Text - { - text: setTime() - anchors.right: parent.right - color: "darkslategrey" - anchors.bottom: parent.bottom - } - } - - Item - { - id: lastMessageText - width: parent.width - height: (lastMessageData && lastMessageData.msg !== undefined)? parent.height /2 : 0 - - Text - { - id: lastMessageSender - font.italic: true - color: "royalblue" - text: ((lastMessageData && lastMessageData.incoming !== undefined) && !lastMessageData.incoming)? "You: " : "" - height: parent.height - } - - Text - { - id: lastMessageMsg - anchors.left: lastMessageSender.right - text: (lastMessageData && lastMessageData.msg !== undefined)? lastMessageData.msg : "" - rightPadding: 5 - elide: Text.ElideRight - color: "darkslategrey" - width: chatInfoRow.width - 30 - height: parent.height - } - - Rectangle - { - visible: model.unread_count > 0 - - color: "cornflowerblue" - antialiasing: true - height: parent.height - 6 - radius: height/2 - width: height -// anchors.verticalCenter: parent.verticalCenter - anchors.right: parent.right - - Text - { - color: "white" - font.bold: true - text: model.unread_count - anchors.centerIn: parent - } - } - - } - - } - - Row - { - id: isContactRow - anchors.right: parent.right - anchors.rightMargin: 10 - anchors.verticalCenter: parent.verticalCenter - height: parent.height - 10 - spacing: 4 - - Image - { - source: model.is_contact ? - "qrc:/icons/rating.svg" : - "qrc:/icons/rating-unrated.svg" - height: parent.height - 4 - sourceSize.height: height - fillMode: Image.PreserveAspectFit - anchors.verticalCenter: parent.verticalCenter - - id: isContactIcon - } - } - } - } - - - Component.onCompleted: - { - if (!chatId){ - chatId = getChatIdFromGXS() - } - if (chatId) { - var last = getChatLastMessage(chatId) - if (last) lastMessageData = last - } - } - - Connections - { - target: ChatCache.lastMessageCache - onLastMessageChanged: { - if (!chatId) { - chatId = getChatIdFromGXS() - } - if (chatId && chatId === chatI){ - console.log("New last message received!") - lastMessageData = newLastMessage - } - } - } - - - function getChatLastMessage (chatId) - { - return ChatCache.lastMessageCache.getChatLastMessage(chatId) - } - - function getChatIdFromGXS () - { - var id= ChatCache.lastMessageCache.getChatIdFromGxs(model.gxs_id) - return ChatCache.lastMessageCache.getChatIdFromGxs(model.gxs_id) - } - function setTime() - { - if (!lastMessageData || lastMessageData.recv_time === undefined) return "" - - var timeFormat = "dd.MM.yyyy"; - var recvDate = new Date(lastMessageData.recv_time*1000) - - // Check if is today - if ( new Date (lastMessageData.recv_time*1000).setHours(0,0,0,0) == new Date ().setHours(0,0,0,0)) - { - timeFormat = "hh:mm" - } - var timeString = Qt.formatDateTime(recvDate, timeFormat) - return timeString - } - - function showDetails() - { - console.log("showDetails()", index) - contactsView.searching = false - stackView.push( - "qrc:/ContactDetails.qml", - {md: contactsListView.model.get(index)}) - } - - function startDistantChat () - { - ChatCache.chatHelper.startDistantChat(contactsView.own_gxs_id, model.gxs_id, model.name, - function (chatId) - { - stackView.push("qrc:/ChatView.qml", {'chatId': chatId}) - }) - } -} - diff -Nru retroshare-0.6.4/src/retroshare-qml-app/src/icons/add.svg retroshare-0.6.4/src/retroshare-qml-app/src/icons/add.svg --- retroshare-0.6.4/src/retroshare-qml-app/src/icons/add.svg 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/retroshare-qml-app/src/icons/add.svg 1970-01-01 00:00:00.000000000 +0000 @@ -1,54 +0,0 @@ - - - -image/svg+xml \ No newline at end of file diff -Nru retroshare-0.6.4/src/retroshare-qml-app/src/icons/application-menu.svg retroshare-0.6.4/src/retroshare-qml-app/src/icons/application-menu.svg --- retroshare-0.6.4/src/retroshare-qml-app/src/icons/application-menu.svg 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/retroshare-qml-app/src/icons/application-menu.svg 1970-01-01 00:00:00.000000000 +0000 @@ -1,13 +0,0 @@ - - - - - - diff -Nru retroshare-0.6.4/src/retroshare-qml-app/src/icons/attach-image.svg retroshare-0.6.4/src/retroshare-qml-app/src/icons/attach-image.svg --- retroshare-0.6.4/src/retroshare-qml-app/src/icons/attach-image.svg 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/retroshare-qml-app/src/icons/attach-image.svg 1970-01-01 00:00:00.000000000 +0000 @@ -1,78 +0,0 @@ - - - -image/svg+xml \ No newline at end of file diff -Nru retroshare-0.6.4/src/retroshare-qml-app/src/icons/attach.svg retroshare-0.6.4/src/retroshare-qml-app/src/icons/attach.svg --- retroshare-0.6.4/src/retroshare-qml-app/src/icons/attach.svg 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/retroshare-qml-app/src/icons/attach.svg 1970-01-01 00:00:00.000000000 +0000 @@ -1,61 +0,0 @@ - -image/svg+xml \ No newline at end of file Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/back.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/back.png differ diff -Nru retroshare-0.6.4/src/retroshare-qml-app/src/icons/chat-bubble.svg retroshare-0.6.4/src/retroshare-qml-app/src/icons/chat-bubble.svg --- retroshare-0.6.4/src/retroshare-qml-app/src/icons/chat-bubble.svg 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/retroshare-qml-app/src/icons/chat-bubble.svg 1970-01-01 00:00:00.000000000 +0000 @@ -1,108 +0,0 @@ - - - -image/svg+xml \ No newline at end of file diff -Nru retroshare-0.6.4/src/retroshare-qml-app/src/icons/edit-image-face-detect.svg retroshare-0.6.4/src/retroshare-qml-app/src/icons/edit-image-face-detect.svg --- retroshare-0.6.4/src/retroshare-qml-app/src/icons/edit-image-face-detect.svg 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/retroshare-qml-app/src/icons/edit-image-face-detect.svg 1970-01-01 00:00:00.000000000 +0000 @@ -1,13 +0,0 @@ - - - - - - diff -Nru retroshare-0.6.4/src/retroshare-qml-app/src/icons/emblem-locked.svg retroshare-0.6.4/src/retroshare-qml-app/src/icons/emblem-locked.svg --- retroshare-0.6.4/src/retroshare-qml-app/src/icons/emblem-locked.svg 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/retroshare-qml-app/src/icons/emblem-locked.svg 1970-01-01 00:00:00.000000000 +0000 @@ -1,18 +0,0 @@ - - - - - - - diff -Nru retroshare-0.6.4/src/retroshare-qml-app/src/icons/exit.svg retroshare-0.6.4/src/retroshare-qml-app/src/icons/exit.svg --- retroshare-0.6.4/src/retroshare-qml-app/src/icons/exit.svg 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/retroshare-qml-app/src/icons/exit.svg 1970-01-01 00:00:00.000000000 +0000 @@ -1,65 +0,0 @@ - - - -image/svg+xml \ No newline at end of file Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/background1.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/background1.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/background2.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/background2.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/background3.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/background3.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/background4.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/background4.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/background5.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/background5.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/clothes10.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/clothes10.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/clothes11.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/clothes11.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/clothes12.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/clothes12.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/clothes13.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/clothes13.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/clothes14.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/clothes14.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/clothes15.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/clothes15.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/clothes16.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/clothes16.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/clothes17.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/clothes17.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/clothes18.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/clothes18.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/clothes19.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/clothes19.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/clothes1.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/clothes1.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/clothes20.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/clothes20.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/clothes21.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/clothes21.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/clothes22.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/clothes22.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/clothes23.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/clothes23.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/clothes24.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/clothes24.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/clothes25.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/clothes25.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/clothes26.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/clothes26.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/clothes27.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/clothes27.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/clothes28.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/clothes28.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/clothes29.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/clothes29.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/clothes2.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/clothes2.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/clothes30.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/clothes30.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/clothes31.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/clothes31.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/clothes32.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/clothes32.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/clothes33.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/clothes33.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/clothes34.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/clothes34.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/clothes35.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/clothes35.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/clothes36.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/clothes36.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/clothes37.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/clothes37.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/clothes38.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/clothes38.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/clothes39.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/clothes39.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/clothes3.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/clothes3.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/clothes40.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/clothes40.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/clothes41.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/clothes41.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/clothes42.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/clothes42.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/clothes43.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/clothes43.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/clothes44.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/clothes44.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/clothes45.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/clothes45.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/clothes46.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/clothes46.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/clothes47.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/clothes47.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/clothes48.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/clothes48.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/clothes49.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/clothes49.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/clothes4.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/clothes4.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/clothes50.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/clothes50.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/clothes51.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/clothes51.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/clothes52.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/clothes52.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/clothes53.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/clothes53.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/clothes54.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/clothes54.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/clothes55.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/clothes55.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/clothes56.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/clothes56.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/clothes57.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/clothes57.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/clothes58.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/clothes58.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/clothes59.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/clothes59.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/clothes5.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/clothes5.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/clothes6.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/clothes6.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/clothes7.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/clothes7.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/clothes8.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/clothes8.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/clothes9.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/clothes9.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/eye10.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/eye10.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/eye11.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/eye11.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/eye12.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/eye12.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/eye13.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/eye13.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/eye14.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/eye14.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/eye15.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/eye15.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/eye16.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/eye16.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/eye17.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/eye17.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/eye18.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/eye18.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/eye19.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/eye19.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/eye1.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/eye1.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/eye20.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/eye20.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/eye21.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/eye21.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/eye22.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/eye22.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/eye23.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/eye23.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/eye24.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/eye24.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/eye25.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/eye25.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/eye26.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/eye26.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/eye27.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/eye27.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/eye28.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/eye28.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/eye29.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/eye29.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/eye2.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/eye2.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/eye30.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/eye30.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/eye31.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/eye31.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/eye32.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/eye32.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/eye33.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/eye33.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/eye34.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/eye34.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/eye35.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/eye35.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/eye36.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/eye36.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/eye37.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/eye37.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/eye38.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/eye38.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/eye39.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/eye39.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/eye3.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/eye3.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/eye40.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/eye40.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/eye41.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/eye41.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/eye42.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/eye42.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/eye43.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/eye43.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/eye44.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/eye44.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/eye45.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/eye45.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/eye46.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/eye46.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/eye47.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/eye47.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/eye48.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/eye48.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/eye49.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/eye49.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/eye4.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/eye4.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/eye50.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/eye50.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/eye51.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/eye51.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/eye52.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/eye52.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/eye53.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/eye53.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/eye5.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/eye5.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/eye6.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/eye6.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/eye7.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/eye7.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/eye8.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/eye8.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/eye9.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/eye9.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/face1.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/face1.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/face2.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/face2.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/face3.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/face3.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/face4.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/face4.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/head10.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/head10.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/head11.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/head11.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/head12.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/head12.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/head13.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/head13.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/head14.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/head14.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/head15.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/head15.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/head16.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/head16.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/head17.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/head17.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/head18.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/head18.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/head19.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/head19.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/head1.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/head1.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/head20.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/head20.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/head21.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/head21.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/head22.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/head22.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/head23.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/head23.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/head24.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/head24.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/head25.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/head25.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/head26.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/head26.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/head27.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/head27.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/head28.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/head28.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/head29.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/head29.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/head2.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/head2.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/head30.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/head30.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/head31.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/head31.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/head32.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/head32.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/head33.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/head33.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/head3.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/head3.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/head4.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/head4.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/head5.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/head5.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/head6.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/head6.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/head7.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/head7.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/head8.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/head8.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/head9.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/head9.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/mouth10.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/mouth10.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/mouth11.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/mouth11.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/mouth12.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/mouth12.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/mouth13.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/mouth13.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/mouth14.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/mouth14.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/mouth15.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/mouth15.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/mouth16.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/mouth16.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/mouth17.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/mouth17.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/mouth1.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/mouth1.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/mouth2.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/mouth2.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/mouth3.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/mouth3.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/mouth4.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/mouth4.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/mouth5.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/mouth5.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/mouth6.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/mouth6.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/mouth7.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/mouth7.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/mouth8.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/mouth8.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/mouth9.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female32/mouth9.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/background1.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/background1.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/background2.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/background2.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/background3.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/background3.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/background4.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/background4.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/background5.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/background5.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/clothes10.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/clothes10.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/clothes11.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/clothes11.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/clothes12.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/clothes12.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/clothes13.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/clothes13.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/clothes14.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/clothes14.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/clothes15.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/clothes15.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/clothes16.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/clothes16.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/clothes17.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/clothes17.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/clothes18.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/clothes18.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/clothes19.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/clothes19.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/clothes1.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/clothes1.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/clothes20.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/clothes20.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/clothes21.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/clothes21.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/clothes22.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/clothes22.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/clothes23.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/clothes23.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/clothes24.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/clothes24.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/clothes25.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/clothes25.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/clothes26.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/clothes26.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/clothes27.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/clothes27.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/clothes28.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/clothes28.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/clothes29.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/clothes29.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/clothes2.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/clothes2.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/clothes30.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/clothes30.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/clothes31.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/clothes31.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/clothes32.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/clothes32.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/clothes33.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/clothes33.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/clothes34.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/clothes34.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/clothes35.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/clothes35.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/clothes36.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/clothes36.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/clothes37.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/clothes37.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/clothes38.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/clothes38.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/clothes39.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/clothes39.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/clothes3.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/clothes3.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/clothes40.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/clothes40.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/clothes41.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/clothes41.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/clothes42.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/clothes42.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/clothes43.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/clothes43.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/clothes44.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/clothes44.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/clothes45.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/clothes45.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/clothes46.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/clothes46.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/clothes47.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/clothes47.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/clothes48.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/clothes48.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/clothes49.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/clothes49.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/clothes4.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/clothes4.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/clothes50.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/clothes50.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/clothes51.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/clothes51.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/clothes52.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/clothes52.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/clothes53.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/clothes53.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/clothes54.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/clothes54.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/clothes55.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/clothes55.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/clothes56.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/clothes56.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/clothes57.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/clothes57.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/clothes58.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/clothes58.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/clothes59.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/clothes59.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/clothes5.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/clothes5.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/clothes6.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/clothes6.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/clothes7.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/clothes7.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/clothes8.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/clothes8.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/clothes9.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/clothes9.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/eye10.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/eye10.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/eye11.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/eye11.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/eye12.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/eye12.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/eye13.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/eye13.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/eye14.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/eye14.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/eye15.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/eye15.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/eye16.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/eye16.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/eye17.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/eye17.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/eye18.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/eye18.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/eye19.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/eye19.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/eye1.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/eye1.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/eye20.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/eye20.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/eye21.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/eye21.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/eye22.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/eye22.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/eye23.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/eye23.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/eye24.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/eye24.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/eye25.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/eye25.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/eye26.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/eye26.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/eye27.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/eye27.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/eye28.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/eye28.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/eye29.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/eye29.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/eye2.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/eye2.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/eye30.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/eye30.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/eye31.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/eye31.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/eye32.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/eye32.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/eye33.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/eye33.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/eye34.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/eye34.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/eye35.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/eye35.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/eye36.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/eye36.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/eye37.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/eye37.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/eye38.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/eye38.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/eye39.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/eye39.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/eye3.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/eye3.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/eye40.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/eye40.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/eye41.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/eye41.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/eye42.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/eye42.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/eye43.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/eye43.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/eye44.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/eye44.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/eye45.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/eye45.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/eye46.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/eye46.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/eye47.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/eye47.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/eye48.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/eye48.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/eye49.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/eye49.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/eye4.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/eye4.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/eye50.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/eye50.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/eye51.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/eye51.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/eye52.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/eye52.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/eye53.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/eye53.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/eye5.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/eye5.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/eye6.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/eye6.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/eye7.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/eye7.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/eye8.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/eye8.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/eye9.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/eye9.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/face1.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/face1.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/face2.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/face2.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/face3.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/face3.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/face4.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/face4.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/head10.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/head10.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/head11.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/head11.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/head12.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/head12.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/head13.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/head13.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/head14.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/head14.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/head15.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/head15.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/head16.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/head16.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/head17.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/head17.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/head18.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/head18.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/head19.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/head19.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/head1.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/head1.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/head20.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/head20.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/head21.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/head21.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/head22.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/head22.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/head23.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/head23.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/head24.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/head24.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/head25.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/head25.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/head26.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/head26.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/head27.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/head27.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/head28.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/head28.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/head29.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/head29.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/head2.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/head2.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/head30.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/head30.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/head31.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/head31.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/head32.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/head32.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/head33.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/head33.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/head3.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/head3.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/head4.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/head4.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/head5.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/head5.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/head6.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/head6.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/head7.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/head7.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/head8.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/head8.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/head9.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/head9.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/mouth10.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/mouth10.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/mouth11.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/mouth11.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/mouth12.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/mouth12.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/mouth13.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/mouth13.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/mouth14.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/mouth14.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/mouth15.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/mouth15.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/mouth16.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/mouth16.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/mouth17.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/mouth17.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/mouth1.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/mouth1.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/mouth2.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/mouth2.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/mouth3.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/mouth3.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/mouth4.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/mouth4.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/mouth5.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/mouth5.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/mouth6.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/mouth6.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/mouth7.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/mouth7.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/mouth8.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/mouth8.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/mouth9.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/female64/mouth9.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/background1.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/background1.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/background2.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/background2.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/background3.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/background3.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/background4.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/background4.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/background5.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/background5.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/clothes10.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/clothes10.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/clothes11.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/clothes11.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/clothes12.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/clothes12.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/clothes13.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/clothes13.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/clothes14.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/clothes14.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/clothes15.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/clothes15.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/clothes16.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/clothes16.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/clothes17.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/clothes17.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/clothes18.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/clothes18.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/clothes19.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/clothes19.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/clothes1.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/clothes1.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/clothes20.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/clothes20.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/clothes21.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/clothes21.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/clothes22.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/clothes22.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/clothes23.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/clothes23.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/clothes24.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/clothes24.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/clothes25.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/clothes25.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/clothes26.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/clothes26.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/clothes27.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/clothes27.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/clothes28.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/clothes28.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/clothes29.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/clothes29.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/clothes2.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/clothes2.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/clothes30.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/clothes30.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/clothes31.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/clothes31.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/clothes32.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/clothes32.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/clothes33.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/clothes33.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/clothes34.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/clothes34.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/clothes35.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/clothes35.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/clothes36.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/clothes36.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/clothes37.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/clothes37.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/clothes38.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/clothes38.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/clothes39.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/clothes39.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/clothes3.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/clothes3.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/clothes40.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/clothes40.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/clothes41.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/clothes41.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/clothes42.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/clothes42.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/clothes43.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/clothes43.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/clothes44.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/clothes44.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/clothes45.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/clothes45.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/clothes46.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/clothes46.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/clothes47.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/clothes47.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/clothes48.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/clothes48.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/clothes49.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/clothes49.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/clothes4.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/clothes4.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/clothes50.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/clothes50.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/clothes51.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/clothes51.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/clothes52.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/clothes52.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/clothes53.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/clothes53.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/clothes54.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/clothes54.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/clothes55.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/clothes55.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/clothes56.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/clothes56.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/clothes57.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/clothes57.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/clothes58.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/clothes58.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/clothes59.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/clothes59.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/clothes5.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/clothes5.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/clothes60.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/clothes60.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/clothes61.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/clothes61.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/clothes62.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/clothes62.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/clothes63.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/clothes63.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/clothes64.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/clothes64.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/clothes65.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/clothes65.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/clothes6.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/clothes6.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/clothes7.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/clothes7.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/clothes8.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/clothes8.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/clothes9.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/clothes9.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/eye10.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/eye10.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/eye11.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/eye11.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/eye12.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/eye12.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/eye13.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/eye13.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/eye14.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/eye14.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/eye15.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/eye15.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/eye16.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/eye16.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/eye17.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/eye17.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/eye18.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/eye18.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/eye19.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/eye19.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/eye1.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/eye1.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/eye20.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/eye20.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/eye21.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/eye21.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/eye22.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/eye22.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/eye23.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/eye23.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/eye24.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/eye24.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/eye25.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/eye25.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/eye26.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/eye26.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/eye27.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/eye27.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/eye28.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/eye28.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/eye29.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/eye29.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/eye2.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/eye2.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/eye30.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/eye30.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/eye31.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/eye31.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/eye32.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/eye32.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/eye3.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/eye3.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/eye4.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/eye4.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/eye5.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/eye5.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/eye6.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/eye6.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/eye7.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/eye7.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/eye8.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/eye8.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/eye9.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/eye9.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/face1.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/face1.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/face2.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/face2.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/face3.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/face3.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/face4.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/face4.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/hair10.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/hair10.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/hair11.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/hair11.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/hair12.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/hair12.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/hair13.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/hair13.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/hair14.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/hair14.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/hair15.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/hair15.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/hair16.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/hair16.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/hair17.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/hair17.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/hair18.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/hair18.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/hair19.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/hair19.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/hair1.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/hair1.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/hair20.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/hair20.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/hair21.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/hair21.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/hair22.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/hair22.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/hair23.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/hair23.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/hair24.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/hair24.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/hair25.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/hair25.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/hair26.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/hair26.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/hair27.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/hair27.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/hair28.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/hair28.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/hair29.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/hair29.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/hair2.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/hair2.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/hair30.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/hair30.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/hair31.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/hair31.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/hair32.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/hair32.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/hair33.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/hair33.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/hair34.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/hair34.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/hair35.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/hair35.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/hair36.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/hair36.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/hair3.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/hair3.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/hair4.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/hair4.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/hair5.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/hair5.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/hair6.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/hair6.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/hair7.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/hair7.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/hair8.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/hair8.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/hair9.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/hair9.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/mouth10.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/mouth10.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/mouth11.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/mouth11.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/mouth12.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/mouth12.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/mouth13.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/mouth13.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/mouth14.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/mouth14.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/mouth15.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/mouth15.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/mouth16.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/mouth16.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/mouth17.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/mouth17.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/mouth18.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/mouth18.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/mouth19.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/mouth19.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/mouth1.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/mouth1.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/mouth20.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/mouth20.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/mouth21.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/mouth21.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/mouth22.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/mouth22.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/mouth23.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/mouth23.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/mouth24.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/mouth24.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/mouth25.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/mouth25.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/mouth26.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/mouth26.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/mouth2.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/mouth2.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/mouth3.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/mouth3.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/mouth4.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/mouth4.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/mouth5.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/mouth5.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/mouth6.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/mouth6.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/mouth7.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/mouth7.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/mouth8.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/mouth8.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/mouth9.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male32/mouth9.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/background1.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/background1.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/background2.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/background2.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/background3.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/background3.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/background4.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/background4.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/background5.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/background5.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/clothes10.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/clothes10.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/clothes11.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/clothes11.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/clothes12.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/clothes12.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/clothes13.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/clothes13.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/clothes14.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/clothes14.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/clothes15.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/clothes15.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/clothes16.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/clothes16.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/clothes17.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/clothes17.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/clothes18.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/clothes18.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/clothes19.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/clothes19.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/clothes1.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/clothes1.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/clothes20.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/clothes20.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/clothes21.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/clothes21.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/clothes22.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/clothes22.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/clothes23.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/clothes23.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/clothes24.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/clothes24.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/clothes25.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/clothes25.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/clothes26.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/clothes26.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/clothes27.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/clothes27.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/clothes28.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/clothes28.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/clothes29.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/clothes29.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/clothes2.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/clothes2.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/clothes30.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/clothes30.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/clothes31.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/clothes31.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/clothes32.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/clothes32.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/clothes33.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/clothes33.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/clothes34.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/clothes34.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/clothes35.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/clothes35.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/clothes36.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/clothes36.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/clothes37.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/clothes37.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/clothes38.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/clothes38.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/clothes39.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/clothes39.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/clothes3.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/clothes3.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/clothes40.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/clothes40.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/clothes41.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/clothes41.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/clothes42.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/clothes42.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/clothes43.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/clothes43.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/clothes44.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/clothes44.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/clothes45.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/clothes45.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/clothes46.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/clothes46.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/clothes47.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/clothes47.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/clothes48.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/clothes48.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/clothes49.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/clothes49.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/clothes4.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/clothes4.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/clothes50.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/clothes50.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/clothes51.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/clothes51.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/clothes52.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/clothes52.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/clothes53.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/clothes53.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/clothes54.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/clothes54.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/clothes55.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/clothes55.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/clothes56.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/clothes56.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/clothes57.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/clothes57.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/clothes58.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/clothes58.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/clothes59.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/clothes59.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/clothes5.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/clothes5.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/clothes60.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/clothes60.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/clothes61.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/clothes61.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/clothes62.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/clothes62.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/clothes63.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/clothes63.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/clothes64.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/clothes64.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/clothes65.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/clothes65.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/clothes6.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/clothes6.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/clothes7.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/clothes7.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/clothes8.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/clothes8.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/clothes9.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/clothes9.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/eye10.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/eye10.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/eye11.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/eye11.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/eye12.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/eye12.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/eye13.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/eye13.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/eye14.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/eye14.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/eye15.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/eye15.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/eye16.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/eye16.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/eye17.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/eye17.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/eye18.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/eye18.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/eye19.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/eye19.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/eye1.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/eye1.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/eye20.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/eye20.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/eye21.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/eye21.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/eye22.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/eye22.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/eye23.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/eye23.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/eye24.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/eye24.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/eye25.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/eye25.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/eye26.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/eye26.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/eye27.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/eye27.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/eye28.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/eye28.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/eye29.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/eye29.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/eye2.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/eye2.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/eye30.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/eye30.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/eye31.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/eye31.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/eye32.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/eye32.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/eye3.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/eye3.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/eye4.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/eye4.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/eye5.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/eye5.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/eye6.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/eye6.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/eye7.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/eye7.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/eye8.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/eye8.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/eye9.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/eye9.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/face1.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/face1.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/face2.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/face2.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/face3.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/face3.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/face4.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/face4.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/hair10.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/hair10.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/hair11.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/hair11.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/hair12.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/hair12.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/hair13.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/hair13.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/hair14.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/hair14.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/hair15.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/hair15.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/hair16.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/hair16.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/hair17.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/hair17.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/hair18.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/hair18.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/hair19.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/hair19.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/hair1.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/hair1.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/hair20.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/hair20.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/hair21.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/hair21.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/hair22.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/hair22.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/hair23.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/hair23.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/hair24.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/hair24.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/hair25.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/hair25.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/hair26.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/hair26.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/hair27.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/hair27.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/hair28.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/hair28.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/hair29.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/hair29.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/hair2.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/hair2.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/hair30.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/hair30.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/hair31.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/hair31.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/hair32.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/hair32.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/hair33.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/hair33.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/hair34.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/hair34.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/hair35.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/hair35.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/hair36.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/hair36.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/hair3.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/hair3.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/hair4.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/hair4.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/hair5.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/hair5.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/hair6.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/hair6.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/hair7.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/hair7.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/hair8.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/hair8.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/hair9.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/hair9.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/mouth10.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/mouth10.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/mouth11.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/mouth11.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/mouth12.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/mouth12.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/mouth13.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/mouth13.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/mouth14.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/mouth14.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/mouth15.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/mouth15.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/mouth16.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/mouth16.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/mouth17.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/mouth17.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/mouth18.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/mouth18.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/mouth19.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/mouth19.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/mouth1.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/mouth1.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/mouth20.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/mouth20.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/mouth21.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/mouth21.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/mouth22.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/mouth22.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/mouth23.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/mouth23.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/mouth24.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/mouth24.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/mouth25.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/mouth25.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/mouth26.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/mouth26.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/mouth2.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/mouth2.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/mouth3.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/mouth3.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/mouth4.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/mouth4.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/mouth5.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/mouth5.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/mouth6.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/mouth6.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/mouth7.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/mouth7.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/mouth8.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/mouth8.png differ Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/mouth9.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/faces/male64/mouth9.png differ diff -Nru retroshare-0.6.4/src/retroshare-qml-app/src/icons/info.svg retroshare-0.6.4/src/retroshare-qml-app/src/icons/info.svg --- retroshare-0.6.4/src/retroshare-qml-app/src/icons/info.svg 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/retroshare-qml-app/src/icons/info.svg 1970-01-01 00:00:00.000000000 +0000 @@ -1,60 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - diff -Nru retroshare-0.6.4/src/retroshare-qml-app/src/icons/invite.svg retroshare-0.6.4/src/retroshare-qml-app/src/icons/invite.svg --- retroshare-0.6.4/src/retroshare-qml-app/src/icons/invite.svg 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/retroshare-qml-app/src/icons/invite.svg 1970-01-01 00:00:00.000000000 +0000 @@ -1,74 +0,0 @@ - - - -image/svg+xml \ No newline at end of file diff -Nru retroshare-0.6.4/src/retroshare-qml-app/src/icons/keyring.svg retroshare-0.6.4/src/retroshare-qml-app/src/icons/keyring.svg --- retroshare-0.6.4/src/retroshare-qml-app/src/icons/keyring.svg 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/retroshare-qml-app/src/icons/keyring.svg 1970-01-01 00:00:00.000000000 +0000 @@ -1,7 +0,0 @@ - - - - - - - diff -Nru retroshare-0.6.4/src/retroshare-qml-app/src/icons/leave.svg retroshare-0.6.4/src/retroshare-qml-app/src/icons/leave.svg --- retroshare-0.6.4/src/retroshare-qml-app/src/icons/leave.svg 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/retroshare-qml-app/src/icons/leave.svg 1970-01-01 00:00:00.000000000 +0000 @@ -1,59 +0,0 @@ - - - -image/svg+xml \ No newline at end of file diff -Nru retroshare-0.6.4/src/retroshare-qml-app/src/icons/microphone_mute.svg retroshare-0.6.4/src/retroshare-qml-app/src/icons/microphone_mute.svg --- retroshare-0.6.4/src/retroshare-qml-app/src/icons/microphone_mute.svg 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/retroshare-qml-app/src/icons/microphone_mute.svg 1970-01-01 00:00:00.000000000 +0000 @@ -1,164 +0,0 @@ - - - -image/svg+xml \ No newline at end of file diff -Nru retroshare-0.6.4/src/retroshare-qml-app/src/icons/microphone.svg retroshare-0.6.4/src/retroshare-qml-app/src/icons/microphone.svg --- retroshare-0.6.4/src/retroshare-qml-app/src/icons/microphone.svg 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/retroshare-qml-app/src/icons/microphone.svg 1970-01-01 00:00:00.000000000 +0000 @@ -1,148 +0,0 @@ - - - -image/svg+xml \ No newline at end of file diff -Nru retroshare-0.6.4/src/retroshare-qml-app/src/icons/netgraph.svg retroshare-0.6.4/src/retroshare-qml-app/src/icons/netgraph.svg --- retroshare-0.6.4/src/retroshare-qml-app/src/icons/netgraph.svg 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/retroshare-qml-app/src/icons/netgraph.svg 1970-01-01 00:00:00.000000000 +0000 @@ -1,54 +0,0 @@ - - - -image/svg+xml \ No newline at end of file diff -Nru retroshare-0.6.4/src/retroshare-qml-app/src/icons/network-connect.svg retroshare-0.6.4/src/retroshare-qml-app/src/icons/network-connect.svg --- retroshare-0.6.4/src/retroshare-qml-app/src/icons/network-connect.svg 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/retroshare-qml-app/src/icons/network-connect.svg 1970-01-01 00:00:00.000000000 +0000 @@ -1,13 +0,0 @@ - - - - - - diff -Nru retroshare-0.6.4/src/retroshare-qml-app/src/icons/network-disconnect.svg retroshare-0.6.4/src/retroshare-qml-app/src/icons/network-disconnect.svg --- retroshare-0.6.4/src/retroshare-qml-app/src/icons/network-disconnect.svg 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/retroshare-qml-app/src/icons/network-disconnect.svg 1970-01-01 00:00:00.000000000 +0000 @@ -1,21 +0,0 @@ - - - - - - - diff -Nru retroshare-0.6.4/src/retroshare-qml-app/src/icons/network.svg retroshare-0.6.4/src/retroshare-qml-app/src/icons/network.svg --- retroshare-0.6.4/src/retroshare-qml-app/src/icons/network.svg 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/retroshare-qml-app/src/icons/network.svg 1970-01-01 00:00:00.000000000 +0000 @@ -1,68 +0,0 @@ - - - -image/svg+xml \ No newline at end of file diff -Nru retroshare-0.6.4/src/retroshare-qml-app/src/icons/options.svg retroshare-0.6.4/src/retroshare-qml-app/src/icons/options.svg --- retroshare-0.6.4/src/retroshare-qml-app/src/icons/options.svg 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/retroshare-qml-app/src/icons/options.svg 1970-01-01 00:00:00.000000000 +0000 @@ -1,62 +0,0 @@ - - - -image/svg+xml \ No newline at end of file diff -Nru retroshare-0.6.4/src/retroshare-qml-app/src/icons/paste.svg retroshare-0.6.4/src/retroshare-qml-app/src/icons/paste.svg --- retroshare-0.6.4/src/retroshare-qml-app/src/icons/paste.svg 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/retroshare-qml-app/src/icons/paste.svg 1970-01-01 00:00:00.000000000 +0000 @@ -1,90 +0,0 @@ - - - -image/svg+xml \ No newline at end of file diff -Nru retroshare-0.6.4/src/retroshare-qml-app/src/icons/rating.svg retroshare-0.6.4/src/retroshare-qml-app/src/icons/rating.svg --- retroshare-0.6.4/src/retroshare-qml-app/src/icons/rating.svg 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/retroshare-qml-app/src/icons/rating.svg 1970-01-01 00:00:00.000000000 +0000 @@ -1,17 +0,0 @@ - - - - - - - - diff -Nru retroshare-0.6.4/src/retroshare-qml-app/src/icons/rating-unrated.svg retroshare-0.6.4/src/retroshare-qml-app/src/icons/rating-unrated.svg --- retroshare-0.6.4/src/retroshare-qml-app/src/icons/rating-unrated.svg 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/retroshare-qml-app/src/icons/rating-unrated.svg 1970-01-01 00:00:00.000000000 +0000 @@ -1,13 +0,0 @@ - - - - - - Binary files /tmp/tmp2X9z3h/TMRiSklNE1/retroshare-0.6.4/src/retroshare-qml-app/src/icons/retroshare.png and /tmp/tmp2X9z3h/O5QK8jFtJv/retroshare-0.6.4/src/retroshare-qml-app/src/icons/retroshare.png differ diff -Nru retroshare-0.6.4/src/retroshare-qml-app/src/icons/search.svg retroshare-0.6.4/src/retroshare-qml-app/src/icons/search.svg --- retroshare-0.6.4/src/retroshare-qml-app/src/icons/search.svg 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/retroshare-qml-app/src/icons/search.svg 1970-01-01 00:00:00.000000000 +0000 @@ -1,78 +0,0 @@ - - - -image/svg+xml \ No newline at end of file diff -Nru retroshare-0.6.4/src/retroshare-qml-app/src/icons/send-message.svg retroshare-0.6.4/src/retroshare-qml-app/src/icons/send-message.svg --- retroshare-0.6.4/src/retroshare-qml-app/src/icons/send-message.svg 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/retroshare-qml-app/src/icons/send-message.svg 1970-01-01 00:00:00.000000000 +0000 @@ -1,67 +0,0 @@ - -image/svg+xml \ No newline at end of file diff -Nru retroshare-0.6.4/src/retroshare-qml-app/src/icons/share.svg retroshare-0.6.4/src/retroshare-qml-app/src/icons/share.svg --- retroshare-0.6.4/src/retroshare-qml-app/src/icons/share.svg 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/retroshare-qml-app/src/icons/share.svg 1970-01-01 00:00:00.000000000 +0000 @@ -1,81 +0,0 @@ - - - -image/svg+xml \ No newline at end of file diff -Nru retroshare-0.6.4/src/retroshare-qml-app/src/icons/smiley.svg retroshare-0.6.4/src/retroshare-qml-app/src/icons/smiley.svg --- retroshare-0.6.4/src/retroshare-qml-app/src/icons/smiley.svg 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/retroshare-qml-app/src/icons/smiley.svg 1970-01-01 00:00:00.000000000 +0000 @@ -1,102 +0,0 @@ - - - -image/svg+xml \ No newline at end of file diff -Nru retroshare-0.6.4/src/retroshare-qml-app/src/icons/state-offline.svg retroshare-0.6.4/src/retroshare-qml-app/src/icons/state-offline.svg --- retroshare-0.6.4/src/retroshare-qml-app/src/icons/state-offline.svg 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/retroshare-qml-app/src/icons/state-offline.svg 1970-01-01 00:00:00.000000000 +0000 @@ -1,27 +0,0 @@ - - - - - - - - - - diff -Nru retroshare-0.6.4/src/retroshare-qml-app/src/icons/state-ok.svg retroshare-0.6.4/src/retroshare-qml-app/src/icons/state-ok.svg --- retroshare-0.6.4/src/retroshare-qml-app/src/icons/state-ok.svg 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/retroshare-qml-app/src/icons/state-ok.svg 1970-01-01 00:00:00.000000000 +0000 @@ -1,24 +0,0 @@ - - - - - - - - diff -Nru retroshare-0.6.4/src/retroshare-qml-app/src/JSONListModel.qml retroshare-0.6.4/src/retroshare-qml-app/src/JSONListModel.qml --- retroshare-0.6.4/src/retroshare-qml-app/src/JSONListModel.qml 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/retroshare-qml-app/src/JSONListModel.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,51 +0,0 @@ -/* JSONListModel - a QML ListModel with JSON and JSONPath support - * - * Copyright (c) 2012 Romain Pokrzywka (KDAB) (romain@kdab.com) - * Licensed under the MIT licence (http://opensource.org/licenses/mit-license.php) - */ - -import QtQuick 2.7 -import "jsonpath.js" as JSONPath - -Item { - property string source: "" - property string json: "" - property string query: "" - - property ListModel model : ListModel { id: jsonModel } - property alias count: jsonModel.count - - onSourceChanged: { - var xhr = new XMLHttpRequest; - xhr.open("GET", source); - xhr.onreadystatechange = function() { - if (xhr.readyState == XMLHttpRequest.DONE) - json = xhr.responseText; - } - xhr.send(); - } - - onJsonChanged: updateJSONModel() - onQueryChanged: updateJSONModel() - - function updateJSONModel() { - jsonModel.clear(); - - if ( json === "" ) - return; - - var objectArray = parseJSONString(json, query); - for ( var key in objectArray ) { - var jo = objectArray[key]; - jsonModel.append( jo ); - } - } - - function parseJSONString(jsonString, jsonPathQuery) { - var objectArray = JSON.parse(jsonString); - if ( jsonPathQuery !== "" ) - objectArray = JSONPath.jsonPath(objectArray, jsonPathQuery); - - return objectArray; - } -} diff -Nru retroshare-0.6.4/src/retroshare-qml-app/src/jsonpath.js retroshare-0.6.4/src/retroshare-qml-app/src/jsonpath.js --- retroshare-0.6.4/src/retroshare-qml-app/src/jsonpath.js 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/retroshare-qml-app/src/jsonpath.js 1970-01-01 00:00:00.000000000 +0000 @@ -1,88 +0,0 @@ -/* JSONPath 0.8.5 - XPath for JSON - * - * Copyright (c) 2007 Stefan Goessner (goessner.net) - * Licensed under the MIT (MIT-LICENSE.txt) licence. - * - */ -function jsonPath(obj, expr, arg) { - var P = { - resultType: arg && arg.resultType || "VALUE", - result: [], - normalize: function(expr) { - var subx = []; - return expr.replace(/[\['](\??\(.*?\))[\]']|\['(.*?)'\]/g, function($0,$1,$2){return "[#"+(subx.push($1||$2)-1)+"]";}) /* http://code.google.com/p/jsonpath/issues/detail?id=4 */ - .replace(/'?\.'?|\['?/g, ";") - .replace(/;;;|;;/g, ";..;") - .replace(/;$|'?\]|'$/g, "") - .replace(/#([0-9]+)/g, function($0,$1){return subx[$1];}); - }, - asPath: function(path) { - var x = path.split(";"), p = "$"; - for (var i=1,n=x.length; i - * Copyright (C) 2016 Manu Pineda - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ - -#include "libresapilocalclient.h" - -#include -#include - -void LibresapiLocalClient::openConnection(const QString& socketPath) -{ - connect(& mLocalSocket, SIGNAL(error(QLocalSocket::LocalSocketError)), - this, SLOT(socketError(QLocalSocket::LocalSocketError))); - connect(& mLocalSocket, SIGNAL(readyRead()), - this, SLOT(read())); - mSocketPath = socketPath; - socketConnectAttempt(); -} - -int LibresapiLocalClient::request( const QString& path, const QString& jsonData, - QJSValue callback ) -{ -#ifdef QT_DEBUG - if(mDebug) - qDebug() << reqCount++ << __PRETTY_FUNCTION__ << path << jsonData - << callback.toString(); -#endif // QT_DEBUG - - int ret = -1; - - if(mLocalSocket.isOpen()) - { - QByteArray data; - data.append(path); data.append('\n'); - data.append(jsonData); data.append('\n'); - processingQueue.enqueue(PQRecord(path, jsonData, callback)); - ret = mLocalSocket.write(data); - if(ret < 0) socketError(mLocalSocket.error()); - } - else - { - if(!mConnectAttemptTimer.isActive()) mConnectAttemptTimer.start(); - qDebug() << __PRETTY_FUNCTION__ - << "Socket not ready yet! Ignoring request: " - << path << jsonData; - } - - return ret; -} - -void LibresapiLocalClient::socketError(QLocalSocket::LocalSocketError error) -{ - qCritical() << __PRETTY_FUNCTION__ << "Socket error! " << error - << mLocalSocket.errorString(); - -#ifdef QT_DEBUG - QString pQueueDump; - - for (auto& qe: processingQueue ) - { - pQueueDump.append(qe.mPath); - pQueueDump.append(QChar::Space); - pQueueDump.append(qe.mJsonData); - pQueueDump.append(QChar::LineSeparator); - } - - qDebug() << __PRETTY_FUNCTION__ << "Discarded requests dump:" - << QChar::LineSeparator << pQueueDump; -#endif //QT_DEBUG - - processingQueue.clear(); - - if(mLocalSocket.state() == QLocalSocket::UnconnectedState && - !mConnectAttemptTimer.isActive()) - { - qDebug() << __PRETTY_FUNCTION__ << "Socket:" << mSocketPath - << "is not connected, scheduling a connect attempt again"; - - mConnectAttemptTimer.start(); - } -} - -void LibresapiLocalClient::read() -{ - if(processingQueue.isEmpty()) - { - qCritical() << __PRETTY_FUNCTION__ << "callbackQueue is empty " - << "something really fishy is happening!"; - return; - } - - if(!mLocalSocket.canReadLine()) - { - qWarning() << __PRETTY_FUNCTION__ - << "Strange, can't read a complete line!"; - return; - } - - QByteArray&& ba(mLocalSocket.readLine()); - if(ba.size() < 2) - { - qWarning() << __PRETTY_FUNCTION__ << "Got answer of less then 2 bytes," - << "something fishy is happening!"; - return; - } - - QString receivedMsg(ba); - PQRecord&& p(processingQueue.dequeue()); - -#ifdef QT_DEBUG - if(mDebug) - qDebug() << ansCount++ << __PRETTY_FUNCTION__ << receivedMsg << p.mPath - << p.mJsonData << p.mCallback.toString(); -#endif // QT_DEBUG - - emit goodResponseReceived(receivedMsg); /// @deprecated - emit responseReceived(receivedMsg); - - if(p.mCallback.isCallable()) - { - QJSValue&& params(p.mCallback.engine()->newObject()); - params.setProperty("response", receivedMsg); - - QJSValue temp = p.mCallback.call(QJSValueList { params }); - if(temp.isError()) - { - qCritical() << __PRETTY_FUNCTION__ - << "JavaScript callback uncaught exception:" - << temp.property("stack").toString() - << temp.toString(); - } - } - - // In case of multiple reply coaleshed in the same signal - if(mLocalSocket.bytesAvailable() > 0) read(); -} - -LibresapiLocalClient::PQRecord::PQRecord( const QString& -#ifdef QT_DEBUG - path -#endif //QT_DEBUG - , const QString& -#ifdef QT_DEBUG - jsonData -#endif //QT_DEBUG - , const QJSValue& callback) : -#ifdef QT_DEBUG - mPath(path), mJsonData(jsonData), -#endif //QT_DEBUG - mCallback(callback) {} - -#ifdef QT_DEBUG -void LibresapiLocalClient::setDebug(bool v) -{ - if(v != mDebug) - { - mDebug = v; - emit debugChanged(); - } -} -#endif // QT_DEBUG diff -Nru retroshare-0.6.4/src/retroshare-qml-app/src/libresapilocalclient.h retroshare-0.6.4/src/retroshare-qml-app/src/libresapilocalclient.h --- retroshare-0.6.4/src/retroshare-qml-app/src/libresapilocalclient.h 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/retroshare-qml-app/src/libresapilocalclient.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,95 +0,0 @@ -#pragma once -/* - * libresapi local socket client - * Copyright (C) 2016-2017 Gioacchino Mazzurco - * Copyright (C) 2016 Manu Pineda - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ - -#include -#include -#include -#include - -class LibresapiLocalClient : public QObject -{ - Q_OBJECT - -public: - LibresapiLocalClient() : -#ifdef QT_DEBUG - reqCount(0), ansCount(0), mDebug(true), -#endif // QT_DEBUG - mLocalSocket(this) - { - mConnectAttemptTimer.setSingleShot(true); - mConnectAttemptTimer.setInterval(500); - connect(&mConnectAttemptTimer, SIGNAL(timeout()), - this, SLOT(socketConnectAttempt())); - } - - Q_INVOKABLE int request( const QString& path, const QString& jsonData = "", - QJSValue callback = QJSValue::NullValue ); - Q_INVOKABLE void openConnection(const QString& socketPath); - -#ifdef QT_DEBUG - Q_PROPERTY(bool debug READ debug WRITE setDebug NOTIFY debugChanged) - - bool debug() const { return mDebug; } - void setDebug(bool v); - - uint64_t reqCount; - uint64_t ansCount; - bool mDebug; -#endif // QT_DEBUG - -private: - QTimer mConnectAttemptTimer; - QString mSocketPath; - QLocalSocket mLocalSocket; - - struct PQRecord - { - PQRecord( const QString& path, const QString& jsonData, - const QJSValue& callback); - -#ifdef QT_DEBUG - QString mPath; - QString mJsonData; -#endif //QT_DEBUG - - QJSValue mCallback; - }; - QQueue processingQueue; - -private slots: - void socketConnectAttempt() { mLocalSocket.connectToServer(mSocketPath); } - void socketError(QLocalSocket::LocalSocketError error); - void read(); - -signals: - /// @deprecated @see LibresapiLocalClient::responseReceived instead - void goodResponseReceived(const QString & msg); - - /** - * @brief responseReceived emitted when a response is received - * @param msg - */ - void responseReceived(const QString & msg); - -#ifdef QT_DEBUG - void debugChanged(); -#endif // QT_DEBUG -}; diff -Nru retroshare-0.6.4/src/retroshare-qml-app/src/Locations.qml retroshare-0.6.4/src/retroshare-qml-app/src/Locations.qml --- retroshare-0.6.4/src/retroshare-qml-app/src/Locations.qml 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/retroshare-qml-app/src/Locations.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,269 +0,0 @@ -/* - * RetroShare Android QML App - * Copyright (C) 2016 Gioacchino Mazzurco - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ - -import QtQuick 2.7 -import QtQuick.Controls 2.0 -import org.retroshare.qml_components.LibresapiLocalClient 1.0 - -import "components/." - -Item -{ - id: locationView - state: "selectLocation" - property bool attemptLogin: false - property string password - property string sslid - - states: - [ - State - { - name: "selectLocation" - PropertyChanges { target: locationsListView; visible: true } - PropertyChanges { target: bottomButton; visible: true } - PropertyChanges { target: loginView; visible: false } - }, - State - { - name: "createLocation" - PropertyChanges { target: locationsListView; visible: false } - PropertyChanges { target: bottomButton; visible: false } - PropertyChanges - { - target: loginView - visible: true - buttonText: qsTr("Save") - iconUrl: "qrc:/icons/edit-image-face-detect.svg" - suggestionText: qsTr("Create your profile") - onSubmit: - { - busyIndicator.running = true - var jsonData = { pgp_name: login, ssl_name: login, - pgp_password: password } - rsApi.request( - "/control/create_location/", - JSON.stringify(jsonData)) - mainWindow.user_name = login - locationView.state = "selectLocation" - bottomButton.enabled = false - bottomButton.text = "Creating profile..." - } - onCancel: - { - locationView.state = "selectLocation" - } - - } - }, - State - { - name: "login" - PropertyChanges { target: locationsListView; visible: false } - PropertyChanges { target: bottomButton; visible: false } - PropertyChanges - { - target: loginView - visible: true - advancedMode: true - onSubmit: - { - locationView.password = password - console.log("locationView.sslid: ", locationView.sslid) - rsApi.request( "/control/login/", - JSON.stringify({id: locationView.sslid}) ) - locationView.attemptLogin = true - attemptTimer.start() - } - onCancel: - { - locationView.state = "selectLocation" - } - } - } - ] - - function requestLocationsListCB(par) - { - var jsonData = JSON.parse(par.response).data - if(jsonData.length === 1) - { - // There is only one location so we can jump selecting location - var location = jsonData[0] - loginView.login = location.name - mainWindow.user_name = location.name - locationView.sslid = location.peer_id - locationView.state = "login" - } - else if (jsonData.length === 0) - { - // The user haven't created a location yet - locationView.state = "createLocation" - } - else - { - // There is more then one location to choose from - locationsModel.json = par.response - } - } - function requestLocationsList() - { rsApi.request("/control/locations/", "", requestLocationsListCB) } - - onFocusChanged: focus && requestLocationsList() - Component.onCompleted: requestLocationsList() - - JSONListModel - { - id: locationsModel - query: "$.data[*]" - } - ListView - { - id: locationsListView - width: parent.width - anchors.top: parent.top - anchors.bottom: bottomButton.top - anchors.horizontalCenter: parent.horizontalCenter - model: locationsModel.model - spacing: 3 - delegate: Item - { - id: delegate - width: parent.width - height: 60 - Rectangle - { - id: backgroundRectangle - anchors.fill: parent.fill - anchors.horizontalCenter: parent.horizontalCenter - width: parent.width /2 - height: parent.height - - color:"transparent" - - Rectangle - { - id: borderBottom - width: parent.width - height: 1 - anchors.bottom: parent.bottom - anchors.right: parent.right - color: "lightgrey" - } - } - - ButtonText - { - id: locationButton - anchors.horizontalCenter: parent.horizontalCenter - anchors.verticalCenter: parent.verticalCenter - text: model.name - borderRadius:0 - iconUrl: "/icons/edit-image-face-detect.svg" - color: "white" - pressColor: "lightsteelblue" - buttonTextPixelSize: 20 - - onClicked: - { - loginView.login = text - locationView.sslid = model.id - locationView.state = "login" - mainWindow.user_name = model.name - } - } - } - visible: false - } - - ButtonText - { - id: bottomButton - text: "Create new location" - anchors.bottom: parent.bottom - anchors.horizontalCenter: parent.horizontalCenter - onClicked: locationView.state = "createLocation" - buttonTextPixelSize: 15 - iconUrl: "/icons/add.svg" - borderRadius: 0 - } - - RsLoginPassView - { - id: loginView - visible: false - anchors.fill: parent - } - - BusyIndicator - { - id: busyIndicator - anchors.centerIn: parent - running: false - - Connections - { - target: locationView - onAttemptLoginChanged: - if(locationView.attemptLogin) busyIndicator.running = true - } - } - - LibresapiLocalClient - { - id: loginApi - Component.onCompleted: openConnection(apiSocketPath) - onGoodResponseReceived: - { - var jsonData = JSON.parse(msg) - if(jsonData && jsonData.data && jsonData.data.key_name) - { - if(jsonData.data.want_password) - { - // if Server requested password - var jsonPass = { password: locationView.password } - request( "/control/password/", JSON.stringify(jsonPass) ) - locationView.attemptLogin = false - console.debug("RS core asked for password") - } - else - { - // if Already logged in - bottomButton.enabled = false - bottomButton.text = "Unlocking location..." - locationView.attemptLogin = false - locationView.state = "selectLocation" - locationsListView.enabled = false - console.debug("Already logged in") - } - } - } - } - Timer - { - id: attemptTimer - interval: 1000 - repeat: true - triggeredOnStart: true - onTriggered: - { - if (locationView.attemptLogin) - loginApi.request("/control/password/", "") - } - } -} diff -Nru retroshare-0.6.4/src/retroshare-qml-app/src/main-app.cpp retroshare-0.6.4/src/retroshare-qml-app/src/main-app.cpp --- retroshare-0.6.4/src/retroshare-qml-app/src/main-app.cpp 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/retroshare-qml-app/src/main-app.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,153 +0,0 @@ -/* - * RetroShare Android QML App - * Copyright (C) 2016-2017 Gioacchino Mazzurco - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#ifdef Q_OS_ANDROID -# include -# include -# include -# include "androidplatforminteracions.h" -#else -# include "defaultplatforminteracions.h" -#endif // Q_OS_ANDROID - - -#include "libresapilocalclient.h" -#include "rsqmlappengine.h" -#include "androidimagepicker.h" -#include "platforminteracions.h" - -int main(int argc, char *argv[]) -{ - QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); - QGuiApplication app(argc, argv); - - /** When possible it is better to use +rsApi+ object directly instead of - * multiple instances of +LibresapiLocalClient+ in Qml */ - qmlRegisterType( - "org.retroshare.qml_components.LibresapiLocalClient", 1, 0, - "LibresapiLocalClient"); - - - QString sockPath = QDir::homePath() + "/.retroshare"; - sockPath.append("/libresapi.sock"); - - LibresapiLocalClient rsApi; - rsApi.openConnection(sockPath); - - RsQmlAppEngine engine(true); - QQmlContext& rootContext = *engine.rootContext(); - - qmlRegisterType( - "org.retroshare.qml_components.AndroidImagePicker", 1, 0, - "AndroidImagePicker"); - - AndroidImagePicker androidImagePicker; - engine.rootContext()->setContextProperty("androidImagePicker", - &androidImagePicker); - - QStringList mainArgs = app.arguments(); - -#ifdef Q_OS_ANDROID - rootContext.setContextProperty("Q_OS_ANDROID", QVariant(true)); - - AndroidPlatformInteracions platformGW(&app); - - /* Add Activity Intent data to args, because onNewIntent is called only if - * the Intet was triggered when the Activity was already created, so only in - * case onCreate is not called. - * The solution exposed in http://stackoverflow.com/a/36942185 is not - * adaptable to our case, because when onCreate is called the RsQmlAppEngine - * is not ready yet. - */ - uint waitCount = 0; - std::atomic waitIntent(true); - QString uriStr; - do - { - QtAndroid::runOnAndroidThread( - [&waitIntent, &uriStr]() - { - QAndroidJniObject activity = QtAndroid::androidActivity(); - if(!activity.isValid()) - { - qDebug() << "QtAndroid::runOnAndroidThread(...)" - << "activity not ready yet"; - return; - } - - QAndroidJniObject intent = activity.callObjectMethod( - "getIntent", "()Landroid/content/Intent;"); - if(!intent.isValid()) - { - qDebug() << "QtAndroid::runOnAndroidThread(...)" - << "intent not ready yet"; - return; - } - - QAndroidJniObject intentData = intent.callObjectMethod( - "getDataString", "()Ljava/lang/String;"); - if(intentData.isValid()) uriStr = intentData.toString(); - - waitIntent = false; - }); - - if(waitIntent) - { - qWarning() << "uriStr not ready yet after waiting" - << waitCount << "times"; - app.processEvents(); - ++waitCount; - QThread::msleep(10); - } - } - while (waitIntent); - - qDebug() << "Got uriStr:" << uriStr; - - if(!uriStr.isEmpty()) mainArgs.append(uriStr); -#else - DefaultPlatformInteracions platformGW(&app); - rootContext.setContextProperty("Q_OS_ANDROID", QVariant(false)); -#endif - - rootContext.setContextProperty("mainArgs", mainArgs); - rootContext.setContextProperty("platformGW", &platformGW); - -#ifdef QT_DEBUG - rootContext.setContextProperty("QT_DEBUG", QVariant(true)); - rsApi.setDebug(false); -#else - rootContext.setContextProperty("QT_DEBUG", QVariant(false)); -#endif // QT_DEBUG - - rootContext.setContextProperty("apiSocketPath", sockPath); - rootContext.setContextProperty("rsApi", &rsApi); - engine.load(QUrl(QLatin1String("qrc:/main-app.qml"))); - - return app.exec(); -} diff -Nru retroshare-0.6.4/src/retroshare-qml-app/src/main-app.qml retroshare-0.6.4/src/retroshare-qml-app/src/main-app.qml --- retroshare-0.6.4/src/retroshare-qml-app/src/main-app.qml 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/retroshare-qml-app/src/main-app.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,688 +0,0 @@ -/* - * RetroShare Android QML App - * Copyright (C) 2016-2017 Gioacchino Mazzurco - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ - -import QtQuick 2.1 -import QtQuick.Controls 2.0 -import QtGraphicalEffects 1.0 -import org.retroshare.qml_components.LibresapiLocalClient 1.0 -import "URI.js" as UriJs -import "." //Needed for TokensManager and ClipboardWrapper singleton -import "components/." - - -ApplicationWindow -{ - id: mainWindow - visible: true - title: "RetroShare" - width: 400 - height: 400 - - property string user_name - - property bool coreReady: stackView.state === "running_ok" || - stackView.state === "running_ok_no_full_control" - - Component.onCompleted: - { - addUriHandler("/certificate", certificateLinkHandler) - addUriHandler("/identity", contactLinkHandler) - addUriHandler("/contacts", openContactsViewLinkHandler) - - var argc = mainArgs.length - for(var i=0; i 1) - { - stackView.pop(); - event.accepted = true; - setStatus (stackView.currentItem) - } - } - - function setStatus (currentItem) - { - if (currentItem) - { - if (currentItem.objectName != "chatView" && - currentItem.objectName != "contactsView" && - toolBar.state != "DEFAULT") - { - toolBar.state = "DEFAULT" - } - else if (typeof currentItem.changeState === 'function') - { - currentItem.changeState () - } - - currentItem.focus = true - } - } - - - state: "core_down" - initialItem: BusyOverlay { message: qsTr("Connecting to core...") } - - states: [ - State - { - name: "core_down" - PropertyChanges { target: stackView; enabled: false } - }, - State - { - name: "waiting_account_select" - PropertyChanges { target: stackView; enabled: true } - StateChangeScript - { - script: - { - console.log("StateChangeScript waiting_account_select") - stackView.clear() - stackView.push("qrc:/Locations.qml") - } - } - }, - State - { - name: "waiting_startup" - PropertyChanges { target: stackView; enabled: false } - StateChangeScript - { - script: - { - console.log("StateChangeScript waiting_startup") - stackView.clear() - stackView.push("qrc:/BusyOverlay.qml", - { message: "Core initializing..."}) - } - } - }, - State - { - name: "running_ok" - PropertyChanges { target: stackView; enabled: true } - StateChangeScript - { - script: - { - console.log("StateChangeScript running_ok") - coreStateCheckTimer.stop() - stackView.clear() - stackView.push("qrc:/Contacts.qml") - while(mainWindow.pendingUriRegister.length > 0) - mainWindow.handleIntentUri( - mainWindow.pendingUriRegister.shift()) - } - } - }, - State - { - name: "running_ok_no_full_control" - PropertyChanges { target: stackView; state: "running_ok" } - } - ] - } - - Timer - { - id: coreStateCheckTimer - interval: 1000 - repeat: true - triggeredOnStart: true - onTriggered: - { - var ret = rsApi.request("/control/runstate/", "", runStateCallback) - if ( ret < 1 ) - { - console.log("checkCoreStatus() core is down") - stackView.state = "core_down" - } - } - Component.onCompleted: start() - - function runStateCallback(par) - { - var jsonReponse = JSON.parse(par.response) - var runState = jsonReponse.data.runstate - if(typeof(runState) === 'string') stackView.state = runState - else - { - stackView.state = "core_down" - console.log("runStateCallback(...) core is down") - } - } - } - - function handleIntentUri(uriStr) - { - console.log("handleIntentUri(uriStr)", uriStr) - - if(!Array.isArray(uriStr.match(/:\/\/[a-zA-Z.-]*\//g))) - { - /* RetroShare GUI produces links without hostname and only two - * slashes after scheme causing the first piece of the path part - * being interpreted as host, this is awckard and should be fixed in - * the GUI, in the meantime we add a slash for easier parsing, in - * case there is no hostname and just two slashes, we might consider - * to use +hostname+ part for some trick in the future, for example - * it could help other application to recognize retroshare link by - * putting a domain name there that has no meaning for retroshare - */ - uriStr = uriStr.replace("://", ":///") - } - - var uri = new UriJs.URI(uriStr) - var hPath = uri.path() // no nesting ATM segmentCoded() - console.log("hPath", hPath) - - var authority = uri.authority() - console.log("authority", authority) - - if(typeof uriHandlersRegister[hPath] == "function") - { - console.log("handleIntentUri(uriStr)", "found handler for path", - hPath, uriHandlersRegister[hPath]) - uriHandlersRegister[hPath](uriStr) - } - - else if (typeof uriHandlersRegister[authority] == "function" ) - { - console.log("handleIntentUri(uriStr)", "found handler for path", - authority, uriHandlersRegister[authority]) - uriHandlersRegister[authority](uriStr) - } - } - - function certificateLinkHandler(uriStr) - { - console.log("certificateLinkHandler(uriStr)", coreReady) - - if(!coreReady) - { - // Save cert uri for later processing as we need core to examine it - pendingUriRegister.push(uriStr) - return - } - - var uri = new UriJs.URI(uriStr) - var uQuery = uri.search(true) - if(uQuery.radix) - { - var certStr = UriJs.URI.decode(uQuery.radix) - - // Workaround https://github.com/RetroShare/RetroShare/issues/772 - certStr = certStr.replace(/ /g, "+") - - rsApi.request( - "/peers/examine_cert/", - JSON.stringify({cert_string: certStr}), - function(par) - { - console.log("/peers/examine_cert/ CB", par) - var jData = JSON.parse(par.response).data - stackView.push( - "qrc:/TrustedNodeDetails.qml", - { - nodeCert: certStr, - pgpName: jData.name, - pgpId: jData.pgp_id, - locations: - [{ - location: jData.location, - peer_id: jData.peer_id - }] - } - ) - } - ) - } - } - - function contactLinkHandler(uriStr) - { - console.log("contactLinkHandler(uriStr)", coreReady) - - if(!coreReady) - { - // Save cert uri for later processing as we need core to examine it - pendingUriRegister.push(uriStr) - return - } - - var uri = new UriJs.URI(uriStr) - var uQuery = uri.search(true) - if(uQuery.groupdata) - { - contactImportPopup.expectedName = uQuery.name - contactImportPopup.expectedGxsId = uQuery.gxsid - - rsApi.request( - "/identity/import_key", - JSON.stringify({radix: uQuery.groupdata}), - function(par) - { - var jD = JSON.parse(par.response).data - contactImportPopup.realGxsId = jD.gxs_id - contactImportPopup.open() - } - ) - } - } - - function openContactsViewLinkHandler (uriStr) - { - console.log("openContactsViewLinkHandler(uriStr)" , uriStr) - if(coreReady) - { - var uri = new UriJs.URI(uriStr) - var query = UriJs.URI.parseQuery(uri.search()); - if (query.gxsId && query.name) - { - - ChatCache.chatHelper.startDistantChat(ChatCache.contactsCache.own.gxs_id, - query.gxsId, - query.name, - function (chatId) - { - stackView.push("qrc:/ChatView.qml", {'chatId': chatId}) - }) - } - else - { - stackView.push("qrc:/Contacts.qml" ) - } - } - } - - Popup - { - id: contactImportPopup - property string expectedName - property string expectedGxsId - property string realGxsId - - function idMatch() { return expectedGxsId === realGxsId } - - visible: false - onVisibleChanged: if(visible && idMatch()) contactImportTimer.start() - - x: parent.x + parent.width/2 - width/2 - y: parent.y + parent.height/2 - height/2 - - Column - { - spacing: 3 - anchors.centerIn: parent - - Text - { - text: qsTr("%1 key imported").arg( - contactImportPopup.expectedName) - anchors.horizontalCenter: parent.horizontalCenter - } - - Text - { - text: qsTr("Link malformed!") - color: "red" - visible: contactImportPopup.visible && - !contactImportPopup.idMatch() - anchors.horizontalCenter: parent.horizontalCenter - } - - Text - { - text: - qsTr("Expected id and real one differs:") + - "
" + contactImportPopup.expectedGxsId +
-					"
" + contactImportPopup.realGxsId + "
" - visible: contactImportPopup.visible && - !contactImportPopup.idMatch() - anchors.horizontalCenter: parent.horizontalCenter - } - } - - Timer - { - id: contactImportTimer - interval: 1500 - onTriggered: contactImportPopup.close() - } - } - - Popup - { - id: linkCopiedPopup - property string itemName - - visible: false - onVisibleChanged: if(visible) contactLinkTimer.start() - - x: parent.x + parent.width/2 - width/2 - y: parent.y + parent.height/2 - height/2 - - Text - { - text: - qsTr("%1 link copied to clipboard").arg( - linkCopiedPopup.itemName) - } - - Timer - { - id: contactLinkTimer - interval: 1500 - onTriggered: linkCopiedPopup.close() - } - } - - FontLoader { id: emojiFont; source: "/fonts/OpenSansEmoji.ttf" } - - QtObject - { - id: theme - - property var emojiFontName: emojiFont.name - - property var supportedEmojiFonts: ["Android Emoji"] - property var rootFontName: emojiFont.name - - // If native emoji font exists use it, else use RS emoji font - function selectFont () - { - var fontFamilies = Qt.fontFamilies() - fontFamilies.some(function (f) - { - if (supportedEmojiFonts.indexOf(f) !== -1) - { - emojiFontName = f - return true - } - return false - }) - } - - Component.onCompleted: - { - selectFont() - } - } - - property var netStatus: ({}) - function refreshNetStatus(optCallback) - { - console.log("refreshNetStatus(optCallback)") - rsApi.request("/peers/get_network_options", "", function(par) - { - var json = JSON.parse(par.response) - mainWindow.netStatus = json.data - if(typeof(optCallback) === "function") optCallback(); - }) - } - - function updateDhtMode(stopping) - { - console.log("updateDhtMode(stopping)", stopping) - - switch(AppSettings.dhtMode) - { - case "On": mainWindow.netStatus.discovery_mode = 0; break; - case "Off": mainWindow.netStatus.discovery_mode = 1; break; - case "Interactive": mainWindow.netStatus.discovery_mode = stopping ? 1:0; break - } - - console.log("updateDhtMode(stopping)", stopping, netStatus.discovery_mode) - - rsApi.request("/peers/set_network_options", JSON.stringify(netStatus)) - } - - Component.onDestruction: if(coreReady) updateDhtMode(true) - - - Connections - { - target: AppSettings - onDhtModeChanged: - { - Qt.application.state - console.log("onDhtModeChanged", AppSettings.dhtMode) - if(coreReady) updateDhtMode(false) - } - } - - Connections - { - target: stackView - onStateChanged: if(coreReady) refreshNetStatus(function() {updateDhtMode(false)}) - } - - Connections - { - target: Qt.application - onStateChanged: - { - console.log("Qt.application.state changed to", Qt.ApplicationSuspended) - if(coreReady && (Qt.application.state === Qt.ApplicationSuspended)) - updateDhtMode(true) - } - } -} diff -Nru retroshare-0.6.4/src/retroshare-qml-app/src/NativeCalls.cpp retroshare-0.6.4/src/retroshare-qml-app/src/NativeCalls.cpp --- retroshare-0.6.4/src/retroshare-qml-app/src/NativeCalls.cpp 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/retroshare-qml-app/src/NativeCalls.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,43 +0,0 @@ -/* - * RetroShare Android QML App - * Copyright (C) 2017 Gioacchino Mazzurco - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ - -#include "NativeCalls.h" -#include "rsqmlappengine.h" - -#include -#include - -JNIEXPORT void JNICALL -Java_org_retroshare_android_qml_1app_jni_NativeCalls_notifyIntentUri -(JNIEnv* env, jclass, jstring uri) -{ - qDebug() << __PRETTY_FUNCTION__; - - const char *uriBytes = env->GetStringUTFChars(uri, NULL); - QString uriStr(uriBytes); - env->ReleaseStringUTFChars(uri, uriBytes); - - RsQmlAppEngine* engine = RsQmlAppEngine::mainInstance(); - if(engine) - QMetaObject::invokeMethod( - engine, "handleUri", - Qt::QueuedConnection, // BlockingQueuedConnection, AutoConnection - Q_ARG(QString, uriStr)); - else qCritical() << __PRETTY_FUNCTION__ << "RsQmlAppEngine::mainInstance()" - << "not initialized yet!"; -} diff -Nru retroshare-0.6.4/src/retroshare-qml-app/src/NativeCalls.h retroshare-0.6.4/src/retroshare-qml-app/src/NativeCalls.h --- retroshare-0.6.4/src/retroshare-qml-app/src/NativeCalls.h 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/retroshare-qml-app/src/NativeCalls.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,21 +0,0 @@ -/* DO NOT EDIT THIS FILE - it is machine generated */ -#include -/* Header for class org_retroshare_android_qml_app_jni_NativeCalls */ - -#ifndef _Included_org_retroshare_android_qml_app_jni_NativeCalls -#define _Included_org_retroshare_android_qml_app_jni_NativeCalls -#ifdef __cplusplus -extern "C" { -#endif -/* - * Class: org_retroshare_android_qml_app_jni_NativeCalls - * Method: notifyIntentUri - * Signature: (Ljava/lang/String;)V - */ -JNIEXPORT void JNICALL Java_org_retroshare_android_qml_1app_jni_NativeCalls_notifyIntentUri - (JNIEnv *, jclass, jstring); - -#ifdef __cplusplus -} -#endif -#endif diff -Nru retroshare-0.6.4/src/retroshare-qml-app/src/Options.qml retroshare-0.6.4/src/retroshare-qml-app/src/Options.qml --- retroshare-0.6.4/src/retroshare-qml-app/src/Options.qml 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/retroshare-qml-app/src/Options.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,53 +0,0 @@ -/* - * RetroShare Android QML App - * Copyright (C) 2018 Gioacchino Mazzurco - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ - -import QtQuick 2.7 -import QtQuick.Controls 2.0 -import "." //Needed for AppSettings singleton - - -Item -{ - Column - { - spacing: 5 - padding: 10 - - Row - { - spacing: 10 - - Label - { - text: "DHT mode:" - anchors.verticalCenter: parent.verticalCenter - } - - ComboBox - { - model: ["On", "Off", "Interactive"] - Component.onCompleted: currentIndex = find(AppSettings.dhtMode) - onActivated: - { - AppSettings.dhtMode = displayText - focus = false - } - } - } - } -} diff -Nru retroshare-0.6.4/src/retroshare-qml-app/src/platforminteracions.h retroshare-0.6.4/src/retroshare-qml-app/src/platforminteracions.h --- retroshare-0.6.4/src/retroshare-qml-app/src/platforminteracions.h 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/retroshare-qml-app/src/platforminteracions.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,32 +0,0 @@ -#pragma once -/* - * RetroShare Android QML App - * Copyright (C) 2017 Gioacchino Mazzurco - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ - -#include -#include - -class PlatformInteracions : public QObject -{ - Q_OBJECT - -public: - explicit PlatformInteracions(QObject *parent = nullptr) : QObject(parent) {} - -public slots: - virtual void shareUrl(QUrl url) = 0; -}; diff -Nru retroshare-0.6.4/src/retroshare-qml-app/src/qmldir retroshare-0.6.4/src/retroshare-qml-app/src/qmldir --- retroshare-0.6.4/src/retroshare-qml-app/src/qmldir 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/retroshare-qml-app/src/qmldir 1970-01-01 00:00:00.000000000 +0000 @@ -1,7 +0,0 @@ -singleton TokensManager 1.0 TokensManager.qml -singleton ClipboardWrapper 1.0 ClipboardWrapper.qml -singleton ChatCache ChatCache.qml -singleton StyleChat styles/ChatStyle.qml -singleton StyleSideBar styles/SideBarStyle.qml -singleton AppSettings 1.0 AppSettings.qml - diff -Nru retroshare-0.6.4/src/retroshare-qml-app/src/qml.qrc retroshare-0.6.4/src/retroshare-qml-app/src/qml.qrc --- retroshare-0.6.4/src/retroshare-qml-app/src/qml.qrc 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/retroshare-qml-app/src/qml.qrc 1970-01-01 00:00:00.000000000 +0000 @@ -1,750 +0,0 @@ - - - main-app.qml - Locations.qml - jsonpath.js - JSONListModel.qml - Contacts.qml - AddTrustedNode.qml - RsLoginPassView.qml - TrustedNodesView.qml - ChatView.qml - icons/retroshare.png - icons/state-offline.svg - icons/state-ok.svg - GxsIdentityDelegate.qml - icons/edit-image-face-detect.svg - icons/application-menu.svg - ContactSort.js - icons/emblem-locked.svg - BusyOverlay.qml - URI.js - TokensManager.qml - qmldir - TrustedNodeDetails.qml - ClipboardWrapper.qml - ContactDetails.qml - icons/rating-unrated.svg - icons/rating.svg - TimedPopup.qml - ChatCache.qml - ChatBubbleDelegate.qml - icons/send-message.svg - icons/attach.svg - components/ButtonIcon.qml - icons/smiley.svg - icons/microphone_mute.svg - icons/microphone.svg - components/ColorHash.qml - styles/ChatStyle.qml - components/AvatarOrColorHash.qml - components/SideBar.qml - styles/SideBarStyle.qml - components/ButtonText.qml - icons/netgraph.svg - icons/search.svg - icons/exit.svg - icons/add.svg - icons/keyring.svg - components/TextAndIcon.qml - components/emoji/EmojiPicker.qml - components/emoji/EmojiCategoryButton.qml - components/emoji/EmojiButton.qml - components/emoji/emoji.js - icons/network-connect.svg - icons/network-disconnect.svg - components/CustomFileChooser.qml - icons/options.svg - icons/network.svg - icons/back.png - icons/attach-image.svg - icons/invite.svg - icons/leave.svg - icons/paste.svg - icons/share.svg - icons/chat-bubble.svg - icons/info.svg - icons/faces/female32/background1.png - icons/faces/female32/background2.png - icons/faces/female32/background3.png - icons/faces/female32/background4.png - icons/faces/female32/background5.png - icons/faces/female32/clothes1.png - icons/faces/female32/clothes10.png - icons/faces/female32/clothes11.png - icons/faces/female32/clothes12.png - icons/faces/female32/clothes13.png - icons/faces/female32/clothes14.png - icons/faces/female32/clothes15.png - icons/faces/female32/clothes16.png - icons/faces/female32/clothes17.png - icons/faces/female32/clothes18.png - icons/faces/female32/clothes19.png - icons/faces/female32/clothes2.png - icons/faces/female32/clothes20.png - icons/faces/female32/clothes21.png - icons/faces/female32/clothes22.png - icons/faces/female32/clothes23.png - icons/faces/female32/clothes24.png - icons/faces/female32/clothes25.png - icons/faces/female32/clothes26.png - icons/faces/female32/clothes27.png - icons/faces/female32/clothes28.png - icons/faces/female32/clothes29.png - icons/faces/female32/clothes3.png - icons/faces/female32/clothes30.png - icons/faces/female32/clothes31.png - icons/faces/female32/clothes32.png - icons/faces/female32/clothes33.png - icons/faces/female32/clothes34.png - icons/faces/female32/clothes35.png - icons/faces/female32/clothes36.png - icons/faces/female32/clothes37.png - icons/faces/female32/clothes38.png - icons/faces/female32/clothes39.png - icons/faces/female32/clothes4.png - icons/faces/female32/clothes40.png - icons/faces/female32/clothes41.png - icons/faces/female32/clothes42.png - icons/faces/female32/clothes43.png - icons/faces/female32/clothes44.png - icons/faces/female32/clothes45.png - icons/faces/female32/clothes46.png - icons/faces/female32/clothes47.png - icons/faces/female32/clothes48.png - icons/faces/female32/clothes49.png - icons/faces/female32/clothes5.png - icons/faces/female32/clothes50.png - icons/faces/female32/clothes51.png - icons/faces/female32/clothes52.png - icons/faces/female32/clothes53.png - icons/faces/female32/clothes54.png - icons/faces/female32/clothes55.png - icons/faces/female32/clothes56.png - icons/faces/female32/clothes57.png - icons/faces/female32/clothes58.png - icons/faces/female32/clothes59.png - icons/faces/female32/clothes6.png - icons/faces/female32/clothes7.png - icons/faces/female32/clothes8.png - icons/faces/female32/clothes9.png - icons/faces/female32/eye1.png - icons/faces/female32/eye10.png - icons/faces/female32/eye11.png - icons/faces/female32/eye12.png - icons/faces/female32/eye13.png - icons/faces/female32/eye14.png - icons/faces/female32/eye15.png - icons/faces/female32/eye16.png - icons/faces/female32/eye17.png - icons/faces/female32/eye18.png - icons/faces/female32/eye19.png - icons/faces/female32/eye2.png - icons/faces/female32/eye20.png - icons/faces/female32/eye21.png - icons/faces/female32/eye22.png - icons/faces/female32/eye23.png - icons/faces/female32/eye24.png - icons/faces/female32/eye25.png - icons/faces/female32/eye26.png - icons/faces/female32/eye27.png - icons/faces/female32/eye28.png - icons/faces/female32/eye29.png - icons/faces/female32/eye3.png - icons/faces/female32/eye30.png - icons/faces/female32/eye31.png - icons/faces/female32/eye32.png - icons/faces/female32/eye33.png - icons/faces/female32/eye34.png - icons/faces/female32/eye35.png - icons/faces/female32/eye36.png - icons/faces/female32/eye37.png - icons/faces/female32/eye38.png - icons/faces/female32/eye39.png - icons/faces/female32/eye4.png - icons/faces/female32/eye40.png - icons/faces/female32/eye41.png - icons/faces/female32/eye42.png - icons/faces/female32/eye43.png - icons/faces/female32/eye44.png - icons/faces/female32/eye45.png - icons/faces/female32/eye46.png - icons/faces/female32/eye47.png - icons/faces/female32/eye48.png - icons/faces/female32/eye49.png - icons/faces/female32/eye5.png - icons/faces/female32/eye50.png - icons/faces/female32/eye51.png - icons/faces/female32/eye52.png - icons/faces/female32/eye53.png - icons/faces/female32/eye6.png - icons/faces/female32/eye7.png - icons/faces/female32/eye8.png - icons/faces/female32/eye9.png - icons/faces/female32/face1.png - icons/faces/female32/face2.png - icons/faces/female32/face3.png - icons/faces/female32/face4.png - icons/faces/female32/head1.png - icons/faces/female32/head10.png - icons/faces/female32/head11.png - icons/faces/female32/head12.png - icons/faces/female32/head13.png - icons/faces/female32/head14.png - icons/faces/female32/head15.png - icons/faces/female32/head16.png - icons/faces/female32/head17.png - icons/faces/female32/head18.png - icons/faces/female32/head19.png - icons/faces/female32/head2.png - icons/faces/female32/head20.png - icons/faces/female32/head21.png - icons/faces/female32/head22.png - icons/faces/female32/head23.png - icons/faces/female32/head24.png - icons/faces/female32/head25.png - icons/faces/female32/head26.png - icons/faces/female32/head27.png - icons/faces/female32/head28.png - icons/faces/female32/head29.png - icons/faces/female32/head3.png - icons/faces/female32/head30.png - icons/faces/female32/head31.png - icons/faces/female32/head32.png - icons/faces/female32/head33.png - icons/faces/female32/head4.png - icons/faces/female32/head5.png - icons/faces/female32/head6.png - icons/faces/female32/head7.png - icons/faces/female32/head8.png - icons/faces/female32/head9.png - icons/faces/female32/mouth1.png - icons/faces/female32/mouth10.png - icons/faces/female32/mouth11.png - icons/faces/female32/mouth12.png - icons/faces/female32/mouth13.png - icons/faces/female32/mouth14.png - icons/faces/female32/mouth15.png - icons/faces/female32/mouth16.png - icons/faces/female32/mouth17.png - icons/faces/female32/mouth2.png - icons/faces/female32/mouth3.png - icons/faces/female32/mouth4.png - icons/faces/female32/mouth5.png - icons/faces/female32/mouth6.png - icons/faces/female32/mouth7.png - icons/faces/female32/mouth8.png - icons/faces/female32/mouth9.png - icons/faces/female64/background1.png - icons/faces/female64/background2.png - icons/faces/female64/background3.png - icons/faces/female64/background4.png - icons/faces/female64/background5.png - icons/faces/female64/clothes1.png - icons/faces/female64/clothes10.png - icons/faces/female64/clothes11.png - icons/faces/female64/clothes12.png - icons/faces/female64/clothes13.png - icons/faces/female64/clothes14.png - icons/faces/female64/clothes15.png - icons/faces/female64/clothes16.png - icons/faces/female64/clothes17.png - icons/faces/female64/clothes18.png - icons/faces/female64/clothes19.png - icons/faces/female64/clothes2.png - icons/faces/female64/clothes20.png - icons/faces/female64/clothes21.png - icons/faces/female64/clothes22.png - icons/faces/female64/clothes23.png - icons/faces/female64/clothes24.png - icons/faces/female64/clothes25.png - icons/faces/female64/clothes26.png - icons/faces/female64/clothes27.png - icons/faces/female64/clothes28.png - icons/faces/female64/clothes29.png - icons/faces/female64/clothes3.png - icons/faces/female64/clothes30.png - icons/faces/female64/clothes31.png - icons/faces/female64/clothes32.png - icons/faces/female64/clothes33.png - icons/faces/female64/clothes34.png - icons/faces/female64/clothes35.png - icons/faces/female64/clothes36.png - icons/faces/female64/clothes37.png - icons/faces/female64/clothes38.png - icons/faces/female64/clothes39.png - icons/faces/female64/clothes4.png - icons/faces/female64/clothes40.png - icons/faces/female64/clothes41.png - icons/faces/female64/clothes42.png - icons/faces/female64/clothes43.png - icons/faces/female64/clothes44.png - icons/faces/female64/clothes45.png - icons/faces/female64/clothes46.png - icons/faces/female64/clothes47.png - icons/faces/female64/clothes48.png - icons/faces/female64/clothes49.png - icons/faces/female64/clothes5.png - icons/faces/female64/clothes50.png - icons/faces/female64/clothes51.png - icons/faces/female64/clothes52.png - icons/faces/female64/clothes53.png - icons/faces/female64/clothes54.png - icons/faces/female64/clothes55.png - icons/faces/female64/clothes56.png - icons/faces/female64/clothes57.png - icons/faces/female64/clothes58.png - icons/faces/female64/clothes59.png - icons/faces/female64/clothes6.png - icons/faces/female64/clothes7.png - icons/faces/female64/clothes8.png - icons/faces/female64/clothes9.png - icons/faces/female64/eye1.png - icons/faces/female64/eye10.png - icons/faces/female64/eye11.png - icons/faces/female64/eye12.png - icons/faces/female64/eye13.png - icons/faces/female64/eye14.png - icons/faces/female64/eye15.png - icons/faces/female64/eye16.png - icons/faces/female64/eye17.png - icons/faces/female64/eye18.png - icons/faces/female64/eye19.png - icons/faces/female64/eye2.png - icons/faces/female64/eye20.png - icons/faces/female64/eye21.png - icons/faces/female64/eye22.png - icons/faces/female64/eye23.png - icons/faces/female64/eye24.png - icons/faces/female64/eye25.png - icons/faces/female64/eye26.png - icons/faces/female64/eye27.png - icons/faces/female64/eye28.png - icons/faces/female64/eye29.png - icons/faces/female64/eye3.png - icons/faces/female64/eye30.png - icons/faces/female64/eye31.png - icons/faces/female64/eye32.png - icons/faces/female64/eye33.png - icons/faces/female64/eye34.png - icons/faces/female64/eye35.png - icons/faces/female64/eye36.png - icons/faces/female64/eye37.png - icons/faces/female64/eye38.png - icons/faces/female64/eye39.png - icons/faces/female64/eye4.png - icons/faces/female64/eye40.png - icons/faces/female64/eye41.png - icons/faces/female64/eye42.png - icons/faces/female64/eye43.png - icons/faces/female64/eye44.png - icons/faces/female64/eye45.png - icons/faces/female64/eye46.png - icons/faces/female64/eye47.png - icons/faces/female64/eye48.png - icons/faces/female64/eye49.png - icons/faces/female64/eye5.png - icons/faces/female64/eye50.png - icons/faces/female64/eye51.png - icons/faces/female64/eye52.png - icons/faces/female64/eye53.png - icons/faces/female64/eye6.png - icons/faces/female64/eye7.png - icons/faces/female64/eye8.png - icons/faces/female64/eye9.png - icons/faces/female64/face1.png - icons/faces/female64/face2.png - icons/faces/female64/face3.png - icons/faces/female64/face4.png - icons/faces/female64/head1.png - icons/faces/female64/head10.png - icons/faces/female64/head11.png - icons/faces/female64/head12.png - icons/faces/female64/head13.png - icons/faces/female64/head14.png - icons/faces/female64/head15.png - icons/faces/female64/head16.png - icons/faces/female64/head17.png - icons/faces/female64/head18.png - icons/faces/female64/head19.png - icons/faces/female64/head2.png - icons/faces/female64/head20.png - icons/faces/female64/head21.png - icons/faces/female64/head22.png - icons/faces/female64/head23.png - icons/faces/female64/head24.png - icons/faces/female64/head25.png - icons/faces/female64/head26.png - icons/faces/female64/head27.png - icons/faces/female64/head28.png - icons/faces/female64/head29.png - icons/faces/female64/head3.png - icons/faces/female64/head30.png - icons/faces/female64/head31.png - icons/faces/female64/head32.png - icons/faces/female64/head33.png - icons/faces/female64/head4.png - icons/faces/female64/head5.png - icons/faces/female64/head6.png - icons/faces/female64/head7.png - icons/faces/female64/head8.png - icons/faces/female64/head9.png - icons/faces/female64/mouth1.png - icons/faces/female64/mouth10.png - icons/faces/female64/mouth11.png - icons/faces/female64/mouth12.png - icons/faces/female64/mouth13.png - icons/faces/female64/mouth14.png - icons/faces/female64/mouth15.png - icons/faces/female64/mouth16.png - icons/faces/female64/mouth17.png - icons/faces/female64/mouth2.png - icons/faces/female64/mouth3.png - icons/faces/female64/mouth4.png - icons/faces/female64/mouth5.png - icons/faces/female64/mouth6.png - icons/faces/female64/mouth7.png - icons/faces/female64/mouth8.png - icons/faces/female64/mouth9.png - icons/faces/male32/background1.png - icons/faces/male32/background2.png - icons/faces/male32/background3.png - icons/faces/male32/background4.png - icons/faces/male32/background5.png - icons/faces/male32/clothes1.png - icons/faces/male32/clothes10.png - icons/faces/male32/clothes11.png - icons/faces/male32/clothes12.png - icons/faces/male32/clothes13.png - icons/faces/male32/clothes14.png - icons/faces/male32/clothes15.png - icons/faces/male32/clothes16.png - icons/faces/male32/clothes17.png - icons/faces/male32/clothes18.png - icons/faces/male32/clothes19.png - icons/faces/male32/clothes2.png - icons/faces/male32/clothes20.png - icons/faces/male32/clothes21.png - icons/faces/male32/clothes22.png - icons/faces/male32/clothes23.png - icons/faces/male32/clothes24.png - icons/faces/male32/clothes25.png - icons/faces/male32/clothes26.png - icons/faces/male32/clothes27.png - icons/faces/male32/clothes28.png - icons/faces/male32/clothes29.png - icons/faces/male32/clothes3.png - icons/faces/male32/clothes30.png - icons/faces/male32/clothes31.png - icons/faces/male32/clothes32.png - icons/faces/male32/clothes33.png - icons/faces/male32/clothes34.png - icons/faces/male32/clothes35.png - icons/faces/male32/clothes36.png - icons/faces/male32/clothes37.png - icons/faces/male32/clothes38.png - icons/faces/male32/clothes39.png - icons/faces/male32/clothes4.png - icons/faces/male32/clothes40.png - icons/faces/male32/clothes41.png - icons/faces/male32/clothes42.png - icons/faces/male32/clothes43.png - icons/faces/male32/clothes44.png - icons/faces/male32/clothes45.png - icons/faces/male32/clothes46.png - icons/faces/male32/clothes47.png - icons/faces/male32/clothes48.png - icons/faces/male32/clothes49.png - icons/faces/male32/clothes5.png - icons/faces/male32/clothes50.png - icons/faces/male32/clothes51.png - icons/faces/male32/clothes52.png - icons/faces/male32/clothes53.png - icons/faces/male32/clothes54.png - icons/faces/male32/clothes55.png - icons/faces/male32/clothes56.png - icons/faces/male32/clothes57.png - icons/faces/male32/clothes58.png - icons/faces/male32/clothes59.png - icons/faces/male32/clothes6.png - icons/faces/male32/clothes60.png - icons/faces/male32/clothes61.png - icons/faces/male32/clothes62.png - icons/faces/male32/clothes63.png - icons/faces/male32/clothes64.png - icons/faces/male32/clothes65.png - icons/faces/male32/clothes7.png - icons/faces/male32/clothes8.png - icons/faces/male32/clothes9.png - icons/faces/male32/eye1.png - icons/faces/male32/eye10.png - icons/faces/male32/eye11.png - icons/faces/male32/eye12.png - icons/faces/male32/eye13.png - icons/faces/male32/eye14.png - icons/faces/male32/eye15.png - icons/faces/male32/eye16.png - icons/faces/male32/eye17.png - icons/faces/male32/eye18.png - icons/faces/male32/eye19.png - icons/faces/male32/eye2.png - icons/faces/male32/eye20.png - icons/faces/male32/eye21.png - icons/faces/male32/eye22.png - icons/faces/male32/eye23.png - icons/faces/male32/eye24.png - icons/faces/male32/eye25.png - icons/faces/male32/eye26.png - icons/faces/male32/eye27.png - icons/faces/male32/eye28.png - icons/faces/male32/eye29.png - icons/faces/male32/eye3.png - icons/faces/male32/eye30.png - icons/faces/male32/eye31.png - icons/faces/male32/eye32.png - icons/faces/male32/eye4.png - icons/faces/male32/eye5.png - icons/faces/male32/eye6.png - icons/faces/male32/eye7.png - icons/faces/male32/eye8.png - icons/faces/male32/eye9.png - icons/faces/male32/face1.png - icons/faces/male32/face2.png - icons/faces/male32/face3.png - icons/faces/male32/face4.png - icons/faces/male32/hair1.png - icons/faces/male32/hair10.png - icons/faces/male32/hair11.png - icons/faces/male32/hair12.png - icons/faces/male32/hair13.png - icons/faces/male32/hair14.png - icons/faces/male32/hair15.png - icons/faces/male32/hair16.png - icons/faces/male32/hair17.png - icons/faces/male32/hair18.png - icons/faces/male32/hair19.png - icons/faces/male32/hair2.png - icons/faces/male32/hair20.png - icons/faces/male32/hair21.png - icons/faces/male32/hair22.png - icons/faces/male32/hair23.png - icons/faces/male32/hair24.png - icons/faces/male32/hair25.png - icons/faces/male32/hair26.png - icons/faces/male32/hair27.png - icons/faces/male32/hair28.png - icons/faces/male32/hair29.png - icons/faces/male32/hair3.png - icons/faces/male32/hair30.png - icons/faces/male32/hair31.png - icons/faces/male32/hair32.png - icons/faces/male32/hair33.png - icons/faces/male32/hair34.png - icons/faces/male32/hair35.png - icons/faces/male32/hair36.png - icons/faces/male32/hair4.png - icons/faces/male32/hair5.png - icons/faces/male32/hair6.png - icons/faces/male32/hair7.png - icons/faces/male32/hair8.png - icons/faces/male32/hair9.png - icons/faces/male32/mouth1.png - icons/faces/male32/mouth10.png - icons/faces/male32/mouth11.png - icons/faces/male32/mouth12.png - icons/faces/male32/mouth13.png - icons/faces/male32/mouth14.png - icons/faces/male32/mouth15.png - icons/faces/male32/mouth16.png - icons/faces/male32/mouth17.png - icons/faces/male32/mouth18.png - icons/faces/male32/mouth19.png - icons/faces/male32/mouth2.png - icons/faces/male32/mouth20.png - icons/faces/male32/mouth21.png - icons/faces/male32/mouth22.png - icons/faces/male32/mouth23.png - icons/faces/male32/mouth24.png - icons/faces/male32/mouth25.png - icons/faces/male32/mouth26.png - icons/faces/male32/mouth3.png - icons/faces/male32/mouth4.png - icons/faces/male32/mouth5.png - icons/faces/male32/mouth6.png - icons/faces/male32/mouth7.png - icons/faces/male32/mouth8.png - icons/faces/male32/mouth9.png - icons/faces/male64/background1.png - icons/faces/male64/background2.png - icons/faces/male64/background3.png - icons/faces/male64/background4.png - icons/faces/male64/background5.png - icons/faces/male64/clothes1.png - icons/faces/male64/clothes10.png - icons/faces/male64/clothes11.png - icons/faces/male64/clothes12.png - icons/faces/male64/clothes13.png - icons/faces/male64/clothes14.png - icons/faces/male64/clothes15.png - icons/faces/male64/clothes16.png - icons/faces/male64/clothes17.png - icons/faces/male64/clothes18.png - icons/faces/male64/clothes19.png - icons/faces/male64/clothes2.png - icons/faces/male64/clothes20.png - icons/faces/male64/clothes21.png - icons/faces/male64/clothes22.png - icons/faces/male64/clothes23.png - icons/faces/male64/clothes24.png - icons/faces/male64/clothes25.png - icons/faces/male64/clothes26.png - icons/faces/male64/clothes27.png - icons/faces/male64/clothes28.png - icons/faces/male64/clothes29.png - icons/faces/male64/clothes3.png - icons/faces/male64/clothes30.png - icons/faces/male64/clothes31.png - icons/faces/male64/clothes32.png - icons/faces/male64/clothes33.png - icons/faces/male64/clothes34.png - icons/faces/male64/clothes35.png - icons/faces/male64/clothes36.png - icons/faces/male64/clothes37.png - icons/faces/male64/clothes38.png - icons/faces/male64/clothes39.png - icons/faces/male64/clothes4.png - icons/faces/male64/clothes40.png - icons/faces/male64/clothes41.png - icons/faces/male64/clothes42.png - icons/faces/male64/clothes43.png - icons/faces/male64/clothes44.png - icons/faces/male64/clothes45.png - icons/faces/male64/clothes46.png - icons/faces/male64/clothes47.png - icons/faces/male64/clothes48.png - icons/faces/male64/clothes49.png - icons/faces/male64/clothes5.png - icons/faces/male64/clothes50.png - icons/faces/male64/clothes51.png - icons/faces/male64/clothes52.png - icons/faces/male64/clothes53.png - icons/faces/male64/clothes54.png - icons/faces/male64/clothes55.png - icons/faces/male64/clothes56.png - icons/faces/male64/clothes57.png - icons/faces/male64/clothes58.png - icons/faces/male64/clothes59.png - icons/faces/male64/clothes6.png - icons/faces/male64/clothes60.png - icons/faces/male64/clothes61.png - icons/faces/male64/clothes62.png - icons/faces/male64/clothes63.png - icons/faces/male64/clothes64.png - icons/faces/male64/clothes65.png - icons/faces/male64/clothes7.png - icons/faces/male64/clothes8.png - icons/faces/male64/clothes9.png - icons/faces/male64/eye1.png - icons/faces/male64/eye10.png - icons/faces/male64/eye11.png - icons/faces/male64/eye12.png - icons/faces/male64/eye13.png - icons/faces/male64/eye14.png - icons/faces/male64/eye15.png - icons/faces/male64/eye16.png - icons/faces/male64/eye17.png - icons/faces/male64/eye18.png - icons/faces/male64/eye19.png - icons/faces/male64/eye2.png - icons/faces/male64/eye20.png - icons/faces/male64/eye21.png - icons/faces/male64/eye22.png - icons/faces/male64/eye23.png - icons/faces/male64/eye24.png - icons/faces/male64/eye25.png - icons/faces/male64/eye26.png - icons/faces/male64/eye27.png - icons/faces/male64/eye28.png - icons/faces/male64/eye29.png - icons/faces/male64/eye3.png - icons/faces/male64/eye30.png - icons/faces/male64/eye31.png - icons/faces/male64/eye32.png - icons/faces/male64/eye4.png - icons/faces/male64/eye5.png - icons/faces/male64/eye6.png - icons/faces/male64/eye7.png - icons/faces/male64/eye8.png - icons/faces/male64/eye9.png - icons/faces/male64/face1.png - icons/faces/male64/face2.png - icons/faces/male64/face3.png - icons/faces/male64/face4.png - icons/faces/male64/hair1.png - icons/faces/male64/hair10.png - icons/faces/male64/hair11.png - icons/faces/male64/hair12.png - icons/faces/male64/hair13.png - icons/faces/male64/hair14.png - icons/faces/male64/hair15.png - icons/faces/male64/hair16.png - icons/faces/male64/hair17.png - icons/faces/male64/hair18.png - icons/faces/male64/hair19.png - icons/faces/male64/hair2.png - icons/faces/male64/hair20.png - icons/faces/male64/hair21.png - icons/faces/male64/hair22.png - icons/faces/male64/hair23.png - icons/faces/male64/hair24.png - icons/faces/male64/hair25.png - icons/faces/male64/hair26.png - icons/faces/male64/hair27.png - icons/faces/male64/hair28.png - icons/faces/male64/hair29.png - icons/faces/male64/hair3.png - icons/faces/male64/hair30.png - icons/faces/male64/hair31.png - icons/faces/male64/hair32.png - icons/faces/male64/hair33.png - icons/faces/male64/hair34.png - icons/faces/male64/hair35.png - icons/faces/male64/hair36.png - icons/faces/male64/hair4.png - icons/faces/male64/hair5.png - icons/faces/male64/hair6.png - icons/faces/male64/hair7.png - icons/faces/male64/hair8.png - icons/faces/male64/hair9.png - icons/faces/male64/mouth1.png - icons/faces/male64/mouth10.png - icons/faces/male64/mouth11.png - icons/faces/male64/mouth12.png - icons/faces/male64/mouth13.png - icons/faces/male64/mouth14.png - icons/faces/male64/mouth15.png - icons/faces/male64/mouth16.png - icons/faces/male64/mouth17.png - icons/faces/male64/mouth18.png - icons/faces/male64/mouth19.png - icons/faces/male64/mouth2.png - icons/faces/male64/mouth20.png - icons/faces/male64/mouth21.png - icons/faces/male64/mouth22.png - icons/faces/male64/mouth23.png - icons/faces/male64/mouth24.png - icons/faces/male64/mouth25.png - icons/faces/male64/mouth26.png - icons/faces/male64/mouth3.png - icons/faces/male64/mouth4.png - icons/faces/male64/mouth5.png - icons/faces/male64/mouth6.png - icons/faces/male64/mouth7.png - icons/faces/male64/mouth8.png - icons/faces/male64/mouth9.png - components/Faces.qml - fonts/OpenSansEmoji.ttf - Options.qml - AppSettings.qml - - diff -Nru retroshare-0.6.4/src/retroshare-qml-app/src/retroshare-qml-app.pro retroshare-0.6.4/src/retroshare-qml-app/src/retroshare-qml-app.pro --- retroshare-0.6.4/src/retroshare-qml-app/src/retroshare-qml-app.pro 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/retroshare-qml-app/src/retroshare-qml-app.pro 1970-01-01 00:00:00.000000000 +0000 @@ -1,49 +0,0 @@ -!include("../../retroshare.pri"): error("Could not include file ../../retroshare.pri") - -QT += core network qml quick svg - -CONFIG += c++11 - -HEADERS += libresapilocalclient.h \ - rsqmlappengine.h \ - androidimagepicker.h \ - platforminteracions.h -SOURCES += main-app.cpp \ - libresapilocalclient.cpp \ - rsqmlappengine.cpp - -RESOURCES += qml.qrc - - -# Platform interaction specific code - -android-* { - QT += androidextras - HEADERS += NativeCalls.h androidplatforminteracions.h - SOURCES += NativeCalls.cpp androidplatforminteracions.cpp - - ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android - - - # Default rules for deployment. - include(deployment.pri) - - DISTFILES += \ - android/AndroidManifest.xml \ - android/gradle/wrapper/gradle-wrapper.jar \ - android/gradlew \ - android/res/values/libs.xml \ - android/build.gradle \ - android/gradle/wrapper/gradle-wrapper.properties \ - android/gradlew.bat \ - icons/retroshare.png - -} else { - - HEADERS += defaultplatforminteracions.h - SOURCES += defaultplatforminteracions.cpp -} - -# Additional import path used to resolve QML modules in Qt Creator's code model -#QML_IMPORT_PATH = -#QML2_IMPORT_PATH = diff -Nru retroshare-0.6.4/src/retroshare-qml-app/src/RsLoginPassView.qml retroshare-0.6.4/src/retroshare-qml-app/src/RsLoginPassView.qml --- retroshare-0.6.4/src/retroshare-qml-app/src/RsLoginPassView.qml 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/retroshare-qml-app/src/RsLoginPassView.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,153 +0,0 @@ -/* - * RetroShare Android QML App - * Copyright (C) 2016-2017 Gioacchino Mazzurco - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ - -import QtQuick 2.7 -import QtQuick.Layouts 1.3 -import QtQuick.Controls 2.0 -import "components/." - -Item -{ - id: loginView - property string buttonText: qsTr("Unlock") - property string cancelText: qsTr("Cancel") - property string iconUrl: "qrc:/icons/emblem-locked.svg" - property string login - property bool loginPreset: false - property bool advancedMode: false - property string hardcodedPassword: "hardcoded default password" - property string password: advancedMode ? "" : hardcodedPassword - property string suggestionText - signal submit(string login, string password) - signal cancel() - - Component.onCompleted: loginPreset = login.length > 0 - - ColumnLayout - { - id: inputView - width: parent.width - anchors.centerIn: parent - - Text - { - text: loginView.suggestionText - visible: loginView.suggestionText.length > 0 - font.bold: true - Layout.alignment: Qt.AlignHCenter - } - - Image - { - source: loginView.iconUrl - Layout.alignment: Qt.AlignHCenter - height: 128 - sourceSize.height: height - } - - Text - { - text: qsTr("Name") - visible: !loginView.loginPreset - Layout.alignment: Qt.AlignHCenter - anchors.bottom: nameField.top - anchors.bottomMargin: 5 - } - TextField - { - id: nameField - text: loginView.login - visible: !loginView.loginPreset - Layout.alignment: Qt.AlignHCenter - - ToolTip - { - text: qsTr("Choose a descriptive name, one
" + - "that your friends can recognize.", - "The linebreak is to make the text fit better in " + - "tooltip") - visible: nameField.activeFocus - timeout: 5000 - } - } - - Text - { - id: passLabel - visible: loginView.advancedMode || loginView.loginPreset - text: nameField.visible ? - qsTr("Password") : - qsTr("Enter password for %1").arg(loginView.login) - Layout.alignment: Qt.AlignHCenter - anchors.bottom: passwordField.top - anchors.bottomMargin: 5 - } - TextField - { - id: passwordField - visible: loginView.advancedMode || loginView.loginPreset - text: loginView.password - echoMode: TextInput.Password - Layout.alignment: Qt.AlignHCenter - - ToolTip - { - visible: passwordField.activeFocus && !loginView.loginPreset - timeout: 5000 - text: qsTr("Choose a strong password and don't forget it,
"+ - "there is no way to recover lost password.", - "The linebreak is to make the text fit better in " + - "tooltip") - } - } - - Row - { - Layout.alignment: Qt.AlignHCenter | Qt.AlignBottom - spacing: 3 - - ButtonIcon - { - visible: !loginView.loginPreset - onClicked: loginView.advancedMode = !loginView.advancedMode - imgUrl: "/icons/options.svg" - height: bottomButton.height - 5 - width: height - anchors.verticalCenter: bottomButton.verticalCenter - } - - ButtonText - { - id: bottomButton - text: loginView.buttonText - onClicked: loginView.submit(nameField.text, passwordField.text) - iconUrl: "/icons/network.svg" - buttonTextPixelSize: 15 - } - ButtonIcon - { - id: cancelButton - onClicked: loginView.cancel() - height: bottomButton.height - 5 - width: height - imgUrl: "/icons/back.png" - anchors.verticalCenter: bottomButton.verticalCenter - } - } - } -} diff -Nru retroshare-0.6.4/src/retroshare-qml-app/src/rsqmlappengine.cpp retroshare-0.6.4/src/retroshare-qml-app/src/rsqmlappengine.cpp --- retroshare-0.6.4/src/retroshare-qml-app/src/rsqmlappengine.cpp 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/retroshare-qml-app/src/rsqmlappengine.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,40 +0,0 @@ -/* - * RetroShare Qml App - * Copyright (C) 2017 Gioacchino Mazzurco - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ - -#include "rsqmlappengine.h" - -#include -#include - - -/*static*/ RsQmlAppEngine* RsQmlAppEngine::mMainInstance = nullptr; - -void RsQmlAppEngine::handleUri(QString uri) -{ - QObject* rootObj = rootObjects()[0]; - QQuickWindow* mainWindow = qobject_cast(rootObj); - - if(mainWindow) - { - QMetaObject::invokeMethod(mainWindow, "handleIntentUri", - Qt::AutoConnection, - Q_ARG(QVariant, uri)); - } - else qCritical() << __PRETTY_FUNCTION__ - << "Root object is not a window!"; -} diff -Nru retroshare-0.6.4/src/retroshare-qml-app/src/rsqmlappengine.h retroshare-0.6.4/src/retroshare-qml-app/src/rsqmlappengine.h --- retroshare-0.6.4/src/retroshare-qml-app/src/rsqmlappengine.h 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/retroshare-qml-app/src/rsqmlappengine.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,67 +0,0 @@ -#pragma once -/* - * RetroShare Qml App - * Copyright (C) 2017 Gioacchino Mazzurco - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ - -#include -#include - - -class RsQmlAppEngine : public QQmlApplicationEngine -{ - Q_OBJECT - -public: - - RsQmlAppEngine(bool isMainInstance = false, QObject* parent = nullptr) : - QQmlApplicationEngine(parent) - { if(isMainInstance) mMainInstance = this; } - - ~RsQmlAppEngine() { if(mMainInstance == this) mMainInstance = nullptr; } - - static RsQmlAppEngine* mainInstance() { return mMainInstance; } - -public slots: - void handleUri(QString uri); - -private: - - /** - * Using a static variable as QQmlApplicationEngine singleton caused crash - * on application termination, while using a dinamically allocated one - * causes deadlock on termination in QML WorkerScript destructor object - * with the following stacktrace - * #0 0x00007f0a8c3e4c67 in sched_yield () from /lib64/libc.so.6 - * #1 0x00007f0a8db5191c in QQuickWorkerScriptEngine::~QQuickWorkerScriptEngine() () from /usr/lib64/libQt5Qml.so.5 - * #2 0x00007f0a8db51949 in QQuickWorkerScriptEngine::~QQuickWorkerScriptEngine() () from /usr/lib64/libQt5Qml.so.5 - * #3 0x00007f0a8d61359c in QObjectPrivate::deleteChildren() () from /usr/lib64/libQt5Core.so.5 - * #4 0x00007f0a8d61ab83 in QObject::~QObject() () from /usr/lib64/libQt5Core.so.5 - * #5 0x00007f0a8da7d27d in QQmlEngine::~QQmlEngine() () from /usr/lib64/libQt5Qml.so.5 - * #6 0x00007f0a8dafeb39 in QQmlApplicationEngine::~QQmlApplicationEngine() () from /usr/lib64/libQt5Qml.so.5 - * #7 0x00007f0a8d61359c in QObjectPrivate::deleteChildren() () from /usr/lib64/libQt5Core.so.5 - * #8 0x00007f0a8d61ab83 in QObject::~QObject() () from /usr/lib64/libQt5Core.so.5 - * #9 0x00007f0a8d5ede58 in QCoreApplication::~QCoreApplication() () from /usr/lib64/libQt5Core.so.5 - * #10 0x00007f0a8dd2d97b in QGuiApplication::~QGuiApplication() () from /usr/lib64/libQt5Gui.so.5 - * #11 0x000000000041b6b4 in main (argc=1, argv=0x7fff218dd1a8) at ../../../../Development/rs-develop/retroshare-qml-app/src/main-app.cpp:58 - * - * To avoid this we leave the creation of the instance to the user (main) - * and to store the static pointer to that, the pointer can be null at early - * stage of execution (or if the user forget to initialize it properly) so - * early user (JNI intent handler) should take this in account - */ - static RsQmlAppEngine* mMainInstance; -}; diff -Nru retroshare-0.6.4/src/retroshare-qml-app/src/styles/ChatStyle.qml retroshare-0.6.4/src/retroshare-qml-app/src/styles/ChatStyle.qml --- retroshare-0.6.4/src/retroshare-qml-app/src/styles/ChatStyle.qml 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/retroshare-qml-app/src/styles/ChatStyle.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,74 +0,0 @@ -import QtQuick 2.0 -pragma Singleton - -QtObject { - - property QtObject bubble: QtObject{ - // Bubble measures - readonly property int lMarginBubble: 10 - readonly property int rMarginBubble: 10 - readonly property int tMarginBubble: 5 - readonly property int bMarginBubble: 10 - readonly property int aditionalBubbleHeight: tMarginBubble * 2 - readonly property int aditionalBubbleWidth: 30 - readonly property real bubbleMaxWidth: 0.5 // % from parent - - // BubbleProps - readonly property int radius: 5 - - - // Colors - readonly property string colorIncoming: "lightGreen" - readonly property string colorOutgoing: "aliceblue" - readonly property string colorSenderName: "cornflowerblue" - readonly property string colorMessageTime: "grey" - - // Text - readonly property int messageTextSize: 15 - - } - - - property QtObject inferiorPanel: QtObject{ - // Panel globals - readonly property int height: 50 - readonly property string backgroundColor: "white" - readonly property string borderColor: "lightGrey" - - property QtObject msgComposer: QtObject{ - readonly property string placeHolder: "Send message..." - readonly property int maxHeight: 180 - readonly property int messageBoxTextSize: 15 - - property QtObject background: Rectangle { - color: "transparent" - } - } - - - // Button Icon - property QtObject btnIcon: QtObject{ - readonly property int width: 35 - readonly property int height: 35 - - readonly property int margin: 5 - - readonly property string sendIconUrl: "/icons/send-message.svg" - readonly property string attachIconUrl: "/icons/attach.svg" - readonly property string microIconUrl: "/icons/microphone.svg" - readonly property string microMuteIconUrl: "/icons/microphone_mute.svg" - readonly property string emojiIconUrl: "/icons/smiley.svg" - - - } - } - - property QtObject chat: QtObject { - // Measures - readonly property int bubbleMargin: 20 - readonly property int bubbleSpacing: 10 - - } - - -} diff -Nru retroshare-0.6.4/src/retroshare-qml-app/src/styles/SideBarStyle.qml retroshare-0.6.4/src/retroshare-qml-app/src/styles/SideBarStyle.qml --- retroshare-0.6.4/src/retroshare-qml-app/src/styles/SideBarStyle.qml 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/retroshare-qml-app/src/styles/SideBarStyle.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,34 +0,0 @@ -import QtQuick 2.0 -pragma Singleton - -QtObject { - - property var width: 2 // Number of third parts of screen (for example 2/3) - - property QtObject item: QtObject - { - property var height: 50 - - property string hoverColor: "lightgrey" - property string defaultColor: "white" - property string pressColor: "slategrey" - property int pixelSize: 14 - } - property QtObject header: QtObject - { - property var color: "#0398d5" - property var avatarHeight: 50 - property var avatarMargins: 15 - property var textColor: "white" - property var textNickSize: 14 - property var textGxsidSize: 11 - } - property QtObject footer: QtObject - { - property var color: "white" - property var textColor: "grey" - property var margins: 8 - property string text: "Retroshare Android alpha" - } - -} diff -Nru retroshare-0.6.4/src/retroshare-qml-app/src/TimedPopup.qml retroshare-0.6.4/src/retroshare-qml-app/src/TimedPopup.qml --- retroshare-0.6.4/src/retroshare-qml-app/src/TimedPopup.qml 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/retroshare-qml-app/src/TimedPopup.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,41 +0,0 @@ -/* - * RetroShare Android QML App - * Copyright (C) 2017 Gioacchino Mazzurco - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ - -import QtQuick 2.7 -import QtQuick.Controls 2.0 - -Popup -{ - property alias duration: timer.interval - - - id: popupRoot - visible: false - onVisibleChanged: if(visible) timer.start() - x: parent.x + parent.width/2 - width/2 - y: parent.y + parent.height/2 - height/2 - - - Timer - { - id: timer - interval: 1500 - onTriggered: popupRoot.close() - } -} - diff -Nru retroshare-0.6.4/src/retroshare-qml-app/src/TokensManager.qml retroshare-0.6.4/src/retroshare-qml-app/src/TokensManager.qml --- retroshare-0.6.4/src/retroshare-qml-app/src/TokensManager.qml 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/retroshare-qml-app/src/TokensManager.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,145 +0,0 @@ -/* - * RetroShare Android QML App - * Copyright (C) 2017-2018 Gioacchino Mazzurco - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ - -pragma Singleton - -import QtQml 2.2 -import org.retroshare.qml_components.LibresapiLocalClient 1.0 - -QtObject -{ - id: tokensManager - - property var tokens: ({}) - function registerToken(token, callback) - { - if(!maybeToken(token)) - { - console.error("TokensManager attempt to register a non int token: ", token) - console.trace() - return - } - - if (Array.isArray(tokens[token])) tokens[token].push(callback) - else tokens[token] = [callback] - } - function unRegisterToken(token, callback) - { - if(!maybeToken(token)) - { - console.error("TokensManager attempt to unregister a non int token: ", token) - console.trace() - return - } - - var remCount = 0; - var arrLen = tokens[token].length - for(var i=0; i - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ - -import QtQuick 2.7 -import QtQuick.Controls 2.0 -import "components/." - -Item -{ - id: nodeDetailsRoot - - property string pgpName - property alias pgpId: pgpIdTxt.text - property bool isOnline - - property string nodeCert - - property var locations - - function attemptConnectionCB (par) - { - console.log("attemptConnectionCB()", par.response) - } - - - Image - { - id: nodeStatusImage - source: isOnline? - "icons/state-ok.svg" : - "icons/state-offline.svg" - - height: 128 - sourceSize.height: height - fillMode: Image.PreserveAspectFit - - anchors.top: parent.top - anchors.topMargin: 6 - anchors.horizontalCenter: parent.horizontalCenter - } - - - - Column - { - id: pgpColumn - - anchors.top: nodeStatusImage.bottom - width: parent.width - - Text - { - text: nodeDetailsRoot.pgpName.replace(" (Generated by RetroShare) <>", "") - anchors.horizontalCenter: parent.horizontalCenter - font.pixelSize: 20 - } - Text - { - id: pgpIdTxt - anchors.horizontalCenter: parent.horizontalCenter - color: "darkslategrey" - } - } - - JSONListModel - { - id: jsonModel - json: JSON.stringify(nodeDetailsRoot.locations) - } - - ListView - { - width: parent.width * .75 - anchors.top: pgpColumn.bottom - anchors.topMargin: 5 - anchors.bottom: buttonsRow.top - model: jsonModel.model - anchors.horizontalCenter: parent.horizontalCenter - headerPositioning: ListView.OverlayHeader - - clip: true - snapMode: ListView.SnapToItem - - spacing:7 - - header:Rectangle - { - color: "aliceblue" - width: parent.width - z: 2 - height: headetText.contentHeight + 10 - radius: 10 - - Text - { - id: headetText - text: "Node locations ("+jsonModel.model.count+")" - anchors.horizontalCenter: parent.horizontalCenter - anchors.verticalCenter: parent.verticalCenter - font.italic: true - } - - } - - delegate: - MouseArea - { - width: parent.width - height: innerCol.height - - onClicked: - { - console.log("triggerLocationConnectionAttempt()") - rsApi.request("/peers/attempt_connection/", - JSON.stringify({peer_id: model.peer_id}) , attemptConnectionCB) - - } - - Column - { - id: innerCol - height: idRow.height + gxsInfo.height - width: parent.width - leftPadding: 4 - spacing: 6 - - Row - { - id: idRow - height: 30 - spacing: 4 - - Image - { - id: statusImage - source: model.is_online ? - "icons/network-connect.svg" : - "icons/network-disconnect.svg" - - height: parent.height - 4 - sourceSize.height: height - fillMode: Image.PreserveAspectFit - anchors.verticalCenter: parent.verticalCenter - } - Text - { - id: locNameText - text: model.location - anchors.verticalCenter: parent.verticalCenter - } - } - - TextAndIcon - { - id: gxsInfo - width: parent.width - innerText: model.peer_id - anchors.horizontalCenter: parent.horizontalCenter - iconUrl: "/icons/keyring.svg" - - } - } - } - } - - Row - { - id: buttonsRow - - anchors.bottom: parent.bottom - anchors.horizontalCenter: parent.horizontalCenter - spacing: 6 - - ButtonText - { - text: qsTr("Revoke") - - borderRadius: 0 - buttonTextPixelSize: 14 - iconUrl: "/icons/leave.svg" - - onClicked: - rsApi.request( - "/peers/"+nodeDetailsRoot.pgpId+"/delete", "", - function() - { stackView.push("qrc:/TrustedNodesView.qml") }) - } - - ButtonText - { - text: qsTr("Entrust") - - visible: nodeDetailsRoot.nodeCert.length > 0 - - borderRadius: 0 - buttonTextPixelSize: 14 - iconUrl: "/icons/invite.svg" - - onClicked: - { - var jsonData = - { - cert_string: nodeCert, - flags: - { - allow_direct_download: true, - allow_push: false, - require_whitelist: false, - } - } - rsApi.request( - "PUT /peers", JSON.stringify(jsonData), - function() - { stackView.push("qrc:/TrustedNodesView.qml") }) - } - } - } -} diff -Nru retroshare-0.6.4/src/retroshare-qml-app/src/TrustedNodesView.qml retroshare-0.6.4/src/retroshare-qml-app/src/TrustedNodesView.qml --- retroshare-0.6.4/src/retroshare-qml-app/src/TrustedNodesView.qml 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/retroshare-qml-app/src/TrustedNodesView.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,123 +0,0 @@ -/* - * RetroShare Android QML App - * Copyright (C) 2016-2018 Gioacchino Mazzurco - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ - -import QtQuick 2.7 -import QtQuick.Controls 2.0 -import "jsonpath.js" as JSONPath -import "." //Needed for TokensManager singleton -import "components/." - -Item -{ - id: trustedNodesView - property int token: 0 - - Component.onCompleted: refreshData() - Component.onDestruction: TokensManager.unRegisterToken(token, refreshData) - onVisibleChanged: visible && refreshData() - - function refreshDataCallback(par) - { - jsonModel.json = par.response - token = JSON.parse(par.response).statetoken - TokensManager.registerToken(token, refreshData) - } - function refreshData() - { if(visible) rsApi.request("/peers/*", "", refreshDataCallback) } - - JSONListModel - { - id: jsonModel - query: "$.data[*]" - - function isOnline(pgpId) - { - var qr = "$.data[?(@.pgp_id=='"+pgpId+"')].locations[*].is_online" - var locOn = JSONPath.jsonPath(JSON.parse(jsonModel.json), qr) - if (Array.isArray(locOn)) - return locOn.reduce(function(cur,acc){return cur || acc}, false) - return Boolean(locOn) - } - - function getLocations(pgpId) - { - var qr = "$.data[?(@.pgp_id=='"+pgpId+"')].locations" - return JSONPath.jsonPath(JSON.parse(jsonModel.json), qr) - } - } - - ListView - { - width: parent.width - anchors.top: parent.top - anchors.bottom: bottomButton.top - model: jsonModel.model - anchors.horizontalCenter: parent.horizontalCenter - spacing: 3 - delegate: Item - { - property bool isOnline: jsonModel.isOnline(model.pgp_id) - height: 54 - width: parent.width - anchors.horizontalCenter: parent.horizontalCenter - - ButtonText - { - id: locationButton -// anchors.horizontalCenter: parent.horizontalCenter - text: model.name - borderRadius:0 - iconUrl: isOnline? - "/icons/state-ok.svg" : - "/icons/state-offline.svg" - color: "transparent" - pressColor: "lightsteelblue" - buttonTextPixelSize: 18 - iconHeight:parent.height - 4 - - onClicked: - { - stackView.push( - "qrc:/TrustedNodeDetails.qml", - { - pgpName: model.name, - pgpId: model.pgp_id, - isOnline: isOnline, - locations: jsonModel.getLocations( - model.pgp_id) - } - ) - } - } - } - } - - ButtonText - { - id: bottomButton - text: qsTr("Add/Share Trusted Node") - anchors.bottom: parent.bottom - onClicked: stackView.push("qrc:/AddTrustedNode.qml") - anchors.horizontalCenter: parent.horizontalCenter -// width: parent.width - - borderRadius: 0 - buttonTextPixelSize: 14 - iconUrl: "/icons/add.svg" - } -} diff -Nru retroshare-0.6.4/src/retroshare-qml-app/src/URI.js retroshare-0.6.4/src/retroshare-qml-app/src/URI.js --- retroshare-0.6.4/src/retroshare-qml-app/src/URI.js 2018-05-03 13:55:51.000000000 +0000 +++ retroshare-0.6.4/src/retroshare-qml-app/src/URI.js 1970-01-01 00:00:00.000000000 +0000 @@ -1,69 +0,0 @@ -/*! URI.js v1.18.10 http://medialize.github.io/URI.js/ */ -/* build contains: URI.js */ -/* - URI.js - Mutating URLs - - Version: 1.18.10 - - Author: Rodney Rehm - Web: http://medialize.github.io/URI.js/ - - Licensed under - MIT License http://www.opensource.org/licenses/mit-license - -*/ -(function(m,w){"object"===typeof module&&module.exports?module.exports=w(require("./punycode"),require("./IPv6"),require("./SecondLevelDomains")):"function"===typeof define&&define.amd?define(["./punycode","./IPv6","./SecondLevelDomains"],w):m.URI=w(m.punycode,m.IPv6,m.SecondLevelDomains,m)})(this,function(m,w,u,h){function d(a,b){var c=1<=arguments.length,g=2<=arguments.length;if(!(this instanceof d))return c?g?new d(a,b):new d(a):new d;if(void 0===a){if(c)throw new TypeError("undefined is not a valid argument for URI"); -a="undefined"!==typeof location?location.href+"":""}if(null===a&&c)throw new TypeError("null is not a valid argument for URI");this.href(a);return void 0!==b?this.absoluteTo(b):this}function r(a){return a.replace(/([.*+?^=!:${}()|[\]\/\\])/g,"\\$1")}function v(a){return void 0===a?"Undefined":String(Object.prototype.toString.call(a)).slice(8,-1)}function l(a){return"Array"===v(a)}function E(a,b){var c={},d,f;if("RegExp"===v(b))c=null;else if(l(b))for(d=0,f=b.length;d]+|\(([^\s()<>]+|(\([^\s()<>]+\)))*\))+(?:\(([^\s()<>]+|(\([^\s()<>]+\)))*\)|[^\s`!()\[\]{};:'".,<>?\u00ab\u00bb\u201c\u201d\u2018\u2019]))/ig;d.findUri={start:/\b(?:([a-z][a-z0-9.+-]*:\/\/)|www\.)/gi,end:/[\s\r\n]|$/,trim:/[`!()\[\]{};:'".,<>?\u00ab\u00bb\u201c\u201d\u201e\u2018\u2019]+$/,parens:/(\([^\)]*\)|\[[^\]]*\]|\{[^}]*\}|<[^>]*>)/g};d.defaultPorts={http:"80",https:"443",ftp:"21", -gopher:"70",ws:"80",wss:"443"};d.invalid_hostname_characters=/[^a-zA-Z0-9\.-]/;d.domAttributes={a:"href",blockquote:"cite",link:"href",base:"href",script:"src",form:"action",img:"src",area:"href",iframe:"src",embed:"src",source:"src",track:"src",input:"src",audio:"src",video:"src"};d.getDomAttribute=function(a){if(a&&a.nodeName){var b=a.nodeName.toLowerCase();if("input"!==b||"image"===a.type)return d.domAttributes[b]}};d.encode=C;d.decode=decodeURIComponent;d.iso8859=function(){d.encode=escape;d.decode= -unescape};d.unicode=function(){d.encode=C;d.decode=decodeURIComponent};d.characters={pathname:{encode:{expression:/%(24|26|2B|2C|3B|3D|3A|40)/ig,map:{"%24":"$","%26":"&","%2B":"+","%2C":",","%3B":";","%3D":"=","%3A":":","%40":"@"}},decode:{expression:/[\/\?#]/g,map:{"/":"%2F","?":"%3F","#":"%23"}}},reserved:{encode:{expression:/%(21|23|24|26|27|28|29|2A|2B|2C|2F|3A|3B|3D|3F|40|5B|5D)/ig,map:{"%3A":":","%2F":"/","%3F":"?","%23":"#","%5B":"[","%5D":"]","%40":"@","%21":"!","%24":"$","%26":"&","%27":"'", -"%28":"(","%29":")","%2A":"*","%2B":"+","%2C":",","%3B":";","%3D":"="}}},urnpath:{encode:{expression:/%(21|24|27|28|29|2A|2B|2C|3B|3D|40)/ig,map:{"%21":"!","%24":"$","%27":"'","%28":"(","%29":")","%2A":"*","%2B":"+","%2C":",","%3B":";","%3D":"=","%40":"@"}},decode:{expression:/[\/\?#:]/g,map:{"/":"%2F","?":"%3F","#":"%23",":":"%3A"}}}};d.encodeQuery=function(a,b){var c=d.encode(a+"");void 0===b&&(b=d.escapeQuerySpace);return b?c.replace(/%20/g,"+"):c};d.decodeQuery=function(a,b){a+="";void 0===b&& -(b=d.escapeQuerySpace);try{return d.decode(b?a.replace(/\+/g,"%20"):a)}catch(c){return a}};var t={encode:"encode",decode:"decode"},y,D=function(a,b){return function(c){try{return d[b](c+"").replace(d.characters[a][b].expression,function(c){return d.characters[a][b].map[c]})}catch(g){return c}}};for(y in t)d[y+"PathSegment"]=D("pathname",t[y]),d[y+"UrnPathSegment"]=D("urnpath",t[y]);t=function(a,b,c){return function(g){var f;f=c?function(a){return d[b](d[c](a))}:d[b];g=(g+"").split(a);for(var e=0, -k=g.length;ed)return a.charAt(0)===b.charAt(0)&&"/"===a.charAt(0)?"/":"";if("/"!==a.charAt(d)||"/"!==b.charAt(d))d=a.substring(0,d).lastIndexOf("/");return a.substring(0,d+1)};d.withinString=function(a,b,c){c||(c={}); -var g=c.start||d.findUri.start,e=c.end||d.findUri.end,z=c.trim||d.findUri.trim,k=c.parens||d.findUri.parens,l=/[a-z0-9-]=["']?$/i;for(g.lastIndex=0;;){var h=g.exec(a);if(!h)break;var m=h.index;if(c.ignoreHtml){var p=a.slice(Math.max(m-3,0),m);if(p&&l.test(p))continue}for(var q=m+a.slice(m).search(e),p=a.slice(m,q),q=-1;;){var n=k.exec(p);if(!n)break;q=Math.max(q,n.index+n[0].length)}p=-1c.length)return this._parts.hostname;c=this._parts.hostname.length-this.tld(b).length-1;c=this._parts.hostname.lastIndexOf(".",c-1)+1;return this._parts.hostname.substring(c)||""}if(!a)throw new TypeError("cannot set domain empty");d.ensureValidHostname(a); -!this._parts.hostname||this.is("IP")?this._parts.hostname=a:(c=new RegExp(r(this.domain())+"$"),this._parts.hostname=this._parts.hostname.replace(c,a));this.build(!b);return this};e.tld=function(a,b){if(this._parts.urn)return void 0===a?"":this;"boolean"===typeof a&&(b=a,a=void 0);if(void 0===a){if(!this._parts.hostname||this.is("IP"))return"";var c=this._parts.hostname.lastIndexOf("."),c=this._parts.hostname.substring(c+1);return!0!==b&&u&&u.list[c.toLowerCase()]?u.get(this._parts.hostname)||c:c}if(a)if(a.match(/[^a-zA-Z0-9-]/))if(u&& -u.is(a))c=new RegExp(r(this.tld())+"$"),this._parts.hostname=this._parts.hostname.replace(c,a);else throw new TypeError('TLD "'+a+'" contains characters other than [A-Z0-9]');else{if(!this._parts.hostname||this.is("IP"))throw new ReferenceError("cannot set TLD on non-domain host");c=new RegExp(r(this.tld())+"$");this._parts.hostname=this._parts.hostname.replace(c,a)}else throw new TypeError("cannot set TLD empty");this.build(!b);return this};e.directory=function(a,b){if(this._parts.urn)return void 0=== -a?"":this;if(void 0===a||!0===a){if(!this._parts.path&&!this._parts.hostname)return"";if("/"===this._parts.path)return"/";var c=this._parts.path.length-this.filename().length-1,c=this._parts.path.substring(0,c)||(this._parts.hostname?"/":"");return a?d.decodePath(c):c}c=this._parts.path.length-this.filename().length;c=this._parts.path.substring(0,c);c=new RegExp("^"+r(c));this.is("relative")||(a||(a="/"),"/"!==a.charAt(0)&&(a="/"+a));a&&"/"!==a.charAt(a.length-1)&&(a+="/");a=d.recodePath(a);this._parts.path= -this._parts.path.replace(c,a);this.build(!b);return this};e.filename=function(a,b){if(this._parts.urn)return void 0===a?"":this;if("string"!==typeof a){if(!this._parts.path||"/"===this._parts.path)return"";var c=this._parts.path.lastIndexOf("/"),c=this._parts.path.substring(c+1);return a?d.decodePathSegment(c):c}c=!1;"/"===a.charAt(0)&&(a=a.substring(1));a.match(/\.?\//)&&(c=!0);var g=new RegExp(r(this.filename())+"$");a=d.recodePath(a);this._parts.path=this._parts.path.replace(g,a);c?this.normalizePath(b): -this.build(!b);return this};e.suffix=function(a,b){if(this._parts.urn)return void 0===a?"":this;if(void 0===a||!0===a){if(!this._parts.path||"/"===this._parts.path)return"";var c=this.filename(),g=c.lastIndexOf(".");if(-1===g)return"";c=c.substring(g+1);c=/^[a-z0-9%]+$/i.test(c)?c:"";return a?d.decodePathSegment(c):c}"."===a.charAt(0)&&(a=a.substring(1));if(c=this.suffix())g=a?new RegExp(r(c)+"$"):new RegExp(r("."+c)+"$");else{if(!a)return this;this._parts.path+="."+d.recodePath(a)}g&&(a=d.recodePath(a), -this._parts.path=this._parts.path.replace(g,a));this.build(!b);return this};e.segment=function(a,b,c){var d=this._parts.urn?":":"/",e=this.path(),h="/"===e.substring(0,1),e=e.split(d);void 0!==a&&"number"!==typeof a&&(c=b,b=a,a=void 0);if(void 0!==a&&"number"!==typeof a)throw Error('Bad segment "'+a+'", must be 0-based integer');h&&e.shift();0>a&&(a=Math.max(e.length+a,0));if(void 0===b)return void 0===a?e:e[a];if(null===a||void 0===e[a])if(l(b)){e=[];a=0;for(var k=b.length;a