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,693 Commits 63 Branches 22 Tags 194 MiB
fe965d2335
Commit Graph

9693 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Cyril Soler
fe965d2335 Merge pull request #572 from csoler/v0.6-FileListsOptim 
V0.6 file lists optim
 2016-11-16 22:12:55 +01:00
csoler
ba78007cf1 added parameter to disallow hashing files which time is in the future (as they severely perturbate the synchronisation process) 2016-11-16 21:49:27 +01:00
csoler
6272856b5e added param to folderIterator to skip/follow symbolic links 2016-11-16 21:41:32 +01:00
Cyril Soler
188f3453fd Merge pull request #571 from felisucoibi/master 
fix sorting crashing with qt5 in shared files of friends
 2016-11-16 12:10:37 +01:00
felisucoibi
999ab0b98a fix sorting crashing with qt5 in shared files of friends rev3 2016-11-16 12:07:38 +01:00
felisucoibi
ee23c42db8 fix sorting crashing with qt5 in shared files of friends rev2 2016-11-16 12:05:05 +01:00
felisucoibi
1757a7b7e1 fix sorting crashing with qt5 in shared files of friends 2016-11-16 12:02:54 +01:00
Cyril Soler
176999d483 Merge pull request #570 from felisucoibi/master 
Improved total file size and a small bug with a comma in TB string of…
 2016-11-16 11:47:02 +01:00
felisucoibi
628177c302 fix for windows compile 2016-11-16 11:22:23 +01:00
felisucoibi
ddff9f5358 Improved total file size and a small bug with a comma in TB string of file size 2 CLEANED CODE 2016-11-16 11:03:02 +01:00
thunder2
e3d832cfd1 Added missing include time.h for Windows compile 2016-11-16 10:47:34 +01:00
Cyril Soler
cc452ae51e Merge pull request #569 from csoler/v0.6-FileListsOptim 
V0.6 file lists optim
 2016-11-15 22:58:37 +01:00
csoler
608d0d0a65 auto-remove remote directories for friends offline for too long (depending on whether the dir is empty or not) and also remove unused dir files 2016-11-15 21:33:39 +01:00
csoler
99860c1eb0 only allocate a remote directory entry if the peer is online, or the file already exists 2016-11-15 20:10:18 +01:00
cyril soler
de6f753fec fixed compilation due to previous commit 2016-11-15 09:18:51 +01:00
Cyril Soler
aeb683479b Merge pull request #568 from csoler/v0.6-FileListsOptim 
fixed problems with negative time shifts in DirDetails causing multip…
 2016-11-14 22:03:47 +01:00
csoler
8c8cc88503 fixed problems with negative time shifts in DirDetails causing multiple GUI bugs in File Lists and Search 2016-11-14 21:58:58 +01:00
cyril soler
d433713bd0 fixed possible uninitialised memory read in folderiterator for windows, and changed file folderiterator.cc to unix format 2016-11-14 14:10:49 +01:00
Cyril Soler
fb302002d6 Merge pull request #567 from Reedych/patch-1 
Updated link for Qt
 2016-11-14 09:56:46 +01:00
Cyril Soler
5fd11eb2a8 Merge pull request #565 from G10h4ck/master 
Add some documentation for QML app and link android readme in main README
 2016-11-14 09:56:05 +01:00
Reedych
baaa82af58 Updated link for Qt 2016-11-13 01:39:54 +07:00
Cyril Soler
17738031fd Merge pull request #562 from csoler/v0.6-FileListsOptim 
added a small trick to cache last request of RemoteDirModel::requestD…
 2016-11-12 16:12:55 +01:00
csoler
c07dd83ba9 merged upstream/master 2016-11-12 15:53:17 +01:00
csoler
5ef4e752d9 added count of total number of files and total file isze on top of shared directories 2016-11-11 20:25:11 +01:00
Gio
98183e10e7 Add some documentation for QML app and link android readme in main README 2016-11-10 11:45:41 +01:00
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