Commit Graph

331 Commits

Author SHA1 Message Date
csoler
d631758e8c added hashstream class to hash content of RsIdentityUsage and fix duplication of identity usage statistics 2017-01-05 23:07:59 +01:00
Gio
06a1020724 Add workaround to see debug messages from native code in android service 2016-12-22 13:50:44 +01:00
csoler
81dffbed84 Merge pull request #591 from G10h4ck/split_autologin
Made autologin optional at compile time
2016-12-14 16:45:45 +01:00
Gio
9eef412b44 Expose libresapi for distant chat
Added macro to deprecate symbols usage in a crossplatform way.
Deprecated Request::mMethod and related stuff that make implementation
 more complex without advantage.
Added /chat/{initiate_distant_chat, distant_chat_status,
 close_distant_chat} to libresapi.
Solved subtle bug in ChatId::ChatId(std::string str) that caused zeroed
 DistantChatPeerId being created.
2016-12-07 20:29:33 +01:00
Gio
8656452c68 Made autologin optional at compile time
Autologin is disabled by default at compile time, and a warning to
discourage it's usage is printed if it is enabled.
This will make default RetroShare build safer and reduce dependencies as
example we don't depends anymore on gnome keyring is not needed in default
build for linux anymore.
2016-12-03 20:04:25 +01:00
Gio
8ab3c7de26 Merge branch 'master' into android 2016-11-07 14:37:23 +01:00
mr-alice
2bb9a87b3b merged and fixed conflict with upstream/master 2016-11-04 13:52:11 +01:00
Phenom
2db8dbd45f Fix El Capitan OSX 10.11 Compil 2016-11-02 21:40:46 +01:00
Gio
ea42d822c2 Merge branch 'master' into android 2016-10-26 13:43:24 +02:00
mr-alice
997154f9c5 added preliminary implementation of chacha20/poly1305 2016-10-13 15:13:56 +02:00
Gio
48a9be0ccc Use Qt to read the local addresses on android
getifaddrs is not present on android and an alternative implementation
crashed, use QNetworkInterface::allAddresses() to retrieve local
addresses list instead

This
2016-09-21 12:46:55 +02:00
mr-alice
0757fb303c merged upstream/master 2016-09-20 20:51:50 +02:00
mr-alice
53c65fff9f removed cache transfers from the GUI 2016-09-13 18:54:00 +02:00
mr-alice
6ac9b27d7b moved rsexpr.cc into util/ 2016-09-13 12:14:16 +02:00
mr-alice
a2e34f9cc6 moved regular expression classes into a separate namespace 2016-09-13 12:05:22 +02:00
mr-alice
9f66c0050b moved rsexpr to file_sharing directory 2016-09-12 23:37:19 +02:00
Cyril Soler
e3d12c4faf Merge pull request #491 from G10h4ck/warnings_cleanup
fix compiler warnings, fix typos and remove unuseful code
2016-09-08 17:08:34 +02:00
thunder2
5f5ce4ab63 Fixed version_detail_bash_script with shadow build 2016-09-05 16:27:04 +02:00
manu
50fe3dd711 QML activity interacts with backend.
Test QML activity changed for a simplified version of drbob's rsqml-models.
It requests JSON documents from the libresapilocalserver and shows them raw.
Updated Android documentation.
Moved Android qmake section to the end of libretroshare.pro and openpgpsdk.pro
to avoid static linking errors.
2016-09-04 15:01:44 +02:00
mr-alice
371171fcbb moved InternalFileHierarchyStorage to separate file. Fixed loading/saving infrastructure (not working yet) 2016-09-03 13:29:23 +02:00
mr-alice
6fc02e03b1 added load/save of configuration and shared dirs list 2016-09-01 21:04:48 +02:00
mr-alice
ade6017f74 merged with upstream/master 2016-09-01 19:52:31 +02:00
Gio
3ec50837d0 Fix typos in qmake files 2016-08-31 07:41:22 +02:00
Gio
47944b30e6 libretroshare android move openssl static linking in more appropriated place 2016-08-23 12:29:31 +02:00
Gio
279551fe8d Retroshare android service now run and start at boot on android, the qml app is still disfunctional 2016-08-23 12:15:28 +02:00
Gio
9a980def2c libretroshare now compiles for Android, instruction on how to do it included 2016-08-23 12:15:28 +02:00
mr-alice
76831348e6 added update of last modif LS, and rsitems to update directories between friends 2016-08-22 07:49:45 +02:00
mr-alice
edc602f68f added infrastructure for synchronisation of file lists 2016-08-20 16:23:11 +02:00
MrAlice
82c18bbb86 added load/save for file hash cache 2016-08-09 15:07:02 +02:00
mr-alice
3e20b9ddf7 added p3FileLists service 2016-07-20 15:28:55 -04:00
sehraf
4d2d825d5b add new option to qmake to enable dht stunner
removed dht stunner code when option is not set
2016-06-21 13:55:23 +02:00
mr-alice
8e2ff56f9a merged to upstream/master 2016-06-18 16:59:01 -04:00
sehraf
6e38554bcd 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 keyring on linux).
This also allows to support other keyrings on linux in the future (e.g. KDEs keyring)
2016-06-02 14:57:46 +02:00
Julian Ospald
ed867c52bd
Don't hardcode g++ in the toolchain settings
Although it's already quite ugly that we overwrite QMAKE_CC like this,
hardcoding 'g++' can break the build where prefixed versions of
the toolchain are expected and where QMAKE_CXX is already properly
defined. So we just use QMAKE_CXX variable here.

