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
3,589 Commits 63 Branches 22 Tags 194 MiB
eafa3d5a87
Commit Graph

3589 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
defnax
3bad8ad1c9 Added to details to display the Status 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3865 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-11-23 22:06:58 +00:00
csoler
ebef7e7141 compatibility with Qt4.5 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3864 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-11-23 21:00:17 +00:00
defnax
b0eb329d31 changed border radius of the thread and forum Label's 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3863 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-11-23 20:41:58 +00:00
drbob
cd33979729 I am an idiot... silly mistake in last checkin. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3862 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-11-23 20:04:14 +00:00
drbob
d9847e2622 Fixed deadlock between p3connmgr::mtx and libbitdht::mtx 
* shifted dht stats call outside of p3connmgr's mtx.

NB: As Dht callback functions hold DHT lock, then lock p3ConnectMgr...
    we cannot have any opposite locks (p3connmgr, then DHT) or we have
    potential for a deadlock.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3861 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-11-23 19:32:19 +00:00
csoler
6589b49025 re-enabled mutex initialization, because RS could not start. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3860 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-11-23 08:01:22 +00:00
drbob
80de6ccdb4 * removed self from channel download requests. 
* enabled (limited) debug messages to check!.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3859 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-11-23 00:08:30 +00:00
drbob
bb102750f3 Fixed up mutexes and removed recursive call into libbitdht on callback. 
* mUdpBitDht doesn't need to be protected by a mutex - as it is static for all intensive purposes.
  * updated PeerCallback() fn signature, and removed extra address callback. (part of args now!).



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3858 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-11-23 00:06:54 +00:00
drbob
ea3311eb2a Tweaked bitdht interface to remove need for double entry to libbitdht. 
* made PeerCallback() pass a bdId rather than a bdNodeId.
 * disabled recursive mutex to test!.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3857 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-11-23 00:02:54 +00:00
