Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity
9,200 Commits 63 Branches 22 Tags 194 MiB
fc5176a652
Commit Graph

9200 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
csoler
a3a0b1d312 added proper menus for adding/removing IDs from circles 2016-05-12 22:30:12 -04: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
csoler
d01c61fde8 added items for encoding subscription requests and the logic to create them from GUI calls 2016-05-11 17:59:42 -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
csoler
2591e3ff25 changed prototype of Radix encoding to take unsigned char* instead of char* 2016-05-10 22:17:48 -04:00
csoler
9a86989060 first version of circle messages 2016-05-10 21:24:31 -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
csoler
c9846c0dcf added proper context menu for requesting/cancelling circle subscription 2016-05-06 22:12:44 -04:00
csoler
83049259f2 added bullets to show subscription status of circles. Enabled message sync in circles. Changed flags in GxsCirclesDetails to include new subscription flags 2016-05-06 21:37:17 -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
csoler
e50e686dd2 updated the debug message for incoming data with no registered tunnel 2016-05-04 18:01:23 -04:00
Cyril Soler
40f8313236 Merge pull request #307 from hunbernd/fix/sqlcipher-version 
Sqlcipher version fix
 2016-05-04 15:32:17 -04:00
csoler
ca003c5f9e added missing initialisation of deleted memory before calling realloc 2016-05-03 20:55:50 -04:00
Cyril Soler
0ff2941adf Merge pull request #365 from zeners/master 
webui: fixed build things
 2016-05-03 13:11:41 -04:00
zeners
f4a4765ba6 Merge remote branch 'origin/master' 2016-05-03 19:04:42 +02:00
zeners
962dd91e0a webui: include files on first clean build 
update website-title to 6
 2016-05-03 19:02:07 +02:00
csoler
aec8b4d27c fixed bug in counting of incoming data size for sliced packets 2016-05-02 18:10:39 -04:00
csoler
70648398e2 merged with upstream/master 2016-05-01 15:22:13 -04:00
Nyfor
f3bc97873b Updated Travis file. 2016-05-01 21:09:21 +02:00
csoler
ef5b9e1bd7 updated ubuntu changelog 2016-04-30 18:39:43 -04:00