Commit Graph

9744 Commits

Author SHA1 Message Date
csoler
6937d870b0 changed from std::string to RsPgpId to represent openned items in FriendList 2016-11-27 20:57:51 +01:00
csoler
f3d7948238 turned one error into a warning in p3filelists.cc when requesting an unexisting ref 2016-11-27 20:57:51 +01:00
defnax
8b22924b25 Merge branch 'master' of https://github.com/RetroShare/RetroShare 2016-11-27 18:00:26 +01:00
defnax
cfd4afdc07 Update emoticons file 2016-11-27 17:59:15 +01:00
defnax
521663698f Merge pull request #585 from PhenomRetroShare/Add_RSELidedItemDelegate
Add RSElidedItemDelegate.
2016-11-27 16:42:45 +01:00
defnax
486c11377f Changed smiley widget default width
Update Emotes file
2016-11-27 15:58:53 +01:00
defnax
0f6392128b Fixing icon size for smiley widget. 2016-11-27 00:11:21 +01:00
csoler
1499092157 updated ubuntu changelog 2016-11-26 21:38:47 +01:00
csoler
2a758dd880 changed shared files tree header when updating 2016-11-26 19:19:15 +01:00
csoler
aa4ecd7d87 added limit to calls of PreMods() in SharedFilesDialog so as to keep CPU load minimal when updating dirs from friends. Disabled sorting when new data comes. 2016-11-26 18:58:02 +01:00
csoler
d01644c854 added back the test for local/remote in SharedFilesDialog as it reduces the load anyway 2016-11-26 11:26:02 +01:00
csoler
4ef1b08ee8 attempt to fix emoticons sizes on high DPI screens 2016-11-26 11:22:35 +01:00
csoler
3386238f35 improved preservation of directories when updating, and allow to temporarily disable sorting while an update is received 2016-11-26 11:03:53 +01:00
defnax
7aaf3306f0 Added category icons for Smiley Groups
Updated emotes file, sorted Emoticons.
2016-11-26 00:02:58 +01:00
Cyril Soler
c92c270a4e Merge pull request #584 from mr-alice/v0.6-FileLists
added an option to follow symbolic links or not, and anti-loop system…
2016-11-25 22:30:47 +01:00
Phenom
d4c3372dec Add RSElidedItemDelegate.
This works like ElidedLabel.
2016-11-25 22:14:17 +01:00
mr-alice
729c05af4f merged with upstream code 2016-11-25 21:09:34 +01:00
csoler
d975a18fd6 added doubling of buffer size in checkSectionSize when missing space. Used 1024 instead of 1000 as start size 2016-11-25 21:06:40 +01:00
mr-alice
2953957e66 added full re-scan when symbolic links are (des)activated, since the directory time stamps will not trigger an update 2016-11-25 20:50:10 +01:00
mr-alice
3f3efca22d removed canonicalize_file_name from MacOS compilation 2016-11-25 20:33:27 +01:00
csoler
5fbc263a36 applied removal of realloc to other files in file_sharing/ directory 2016-11-25 20:05:23 +01:00
csoler
0cb7778ceb removed all calls to realloc causing major slow down on windows where its implementation is extremely inefficient 2016-11-25 18:52:04 +01:00
mr-alice
5f69c9ea1f added an option to follow symbolic links or not, and anti-loop system during directories traversal 2016-11-24 23:42:56 +01:00
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