defnax
85667a2ae9 set a border color for the channel frame 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3856 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-11-22 22:20:42 +00:00
csoler
d83a7118fa removed potential cross-lock situation (reported by Valgrind) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3855 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-11-22 21:15:21 +00:00
csoler
34a3fc4ea8 removed useless include 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3854 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-11-22 21:01:54 +00:00
csoler
b94e4376a4 only assume availability for cache transfers. All other transfers now use ChunkMaps 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3853 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-11-22 20:57:53 +00:00
defnax
0b9a5e5b2b Added to display for attached pictures in Private Chat a default icon for the rs link. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3852 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-11-22 20:10:12 +00:00
defnax
7c86a88a94 update translation 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3851 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-11-22 15:24:10 +00:00
defnax
7e22057c16 update translation 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3850 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-11-22 15:12:21 +00:00
csoler
8a3d3f8c0d enabled recursive lock behavior on main bitdht thread to handle self-lock in DHT callbacks 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3849 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-11-21 22:46:47 +00:00
thunder2
42fb103738 Reactivate command line switch -m for start minimized. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3848 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-11-21 22:18:56 +00:00
thunder2
d673d42ba9 Hide checkbox "Allowing Tunnel Connection" in the server settings for the release version. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3847 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-11-21 21:38:32 +00:00
thunder2
064b619f70 Added standard context menu to the input text in private chat, group chat and create forum message. 
Added paste RetroShare link to the context menu of the text edit and file list in message composer.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3846 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-11-21 21:12:35 +00:00
csoler
20c97680b5 removed lockign lock 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3845 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-11-21 15:32:21 +00:00
defnax
0ca46dbaca removed unused dialog 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3844 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-11-21 15:27:42 +00:00
defnax
22690ff937 Added to OnlineToaster to display friends Avatar when available 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3843 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-11-21 15:22:41 +00:00
defnax
9a10d80613 set Avatar border color and changed text color for OnlineToaster 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3842 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-11-21 15:21:39 +00:00
csoler
02d228b94b added missing locks 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3841 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-11-21 15:08:33 +00:00
csoler
b7badd980f added mutex to correct data race between bdNodeManager::iteration() and bdnodeManager::incomingMsg() 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3840 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-11-21 14:31:35 +00:00
csoler
b2b67cfecc added comment 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3839 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-11-21 13:35:10 +00:00
csoler
b08a924376 corrected uninitialised memory read 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3838 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-11-21 13:30:34 +00:00
thunder2
5d2a649e0a Removed the GUI part of the links cloud from building. You can add it again with 
CONFIG += use_links

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3837 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-11-20 20:58:35 +00:00
defnax
56bdd3b1ea disabled fof and rsid radio items. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3836 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-11-20 16:45:45 +00:00
defnax
cc334b7142 set first tab by default. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3835 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-11-20 15:13:24 +00:00
thunder2
f0f3dc413a Fixed open folder in shared files in portable version. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3834 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-11-20 14:50:14 +00:00
thunder2
7bcebc8e2b Fixed add attachment per drag and drop. 
Added the size after the link in group chat too.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3833 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-11-20 01:40:24 +00:00
csoler
8f9a54544d suppressed debug info 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3832 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-11-19 22:53:55 +00:00
csoler
61e7cf234c removed debug output from p3disc 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3831 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-11-19 22:42:29 +00:00
csoler
b4da2948ed corrected spell error in data directory for linux to enable consistency with packager installation: /usr/bin/Retroshare -> /usr/bin/RetroShare 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3830 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-11-19 22:40:08 +00:00
defnax
d1a0258838 fixed to resize the Avatar pixmap when displayin in PeerItem 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3829 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-11-19 22:24:08 +00:00
csoler
2075cdfd4a changed color of peer having authenticated own key, to avoid confusion with friends of friends in networkview. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3828 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-11-19 22:13:42 +00:00
csoler
58dcb79f42 added display of trust level in NetworkDialog 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3827 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-11-19 22:07:46 +00:00
csoler
1585606c4c NetworkView: 
- corrected bug in popup menu 
	- used more saturated colors to improve clarity
	- used darker colors for less trusted peers
	- fixed ownId node position to the center
NetworkDialog:
	- changed color of own  lign to yellow to comply with color code in NetworkView



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3826 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-11-19 21:52:56 +00:00
defnax
63b32b0794 enable define release flag in project file 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3825 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-11-19 20:46:26 +00:00
defnax
6de5949ba9 update translation 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3824 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-11-19 20:42:21 +00:00
defnax
2632afe9e4 update translation strings to the latest 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3823 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-11-19 18:34:18 +00:00
defnax
d9b0bc1d59 renamed Peer Connect/Online to Friend Connect/Online 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3822 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-11-19 18:32:03 +00:00
chrisparker126
a9ee3d92dc introduced frame catcher to channels, add framecatcher in Retroshare.pro to build it in 
(only works for linux at the moment)

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3821 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-11-19 00:47:18 +00:00
thunder2
b0aa255ead Fixed tabbed chat with more than one friend. 
With receive of a new chat message in an inactive tab the input focus was set to the input field of that inactive tab. The current tab was still visible, but the input has gone to the invisible tab.
This is a bug in Qt.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3820 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-11-18 23:29:39 +00:00
thunder2
5dd70010ea Hide the types "Restricted" and "Private" in CreateForum for the release version. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3819 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-11-18 22:51:40 +00:00
thunder2
e82fab4ba4 Changed the RetroShare link format to an internet conform style. 
retroshare://file?name=&size=&hash=
retroshare://person?name=&hash=
We can extend this very easy. QUrl can build and parse it.
The paste of the old RetroShare links is still working.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3818 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-11-18 16:31:44 +00:00
defnax
d8da5082a1 removed the Log Tab 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3817 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-11-18 14:07:12 +00:00
defnax
f0cc412e73 restored back french translation file and cleand it. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3816 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-11-18 13:40:29 +00:00