Commit Graph

9821 Commits

Author SHA1 Message Date
defnax
cf270d73c0 Merge pull request #583 from PhenomRetroShare/Add_GroupedEmoticons
Add grouped emoticons.
2016-11-24 08:04:00 +01:00
Cyril Soler
1e1c19ef0f Merge pull request #582 from mr-alice/v0.6-DLQueue
V0.6 dl queue
2016-11-23 20:30:06 +01:00
mr-alice
66c3259f9c removed debug output 2016-11-23 19:12:38 +01:00
Phenom
ae8365167e Add grouped emoticons. 2016-11-23 18:48:16 +01:00
mr-alice
fb70cb2e9e removed duplicate copy/rename file methods from ftController 2016-11-22 23:39:09 +01:00
mr-alice
47b825833a fixed the download queue, and allow queued files to start when sources get online and empty slots are present 2016-11-22 23:19:34 +01:00
defnax
69f503ea05 Merge pull request #580 from sehraf/pr-improve-smiley
fix emoticons: make ':)' actually look like ':)' instead of ':D'
2016-11-22 13:26:29 +01:00
Cyril Soler
2faefe8c9d Merge pull request #581 from csoler/v0.6-FileListsOptim
added change in TS for shared directories when virtual name changes
2016-11-21 20:38:45 +01:00
csoler
172b513cd3 added change in TS for shared directories when virtual name changes 2016-11-21 16:14:11 +01:00
sehraf
2ffe3e387f fix emoticons: make ':)' actually look like ':)' instead of ':D' 2016-11-21 15:00:33 +01:00
cyril soler
5d1f479a42 fixed bug preventing plugins loaded as symbolic links to be considered by folderIterator 2016-11-21 10:13:26 +01:00
Cyril Soler
5af54254ca Merge pull request #579 from csoler/v0.6-FileListsOptim
fixed constant updating of flat dir model. Had to limit to at most 10…
2016-11-21 00:17:10 +01:00
csoler
da84b887a9 fixed constant updating of flat dir model. Had to limit to at most 10000 files to keep it interactive. 2016-11-20 20:42:14 +01:00
Cyril Soler
7b78a6843b Merge pull request #577 from PhenomRetroShare/Fix_AnchorOnChannelMessage
Fix Anchor on Channel Message
2016-11-19 23:42:07 +01:00
csoler
9718385333 added missing mutex probably causing crashes when saving directory storage 2016-11-19 20:15:53 +01:00
Phenom
007825b1fa Fix Anchor on Channel Message 2016-11-19 16:44:12 +01:00
csoler
7a2f02e11a added missing control file for xenial 2016-11-19 15:17:31 +01:00
csoler
3c32bb6030 updated ubuntu changelog 2016-11-19 15:03:47 +01:00
Cyril Soler
5b9b63efcd Merge pull request #575 from PhenomRetroShare/FixCrashOnCheckBigBigFileStorage
Fix Crash when checking a big-big file storage.
2016-11-19 14:42:43 +01:00
Phenom
a8782f0612 Fix Crash when checking a big-big file storage.
After check lot of file with errors, error_string become to big and RS
crash.
2016-11-18 23:04:32 +01:00
csoler
4bdfc6e74e removed unused old file 2016-11-18 17:56:42 +01:00
Cyril Soler
6d0293cc45 Merge pull request #573 from csoler/v0.6-FileListsOptim
V0.6 file lists optim
2016-11-17 22:10:57 +01:00
csoler
bdc8086c2e added missing mChanged=true when removign a directory 2016-11-17 21:27:37 +01:00
csoler
deadb1fcf1 small optimization of RemoteDirModel::data() 2016-11-17 21:01:01 +01:00
csoler
5339e99127 force re-sweep of remote directory that has been updated with new dir content to 10 sec 2016-11-17 21:00:34 +01:00
csoler
36755c4092 added load/save of own file hierarchy 2016-11-17 19:03:53 +01:00
cyril soler
ff4e6f3b2c added missing time.h for windows compilation 2016-11-17 14:23:25 +01:00
cyril soler
1b9fe3bc8e removed symbolic links handling from windows compilation 2016-11-17 09:31:05 +01:00
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