Commit Graph

5188 Commits

Author SHA1 Message Date
Phenom
2827233880 Fix windows Compil with sys/socket.h 2016-11-08 23:04:34 +01:00
Gio
8ab3c7de26 Merge branch 'master' into android 2016-11-07 14:37:23 +01:00
csoler
390bdfe12f added request for sync on double click item for shared file lists 2016-11-05 17:03:31 +01:00
mr-alice
2bb9a87b3b merged and fixed conflict with upstream/master 2016-11-04 13:52:11 +01:00
mr-alice
8653649132 fixed two bugs in ShareManager popup menu 2016-11-03 20:26:35 +01:00
Phenom
2db8dbd45f Fix El Capitan OSX 10.11 Compil 2016-11-02 21:40:46 +01:00
mr-alice
5aef67d332 fixed tooltips in ShareManager, and fixed anonymous search mechanism 2016-11-02 21:31:14 +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
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
hunbernd
36dc532da6 Automatically detect retroshare links when pasting text 2016-10-31 01:07:50 +01:00
hunbernd
05b5c08e9f Fixed emoticon order 2016-10-30 19:42:28 +01:00
mr-alice
5b9ef04358 improved debug output in ftserver 2016-10-30 15:33:05 +01:00
mr-alice
34dcb410b4 fixed a few bugs in ftServer for encrypted tunnel management 2016-10-30 11:36:00 +01:00
mr-alice
babc126be3 added default encryption policy variable and GUI to change it 2016-10-29 17:59:03 +02:00
Gio
ea42d822c2 Merge branch 'master' into android 2016-10-26 13:43:24 +02:00
Phenom
32e54e53b7 Fix PR#536 revealing of bad factor management in StyledElidedLabel. 2016-10-25 18:39:22 +02:00
Phenom
fd5a5cc804 Fix PR#540 2016-10-24 20:11:47 +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
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
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
Phenom
4db6d6b56f Fix the "Desktop file is missing" shown in option page. 2016-10-13 13:26:44 +02:00
Gio
633a6cf8c2 Fixed a bunch of warnings in safe ways 2016-10-13 00:01:33 +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
Phenom
3d9fb600f0 Fix Missing ID-Avatars in Create Circle Menu
Fix issue#530
2016-10-09 12:37:09 +02:00
cave beat
3813845343 patch from sss rus translation 2016-10-08 16:06:42 +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
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
Phenom
4b0f82a6d0 Fix Desktop Filename for option page message. 2016-10-08 12:12:37 +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
csoler
ebfc82cc1e save/restore selection in shared dir list tree view 2016-10-03 21:44:34 +02:00
Phenom
0ea909df10 Fix Windows Compilation after 6e4ba76b 2016-09-29 12:45:01 +02:00
csoler
6e4ba76bbb improved display of shared directories for friends with no update info 2016-09-28 21:55:13 +02:00
csoler
5547d71ac7 fixed advanced search not closing 2016-09-27 21:10:18 +02:00
csoler
c26970feba fixed open folder from File Sharing dialog 2016-09-27 21:10:18 +02:00
Silenoz Byronsk
5de73df86f Update retroshare_de.ts 2016-09-24 08:48:35 +02:00
mr-alice
0cc4ebd89c added comments in the file lists code. Removed unused functions. Added a few missing mutexes. 2016-09-22 21:47:58 +02:00