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

5290 Commits

Author SHA1 Message Date
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
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
mr-alice
0757fb303c merged upstream/master 2016-09-20 20:51:50 +02:00
mr-alice
7488ad457d added display of files being hashed with green color and blue icon. This could be improved I suppose. 2016-09-18 22:32:30 +02:00
mr-alice
ff4c43819e fixed reloading of ShareManager due to postModDirectories and made it reload after addign new share 2016-09-18 21:41:18 +02:00
mr-alice
de104d3e34 fixed up GUI parameters in Directories. Removed HashCache duration handles since this is now automatic 2016-09-18 18:34:39 +02:00
MrAlice
ca30b0da44 fixed terrible cost of calling requestDirDetails before createIndex 2016-09-15 10:41:40 +02:00
mr-alice
ddc89a6535 fixed core dump in printout of empty slots. Improved dir sync-ing strategy 2016-09-14 21:52:16 +02:00
mr-alice
e985a2c927 removed call to setDynamicSortFilter in SharedFilesDialog, as a workaround for the crash when sorting 2016-09-14 20:43:52 +02:00
mr-alice
93818f6088 simplified a bit the code in Flat_Model, and tried to fix the crash when sorting items 2016-09-13 21:23:27 +02:00
mr-alice
53c65fff9f removed cache transfers from the GUI 2016-09-13 18:54:00 +02:00
mr-alice
a2e34f9cc6 moved regular expression classes into a separate namespace 2016-09-13 12:05:22 +02:00
mr-alice
c1e538ff13 added interactive update of dir entries when browsing files from an online friend 2016-09-11 17:52:12 +02:00
mr-alice
0ea695beb3 fixed a few bugs in hash-based sync. Not there yet. 2016-09-08 23:43:14 +02:00
Cyril Soler
ea380b2578 Merge pull request #487 from AsamK/fix_wayland 
Fix crash when running natively on Wayland
 2016-09-07 21:29:48 +02:00
defnax
e9540d7b05 Improved look and feel layout of Profile Generation Dialog 2016-09-06 17:45:42 +02:00
thunder2
5f5ce4ab63 Fixed version_detail_bash_script with shadow build 2016-09-05 16:27:04 +02:00
thunder2
ea6431e276 Fixed Windows shadow build with Qt 5.6 or higher 2016-09-05 16:24:49 +02:00
Gio
9d83d56811 Merge branch 'master' into android 2016-09-04 15:16:57 +02:00
mr-alice
ade6017f74 merged with upstream/master 2016-09-01 19:52:31 +02:00
defnax
5241a7d4c0 Added last icon changes for transfers page 2016-08-30 17:18:27 +02:00
cyril soler
3b37fcc4a8 updated help text for circles 2016-08-30 14:18:36 +02:00
mr-alice
1290aa8403 fixed proper display of file sharing flags 2016-08-29 21:30:56 +02:00
csoler
a82f3149d3 removed (unfinished) GettingStarted tab 2016-08-29 20:52:02 +02:00
mr-alice
7c2ed3fca0 save/restore expanded state in file list tree view so that view gets updated seamlessly 2016-08-28 23:14:39 +02:00
AsamK
b36d0fad4a Fix crash when running natively on Wayland 2016-08-28 17:52:01 +02:00
defnax
19443dabf9 added missed icon 2016-08-27 20:16:04 +02:00
defnax
57c9bef993 updated settings icons and some missed one 2016-08-27 18:15:13 +02:00
mr-alice
5194287645 fixed SEGV due to calling layout change in the wrong place 2016-08-27 13:22:29 +02:00
defnax
cc8f2c6e39 changed to one plus button for Create ID/Circle with menu. 2016-08-26 02:48:46 +02:00
defnax
45198121f7 updating replacements icons 2016-08-25 17:09:33 +02:00
defnax
8d2588fec4 added missed icons 2016-08-24 16:57:33 +02:00
defnax
7706f5f7c6 update notify icons now orange color 2016-08-24 16:55:44 +02:00
defnax
f58494f9e4 fixed icon 2016-08-24 13:46:31 +02:00
csoler
5e5a8dcd9a put back opinion combobox in the place where other reputation information already is. Removed absolute size on invite button which causes incorrect display on high DPI screens 2016-08-24 12:50:41 +02:00
defnax
5e22ddc93e updating icons more flat replacement 
improving people page layout
 2016-08-24 03:28:57 +02:00
Gio
279551fe8d Retroshare android service now run and start at boot on android, the qml app is still disfunctional 2016-08-23 12:15:28 +02:00
Gio
9a980def2c libretroshare now compiles for Android, instruction on how to do it included 2016-08-23 12:15:28 +02:00
Phenom
7dd78f28d8 Fix Lobby Load embedded image option. 2016-08-22 23:08:11 +02:00
mr-alice
f8ed1d3fb7 changed DirDetails::children to be a vector, removed costly caching of DirDetailVector 2016-08-19 18:49:42 +02:00
Cyril Soler
6bb1543839 Merge pull request #471 from PhenomRetroShare/Add_AutoHideToRSImageBlockWidget 
Add AutoHide to RSImageBlockWidget
 2016-08-18 17:18:25 +02:00
