Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-02-18 05:44:14 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity
9,600 Commits 63 Branches 22 Tags
Commit Graph

9600 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gio
10ec1144eb Simplify QML to work better on both Desktop and Phone 
- Set request method to GET by default in ApiLocalConnectionHandler to avoid
/peers request fail randomly
- Use TabView instead of SwipeView to not depend on Qt 5.7.0 (latest version)
- AddTrustedNode simplified layout to avoid unexpected behaviour on some phones
- Locations add sslid property to root Item to avoid unexpected behaviour when
multiple locations are available
- TrustedNodesView color connected friends with green and offline with grey
- Ignore kdevelop 4 files
 2016-10-26 20:37:28 +02:00
Gio
ea42d822c2 Merge branch 'master' into android 2016-10-26 13:43:24 +02:00
Cyril Soler
7e536efe66 Merge pull request #549 from PhenomRetroShare/Fix_PR#536 
Fix PR#536 revealing of bad factor management in StyledElidedLabel.
 2016-10-26 11:35:30 +02:00
Phenom
32e54e53b7 Fix PR#536 revealing of bad factor management in StyledElidedLabel. 2016-10-25 18:39:22 +02:00
Cyril Soler
5f5b0d44bb Merge pull request #548 from PhenomRetroShare/Fix_PR#540 
Fix PR#540
 2016-10-24 20:16:20 +02:00
Phenom
fd5a5cc804 Fix PR#540 2016-10-24 20:11:47 +02:00
Cyril Soler
bd4c252e01 Merge pull request #539 from RetroShare/md-fix 
Update README.md
 2016-10-23 23:30:56 +02:00
Cyril Soler
f3bebc030b Merge pull request #540 from PhenomRetroShare/Fix_EmbedInHtmlAhref 
Fix handle of url in EmbedInHtmlAhref.
 2016-10-23 23:29:06 +02:00
Cyril Soler
c77d0521d0 Merge pull request #536 from PhenomRetroShare/Add_ElidedLabelToGroupTreeWidget 
Add ElidedLabel to GroupTreeWidget
 2016-10-23 23:25:53 +02:00
Cyril Soler
04992c9c29 Merge pull request #543 from PhenomRetroShare/Add_TooltipOnComments 
Add Tooltip on comments column to see too long text.
 2016-10-23 23:15:32 +02:00
Cyril Soler
e5254617cc Merge pull request #542 from PhenomRetroShare/Add_PasteRsLinkInTextFields 
Add ability to past RsLink in some more text fields.
 2016-10-23 23:14:29 +02:00
Cyril Soler
07564c7258 Merge pull request #541 from PhenomRetroShare/Fix_RsLinkCopyToClipBoard 
Fix Copy RsLink in Clipboard.
 2016-10-23 23:12:22 +02:00
Cyril Soler
5ccdc28cb1 Merge pull request #547 from hunbernd/fix/upload 
Fix: unable to upload files on Windows
 2016-10-23 22:51:32 +02:00
hunbernd
54ba617229 Fix: unable to upload files on Windows 
Caused by multiple unneeded / character in file path.
 2016-10-23 20:42:59 +02:00
Phenom
46cf25d3aa Fix Copy RsLink in Clipboard. 
Spaces and specials characters are now encoded.
 2016-10-22 17:22:22 +02:00
Phenom
a67cf92192 Add Tooltip on comments column to see too long text. 2016-10-22 16:15:36 +02:00
Phenom
9eafdd30f7 Add ability to past RsLink in some more text fields. 2016-10-22 16:03:01 +02:00
Phenom
58a4d39b0f Fix handle of url in EmbedInHtmlAhref. 
The url cannot contains space. Query and hash are now handled.
 2016-10-22 14:48:47 +02:00
cave
f20ee21ebe Update README.md 2016-10-21 19:56:02 +02:00
Cyril Soler
b8b78dd6cb Merge pull request #538 from Hopetech/master 
Fix some compilation warnings
 2016-10-19 15:50:22 +02:00
hopetech
ecaea051fa Fix some compilation warnings 2016-10-19 15:41:25 +02:00
Phenom
8483c0d0ca Add ElidedLabel to GroupTreeWidget 2016-10-16 19:00:33 +02:00
Cyril Soler
0e1fad0ff7 Merge pull request #533 from PhenomRetroShare/Fix_MissingDesktopFileShow 
Fix the "Desktop file is missing" shown in option page.
 2016-10-13 13:48:32 +02:00
