Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-27 16:39:29 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity
8,966 Commits 63 Branches 22 Tags 196 MiB
4b81fb0a5a
Commit Graph

8966 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
csoler
7914aeb60a use RsTemporaryMemory in signature verification 2016-04-30 17:33:47 -04:00
csoler
be7e87cb1e use RsTemporaryMemory in signature verification 2016-04-30 17:25:24 -04:00
csoler
01605e5a59 updated description f packet slicing in comments section of pqistreamer 2016-04-30 11:19:21 -04:00
csoler
1f7a94d49e fixed bug causing crash in pqistreamer 2016-04-30 11:13:51 -04:00
Cyril Soler
0bd66701ac Merge pull request #362 from zeners/master 
webui: redefined building webui
 2016-04-30 09:47:21 -04:00
zeners
0a6ae559fd webui: redefined building webui 
on linux: 'make' don't build libresapi every time anymore,
it now knows when, what and how to 'build' webui

on windows: builds old style
 2016-04-30 14:21:09 +02:00
Cyril Soler
baf940443d Merge pull request #360 from csoler/v0.6-RTT3 
V0.6 rtt3
 2016-04-29 20:09:48 -04:00
csoler
4bdd464861 removed a few debug output and timer measurement 2016-04-29 18:53:25 -04:00
csoler
6d2bfcf04e restored average kicking rate to a more reasonnable value. To be tested (for too much CPU use). Dynamically changing this value is probably needed for VOIP 2016-04-29 18:52:58 -04:00
csoler
3bc3989e79 removed debug info for pqistreamer 2016-04-29 18:41:10 -04:00
csoler
5ab9aed371 added placeholder service ID for packet slicing probe 2016-04-29 18:40:28 -04:00
csoler
654e0fc1d8 added missing call to SSL_pending, which caused decrypted data to wait in the SSL buffer when the bio is not receiving anything more 2016-04-29 17:53:21 -04:00
csoler
a4430647de various changes to measure RTTs more accurately 2016-04-26 23:42:44 -04:00
csoler
87764abe4c removed debug info in pqistreamer 2016-04-26 21:23:19 -04:00
csoler
153db5ca64 added on/off mechanism for packet slicing to ensure packward compatibility 2016-04-26 09:22:24 -04:00
csoler
3b685851d2 improved/simplified slicing protocol 2016-04-25 23:37:02 -04:00
csoler
dd81ce3bf3 using BinToHex to display mem blocks in pqistreamer debug 2016-04-25 22:50:41 -04:00
csoler
18e9e1c2db moerged with upstream/master 2016-04-24 21:29:55 -04:00
csoler
f62957534e fixed a few bugs in packet slicing in pqiQoS 2016-04-24 21:18:44 -04:00
csoler
a2c11f97c2 added packet reconstruction and deserialising 2016-04-24 13:43:34 -04:00
csoler
0d84a5585f updated ubuntu changelog 2016-04-24 11:29:21 -04:00
csoler
cad8c89746 added packet slicing in pqistreamer 2016-04-23 17:10:25 -04:00
Cyril Soler
0dc43c3e2a Merge pull request #338 from Nyfor/master 
Fixed compilation for Clang.
 2016-04-23 08:29:53 -04:00
Nyfor
5e94c772b3 Fixed compilation for Clang. 2016-04-23 09:50:49 +02:00
csoler
d696f72533 fixed compilation 2016-04-22 20:38:07 -04:00