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
4,167 Commits 63 Branches 22 Tags 194 MiB
a1806bb04f
Commit Graph

2621 Commits

Author SHA1 Message Date
csoler
521e9cb7c2 added missing files 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4646 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-10-20 22:48:50 +00:00
csoler
01a93b5f36 commited rest of AsamK patch for factoring friend list. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4645 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-10-20 21:34:44 +00:00
defnax
c876925e57 layout changes for PluginItem 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4644 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-10-18 22:53:47 +00:00
csoler
6a585517f0 corrected previous commit. Included file that does not exist yet 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4640 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-10-15 17:41:48 +00:00
csoler
2b6d2ede7c added missing lib to link line for ubuntu oneiric 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4639 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-10-15 17:38:43 +00:00
csoler
8ae018d0f1 imported french translation from Max Romeo 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4638 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-10-14 21:49:15 +00:00
csoler
6989a40312 fixed issue of loading the correct instance of RetroShare.conf when switching locations (Patch from AsamK #3423256) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4637 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-10-14 21:16:34 +00:00
thunder2
7a98e83df1 Fixed some more utf8 issues with umlauts in the Windows user name. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4636 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-10-12 23:36:25 +00:00
thunder2
7e3a342a9a Fixed utf8 issues (Patch from Asamk #3393353) 
SearchDialog: enable search for strings containing utf8 characters, I assume that filenames are always stored as utf8 on all platforms
ConnectFriendWizard: adding friends with gpg key or from file, now sets location name correctly
notifyqt: setting status message in chatwindow works correctly now, when a friend changes his message while the chat window is open

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4635 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-10-11 23:29:38 +00:00
thunder2
e3798dafe9 Fixed utf8 issue with links from browser (Windows only). 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4634 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-10-08 17:49:06 +00:00
csoler
6addc80e99 fixed link passed issue due to usin self-closign links (Patch from Asamk #3418941) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4631 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-10-05 16:57:33 +00:00
chrisparker126
af3f9b1dcc Added loading text to forumsdialog and enabled percentage numbers to be 
shown also


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4627 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-10-01 15:19:19 +00:00
csoler
c650265704 added display of TR forwarding probability as a function of depth 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4625 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-10-01 11:46:00 +00:00
thunder2
b3bcfe9d30 Fixed compile on Linux. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4624 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-09-29 09:52:01 +00:00
thunder2
29c090fb44 Moved the chat history into the libretroshare. 
Now the history is saved encrypted. Please delete all files with "chat*.xml" in your profile folder.
Added new config p3HistoryMgr and interface p3History.
Added new option to limit the count of the saved history items.
Added new simple html optimizer "RsHtml::optimizeHtml" to reduce the size of the html strings.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4623 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-09-29 09:20:09 +00:00
drbob
5ea8cfb67d Added Ben's patches: 
* Compilation for FreeBSD.
	* Notes that MT is not cryptographically secure.
	* modified sorting of DHT Window.

Only one change that I didn't commit:

 bitdht {
-       LIBS += ../../libbitdht/src/lib/libbitdht.a
-       PRE_TARGETDEPS *= ../../libbitdht/src/lib/libbitdht.a
+       LIBS += ../../libbitdht/src/libbitdht.a
+       PRE_TARGETDEPS *= ../../libbitdht/src/libbitdht.a
 }

As this would have broken compilation on the other platforms.




git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4619 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-09-28 15:16:21 +00:00
thunder2
bb9f362458 Fixed compile on Windows. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4618 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-09-27 20:25:12 +00:00
csoler
21feaf46da fixed sorting of transfer by priority 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4617 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-09-26 21:39:28 +00:00
csoler
b4d4f3171c fixed inaccurate text in transfer page 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4616 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-09-26 21:00:25 +00:00
csoler
4111740cb6 fixed utf8 issues in sending cert by email (patch from asamK #3393826) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4615 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-09-25 12:33:37 +00:00
csoler
ad4b0153b2 added next unread button to forums (patch from devnewton #3401840) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4614 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-09-25 12:15:25 +00:00
csoler
3ed0c1d885 added patch from AsamK to show the availability status of peers at the level of locations instead of GPG keys 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4611 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-09-23 17:06:07 +00:00
csoler
ad04f62e80 added past RS links to post on channels, and additional check that the file is already shared 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4609 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-09-18 19:43:38 +00:00
thunder2
2fac47293e Reworked the process of the RetroShare links. Now RetroShare asks when adding a file or a person link and shows a detailed result. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4604 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-09-11 22:07:24 +00:00
csoler
dc0f4ef68a send msg in plain text when the html encoding does not change anything into the message. This drastically reduces messages size. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4599 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-09-09 19:54:17 +00:00
thunder2
5b3543d41a Added missing status frame for idle. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4597 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-09-09 12:17:24 +00:00
thunder2
1821d8cb06 Set own status initially to online. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4592 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-09-08 13:17:49 +00:00
thunder2
a34c482db1 Added double click to NetworkDialog to show the peer details. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4591 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-09-06 20:44:22 +00:00
thunder2
62b2de63b7 Added new widget to display an avatar with or without the status frame - AvatarWidget. 
Changed all existing avatars to AvatarWidget.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4589 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-09-05 21:19:07 +00:00
csoler
7f610a4849 removed unused image 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4586 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-09-03 08:45:18 +00:00
thunder2
b35d32ef15 Added avatar image to ConfCertDialog (defnax). 
Added new class AvatarDefs to get the avatar for a ssl id or gpg id.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4585 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-09-02 10:22:44 +00:00
csoler
0591ef0432 corrected bad modification of commit #4560, which made RS not compilable on ubuntu karmic 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4584 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-09-01 16:42:05 +00:00
csoler
80269eb824 changed local root directory to be "My files" instead of SSLid 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4582 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-08-31 20:17:24 +00:00
csoler
52a8b281d5 fixed up color codes for qt 4.7 in NetworkGraph (bug in qt::lighter()) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4581 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-08-31 20:04:04 +00:00
csoler
8941aa5991 corrected a few bugs in the cert cleaning method. Added feedback to the GUI and error codes for the cert cleaning function of rspeers 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4580 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-08-30 21:49:49 +00:00
chrisparker126
3ff69a1be5 added private groups option to forums 
fix for grp edit in p3distrib

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4579 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-08-29 21:20:48 +00:00
thunder2
35a059c44c Partial fix for ticket #146: 
- set default of the signature checkbox in ConnectFriendWizard to disabled
- set the initial option for the download directory to network wide only
- set the default of a new shared directory to network wide


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4578 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-08-28 22:54:01 +00:00
thunder2
44806b7581 Found another missing toUtf8 in GenCertDialog. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4577 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-08-28 00:21:34 +00:00
thunder2
185307ad37 Fix for ticket #129 
Utf8 chars don't show up for peer names, in private chat and file list.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4576 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-08-27 22:54:05 +00:00
thunder2
4f1d1b8dc7 Fix for ticket #127 
Impossible to download a directory, if the download directory is utf8.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4575 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-08-27 21:04:02 +00:00
thunder2
154d315c92 Fix for ticket #124 
Search don't work with utf8 chars.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4574 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-08-27 16:15:56 +00:00
thunder2
ac6f4539e9 Fixed the display of the time in the SecurityItem. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4573 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-08-22 09:32:03 +00:00
thunder2
01fa9eec3f Added a new checbox in the settings (NotifyPage) to enable/disable the new SecurityItem. It is enabled by default, but all existing users need to enable it. 
Added new buttons to SecurityItem to add/remove the peer and view peer details.
Added new call to notifyListChange with NOTIFY_LIST_FRIENDS in AuthGPGimpl::AllowConnection.
Fixed german language.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4572 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-08-21 22:28:19 +00:00
thunder2
d349204a63 Added check for administrator rights to add/remove the retroshare:// protocol. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4570 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-08-17 00:06:44 +00:00
thunder2
0f51b7d72f Set inititial sizes of the splitter and columns in FriendsDialog and SearchDialog. 
Fixed height of the MainWindow when GetStartedDialog is visible.
Fixed the initial size of the ShareManger and show the checkboxes for the share mode centered.
Fixed german language.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4569 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-08-15 23:42:07 +00:00
thunder2
d25730eabb - Removed not used function RsDirUtil::createBackup. 
- Moved ProfileView and ProfileEdit to the folder unfinished.
- Removed "location:" before the ssl name in FriendsDialog and MessengerWindow.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4567 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-08-14 22:31:05 +00:00
thunder2
39708cdd0b Removed some more compiler warnings in retroshare-gui. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4566 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-08-14 21:25:41 +00:00
thunder2
cd0854c4e8 Removed duplicate labels in ui files and some other compiler warnings. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4565 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-08-13 22:26:51 +00:00
thunder2
0fbada0eba Applied patch from AsamK and fixed german translation. 
Reduced code duplication with avatar picture loading, by creating two new functions that handle image choosing and thumbnail creation.

two new functions:
bool misc::getOpenAvatarPicture(QWidget *parent, QByteArray &image_data)
QPixmap misc::getOpenThumbnailedPicture(QWidget *parent, const QString &caption, int width, int height)

getOpenThumbnailedPicture opens a QFileDialog to let the user choose a picture file. This picture is converted to a thumbnail and returned as a QPixmap.

getOpenAvatarPicture calls getOpenThumbnailedPicture and converts the result to a PNG byte array.

All three avatar loading functions now call getOpenAvatarPicture
Furthermore Channel Logo and Channel Msg thumbnail functions now use getOpenThumbnailedPicture

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4561 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-08-12 20:27:05 +00:00
thunder2
43c0594d18 Changed some parameters from "std::string" to "const std::string&" in rsinit.h. 
Log the error messages from gpgme (ProcessPGPmeError) to stderr.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4560 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-08-12 20:02:00 +00:00
thunder2
70d02c718d Removed unused parameter warnings in retroshare-gui. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4559 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-08-12 14:06:29 +00:00
thunder2
babbea6599 - Moved the setting maxTimeBeforeIdle from the section [%General] to [General] in the profile. Please set your prefered value again. 
- Saved the selected tab in the TransferDialog in the profile.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4555 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-08-10 22:47:18 +00:00
defnax
8a995313ad update changelog and rsversion 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4553 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-08-10 21:49:17 +00:00
drbob
8438d011c1 Updated OSX password warning - as the storage is pretty secure (Application Specific) under OSX. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4548 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-08-08 12:19:28 +00:00
drbob
b082362c58 Updated retroshare-gui to match libretroshare interface changes. 
* remove calls to rsPeers->setAcceptToConnectGPGCertificate();
 * these are replaced with addFriend() / removeFriend().
 * renamed rsPeers->getSSLChildListOfGPGId() => rsPeers->getAssociatedSSLIds().



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4543 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-08-07 21:14:09 +00:00
thunder2
80629c5d9b Fixed layout in GeneralPage under Windows (there are three additional checkboxes). 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4541 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-08-07 20:21:02 +00:00
thunder2
687b2ecd36 The password dialog can be canceled. 
Fixed an error when cancel the login password dialog at startup. RetroShare did not start after this.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4537 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-08-05 20:45:09 +00:00
defnax
91b37be2e5 changed DHT icon on system tray menu 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4529 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-08-04 21:41:53 +00:00
drbob
a9bdb5119f * Disable RTT display by default. 
* flipped RTT horizontal axis, and added "New" and "Old" Indicators.
 * only consider visible points for maxRTT (vertical scale) of plot.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4526 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-08-04 15:01:11 +00:00
defnax
615b1b5704 fixed win compile 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4522 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-08-03 19:06:40 +00:00
drbob
70d0328a3b Hacked up Cyril's TurtleStatistics to provide plot of RTT measurements. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4520 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-08-03 17:45:03 +00:00
thunder2
466697276e Applied patch to enable the sort of the columns star and unread in messages (from AsamK) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4515 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-08-02 21:07:42 +00:00
drbob
c1d23c27c7 added missing "FORWARDED_PORT" case to natstatus 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4513 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-08-02 19:07:22 +00:00
defnax
7e6c58dd10 update rs version 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4509 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-07-31 17:56:34 +00:00
defnax
db364e003d fixed win compile 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4508 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-07-31 17:47:29 +00:00
drbob
1cb0a9dc21 Various improvements to the GUI. 
* Switched ServerPage to use netMode, rather than tryNetMode. This fixes the Network Status.
 * Added "Advanced Mode" to Settings GeneralPage.
 * Store / Set Advanced Mode via rsConfig::get/setConfigurationOptions.
 * removed %0D%0A from Linux / OSX emails - made it Windows Only.
 * updated GetStartedDialog text.
 * updated Dht and Nat Indicators to accurately reflect Network status. Roughly:
   - DHT. Off:     gray, ERROR:   red, NO RS PEERS:           yellow, GOOD: green.
   - NAT. Offline: gray, BAD NET: red, NO DHT, or FIREWALLED: yellow, GOOD: green
 * disable GetStartedDialog is AdvancedMode is set.
 


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4502 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-07-30 17:13:08 +00:00
drbob
a1e112934d Improvements to the GettingStarted Tab. 
* Re-written the text.
 * Enabled buttons for "Invite Friends" and "Add Friend". Linked to Email Invite, and Connect Friend Wizard.
 * Switched out FAQ for links to website, and email support buttons.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4499 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-07-30 12:41:28 +00:00
csoler
b3052e0208 set maximum port value to 65535 instead of old arbitrary value of 50000, and warned about system-reserved ports in server settings gui 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4486 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-07-23 20:07:06 +00:00
defnax
0b890420a0 enabled sorting and added dht icon for the window 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4485 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-07-21 23:12:05 +00:00
drbob
9d7b3446a2 Display UDP addresses in Dht WIndow. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4470 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-07-19 00:06:52 +00:00
drbob
69c14461cb Merged v0.5-netupgrade branch back into the trunk ( --- Merging r4410 through r4465 into '.' ) 
This brings lots of improvements:
 * UDP Connection Code - this it the majority of the new code.
 * Simplification of p3ConnectMgr => p3LinkMgr, p3PeerMgr & p3NetMgr.
 * Notifications of Failed Connection Attempts
 * Addition of a "Getting Started Guide".
 



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4466 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-07-18 09:25:15 +00:00
drbob
fe491dec54 Added display of Exclusive mode (E) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-netupgrade@4465 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-07-18 08:44:40 +00:00
thunder2
8d4a4db027 Changed the generation of the gpg key and location to utf8. 
The existing gpg keys and locations with umlauts are now shown wrong. The changes are not backward compatible.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4460 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-07-17 23:07:29 +00:00
drbob
216be04d83 * added DETERM_SYM NAT type to DHT Window. 
* cleared DhtWindow global pointer at delete, so RS doesn't crash (and can relaunch window).




git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-netupgrade@4444 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-07-13 22:25:11 +00:00
thunder2
9992d6ae12 Removed the single notify systray icon (combined icon) and combined it with the normal RetroShare systray icon. 
The user can choose, which notify icon is shown as single icon in systray or with the normal RetroShare icon.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4442 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-07-13 19:24:33 +00:00
drbob
42dd1826b0 added Network Status to DhtWindow. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-netupgrade@4436 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-07-12 14:17:06 +00:00
drbob
52cbe0f2fb Added Getting Started Dialog Box. 
* Connected it up with rsConfig... to tick (and close text) for bits that have been done.
 * Tests cases at first open.
 * Added FAQ from wiki - it needs help.
 * This whole concept needs some further tweaking.




git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-netupgrade@4432 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-07-11 18:53:14 +00:00
thunder2
4792d7c878 Fixed compile on Windows. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-netupgrade@4430 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-07-11 17:00:13 +00:00
drbob
70d8fd14d3 Added additional NewFeed Type SecurityItem 
* added AddNewItemIfUnique() to NewsFeed



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-netupgrade@4429 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-07-11 15:53:41 +00:00
drbob
1cf790990f Added basic PeerItems to NewsFeed for AUTH_DENIED and FAILED_CONNECTION case. 
* This will need to be fixed up - but the basic logic is there!
 * Improved DhtWindow display of peers.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-netupgrade@4426 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-07-11 01:08:01 +00:00
drbob
d6e2d959be Added display of Dht Peer Connection status. 
Switched on DhtWindow.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-netupgrade@4422 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-07-10 18:20:30 +00:00
thunder2
b86407f395 Added a new image to the private chat window to set the window always on top. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4409 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-07-08 22:33:26 +00:00
thunder2
ec12fcff6e Optimized layout of the private chat window. 
Fixed german language.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4407 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-07-07 23:24:48 +00:00
thunder2
5e0e244b8a Fixed layout problem (vertical scrollbar) in ChannelFeed. 
Indent text of the channel message and set it to selectable.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4406 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-07-07 22:01:30 +00:00
drbob
d64b714982 Disabled DHT Window by default. (Will reenable when it is complete) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4405 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-07-07 12:05:36 +00:00
thunder2
93bd251ae6 Fixed compile. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4404 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-07-07 11:38:22 +00:00
thunder2
c62f642706 Optimized layout of the SubFileItem. 
Show the cancel button only when downloading or when used in CreateChannelMsg.
Hide empty message text.
Fixed german language.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4402 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-07-06 23:46:16 +00:00
drbob
38fd0c4a5e Added Basic Dht Details Window to Retroshare GUI. 
* created gui/dht/DhtWindow class.
 * brought across the basic structure from PeerNetQt... will be a condensed version of that GUI.
 * added to status Menu.
 * enabled via #define USE_DHTWINDOW  (which is defined! in MainWindow at the moment).
 * Dht Details only displays Dht Peers at the moment.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4400 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-07-06 13:08:27 +00:00
csoler
cca2962116 removed LinkCloud files from main executable 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4395 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-07-05 20:56:58 +00:00
csoler
ccfbfa9984 Improvement of the plugin system: 
- Added configuration saving for plugin manager and serialization methods
	- added a list of accepted plugin hashes
	- added plugin widget for each plugin in settings, to allow enabling/disabling plugins
	- updated LinkCloud plugin to new rsPlugin class
	- put the addconfiguration for plugin manager in rsinit.cc a bit earlier to allow to load 
		the list of accepted hashes early enough
	- added icon for disabled plugins



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4393 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-07-05 20:29:07 +00:00
csoler
a1258e5470 corrected misspelling error 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4377 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-07-02 11:48:15 +00:00
csoler
3f809b6c3a forgot to commit this 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4373 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-07-01 21:01:47 +00:00
csoler
e9853b655c added a signature add/remove button in connect wizard, only when gpgme-1.3.1 or greater is used, based on the availability of the GPGME_EXPORT_MODE_MINIMAL option. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4372 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-07-01 20:47:58 +00:00
defnax
3c19218bec update changelog 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4338 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-06-25 17:58:31 +00:00
csoler
04d16f2397 corrected display of uploaded size 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4325 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-06-23 18:54:49 +00:00
csoler
e877f31409 made search case insentitive, by default 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4315 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-06-21 21:08:56 +00:00
csoler
a28b6d0de9 made the default behavior for multiple keywords search to eb an AND between keywords (emule style) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4314 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-06-20 22:19:34 +00:00
thunder2
886b366d5c Fixed html title bug in the forum message when answering to a message in ForumMsgItem. 
Fixed enabled sate of the new message buton in ForumsDialog.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4312 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-06-20 21:19:48 +00:00
defnax
dd17fcdcda moved Plugins page little bit to the top of the settings 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4294 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-06-19 10:05:14 +00:00
defnax
af858223d9 moved Plugins page little bit to the top of the settings 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4293 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-06-19 09:44:42 +00:00
thunder2
0706b133a7 Fixed my last commit. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4288 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-06-18 08:40:20 +00:00
thunder2
cbb3b4587f Fixed reaction of the checkbox "web of trust". Now the list of unvalid gpg keys is shown or hide directly after the click. 
Fixed calculation of the unread messages in MessagesDialog. The starred messages was not counted as unread.
Set some tree widgets to allColumnsShowFocus.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4285 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-06-17 20:51:05 +00:00
csoler
e6f2d22a8c added settings page for plugins. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4283 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-06-17 19:59:01 +00:00
csoler
a2c91a7924 - Added basic infrastructure to plugin system in libretroshare and retroshare-gui. 
- ported LinksCloud to a new plugin, and removed it from main sources

Next moves:
- add gui for managing plugins
- handle windows compilation



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4275 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-06-16 21:59:26 +00:00
thunder2
2a82826fba Reworked settings dialog. 
The settings page loads the data with the first show. The dialog now starts faster.
Cleaned DirectoriesPage, removed the directory list and save the data with the OK button.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4265 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-06-15 00:40:07 +00:00
thunder2
25b888d31f Automatic add the recommended friend(s) as CC in the MessageComposer. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4262 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-06-14 20:42:32 +00:00
thunder2
aa71b9320d Fixed crash in ForumsDialog (second try). 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4261 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-06-13 23:46:45 +00:00
drbob
9c7adc38b0 * Added a "return" if QTreeWidgetItem = NULL, to stop crash. 
* Added new version of QuickStartWizard2.ui for review.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4260 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-06-13 22:30:32 +00:00
thunder2
8011a55763 Fixed crash in ForumsDialog (hopefully) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4259 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-06-13 20:04:55 +00:00
defnax
4716737398 possible fix for Networkdialog 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4258 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-06-13 15:52:21 +00:00
defnax
20c9e9d1c3 possible fix for the channel/forum tree 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4257 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-06-13 15:47:45 +00:00
defnax
5cbc3ada4c update with new French translation 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4253 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-06-12 15:32:17 +00:00
defnax
eeb47cb16b restore back last translation 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4249 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-06-11 11:32:28 +00:00
csoler
3692ab7afe removed debug output 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4248 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-06-10 21:17:28 +00:00
csoler
844aa174b5 send plain text message instead of html, when the text contains no html specifics. This is a huge gain in forum posts size, up to a factor of 50 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4247 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-06-10 21:16:38 +00:00
defnax
29553d1ae3 * enabled new Spanish translation 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4246 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-06-10 18:40:31 +00:00
thunder2
a56ce1d5be Fixed refill of the threads tree after receiving a new message. 
Now the new message is expanded.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4245 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-06-09 23:16:56 +00:00
defnax
f1e96c839e update translation 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4244 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-06-09 21:56:52 +00:00
defnax
4b590175d8 restore and update .ts files 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4243 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-06-09 21:38:08 +00:00
csoler
ccb9699f81 updated .ts files 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4241 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-06-08 18:56:31 +00:00
thunder2
2efa6b5b06 Moved the fill function of the ForumsDialog to a QThread. 
Fixed memory leak of the fill thread of the history browser.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4240 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-06-07 22:28:07 +00:00
csoler
bf00c510c4 cleaned display of TR statistics 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4238 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-06-07 20:50:04 +00:00
thunder2
0dd77f6f27 Optimized the functions for the forum messages. 
- used "const std::string&" for the parameters
- used "std::map" for the read status
- removed useless variables
Added new define DEBUG_FORUMS in ForumsDialog.cpp.
Added function to generate mass data for the forum messages.
Fixed german language for the FriendsDialog.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4236 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-06-06 21:44:16 +00:00
thunder2
9fb2ddfec0 Added a placeholder text to the message list in the MessagesDialog (currently used when Starred is selected). 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4235 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-06-05 20:19:10 +00:00
defnax
3b89616334 update translation 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4234 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-06-05 14:20:16 +00:00
thunder2
a5ccab9a13 Connected the menu actions reply, reply all and forward in MessagesDialog. Now they work again. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4233 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-06-05 13:37:49 +00:00
thunder2
11a56d2737 Added missing Q_OBJECT to TreeStyle_RDM and fixed translation. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4232 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-06-04 23:44:17 +00:00
thunder2
57ec7b34ce MessagesDialog: 
- Renamed "Favorite Tags" to "Quick View".
- Added the quick view "Starred" to the list to show all messages signed with a star.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4231 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-06-04 22:54:03 +00:00
thunder2
7661f4486d Redesigned the MessagesDialog to open the message in a new tab or new window for reading. 
The MessageComposer is now only for writing a new message or editing a message from the draft box.
Added a new setting to the MessagePage.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4230 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-06-04 00:46:02 +00:00
defnax
50e243adf6 clean up the code 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4229 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-05-31 21:51:15 +00:00
defnax
b139ce2d88 Added a second tab for Router Statistics 
renamed Tunneling to Router Requests


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4228 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-05-31 21:39:44 +00:00
defnax
00d6ec3c1f Added to store splitter position on TurtleRouterDialog 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4226 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-05-30 23:06:22 +00:00
csoler
68e679873d improved color code of previous commit 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4225 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-05-28 22:29:06 +00:00
csoler
429d6f2dc3 improved tunnel statistics gui 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4224 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-05-28 22:25:42 +00:00
csoler
4d846513e2 added additional statistics from turtle router. Needs full recompilation. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4221 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-05-26 22:11:06 +00:00
thunder2
265650c88d Moved the star to the first column in MessagesDialog. 
Fixed debug output in FriendsDialog.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4220 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-05-24 23:35:11 +00:00
thunder2
b1953fd769 Show the selected tag in the tab title in MessagesDialog. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4219 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-05-24 13:15:43 +00:00
csoler
eae57516c5 Included patch to compile on OpenSUSE 11.4 (from AsamK) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4218 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-05-24 10:25:43 +00:00
thunder2
c45e7562bb Added a star column for messages. 
Recompile of the gui needed.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4217 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-05-23 23:45:31 +00:00
csoler
3f21835114 added a display of turtle search/tunnel requests over time, to help spotting potential spammers 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4216 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-05-23 21:45:25 +00:00
defnax
0429baf807 Added to sort by Age when one day, one week or one month is selected 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4215 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-05-21 18:34:34 +00:00
notdefine
a748f88686 Fixed compile Problems on Ubuntu LTS 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4214 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-05-21 17:54:44 +00:00
thunder2
f14b529009 Added tags to the MessageComposer. 
Added context menu to contact list in MessageComposer.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4213 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-05-21 16:26:00 +00:00
thunder2
4c13280fed Show the RetroShare id of the peer and the signers of the key in ConfCertDialog as clickable links. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4212 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-05-18 21:23:26 +00:00
csoler
c3f2f788c4 updated french translation 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4211 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-05-18 12:04:00 +00:00
defnax
2f1c9b713b renamed class PeersDialog to FriendsDialog 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4208 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-05-17 17:27:47 +00:00
thunder2
e6868d4a1e Added "Copy RetroShare Link" of the selected peer in PeersDialog and NetworkDialog. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4206 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-05-16 22:51:08 +00:00
thunder2
7b4f45b686 Removed the + button in channels and forums and moved the post button to the right side. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4205 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-05-16 21:24:16 +00:00
defnax
a8fdcaacb4 Added tooltip's for Messages columns 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4204 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-05-16 20:28:07 +00:00
thunder2
bb832d15e8 Added word wrap to the title of the thread and the subject of the message to avoid the stretch of the splitter. 
Changed style sheet of the tags in MessageDialog to gradient color.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4203 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-05-16 12:04:43 +00:00