Phenom
4db6d6b56f Fix the "Desktop file is missing" shown in option page. 2016-10-13 13:26:44 +02:00
Cyril Soler
64129a7dc2 Merge pull request #532 from G10h4ck/less_warning 
Fixed a bunch of warnings in safe ways
 2016-10-13 10:05:14 +02:00
Gio
8de054812b Merge branch 'master' into less_warning 2016-10-13 00:09:53 +02:00
Gio
633a6cf8c2 Fixed a bunch of warnings in safe ways 2016-10-13 00:01:33 +02:00
csoler
10c269ec5a removed warning when friend directory list cannot be found 2016-10-12 23:31:32 +02:00
csoler
bd9a464d11 added deterministic but unredictable hash generation for dir hashes, which should be preserved accross reboots. Should fix the msg from friends sending requests for the "wrong" dir hashes. 2016-10-12 23:20:38 +02:00
cyril soler
3c5e12ae84 fixed compilation on windows 2016-10-10 11:29:03 +02:00
csoler
4e48005047 replaced explicit old code in cleanupDirectory() by new code based on FolderIterator 2016-10-09 21:43:31 +02:00
csoler
957d48b5fc removed folderIterator::d_name() because it duplicates file_name() 2016-10-09 21:43:31 +02:00
Cyril Soler
32816eda71 Merge pull request #531 from PhenomRetroShare/Fix_AvatarOnEditCircle 
Fix Missing ID-Avatars in Create Circle Menu
 2016-10-09 18:23:25 +02:00
Cyril Soler
6e8e5d0e87 Merge pull request #529 from cavebeat/rus_patch 
patch from sss rus translation
 2016-10-09 18:20:00 +02:00
Phenom
3d9fb600f0 Fix Missing ID-Avatars in Create Circle Menu 
Fix issue#530
 2016-10-09 12:37:09 +02:00
csoler
9e1f21b941 updated ubuntu changelog 2016-10-08 19:19:28 +02:00
cave beat
3813845343 patch from sss rus translation 2016-10-08 16:06:42 +02:00
csoler
3dbf916332 updated ubuntu changelog 2016-10-08 14:54:30 +02:00
Cyril Soler
9a3eb1cf9a Merge pull request #528 from sehraf/pr-drop-ssh-protobuf 
remove deprecated ssh/protobuf code
 2016-10-08 14:30:58 +02:00
Cyril Soler
c55fb0d0fb Merge pull request #524 from cavebeat/compile 
updated MSys2 Install Guide to .md
 2016-10-08 14:11:43 +02:00
Cyril Soler
97f2589a1f Merge pull request #513 from grennvyper/patch-1 
Update retroshare_de.ts
 2016-10-08 14:09:34 +02:00
Cyril Soler
aa200bfbb6 Merge pull request #526 from marcobarbosa16/master 
add uninstall section in README.md
 2016-10-08 14:06:54 +02:00
Cyril Soler
259181889f Merge pull request #515 from PhenomRetroShare/Add_ContextMenuToShowImageInLobby 
Add context menu to show hidden image on lobby.
 2016-10-08 14:04:31 +02:00
Cyril Soler
9ed759d0db Merge pull request #527 from PhenomRetroShare/Fix_DesktopFileName 
Fix Desktop Filename for option page message.
 2016-10-08 13:38:18 +02:00
sehraf
ada1cee2c8 remove deprecated ssh/protobuf code 2016-10-08 12:59:27 +02:00
Phenom
4b0f82a6d0 Fix Desktop Filename for option page message. 2016-10-08 12:12:37 +02:00
Marco Barbosa
69ecca4281 add uninstall section in README.md 2016-10-07 23:12:40 -03:00
cyril soler
7cd31aa788 fixed bug preventign update of subdirs after last commit 2016-10-05 14:15:12 +02:00
Phenom
fdfd2e9248 Add context menu to show hidden image on lobby. 
A tooltip show hidden image too.
The RSImageBlockWidget is removed.
 2016-10-05 12:27:31 +02:00
cyril soler
854eebb2cb only update subfiles and subdirs list during dir watching sweep when the TS of the dir has changed. Greatly improve cost of regular directory watching process 2016-10-05 11:00:01 +02:00