This fixes build failures on some distributions, e.g.
https://galileo.mailstation.de/jenkins/job/lipidity/36/console
2016-05-27 18:07:28 +02:00
mr-alice
89af650f74 basic bits of new file list sharing system 2016-04-14 18:25:12 -04:00
csoler
d13526facd 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 2016-01-12 21:10:11 -05:00
Gio
ed7f958f95 Add stacktrave.h, sanitize p3LinkMgrIMPL::retryConnectTCP avoid to look for port on null sockaddr_storage 2015-12-31 15:42:22 +01:00
Phenom
86b559191e Fix MacOSX 10.10 Yosemite Compilation
by using retroshare.pri file like linux or windows,
 fixing namespace for unordered_set,
 fixing c++11 for ostream& operator<<,
 checking if ntohll and htonll already defined.
2015-12-22 17:27:51 +01:00
csoler
9193d3579b merged with latest master before creating PR 2015-12-04 21:24:51 -05:00
Jenster
699299ae8a latest OSX patches 2015-11-20 08:10:59 -08:00
csoler
cb8b814543 added gxs tunnel service, based on distant chat code. Does not compile yet 2015-11-17 18:11:00 -05:00
defnax
c41f98cb4c Merge pull request #86 from PhenomRetroShare/Fix_Win7_32bCompilationFromScratch
Fix Windows 7 32b Compilation from scratch.
2015-11-06 01:58:30 +01:00
Sergei Reznikov
34758be52a Add Haiku support 2015-10-20 20:32:44 +03:00
Phenom
7e708ff4aa Fix MiniUPnP IGD with newers versions.
Only for windows, as other use UPnPBase.
2015-10-17 12:15:36 +02:00
Phenom
79d761ae2e Add Win32 section in retroshare.pri
And add MSys2 directories.
2015-10-17 12:15:36 +02:00
csoler
71c8dfdc58 manual merge before creating a conflict-free PR 2015-10-12 14:45:11 -04:00
csoler
317e7ea5ab added some backend for reputation system 2015-10-04 23:14:49 -04:00
sirjenster
68fd1b206e First Mac/OSX compile fixes 2015-09-22 18:33:16 -07:00
AsamK
c80ad59fb2 Add workaround for broken sqlcipher packages 2015-09-22 16:36:02 +02:00
AsamK
0793a6a52d Use PLUGIN_DIR to define plugin directory only once 2015-09-06 22:27:22 +02:00