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
6,008 Commits 63 Branches 22 Tags 194 MiB
7ba1827b4c
Commit Graph

6008 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
csoler
7ba1827b4c removed potential deadlock in method called from notify 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6838 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-10-16 20:42:34 +00:00
csoler
26c1ce8025 fixed response to distant peer when not actually a friend. Added warning when key is not available 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6837 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-10-16 20:20:41 +00:00
csoler
cd43900eb9 added flag and icon for message that was successfuly decrypted 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6836 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-10-16 20:02:28 +00:00
csoler
292bdfa324 allow to change destination directory for queued files (modified patch from Phenom) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6835 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-10-16 19:02:15 +00:00
defnax
783f73476b set default chat lobby icon 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6834 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-10-16 12:30:28 +00:00
csoler
7876001be3 remove three costly loops in ftController 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6833 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-10-15 20:39:13 +00:00
csoler
a8c250e7d9 fixed warning 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6832 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-10-15 20:28:30 +00:00
csoler
08c585df2d fixed typo 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6830 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-10-14 19:57:06 +00:00
csoler
c608d7ed69 updated english strings 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6828 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-10-13 15:57:12 +00:00
csoler
e1d907bb95 fixed typo 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6827 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-10-13 15:31:34 +00:00
csoler
48839249c0 changed version string to 0.5.5b 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6826 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-10-13 12:23:00 +00:00
csoler
8e220c691b added help string for notify page 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6825 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-10-13 12:16:46 +00:00
csoler
cf8d6682da added help string for relays 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6824 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-10-13 12:02:50 +00:00
csoler
7d3f8b5c10 added help string to plugins page 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6823 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-10-13 11:43:15 +00:00
csoler
5879613e85 updated ubuntu changelog 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6822 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-10-12 12:41:38 +00:00
csoler
5865c80a76 added new tree items for subscribed lobbies. Helps spoting them in the list (Patch from Phenom) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6821 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-10-11 20:46:25 +00:00
defnax
9d73b1f4af update button colors 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6820 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-10-11 18:45:01 +00:00
chrisparker126
55bbfb29da Electron patch 
- fixes issue with, message offsets not being calculated in loop correctly, resulted in only invalid message offset in db after calling message removal

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6819 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-10-11 17:29:38 +00:00
thunder2
a50c899ff3 Moved help browser from MainPage to a new base class named FloatingHelpBrowser for global usage. 
Added FloatingHelpBrowser to the option window (help text not including).
The help text can be specified for the ConfigPages in the method "helpText".

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6818 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-10-09 09:31:40 +00:00
defnax
fa6bc5fe39 Added a warning info label for the make friend Wizard 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6817 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-10-08 16:45:14 +00:00
defnax
1d83754385 fixed to show the General tab by default 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6816 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-10-08 14:24:21 +00:00
defnax
d4b64ae551 Added a default stylesheet for the send button 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6815 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-10-08 13:58:56 +00:00
thunder2
13e7ac8b43 Fixed compile of the libraries with MinGW 4.8 on Windows. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6814 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-10-07 23:11:10 +00:00
csoler
9b8d597c0d added fingerprint to cryptopage 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6813 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-10-07 21:01:05 +00:00
csoler
e4e28c733c added the possibility to distant chat with unverified identities, while warning the user about it. Should help distant chatting. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6812 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-10-07 20:49:02 +00:00
defnax
ed44bc6884 enabled wordWrap for the topic label 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6808 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-10-06 16:07:37 +00:00
csoler
67517ad074 restore file state when restart (Modified patch from Phenom) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6807 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-10-06 12:56:37 +00:00
csoler
e9ccc323a2 added new delegate for BW statistics window. Changed column names to more appropriate values (Patch from Phenom) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6806 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-10-06 12:19:13 +00:00
csoler
7cd9ca9f09 Added proper sorting of DL files according to sources (Patch from Phenom) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6805 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-10-06 12:09:36 +00:00
csoler
f3f7a40ad7 changed the connect wizard so that we can add someone key to keyring without making friend. Made connection progress dialog only show up when really making friend 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6801 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-10-04 20:55:16 +00:00
csoler
a9290e9dd7 fixed image resizing for channel thumbnails. Apparently there is a bug in Qt preventing Qt::KeepAspectRatioByExpanding to work correctly 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6800 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-10-04 19:40:29 +00:00
thunder2
b49ba8b98f Changed the additional buttons of ChatLobbyDialog and AudioPopupChatDialog to QToolButton. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6798 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-10-04 12:13:09 +00:00
defnax
9ca0775933 added some sound files 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6797 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-10-03 22:50:36 +00:00
defnax
a4524485ad changed the voip icons and the tooltips 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6796 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-10-03 22:00:16 +00:00
thunder2
bf9270dd54 Removed the external library pthreads 2.8.0 on Windows build and used the library of MinGW (version 2.8.0 too). This fixes header mixup of both versions. 
Switched to the release version of pthread so the name of the dll changes from pthreadGC2d.dll to pthreadGC2.dll. The new dll can be found in the bin directory of MinGW.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6794 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-10-03 16:23:02 +00:00
csoler
27041aa1a6 fixed bug in turtle router, causing potential memory access error in rare occasions (sendItem does not delete items fast enough, normally). 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6786 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-10-01 22:23:08 +00:00
defnax
6ae9178712 Added a new frame for the Plugin Buttons, add the plugin buttons before the send button. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6785 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-10-01 20:21:57 +00:00
thunder2
959c9c2aca Fixed compile on Windows when using shadow build. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6784 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-10-01 13:50:34 +00:00
thunder2
45f6ec7320 Moved info widget for encrypted messages in MessageWidget above subject. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6780 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-09-29 23:04:21 +00:00
thunder2
571099d56b Optimized p3HistoryMgr::cleanOldMessages. 
There is no need to check the messages when mMaxStorageDurationSeconds is set to 0.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6779 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-09-29 13:31:15 +00:00
csoler
4e259fecfd allow max storage duration to be 0, in which case we keep all history 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6777 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-09-29 12:10:59 +00:00
thunder2
4dd77457ad Added info widget for encrypted messages in MessageWidget. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6774 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-09-28 22:05:38 +00:00
csoler
40ed94f7fb removed copy/paste of links of type PERSON in friendlist. This caused confusion and did not provide anything useful since the creation of the full certificate links 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6771 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-09-27 21:40:51 +00:00
csoler
e21d869006 - added history parameters for chat lobbies 
- added max storage time for items in chat history. Avoids filling up the history with chat from volatile peers.
- worked out the layout in config->ChatPage in a more compact design and added help
- set the max size of chat messages to 6000 bytes instead of 2000 which was a bit too low
- default max number of lobby messages saved in each lobby is 20. Avoids flooding for peers who havn't configured it yet.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6770 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-09-27 21:18:44 +00:00
csoler
f25f46dffb fixed missing update of transferred bytes count, that caused tunnels to not show a correct speed estimate on server side 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6768 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-09-26 18:38:35 +00:00
thunder2
a98f1d90b0 Fixed compile of gxs. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6767 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-09-26 10:09:40 +00:00
csoler
be2025382b restrict last commit to left mouse button 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6766 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-09-25 20:19:24 +00:00
csoler
1d0c7b2e2f highlight peers in network graph according to friendship distance from selected node 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6765 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-09-25 20:13:57 +00:00
csoler
027b9ba017 removed warning that happens when lobby has no activity 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6764 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-09-25 18:34:50 +00:00
thunder2
1dd9d0e49f Moved stylesheet from ShareManager to Standard.qss. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6763 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-09-25 17:24:42 +00:00