Cyril Soler
fea4159b86 Merge pull request #455 from PhenomRetroShare/Add_CopyRSTreeWidgetHeaderContextMenuToItemContextMenu 
Copy RsTreeWidget Header ContextMenu to Item ContextMenu.
 2016-08-18 17:11:07 +02:00
Phenom
9780f1ff78 Add AutoHide to RSImageBlockWidget 2016-08-17 23:33:41 +02:00
mr-alice
78b8744183 fixed display of remote directories 2016-08-17 14:48:54 +02:00
defnax
6682a7a491 added new mainwindow icons for RetroShare. 2016-08-16 22:02:30 +02:00
Cyril Soler
4d5be7fbce Merge pull request #476 from PhenomRetroShare/Add_FilterBannedInIdDialog 
Add Banned Filter in IdDialog.
 2016-08-16 10:29:21 +02:00
Cyril Soler
4572dc650c Merge pull request #475 from PhenomRetroShare/Fix_RSTextBrowser_loadRessource_OnWindows 
Fix RsTextBrowser::loadRessource on Windows.
 2016-08-16 10:22:00 +02:00
Phenom
accd3ca734 Fix RsTextBrowser::loadRessource on Windows. 
When current style use images (like bubble).
 2016-08-15 20:02:01 +02:00
Phenom
dd2e4c32d5 Change Image Blocked Icon On RSTextBrowser 2016-08-15 20:01:14 +02:00
Phenom
df44f50f86 Add Banned Filter in IdDialog. 2016-08-15 19:59:52 +02:00
defnax
b0b4320c0b decrease chat bar widget icon size 2016-08-13 16:20:58 +02:00
Phenom
fcad9d99ab Fix RSTextBrowser::loadResource if image comes from stylesheet. 2016-08-13 10:42:42 +02:00
Phenom
f71aad4b9c Add Chat Load Embedded Images Option like forum and message. 2016-08-13 09:46:31 +02:00
defnax
0e1c0c2eb3 Added search filter for participants list. 2016-08-12 22:19:44 +02:00
thunder2
f3b8843384 Fixed QMAKE_PRE_LINK for Windows compile without MSYS2 2016-08-12 10:03:47 +02:00
defnax
1fe7dce424 Set icons for the voting combo box 2016-08-10 00:22:23 +02:00
Phenom
8a5c07b5e2 Copy RsTreeWidget Header ContextMenu to Item ContextMenu. 2016-08-09 21:01:00 +02:00
defnax
d1645e97bd moved auto-ban checkbox to a better position 2016-08-09 19:38:56 +02:00
Cyril Soler
aaf13eb4dd Merge pull request #466 from PhenomRetroShare/Fix_RsCollEditorCountUpdateWhenRemove 
Fix RsCollection Editor Count Update When Removing items.
 2016-08-09 10:47:08 +02:00
Phenom
275c47eff9 Add Title when ask for password. 2016-08-09 01:22:14 +02:00
Phenom
6edd7bb8e3 Add possibility to create GXSId directly on GenCertDialog. 2016-08-08 22:57:06 +02:00
Cyril Soler
c2c88939fe Merge pull request #462 from PhenomRetroShare/Add_CaseSensitiveOptionForLobbyNotify 
Add Case Sensitive option for Lobby Notify.
 2016-08-08 22:18:32 +02:00
Cyril Soler
0b1f08a1ce Merge pull request #461 from PhenomRetroShare/Add_CommentNumberOnButton 
Add Comment Number On Button.
 2016-08-08 22:12:55 +02:00
Cyril Soler
723d96bcd1 Merge pull request #460 from PhenomRetroShare/Fix_LobbyNotifyIcon 
Fix Lobby Notify Icon.
 2016-08-08 22:11:10 +02:00
Phenom
ee368ef045 Fix RsCollection Editor Count Update When Removing items. 
Thanks to Jola to get this bug.
 2016-08-08 20:45:43 +02:00
Phenom
88407e6d30 Fix Image Block on RSTextBrowser. 2016-08-07 19:41:44 +02:00
Phenom
d0482707c5 Add Case Sensitive option for Lobby Notify. 2016-08-07 19:00:23 +02:00
Phenom
ea6bbac732 Add Comment Number On Button. 2016-08-07 14:40:04 +02:00
defnax
dea776a61a Moved font menu to Settings menu 2016-08-06 18:35:07 +02:00
Phenom
776e404c2b Fix Lobby Notify Icon. 
But now this not report which type of lobby is.
 2016-08-06 17:52:12 +02:00
