Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-26 07:59:35 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity
9,000 Commits 63 Branches 22 Tags 196 MiB
ed867c52bd
Commit Graph

9000 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
csoler
59aef8ab7b added packet slicing for large broadcast chat items, and output warning when chat of serialised item is too big. Also fixed a couple of bugs in the handling of chat packets 2016-05-26 20:33:24 -04:00
csoler
1b5d31ff7f attempt to fix the wrong display of uploaded size for files > 4Gb (to be confirmed) 2016-05-22 21:15:18 -04:00
Cyril Soler
4c5c09cbc8 Merge pull request #390 from PhenomRetroShare/Fix_MutexInPqiPersonGrp 
Fix Mutex in pqipersongrp for pqilistener by adding local Mutex.
 2016-05-19 10:11:15 -04:00
anon tahoe
abe0e02910 replaced mktemp by mkstemp (cherry-picked from anontahoe repository) 2016-05-18 21:29:55 -04:00
Phenom
af5129c26d Fix Mutex in pqipersongrp for pqilistener by adding local Mutex. 2016-05-18 19:15:37 +02:00
Cyril Soler
9f560696e9 Merge pull request #389 from PhenomRetroShare/Fix_ClearWebAPIWhenClearChatHistory 
Fix Clear WebAPI when clear chat history in GUI and server is not running.
 2016-05-17 11:21:03 -04:00
Phenom
07191a7c0b Fix Clear WebAPI when clear chat history in GUI and server is not 
running.
 2016-05-17 16:50:59 +02:00
Cyril Soler
f3aed813af added test over signature size to avoid possible memory corruption (Anonymous source) 2016-05-17 10:39:56 -04:00
Cyril Soler
116e7422b9 Merge pull request #388 from PhenomRetroShare/Fix_OpenExistingFileAsWarning 
Change Open existing file link from Question to Warning.
 2016-05-16 12:25:51 -04:00
Phenom
a2a058211c Change Open existing file link from Question to Warning. 2016-05-16 17:42:39 +02:00
Cyril Soler
20648707de Merge pull request #385 from PhenomRetroShare/Fix_RsCollectionFileLoadCall 
Fix RsCollectionFile::load(QString, bool) calls.
 2016-05-16 10:29:58 -04:00
Phenom
1f8f413c85 Fix RsCollectionFile::load(QString, bool) calls. 
Remove "this" as bool parameter.
 2016-05-16 11:32:17 +02:00
Cyril Soler
5d69072c93 Merge pull request #383 from PhenomRetroShare/Fix_FreeTcpPacketIfPeersUnknown 
Free TcpPacket pointer if returns because peer is unknown.
 2016-05-14 18:53:57 -04:00
csoler
4dc62d0e38 updated ubuntu changelog 2016-05-14 15:45:24 -04:00
Cyril Soler
5bb570e90e Merge pull request #384 from PhenomRetroShare/Fix_RsAccountsDetailPrivateInit 
Fix Initialisation of Private in RsAccountDetails
 2016-05-14 10:57:52 -04:00
Phenom
7fd84f28fe Fix Initialisation of Private in RsAccountDetails 2016-05-14 16:50:17 +02:00
Phenom
6f03fa6601 Free TcpPacket pointer if returns because peer is unknown. 2016-05-13 17:58:38 +02:00
Cyril Soler
52f488c84f Merge pull request #382 from PhenomRetroShare/Fix_CorrectPR378 
Move nDir->Files into condition nDir exists.
 2016-05-13 11:13:07 -04:00
Phenom
d7efeb94f9 Move nDir->Files into condition nDir exists. 
Thanks AC.
 2016-05-13 17:06:00 +02:00
Cyril Soler
4b8a1d2570 Merge pull request #380 from PhenomRetroShare/Fix_ContentValue 
Fix ContentValue::ContentValue if GetAsxxx return false.
 2016-05-12 14:42:31 -04:00
Cyril Soler
1c5bcb8466 Merge pull request #379 from PhenomRetroShare/Fix_UninitializedVar 
Fix uninitialized variables netsize, rsnetsize in p3netmgr.cc
 2016-05-12 14:41:10 -04:00
