Commit Graph

3546 Commits

Author SHA1 Message Date
csoler
5d9272055f merged with upstream/master 2015-12-22 18:33:01 -05: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
Gio
436f619fcb getLocalAddresses collects loopback address too 2015-12-21 17:34:53 +01:00
Gio
9d78bba3b8 Guard getLocalAddresses debug 2015-12-21 15:48:59 +01:00
Gio
9826c72969 added rs_inet_ntop crossplatform version of inet_ntop 2015-12-21 15:32:28 +01:00
Gio
ca1a9707ef Removed dead code 2015-12-21 15:31:47 +01:00
Gio
1b2fa3600a Adapted getLocalAddresses() includes for windows 2015-12-21 15:31:46 +01:00
Gio
5a541e7feb Removed unused getLocalInterfaces_ipv4 2015-12-21 09:10:00 +01:00
Gio
77bcc99030 Added sockaddr_storage_dump(...), implemented sockaddr_storage_ipv6_iptostring(...) 2015-12-21 09:10:00 +01:00
Gioacchino Mazzurco
747a03a0b9 Substitute getpreferredinterface flawed logic with simpler getLocalAddresses still just one address used at moment 2015-12-21 09:10:00 +01:00
Cyril Soler
f12b4a1474 Merge pull request #213 from csoler/v0.6-GxsDebug
fixed a number of memory leaks in gxsnetservice. Used a class that au…
2015-12-20 20:53:11 -05:00
csoler
d4926cbc61 fixed a number of memory leaks in gxsnetservice. Used a class that auto-deletes retrieved items. 2015-12-20 20:35:48 -05:00
csoler
ea137adc42 fixed compilation on OSX pb in pqistreamer 2015-12-20 19:07:04 -05:00
Cyril Soler
d50875b9bb Merge pull request #212 from csoler/v0.6-TrafficOptim
V0.6 traffic optim
2015-12-19 21:38:55 -05:00
csoler
141b799c9d removed debug info 2015-12-19 21:20:25 -05:00
Cyril Soler
124da6f3b7 Merge pull request #210 from G10h4ck/pqicleaning
[RFC] Made pqiperson more readable evidence some strange code
2015-12-19 21:12:57 -05:00
csoler
462f969da7 merged with upstream/master 2015-12-19 19:15:48 -05:00
csoler
ccc5f0f8fc improved debug info in rsgxsnetservice 2015-12-19 19:04:49 -05:00
csoler
5fcaa36736 fixed some serialising bugs, and added proper notification of observer 2015-12-19 19:00:06 -05:00
csoler
6910ad3695 added stats exchange system to gather number of posts in unsubscribed groups without the need to actually DL the messages (reduced bw a lot) 2015-12-19 17:38:52 -05:00
Gio
b2c27a1fed Made pqiperson more readable evidence some strange code 2015-12-19 22:10:07 +01:00
csoler
b1b75a35a1 fixed stupid bug causing cleanRejectedMessages() to be called continuously 2015-12-18 08:07:00 -05:00
Cyril Soler
374aa65c66 Merge pull request #209 from csoler/v0.6-GxsDebug
added rejection list to gxsnetservice that is fed by calls from GenEx…
2015-12-17 23:10:02 -05:00
csoler
e8b881b2f1 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 2015-12-17 23:08:02 -05:00
Cyril Soler
45fb453e92 Merge pull request #208 from csoler/v0.6-GxsDebug
V0.6 gxs debug
2015-12-17 09:23:16 -05:00
csoler
55e66d090c fixed mismatch between API versions causing signed groups created with old API to fail author signature checking 2015-12-17 00:08:08 -05:00
Jessie RealityFabric
62abecdd15 Rename licence to LICENSE.txt 2015-12-16 02:00:17 -08:00
csoler
dc034fe523 removed debug info from GxsNetService 2015-12-15 23:17:35 -05:00
csoler
0c4fd8e274 added missing time-stamping of keys 2015-12-15 18:13:40 -05:00
csoler
3617f9ced0 added NXS_NET_DEBUG_5 to print summary of incoming items 2015-12-15 18:09:49 -05:00
csoler
92780b7688 added auto-request of missing GXS ids for group posts authors and group authors 2015-12-15 18:01:03 -05:00
electron128
f7ab3ad04f allow plugins to integrate into the JSON API 2015-12-15 19:56:49 +01:00
csoler
8d886b8ecc added regular timestamp-ing of GXS ids of group authors and group post authors for all subscribed groups 2015-12-15 12:31:03 -05:00
csoler
3f132f2c33 added missing timestamp at message creation time and group creation time 2015-12-14 21:13:44 -05:00
csoler
f702c942ed added a few methods to improve consistency between client and server sides, and force update of groups in some cases (such as database erased) 2015-12-13 18:22:04 -05:00
csoler
82d43eb8a0 fixed a few bugs in packet packing in pqistreamer. 2015-12-12 23:07:33 -05:00
csoler
ed7a261001 added check for NULL client update map in rsgxsnetservice::debugDump() 2015-12-12 21:07:48 -05:00
csoler
ad1aafebf7 added missing mutex 2015-12-12 14:05:45 -05:00
csoler
f6a84aa4ad added packet packing in pqistreamer. To be tested for improvement in bw 2015-12-12 11:52:48 -05:00
csoler
534be72360 improved debug info in rsgxsnetservice.cc 2015-12-11 22:54:45 -05:00
csoler
7be7233b29 fixed a number of timing issues in rsgxsnetservice. To be tested. 2015-12-11 22:38:17 -05:00
csoler
66d6f053f5 added debugDump() method to display update timestamps of GXS groups on both sides 2015-12-11 19:01:20 -05:00
csoler
16d815f891 added protocol documentation in rsgxsnetservice.cc 2015-12-11 18:03:44 -05:00
csoler
039db26cd2 improved debug info in rsgxsnetservice.cc 2015-12-10 22:25:09 -05:00
csoler
c9af8e3240 improved debug info in rsgxsnetservice.cc 2015-12-10 22:08:28 -05:00
csoler
3cb3662d2d improved debug info in rsgxsnetservice.cc 2015-12-10 21:54:48 -05:00
csoler
9db0524f34 merged with upstream/master 2015-12-10 00:10:51 -05:00
csoler
9843c1fb34 started updating debug info in gxsnetservice 2015-12-10 00:03:01 -05:00
csoler
893f178ce1 changed GxsTunnel method for computing turtle hash, to avoid crashing old peers 2015-12-07 23:09:44 -05:00
csoler
0957e7068a 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) 2015-12-07 22:39:45 -05:00
Cyril Soler
e2542a6c50 added missing check after deserialisation of grouter item which caused a crash when receiving a malformed message data 2015-12-07 10:02:04 -05:00
csoler
0c1e6301b3 merged with latest upstream trunk 2015-12-05 16:49:00 -05:00
electron128
7cd880e1e4 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)
2015-12-05 17:00:57 +01:00
Cyril Soler
0ac76d621e Merge pull request #188 from csoler/v0.6-SecuredTunnelService
V0.6 secured tunnel service. Please reports bugs to me (I have tested with valgrind and as many configurations as possible, but the multi-service gathering into GXS tunnels shared for each GXS id pair is not a totally simple thing, so I expect to have missed a few issues).
2015-12-05 10:28:16 -05:00
csoler
325956e8ed renamed flag for messaging permissions to a more appropriate name 2015-12-04 23:15:52 -05:00
csoler
be17a563d1 fixed compilation and added flag function for permissions in messaging 2015-12-04 23:08:49 -05:00
csoler
9193d3579b merged with latest master before creating PR 2015-12-04 21:24:51 -05:00
csoler
318be3a2ad fixed a few bugs in distant chat: disabled history (for now), improved tunnel handling 2015-12-04 00:06:14 -05:00
csoler
b198f1a007 fixed some cleaning of remotely closed tunnels in GxsTunnelService 2015-12-03 00:34:13 -05:00
realityfabric
9f561993ee fixed spelling errors in several files 2015-12-02 06:18:17 -08:00
csoler
81b196d38d added GUI to display authenticated tunnel info. Added counting of data sent/recvd. 2015-12-01 23:40:35 -05:00
csoler
266652f70e put ifdefs around debug info in tunnel service 2015-11-30 21:02:12 -05:00
csoler
12866cd735 fixed a few bugs in new distant chat 2015-11-30 20:51:47 -05:00
csoler
81ab43beb9 fixed GUI update of avatars and status for distant chat. Updated backend for new model. Fixed a few bugs in serialisation 2015-11-30 00:02:44 -05:00
csoler
6951d730a5 debugging of GxsTunnel service - fixed transport layer 2015-11-28 18:02:57 -05:00
csoler
a29f15ae32 fixed compilation, added missing methods for new distant chat 2015-11-28 14:55:56 -05:00
csoler
6ca49a2d98 fixed serialisation methods for GxsTunnel service 2015-11-27 23:37:39 -05:00
csoler
a2e0f4196b updated GUI for new distant chat 2015-11-26 20:40:06 -05:00
Cyril Soler
874f304cd2 Merge pull request #167 from G10h4ck/pqicleaning
Removed some cruft like mymethod(){return;} from pqi
2015-11-26 14:48:30 -05:00
csoler
87ede7eff5 removed debug info 2015-11-25 18:41:40 -05:00
csoler
bca89c63c6 fixed serialisation bug and added new GUI bits 2015-11-25 18:08:53 -05:00
csoler
26f4523f5f fixed compilation 2015-11-25 17:34:13 -05:00
csoler
b552408aab added service part and item queues to GXS tunnel service 2015-11-24 21:57:59 -05:00
csoler
19f1a82bd8 fixed compilation 2015-11-23 22:31:31 -05:00
csoler
85a9e4cbae coding phase done. Needs testing/debugging 2015-11-23 22:19:18 -05:00
csoler
5c0f1dac08 saving ongoing work. Implementation almoast finished. 2015-11-22 23:19:46 -05:00
csoler
8df9d4be04 added some doc for tunnel service. Fixed a few function prototypes 2015-11-22 11:36:14 -05:00
Jenster
699299ae8a latest OSX patches 2015-11-20 08:10:59 -08:00
csoler
3fbbc57a1f added update of flags for contacts 2015-11-19 23:04:13 -05:00
csoler
1347ee4b37 added regular contacts list and method to move RsGxsIds from/into this list 2015-11-19 22:58:28 -05:00
csoler
1de55d8fc5 replaced the few bools in RsIdentityDetail by a set of flags 2015-11-19 21:14:32 -05:00
csoler
cb97ce6f72 half-way through GxsTunnel service 2015-11-18 23:56:35 -05:00
csoler
7bcbc70d21 added interface file for gxs tunnel service 2015-11-17 18:12:46 -05:00
csoler
cb8b814543 added gxs tunnel service, based on distant chat code. Does not compile yet 2015-11-17 18:11:00 -05:00
Cyril Soler
0751876303 changed MAX_CACHE_SIZE to not use the default (fixes previous commit that was wrong) 2015-11-16 14:06:45 -05:00
csoler
b44d08ac4c changed GXS id cache size to 5000 instead of 100. Should help a lot GXS id handling 2015-11-14 21:18:26 -05:00
electron128
413cee375c 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. 2015-11-06 19:50:59 +01: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
AsamK
0e2417dfd7 Hide debug messages from p3historymgr 2015-11-05 15:15:41 +01:00
AsamK
f06d150f86 Add missing return 2015-10-31 15:14:26 +01:00
csoler
1bc2892753 removed some debug info 2015-10-30 21:11:44 -04:00
Gio
8936dafe4d Remove unnecessary overloading from pqissllistener 2015-10-30 20:12:46 +01:00
Gio
bb7cfc6387 Remove more cruft 2015-10-30 09:42:33 +01:00
Gio
30e40470e2 Removed some cruft like mymethod(){return;} from pqi 2015-10-30 09:23:59 +01:00
csoler
e56ba457fe attempt to fix the crash at exit, due to some threads asking for memory while the memory management structure is already gone 2015-10-28 21:22:07 -04:00
csoler
b04ce5ef1c removed debug info 2015-10-27 22:47:02 -04:00
csoler
79c80c968a fixed a few bugs in display of tracking info 2015-10-27 22:41:29 -04:00
csoler
2096cd6c52 added backward compatibility and API extension for RsGxsGrpMetaData 2015-10-27 20:15:50 -04:00
csoler
d69f2709c3 restored constants and output to non debugging state 2015-10-27 00:02:16 -04:00
csoler
c7d0e4cb35 enabled ID tracking forums. Fixed thresholds for anti-spam forums. Changed computation of reputation scored 2015-10-26 23:38:10 -04:00
csoler
b009c1135f changed RsGenExchange strategy to use a threshold on reputation when validating posts 2015-10-25 23:45:33 -04:00
csoler
e60ac99994 added bias to reputation score for known and signed ids. Changed computation formula to an exp 2015-10-25 22:54:56 -04:00
csoler
f24bddf6f1 merged with upstream head 2015-10-25 20:42:41 -04:00
csoler
207e84d719 added new flag for msg tracking 2015-10-25 18:27:15 -04:00
csoler
3de29c589c added load/save of message tracking info 2015-10-25 18:07:17 -04:00
csoler
47dd70fbe8 added non selective tracking for GXS messages 2015-10-25 17:26:34 -04:00
electron128
afa3f53b14 fix #150 cannot create pgp signed gxs identity: give users infinite time to type in their password 2015-10-25 14:50:28 +01:00
csoler
7db3bb1c9b disabled debug info in GenExchange 2015-10-24 12:55:49 -04:00
csoler
e0db78f71a reject messages signed by non PGP-signed IDs from non anonymous forums 2015-10-24 10:41:31 -04:00
csoler
febd348d24 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 2015-10-24 00:22:55 -04:00
csoler
a6851b63dc renamed old flags into indices in rsgenexchange.cc. Fixed up duplicate constants between GxsGroupDialog and rsgxsflags.h 2015-10-23 22:53:00 -04:00
Gioacchino Mazzurco
71073c19b6 Respect passed parameters in unix_socket 2015-10-23 10:53:31 +02:00
csoler
21c31fb446 modifications to item encryption so as to match APIs 2015-10-22 20:24:36 -04:00
csoler
1d1904cae1 added missing memory clean calls in X509 certificate generation 2015-10-20 21:03:08 -04:00
csoler
6398ed2c17 added checks for result of pthread_create (issue #126) 2015-10-20 18:39:32 -04:00
csoler
f49f7ac763 added missing EVP_CIPHER_CTX_cleanup calls (issue #128) 2015-10-20 18:32:10 -04:00
csoler
78e9123f8c added missing delete (issue #135) 2015-10-20 18:20:37 -04:00
Cyril Soler
24a685f5a2 Merge pull request #148 from G10h4ck/unsanelan
Removed flawed logic samenet/samesubnet
2015-10-20 18:03:06 -04:00
Sergei Reznikov
34758be52a Add Haiku support 2015-10-20 20:32:44 +03:00
Phenom
3c9774d3de Fix some PreProcessor errors for MiniUPnP and LibAVUtil. 2015-10-17 12:15:36 +02: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
Gio
16a5eed453 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 2015-10-17 10:27:49 +02:00
Cyril Soler
8e6c7cd075 changed SSL cert size to 4096 bits as suggested by cave 2015-10-16 12:49:10 -04:00
csoler
441b164c73 fixed small bugs in average friend reputation display 2015-10-13 21:54:52 -04:00
csoler
410102a7fc fixed bug causing lobby messages signed by IDs linked to unknown PGP keys to be dropped 2015-10-13 21:34:53 -04:00
Phenom
47c47d144e Fix Compilation on Win32 after PR#143 merged. 2015-10-12 23:21:17 +02:00
csoler
71c8dfdc58 manual merge before creating a conflict-free PR 2015-10-12 14:45:11 -04:00
csoler
f18cc8295e fixed up constants for reputation system, now that is has been tested 2015-10-12 14:22:51 -04:00
csoler
7dc59845e9 added update for forum messages list when an author gets banned 2015-10-12 14:03:53 -04:00
csoler
5a3756f058 fixed bug on reputation cutoff. Updated tooltips 2015-10-12 10:41:48 -04:00
csoler
36101a977d fixed small bug preventing msg exchange 2015-10-12 00:28:21 -04:00
csoler
82c16c6a27 fixed GUI tooltips over banned items. Added dropping of messages from banned identities in chat lobbies 2015-10-11 22:08:19 -04:00
csoler
1a76bea6ff enabled bannign button in forums, and disable message passing for banned users 2015-10-11 21:41:35 -04:00
csoler
ebe48f495d added proper memory release after mallocs in distant chat (SVN bug 383) 2015-10-11 11:12:11 -04:00
csoler
e309dd6fed fixed banning users from forum threads 2015-10-11 10:00:11 -04:00
csoler
68ca57ce75 added removal of messages frm banned users 2015-10-10 18:27:15 -04:00
csoler
59d2ca9c3d fixed bug causing uninitialised friend average reputation to be shown 2015-10-09 18:55:07 -04:00
csoler
338fcee865 added button in forums to flag poster identity as bad 2015-10-09 18:51:16 -04:00
csoler
ce96e88925 debugging of reputation system 2015-10-09 17:51:10 -04:00
csoler
bb7a8f2732 fixed some reputation sending bugs 2015-10-08 23:54:18 -04:00
csoler
8c6c9344fe fixed a few bugs in reputation items serialisation code and GUI display 2015-10-08 23:02:34 -04:00
csoler
1cf9c34207 fixed compilation for MacOS 2015-10-08 19:48:22 -04:00
csoler
4a4625e2bf fixed compilation for windows (to be tested) 2015-10-08 18:54:12 -04:00
csoler
3d21d99601 added debug info for reputation system 2015-10-08 18:39:50 -04:00
csoler
80ed6d1815 added pruning of opinions to limit data in memory. Fixed up types and sending/receiving friends opinions 2015-10-07 23:44:24 -04:00
csoler
e776effc0d added new method rsGetHostByName to use gethostbyname_r for re-entrant calls. Updated dnsresolver and extaddrfinder to use it. Suggestion by GuessWho #125 2015-10-07 21:24:31 -04:00
csoler
f1f722a767 added missing shutdown of non responsive socket that could leak FDs (suggested by GuessWho 2015-10-07 19:08:35 -04:00
csoler
39672b2df6 fixed typo causing non free of mutex_buf structure in pqissl.cc 2015-10-07 18:59:58 -04:00
csoler
78e6f67c69 added some documentation in p3gxsreputation.cc, and the method for computing final assessment 2015-10-06 23:56:39 -04:00
csoler
b0940890cd fixed compilation 2015-10-06 22:39:14 -04:00
csoler
9f6bc0c3fc added code for all reputation items 2015-10-06 00:11:18 -04:00
csoler
7a7f4c99a3 added missing file 2015-10-04 23:18:31 -04:00
csoler
317e7ea5ab added some backend for reputation system 2015-10-04 23:14:49 -04:00
csoler
c17dddb79c updated GUI for reputation 2015-10-04 17:47:30 -04:00
Cyril Soler
9158ed64ef fixed potential buffer overrun (reported by GuessWho) 2015-10-03 10:46:36 -04:00
csoler
1c12178874 finished implementing decryption routines. Still needs fixing compilation 2015-10-01 23:37:50 -04:00
csoler
6626538cab half way through RsNxsItem encryption 2015-09-27 23:53:55 -04:00
Gio
e83ae76320 pqiconnect remove ni NULL pointer check as it would crash anyway for null pointer dereferencing before checking 2015-09-27 21:51:06 +02:00
Gio
28b9a443a2 Write in a sane way pqissl::connect_parameter 2015-09-27 21:51:06 +02:00
Gio
b16ecc89c8 Remove some garbage from pqissl 2015-09-27 15:38:31 +02:00
csoler
3025f4d485 removed aliasign problem that breaks compilation on gentoo 2015-09-24 18:18:11 -04:00
csoler
22d4893721 removed a few compilation warning that might cause compilation errors on some systems 2015-09-24 18:03:19 -04:00
Cyril Soler
0614a24bbb Merge pull request #111 from csoler/v0.6-ImprovedExtIPDetermination
Improved reliability of the determination of external address
2015-09-23 22:11:50 -04:00
csoler
24b3325792 Improved reliability of the determination of external address: removed DHT stunner from the pool, added mPeerMgr which vote is based on ext address most often reported by peer discovery 2015-09-23 21:45:15 -04:00
csoler
e8c93a5639 started with new crypto methods for multiple peers 2015-09-23 18:40:55 -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
csoler
7293cd3afa updated ubuntu changelog 2015-09-21 22:58:58 -04:00
Cyril Soler
66691d4f37 Merge pull request #108 from sehraf/i2p
Adding I2P support to RS
2015-09-16 20:01:39 -04:00
sehraf
6202e83c32 add default case to gui instead of falling back to tor labeling 2015-09-16 11:48:32 +02:00
sehraf
1dd3375c59 hide debug output 2015-09-15 17:14:55 +02:00
sehraf
d24b281948 optimizations
* reduced calls to mPeermgr
* use switch convenience
* small fixes
2015-09-15 17:10:48 +02:00
sehraf
bfcf43f0e1 fixed connection type detection and other small things 2015-09-15 16:18:46 +02:00
sehraf
6b87c38951 small fixes 2015-09-14 14:56:14 +02:00
sehraf
4b19e73975 added comments to functions 2015-09-14 09:56:43 +02:00
csoler
85e6eca2f0 added serialisation for encrypted items 2015-09-12 16:27:01 -04:00
csoler
d304c7fea6 fixed bug in deserialisation causing the wrong method to be called 2015-09-12 09:37:36 -04:00
csoler
225e8f130b changed serialisation methods to use c++ in rsnxsitems, added two new items for encrypted data, renamed classes RsNxsSyncGrp and RsNxsSyncMsg to RsNxsSyncGrp/MsgReqItem 2015-09-12 00:39:35 -04:00
thunder2
ebd5da5e83 Optimizations in RsGenExchange, p3GxsForums and p3GxsChannels.
- Removed not used variables
- avoid copy constructors
- Use swap instead of operator= to move elements of std containers
2015-09-09 09:46:46 +02:00
thunder2
c4061fc6aa Removed not used time consuming calculation of row count from RetroCursor. 2015-09-08 15:14:26 +02:00
thunder2
29a1fa2ce4 Removed unnecessary copy of results in RsGxsDataAccess. 2015-09-08 15:07:45 +02:00
sehraf
0bc77d75ae added some error handling 2015-09-08 13:48:30 +02:00
sehraf
4fc6c73dd9 replaced some ifs with switch 2015-09-07 23:40:52 +02:00
sehraf
fed43450ae made server settings more generic and added i2p support 2015-09-07 23:01:24 +02:00
sehraf
95d6b06eb5 first working version 2015-09-07 21:34:10 +02:00
sehraf
0107f4e406 first run on gui integration 2015-09-07 21:34:10 +02:00
sehraf
ba74c04581 removed duplicated code, fixed compile, few additions 2015-09-07 21:34:10 +02:00
sehraf
c17d0e1498 add i2p support to libretroshare 2015-09-07 21:34:10 +02:00
csoler
a1ce7f2d6f updated branch to upstream/master 2015-09-06 17:37:13 -04:00
csoler
697b7be5d1 fixed compilation of circles 2015-09-06 17:34:43 -04:00
AsamK
0793a6a52d Use PLUGIN_DIR to define plugin directory only once 2015-09-06 22:27:22 +02:00
AsamK
fe1ec9d510 Fixed mac compile. Moved sqlcipher.a to libretroshare.pro 2015-09-06 22:27:22 +02:00
AsamK
571336e1f4 Move duplicate common stuff out of platform parts 2015-09-06 22:27:22 +02:00
AsamK
66b9557833 Use PKGCONFIG instead of manually specifying LIBS for Linux
- The advantage is that this method automatically includes additional
  dependencies of LIBS (e.g. libupnp needs -lixml).
- Also if some distribution moves headers to non default locations the
  correct locations get added by PKGCONFIG
2015-09-06 22:27:22 +02:00
thunder2
b8e3a434cf Auto download of recommended files adds the sender as source of the download. 2015-09-06 21:28:34 +02:00
thunder2
869077b4a5 Combined selects in RsDataService::retrieveNxsGrps/RsDataService::retrieveNxsMsgs. 2015-09-06 01:13:27 +02:00
thunder2
d4226b6815 Fixed Windows compile. Moved "-lsqlcipher" to libretroshare.pro 2015-09-05 21:31:38 +02:00
AsamK
2bf81be6a7 Disable compiling of wikis in libretroshare
It is disabled in the gui anyway
2015-09-05 09:25:08 +02:00
AsamK
1f134d3431 Remove gxs CONFIG, it's always enabled now anyways 2015-09-05 09:25:08 +02:00