Commit Graph

10518 Commits

Author SHA1 Message Date
Thunder
ae8fc61c59 Merge pull request #564 from PhenomRetroShare/Fix_WindowsCompil
Fix windows compile with sys/socket.h
2016-11-09 06:37:52 +01:00
Phenom
2827233880 Fix windows Compil with sys/socket.h 2016-11-08 23:04:34 +01:00
csoler
61131e4bf5 simplified the remoteDirModel cache system a little bie 2016-11-08 19:56:07 +01:00
csoler
644c41e2e7 added a small trick to cache last request of RemoteDirModel::requestDirDetails 2016-11-07 22:24:02 +01:00
Cyril Soler
befeb44f07 Merge pull request #550 from G10h4ck/android
Android - Still need to remove all refs to Qt.
2016-11-07 20:55:02 +01:00
Gio
8ab3c7de26 Merge branch 'master' into android 2016-11-07 14:37:23 +01:00
Gio
beaf479732 Remove rotten code in rsloginhandler autologin 2016-11-07 14:14:28 +01:00
cyril soler
461975f115 generally prevent threads to start twice, and fixed bug causing DirWatcher to be run twice 2016-11-07 10:09:28 +01:00
thunder2
eb95c6895a Windows build environment:
- Renamed folder build_libs to build-libs
- Removed old file stripSVN.sh
- Fixed some batch files
- Switch from curl to wget
- Added Qt environment
- Added build.bat to build everything
2016-11-07 09:42:45 +01:00
Cyril Soler
00085728ae Merge pull request #514 from PhenomRetroShare/Add_MacOSInTravisCI
Add MacOS compilation test on Travis CI
2016-11-06 19:15:05 +01:00
Phenom
7a58a87859 Add MacOS compilation test on Travis CI 2016-11-06 17:08:12 +01:00
csoler
c1b1e25920 updated ubuntu changelog and added control file for ubuntu 16.10 2016-11-06 12:32:59 +01:00
Cyril Soler
17fb682c8d Merge pull request #559 from jolavillette/PacketSlicingGroupingFlags
Create 2 #define in pqistreamer to easily disable packet slicing/grouping
2016-11-05 21:09:49 +01:00
csoler
8cebb33ded updated ubuntu changelog 2016-11-05 20:59:41 +01:00
BuildTools
78d6735b52 Create 2 #define in pqistreamer to easily disable packet slicing/grouping 2016-11-05 19:58:06 +01:00
csoler
e4e366766f fixed bug that caused hierarchies that contain files being hashed to not send updates when the hash is finished 2016-11-05 17:32:40 +01:00
csoler
390bdfe12f added request for sync on double click item for shared file lists 2016-11-05 17:03:31 +01:00
csoler
a97fa1e2cb fixed generation of pseudo-random request ids in p3filelists 2016-11-05 16:07:30 +01:00
csoler
1e919a141c set delay between directory sweep to 60 secs and a-synced sweeps for different friends. Set drop time to 600 for un-answered dir sync requests 2016-11-05 15:30:07 +01:00
BuildTools
192cbe1eda Create two #define in pqistreamer.cc to easily disable packet slicing and/or grouping 2016-11-05 14:57:39 +01:00
csoler
ffcf44b3fe removing call to drand48(). RSRandom is safer 2016-11-04 21:54:28 +01:00
csoler
2ef51edb8c fixed wrong comment about RS_FILE_HINT_SEARCHABLE flag 2016-11-04 21:51:18 +01:00
csoler
79632ed27b fixed compilation on windows 2016-11-04 21:48:58 +01:00
csoler
f39272a709 fixed compilation in debug mode for p3filelists.cc 2016-11-04 21:43:09 +01:00
Cyril Soler
8c1a6537b4 Merge pull request #557 from mr-alice/v0.6-FTEncryption
V0.6 ft encryption
2016-11-04 20:02:14 +01:00
mr-alice
2bb9a87b3b merged and fixed conflict with upstream/master 2016-11-04 13:52:11 +01:00
mr-alice
30860b8f1a removed ^M that polluted unittests.pro 2016-11-04 13:46:20 +01:00
Cyril Soler
45cb442834 Merge pull request #558 from csoler/v0.6-FileListsOptim
reducing linear cost of allocateNewIndex to constant. Should improve …
2016-11-04 09:47:49 +01:00
Cyril Soler
2bf2465653 Merge pull request #498 from PhenomRetroShare/Fix_ElCapitanCompil
Fix El Capitan OSX 10.11 Compil and older
2016-11-04 09:18:34 +01:00
csoler
8dacb22049 reducing linear cost of allocateNewIndex to constant. Should improve huge lags when receiving big file lists for the first time 2016-11-03 22:32:27 +01:00
mr-alice
e324d7d251 removed warning in ftserver for rejected non encrypted tunnels 2016-11-03 20:31:47 +01:00
mr-alice
8653649132 fixed two bugs in ShareManager popup menu 2016-11-03 20:26:35 +01:00
mr-alice
29b5bfe049 attempt to fixed leading tabs 2016-11-03 08:50:13 +01:00
Phenom
2db8dbd45f Fix El Capitan OSX 10.11 Compil 2016-11-02 21:40:46 +01:00
mr-alice
1c2cfb2a03 removed debug info in ftServer 2016-11-02 21:32:14 +01:00
mr-alice
5aef67d332 fixed tooltips in ShareManager, and fixed anonymous search mechanism 2016-11-02 21:31:14 +01:00
mr-alice
d2118c5329 supressed deadlock in ftController due to calling ftServer from ftcontroller itself 2016-11-02 20:51:42 +01:00
Cyril Soler
46dd5be2f2 Merge pull request #554 from hunbernd/feature/paste-RS-link
Automatically detect retroshare links when pasting text
2016-11-01 16:30:46 +01:00
mr-alice
02f442a400 changed naming for files visibility 2016-11-01 14:28:00 +01:00
mr-alice
8c7c7647b0 fixed conflicts in merging upstream/master to v0.6-FTEncryption 2016-11-01 14:23:13 +01:00
mr-alice
6a3610e6cb disallow double tunnels (encrypted+clear) in Accepted mode, since it is not needed 2016-11-01 14:13:43 +01:00
mr-alice
ffdac640d8 fixed swarming with encrypted end-to-end tunnels 2016-11-01 11:57:25 +01:00
mr-alice
c6df59a421 fixed bug in duplication of virtual dir names 2016-11-01 11:11:28 +01:00
mr-alice
761d595cb7 fixed layout and names in ShareManager and SharedFilesDialog 2016-11-01 10:46:29 +01:00
mr-alice
3430eece22 fixed display of share flags as a proper nice icon set 2016-11-01 10:30:36 +01:00
mr-alice
8fe85b9bdd improved ShareManager a little bit more 2016-10-31 23:24:35 +01:00
mr-alice
9d586bcfb0 made a drastic simplification pass on the ShareManager, which now only needs a single window except for selecting files using a QFileDialog 2016-10-31 16:28:26 +01:00
mr-alice
e8e054eeae addednew flag for anonymous search. Merged the two browsable flags in one single flag. 2016-10-31 14:26:01 +01:00
Cyril Soler
f934e88fdf Merge pull request #555 from hunbernd/fix/random-emoji-order
Fixed emoticon order
2016-10-31 12:12:40 +01:00
hunbernd
36dc532da6 Automatically detect retroshare links when pasting text 2016-10-31 01:07:50 +01:00