Cyril Soler
2487f3eea2 Merge pull request #378 from PhenomRetroShare/Fix_CasenDirResetedBefore 
Fix in case nDir was reset before
 2016-05-12 14:40:37 -04:00
Phenom
61e5a62b9f Fix ContentValue::ContentValue if GetAsxxx return false. 2016-05-12 20:29:12 +02:00
Phenom
ed567071a8 Fix in case nDir was reset before 2016-05-12 20:14:59 +02:00
Phenom
a1ece16f35 Fix uninitialized variables netsize, rsnetsize in p3netmgr.cc 2016-05-12 20:00:44 +02:00
Cyril Soler
1d476de806 fixed initialisation of semaphores in created thread object 2016-05-12 10:26:38 -04:00
csoler
96012ef81f new attempt to fix thread issues 2016-05-11 22:18:02 -04:00
Cyril Soler
383e40324d tried to improve the RsSemaphore class to avoid and display more info about the deadlock problem 2016-05-11 12:42:59 -04:00
Cyril Soler
e891e2be2e added missing check for ssl_connection that would cause crash when the ssl connection gets closed by another thread 2016-05-11 10:00:20 -04:00
Cyril Soler
8fdf8f81a8 fixed possible crash in rsnet.cc 2016-05-10 09:46:33 -04:00
csoler
74bb3b6a8b replaced deprecated gethostbyname by getaddrinfo. Only linux was using the re-entrant version, possibly causing bugs on windows+apple 2016-05-09 20:54:58 -04:00
Cyril Soler
f8e6937e87 Merge pull request #373 from PhenomRetroShare/Fix_LibResAPI_MacOS 
Fix compilation of LibResAPI for MacOS
 2016-05-08 18:36:41 -04:00
Cyril Soler
4b81fb0a5a Merge pull request #374 from PhenomRetroShare/Fix_MacOSVersion 
Fix preprocessor for MacOS version.
 2016-05-08 10:42:20 -04:00
Phenom
ceb092c71f Fix preprocessor for MacOS version. 2016-05-06 22:51:25 +02:00
Phenom
61d2ab5eb3 Fix compilation of LibResAPI for MacOS 2016-05-06 22:12:40 +02:00
Cyril Soler
6a7bd9018b Merge pull request #372 from zeners/master 
webui: generating web-files on qmake
 2016-05-06 08:59:59 -04:00
zeners
ae631a1eaf Merge remote branch 'origin/master' 2016-05-06 10:34:13 +02:00
zeners
08be19faa9 webui: rebuild files on qmake 
giving up: don't know why build-steps are missed
 2016-05-06 10:29:03 +02:00
zeners
13dec7ab5a webui: reset file-date on touch to force build 2016-05-06 10:06:03 +02:00
Cyril Soler
48bc31e637 Merge pull request #371 from csoler/v0.6-Threads 
V0.6 threads
 2016-05-05 23:55:16 -04:00
csoler
67e976057d removed debug output from threads 2016-05-05 22:03:46 -04:00
csoler
b5ace406b9 attempt to fix socket problem on 32bits/64bits windows, by using the proper SOCKET type instead of int 2016-05-05 21:40:29 -04:00
csoler
9847a7a45f implemented a new semaphore class that should be cross plateform 2016-05-05 20:52:10 -04:00
Cyril Soler
092345c3fb Merge pull request #363 from Nyfor/travis 
Updated Travis file.
 2016-05-05 09:49:56 -04:00
Cyril Soler
ad2df86ab3 Merge pull request #370 from Nyfor/fix-segfault-on-close 
Fix segfault on shutdown.
 2016-05-05 09:45:22 -04:00
Nyfor
dbd0418971 Fix segfault on shutdown. 2016-05-05 09:36:36 +02:00
csoler
0817aad0f9 improved debugging output of rsthreads.cc (part 3) 2016-05-04 22:51:33 -04:00
csoler
bb00e39972 improved debugging output of rsthreads.cc (part 2) 2016-05-04 22:34:03 -04:00
csoler
2e02a89874 improved debugging output of rsthreads.cc 2016-05-04 22:23:36 -04:00