Cyril Soler
9f14103c1c Merge pull request #458 from PhenomRetroShare/Fix_QMessageBoxAddWidget 
Fix QMessageBox layout addWidget.
 2016-08-06 15:47:23 +02:00
Phenom
21bd8cd6df Fix QMessageBox layout addWidget. 2016-08-06 13:49:53 +02:00
Phenom
beab81e134 Fix Forum Item sort on LastPost View. 
msg.mMeta.mChildTs Was not updated when received new child so do it when
creating GxsIdRSTreeWidgetItem.
 2016-08-06 11:57:41 +02:00
defnax
f3d1a6c1ec Added missed notify icon 2016-08-05 19:13:59 +02:00
defnax
ac73fd92a7 Merge branch 'master' of https://github.com/RetroShare/RetroShare 2016-08-05 01:01:56 +02:00
defnax
e2bb477899 Added new blue icon set for Chat Widget (icons by Beluga) svg ad png Format 2016-08-05 01:00:53 +02:00
Cyril Soler
96e73b301c Merge pull request #454 from csoler/v0.6-ContactList 
V0.6 contact list
 2016-08-04 22:38:59 +02:00
csoler
5a55de5ec8 added missing DontUseNativeDialog flag in misc.cpp 2016-08-04 22:01:30 +02:00
csoler
7545ad4d11 simplied/improved reputation system. Now ids can be banned based on their owner node using a single checkbox in the Person tab, with immediate effect 2016-08-04 11:43:35 +02:00
Cyril Soler
60cf2991d4 Merge pull request #436 from G10h4ck/libresapilocal 
Libresapilocal
 2016-08-03 08:46:15 +02:00
csoler
5fac5a8d76 moved all getOpenFilename to use misc::getOpenFilename 2016-07-31 22:15:56 +02:00
Phenom
d000d75a38 Fix Import and Export Cert file *.asc. 2016-07-31 21:03:45 +02:00
Cyril Soler
edce1e953c Merge pull request #449 from PhenomRetroShare/Add_RemoveDuplicateCBInRSCollEditor 
Add Remove Duplicate checkbox in RsCollection editor.
 2016-07-31 17:47:50 +02:00
Phenom
6935441e4f Fix other QFileDialog call in misc adding DontUseNativeDialog option. 2016-07-31 16:23:41 +02:00
Phenom
03179043f1 Add Remove Duplicate checkbox in RsCollection editor. 
If unchecked, you can add the same file (same hash) in multiple
directories.
 2016-07-31 16:08:15 +02:00
Phenom
998fede7e7 Fix IdDialog ContextMenu shown at startup. 2016-07-31 11:15:47 +02:00
mr-alice
5b9fd74d85 removed most of CacheStrapper stuff from ftServer, replaced fimonitor by p3FileDatabase 2016-07-30 21:52:42 +02:00
Phenom
bef7db4b4d Fix IdChooser in Signed Lobby. 
So you cannot choose an unsigned Id.
 2016-07-30 19:14:59 +02:00
Cyril Soler
2921d9eac2 Merge pull request #445 from PhenomRetroShare/Add_MergeDisplayMenuToHeaderContextMenu 
Move Display button's menu to Header context menu on FriendList.
 2016-07-30 15:26:27 +02:00
Phenom
46e4b3b4c8 Fix FriendList sorting when expand PGPItem sorted by LastContact or IP 2016-07-30 13:58:02 +02:00
Phenom
ae9ab644a9 Move Display button's menu to Header context menu on FriendList. 2016-07-30 13:27:23 +02:00
defnax
d62f8a49f1 Fixed stylesheet 2016-07-29 23:21:46 +02:00
defnax
032bcf7a26 Fixed Stylesheets 2016-07-29 23:14:46 +02:00
Cyril Soler
b1dcd2ff08 Merge pull request #444 from PhenomRetroShare/Add_MergeFilterIdFilterToHeaderContextMenu 
Merge Filter ComboBox to Header Context Menu in IdDialog.
 2016-07-29 22:02:57 +02:00
csoler
1707c07937 added DontUseNativeDialog as default flag in file dialog in order to avoid some crashed when not using it 2016-07-29 21:58:59 +02:00
Phenom
d3beccf3e2 Merge Filter ComboBox to Header Context Menu in IdDialog. 2016-07-29 21:39:58 +02:00
defnax
431dd68509 Temporary solution for the Filter Combobox it takes to much space, no space more for search filter,moved under the ToolBar. 2016-07-29 17:29:54 +02:00
Gio
fe7de83529 WebUI is now optional but enabled by default at compile time 2016-07-28 14:08:49 +02:00
csoler
c73be934ed removed anti-spam message that has become irrelevant 2016-07-26 16:06:03 +02:00
csoler
ed05ec7008 fixed text in People tab 2016-07-25 16:06:28 -04:00