Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-14 18:34:29 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity
13,741 Commits 63 Branches 22 Tags 195 MiB
d2ae01ab50
Commit Graph

379 Commits

Author SHA1 Message Date
thunder2
3ef04a61c9 Added feed item for Posted group and message 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7694 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-11-21 00:50:18 +00:00
thunder2
d70bb01b2e Added feed item for forum group and forum message 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7692 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-11-19 12:40:42 +00:00
thunder2
97968170d1 - Added new base class for group feeds - GxsGroupFeedItem 
- Added feed item for channel group
- Added test of feed items for channels and forums
- Reworked existing feed items

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7689 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-11-18 00:49:21 +00:00
thunder2
b4ee877c64 Fixed colors of feed items in RSFeedWidget without style sheet 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7686 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-11-16 02:14:56 +00:00
thunder2
dee39a8840 Replaced scroll area in NewsFeed with RSFeedWidget. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7680 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-11-15 17:24:49 +00:00
csoler
b593a918a0 optim: changed postfixed ++ into prefix++ for non trivial operators, replaced test on std::list::size() by std::list::empty() (Patch from Phenom, modified) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7627 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-10-21 22:33:02 +00:00
thunder2
fbb177dd66 Added read status to posted messages 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7600 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-10-12 17:22:21 +00:00
defnax
be696eb033 fixed layout 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7594 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-10-10 12:20:49 +00:00
defnax
d72354d7f0 added tooltip for the buttons 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7537 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-09-15 15:13:50 +00:00
defnax
2d2e3881cf Fixed the stylesheets 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7479 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-08-01 16:19:07 +00:00
thunder2
d13aa90b2b Added basic widget RSFeedWidget for showing feed items in a QTreeWidget as replacement for the QScrollArea. 
- Use sort of QTreeWidget
- Filter items
- Open/collapse selected item with +/-
- Remove selecteds item with dselete key

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7478 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-08-01 14:49:58 +00:00
thunder2
e588b25b67 Added new method to GxsFeedItem to set content with QVariant. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7477 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-07-27 18:29:35 +00:00
thunder2
3458cdc8fc - Added copy link to GxsFeedItem (GxsChannelPostItem) 
- Fixed copy link of GxsGroupFrameDialog
  - utf8 issue
  - removed unread message count from group name

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7476 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-07-26 23:52:45 +00:00
defnax
3a4a8f388d Added Channel Item Filter from Phenom 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7381 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-05-27 06:57:45 +00:00
thunder2
4c66f82da8 Added set read status to channel post 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7343 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-05-06 20:55:30 +00:00
thunder2
0abc2342fe - Added update of changed posts to GxsChannelPostsWidget 
- Added auto update to GxsFeedItem

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7342 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-05-06 20:19:04 +00:00
defnax
bcb3dee381 changed News Feed icon 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7339 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-05-06 18:10:35 +00:00
thunder2
d2bd938e82 Code maintenance 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7336 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-05-05 23:34:28 +00:00
thunder2
471f4357ba Code maintenance 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7335 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-05-05 23:25:17 +00:00
thunder2
306c8fe431 - Added request of complete fill to update broadcast 
- Added fill of new messages to GxsChannelPostsWidget instead of a complete refill
- Removed static html text from GxsCannelPostItem.ui

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7334 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-05-05 21:53:47 +00:00
drbob
e2cf4feaa5 fixed compilation error. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7253 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-04-07 13:12:57 +00:00
defnax
2bed14865f forget to commit this, vote buttons not yet done. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7229 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-04-04 13:55:00 +00:00
csoler
1042744685 merged remaining of v0.6-IdCleaning branch (7180->7213) to incorporate global router stuff in trunk 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7214 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-03-29 14:18:05 +00:00
chrisparker126
0f29d28b1b merge of branch v0.6-idclean 7180 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7187 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-03-17 20:56:06 +00:00
drbob
c0738eec7f Merging branches/v0.6-initdev into trunk. 
These split at 6672 -> 7075, so quite a bit merge.
libretroshare compiles - but untested.
retroshare-gui needs GenCertDialog.ui and IdEditDialog.ui to be properly merged. (compile errors).
some plugins will be broken.
retroshare-nogui is untested.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7078 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-02-01 14:16:15 +00:00
csoler
730554d397 improved gui message for known peers that are not friends 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7066 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-28 21:33:17 +00:00
defnax
bdecf3def1 Improving some layouts for the Feed Items 
Update Splash Image

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7024 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-17 00:40:28 +00:00
csoler
b8c65db00e limit max number of feed items to 500, to avoid flooding possibility. Improved text 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7023 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-16 20:51:13 +00:00
csoler
8594d68985 improved text for security item 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7022 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-16 20:20:17 +00:00
csoler
bbdc978d00 improved display/fixed bugs in security item 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7021 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-16 19:57:08 +00:00
defnax
6fa0d894d0 clean up SecurityItem, removed unused old stuff 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7020 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-16 17:52:41 +00:00
csoler
613f822133 added new feed item types and logic to show connection attempts from forged certificates (e.g. bad signature, bad certificate) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7018 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-15 20:19:17 +00:00
defnax
0e134d0a92 Added to change the text for the Play Button, when file is not a media file. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6978 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-01 16:58:52 +00:00
defnax
51ed2ca9f9 * Changed the logo size for some news feed items to use same size for better look. 
* Added to display blue/black forum message icons for the forum feeds, when forum is anon or signed. 

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6966 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-12-27 18:24:13 +00:00
defnax
beedc07de8 Added a default background color for the Channel Message Logo for a better look and feel, removed stretching of the logo, set a minimum size, background is now filled black. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6960 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-12-23 20:03:46 +00:00
thunder2
c447ab2829 Channels: 
- Use destination directory when manually downloading a file from a channel
- Show destination directory in channel details
- Fixed utf8 issue when choosing the destination directory

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6902 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-11-16 13:21:25 +00:00
csoler
f3750d0d61 added copy-rs-link to SubFileItem (Patch from Phenom) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6887 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-11-02 14:56:22 +00:00
csoler
695e417fd5 changed std::wstring for std::string+utf8 in chat, and messages 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-initdev@6795 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-10-03 21:41:34 +00:00
drbob
683e75aeef Removed Forums / Channels / Blogs stuff. 
and made GUI recompile.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-initdev@6702 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-09-07 04:21:48 +00:00
thunder2
90bac2a18e Fixed some strings 
Updated english translation

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6675 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-09-02 17:16:54 +00:00
thunder2
4559b48a9d Use sslid to add a location when accepting a friend request from the security item with a known pgp key. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6668 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-09-01 22:18:39 +00:00
csoler
ff67c7eea4 fixed MsgFeedItem for encrypted distant msgs 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6662 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-08-31 21:46:04 +00:00
defnax
43fecc2307 changed the peer details icon 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6625 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-08-26 23:52:06 +00:00
defnax
ff7b56da36 added newsfeed notify icon 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6605 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-08-25 16:05:45 +00:00
csoler
1e2307df47 removed quick message menu and replaced message writing so that it runs a distant message. This is most likely to be needed if the peer is not a friend or can not be connected anyway 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6566 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-08-08 15:09:20 +00:00
thunder2
766bd9c6ae - Fixed fill of news feed. 
- Added display of feed count in main action.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6454 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-06-22 00:05:02 +00:00
defnax
7bc9e2ba53 Added a new icon for "connection refused by remote peer" 
removed not good looking avatar label border stylesheet.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6451 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-06-21 11:45:11 +00:00
thunder2
27d72c6fba Fixed some compiler warnings 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6421 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-06-10 13:27:24 +00:00
csoler
3b5bd220cf fixed compilation 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6418 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-06-09 13:18:31 +00:00
csoler
ae5e1c7ae5 reverted last commit. Fixed the perm bug in ConnectFreindWizard (Patch from Henry Morgan) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6316 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-04-19 11:54:39 +00:00
csoler
3240b1f71b patch from Henry Morgan to use ConfCertDialog rather than connectFriendWizard from Security item 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6313 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-04-18 18:54:53 +00:00
csoler
1500fda2fd clicking on download for channel item marks the item as read 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6248 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-03-19 20:32:46 +00:00
drbob
0c604d08d9 Cleanup of GxsChannels GUI. 
- disabled last references to old channels system.
 - switched on contextMenu.
 - removed FillThread.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6230 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-03-16 12:28:14 +00:00
drbob
f1e23599da Finished most of Comment GUI side. 
- Created GxsFeedItem to subclass all potential Gxs feeds.
 - Modified GxsChannelPostItem & PostedItem to use GxsFeedItem.
 - Added Posted and Channel Items to Comment Header.
 - Added Message Title to Comment Tab.
 - Added MessageBoxes for missing signatures in various places.
 - Changed Licence from GPL to LGPL for gxs, Posted, gxschannels.
 - Deleted Old Posted Classes that are no longer needed.
 - Added Comment Up/Down/Own Vote to CommentTree.
 - Tweaked FeedHolder fns to support GXS comments.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6225 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-03-15 21:02:43 +00:00
drbob
5ba4c8f7ff Major improvements to Comments GUI for channels and posted. 
- Split GxsIdWidgetTreeItem into two types.
 - Added Voter Id into Comment Dialog.
 - Expanded Comment display to show Votes and Score.
 - Expanded Comment Context Menu to include Voting and Reputation Options.
 - Fixed up CreateComment Dialog to include AuthorId, and enabled.
 - Completed Basic Comment Voting.
 - Made Comment Windows Closable.
 - Cleanup up Channel Posts before loading new ones.
 - Fixed up Channel Post Attachments, and Thumbnails.
 - Added View Comments button to Channel Posts
 - Misc other Bugs.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6219 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-03-13 00:33:14 +00:00
thunder2
f4569c57bd Fixed compile on Windows. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6214 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-03-12 00:07:20 +00:00
drbob
da4c1e0f7f Added New Services to GUI. 
- Added GxsChannels 
 - Added New Common Comments GUI elements.
 - Moved Posted over to use Comments.
 
Lots done, but lots to do!



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6212 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-03-11 20:53:15 +00:00
csoler
50db473329 Merged branch for GUI improvements into trunk. The improvement phase is not finsihed yet. The work on GUI will continue into trunk 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6138 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-02-22 21:42:27 +00:00
thunder2
72e5d10bcd Added and modified patch from Anonym 
- when an unknow user attempt to connect, show the name in the security item

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6079 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-01-19 19:24:08 +00:00
thunder2
63d66ee53c Fixed display of "TextLabel" in SecurityItem. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5956 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-09 18:26:30 +00:00
csoler
93501bdc12 patch from AC to perform html optimization of forum posts using the canonical function optimizeHtml() 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5847 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-19 21:35:48 +00:00
thunder2
968f72f303 Fixed missing seconds in time format. 
Added new basic class for date/time format.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5825 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-15 21:35:37 +00:00
csoler
f61a50c5a6 fixed permission of drap+dropped files. all attached files get added to extra list, but with different permission flags depending on the client. From that, we compute sharing permissions : turtle, or direct transfer only 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5808 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-11 21:17:00 +00:00
thunder2
a573211629 Added and modified patch from Henry 
Modified the date format according to the chosen language (locale).

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5798 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-10 18:59:58 +00:00
csoler
6edb9eb4f8 Merged branch that provide group-based file permissions. 
Now users can sort peers into groups in the friend list, and attribute flags and parent groups to the
directories in the share manager.

Flags are B-B-N, meaning in order:
- browsable for peers in the parent groups
- browsable for everyone
- network wide for everyone
Backward compatibility makes previously BN flags been interpreted as -BN, meaning browsable/network wide for everyone.

Be careful with this new feature. It has been tested, but it's a bit early to rely on it for highly sensitive data.

The merge also includes a significant improvement of the naming of flags with incompatible types
which should sort out some existing bugs as well, since inconsistencies in flag usage have been
found during the process.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5787 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-07 20:03:16 +00:00
defnax
07d8db4505 Added to identify for Channel Files if its a media file(s) or not, to change the Play Button text from "Play" to "Open" 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5781 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-06 16:25:20 +00:00
defnax
4009ff47cb set a minimum spacing of 1 pixel, for better look 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5780 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-06 15:17:50 +00:00
csoler
e753f22909 fixed flags conflicts 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-FileSharingPermissions@5758 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-02 13:52:29 +00:00
defnax
886f84b929 patch from Henry Morgan to correct spelling mistakes in source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5662 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-10-11 10:28:24 +00:00
thunder2
11444af4b2 Removed unnecessary values from the ui files of the feed items. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5652 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-10-09 10:04:04 +00:00
thunder2
7502085b64 Fixed "jumping" of the items in channels and news feed when items are changed (load, toggle and remove). 
Added workaround for QTBUG-3372.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5650 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-10-08 23:06:34 +00:00
defnax
1b45be347b Hide request Label, when peer is unknown 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5645 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-10-08 12:48:38 +00:00
thunder2
1d76628181 Reduced fix width of the SecurityItem. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5612 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-09-26 23:01:34 +00:00
csoler
16f07f766c add direct public sources for files shared in channels, when available 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5591 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-09-23 20:02:07 +00:00
defnax
d413412229 - update Changelog for release 0.5.4a 
- added latest translations from beluga
- fixed SecurityItem to hide request Label, when attempt comes from a friend

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5583 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-09-22 12:25:47 +00:00
thunder2
5c5776d486 Added window icon for the application. All windows without a parent are now showing this icon. 
Tweaked standard style of the feed items.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5545 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-09-13 09:52:17 +00:00
thunder2
bcb76154f7 Fixed height of the search input field when using no stylesheet. 
Changed the colors of the feed items. It was too bright.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5533 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-09-09 23:17:47 +00:00
csoler
b8cee76fa5 added display of IP address for incoming failed connexion attempts 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5532 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-09-09 20:25:39 +00:00
thunder2
3d341b3817 Moved some internal stylesheets to the file Standard.qss. 
Reworked some elements in the standard gui.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5521 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-09-07 17:30:23 +00:00
thunder2
a82e2960e1 Moved some internal stylesheets to the file Standard.qss. 
Set the built-in stylesheet "Standard" as default for new profiles.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5484 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-08-29 22:40:16 +00:00
thunder2
e49854ee25 Removed dialog FriendRequest and use ConnectFriendWizard instead. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5482 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-08-28 23:39:11 +00:00
thunder2
dd42738b3c Moved some internal stylesheets to the file Standard.qss. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5479 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-08-27 23:38:27 +00:00
defnax
b2b09de8df set a minimum margin for the Description Label 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5450 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-08-21 15:15:11 +00:00
thunder2
a360419f97 Enabled some more translations in news feed items and fixed german translation. 
Removed not needed file "Thumbs.db" in skin directory.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5350 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-07-29 20:24:09 +00:00
thunder2
219c5db3c9 Added a new button in ChanMsgItem and ForumMsgItem to set the message as read (without expanding the message) and remove the item from the news feed. 
Redesigned ChanMsgItem.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5322 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-07-22 22:48:13 +00:00
thunder2
540f04bed5 Enabled word wrap of the description in ChanNewItem. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5288 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-07-12 10:38:22 +00:00
thunder2
25547d0ea8 Added patch from braindead: 
changed base-class of AvatarWidget to QLabel

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5179 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-05-21 19:37:38 +00:00
thunder2
dc2d6c975e - Moved HandleRichText from the folder "chat" to "util" and redesigned the source 
- Extended RsHtml::formatText to replace the RetroShare links with an image and enabled this for the certificate links in the system messages (friend recommendation and user request)
- Added new ObjectPainter for painting a button on a pixmap


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5160 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-05-12 00:40:53 +00:00
thunder2
c331098203 Added new message flag for system messages like friend request. 
Show "RetroShare" as sender of system messages to myself.
Added new quick view in MessagesDialog to filter system messages.
Changed RetroShare link in friend request message to certificate.
Added new subject image for the system messages (defnax).
Removed not used notify in message service.
Recompile needed.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5129 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-05-01 09:18:55 +00:00
thunder2
9501a4fe2c Added new friend request toaster from defnax. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5120 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-04-25 19:19:16 +00:00
defnax
722bade918 Fixed, hide "Accept Friend Request" Button for Unknown Peers 
Update translation

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5094 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-04-12 22:50:44 +00:00
defnax
68c07321ea Added a label for Connect Attempt after nickname "wants to be friends with you on RetroShare" 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5091 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-04-12 15:30:14 +00:00
thunder2
681ec848e0 Fixed clickable links in forum message feed. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5085 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-04-09 15:01:25 +00:00
defnax
70af1eccf5 Renamed "Accept Friend Request" Button to "Confirm", 
set correct stylesheet for new forum item

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5082 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-04-06 21:29:09 +00:00
defnax
70a7d6ce40 Added Friend Request Dialog for SecurityItem 
Fixed the horizontal spacers

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5077 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-04-04 15:44:35 +00:00
defnax
fb47f06d24 Some Layout changes for MsgItem 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5074 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-04-02 15:57:44 +00:00
defnax
61f5ff5180 Improved PeerItem and SecurityItem layout 
Added icon for "Not Yet Friends"

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5069 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-03-31 23:05:30 +00:00
thunder2
37986e00a3 Added three new toasters - private chat, group chat and chat lobby. 
Fixed some utf8 issues in toasters and feeds.
Fixed german language.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5065 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-03-30 23:02:52 +00:00
defnax
6fa38e7d18 changed Avatar icons for SecurityItem 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5062 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-03-30 09:30:52 +00:00
thunder2
fae86aff3b Added two new images from defnax to SecurityItem for SEC_TYPE_CONNECT_ATTEMPT and SEC_TYPE_UNKNOWN_IN. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5060 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-03-29 20:23:18 +00:00
thunder2
4cb844c44d Removed most of the usages of std::ostringstream in the gui. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5056 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-03-28 18:02:49 +00:00
thunder2
a646f52671 Optimized layout of the newsfeed items. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5005 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-03-04 22:00:28 +00:00
csoler
ee5dcd1a8c - moved RsAutoUpdatePage into retroshare-gui/ directory, to allow plugins to use it 
- removed VOIP code from main executable. Moved it into VOIP plugin (c.f next commit)



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4963 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-02-19 15:03:07 +00:00
thunder2
8675eb9225 Added translation for "[ ... Missing Message ... ]". 
Fixed german language.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4934 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-02-13 20:40:36 +00:00
thunder2
07ea6829b6 The channel message (in channels) is set to read when the user clicks on the show more button. 
The forum/channel news feed is removed when the user reads the message in forums/channels.
Recompile needed.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4927 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-02-12 00:58:47 +00:00
thunder2
340a313fea Fixed bug when the user clicks on a link without http:// in a QTextBrowser. This link was opened directly in RetroShare. 
Show clickable links in the channel feed message.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4923 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-02-11 13:42:42 +00:00
thunder2
3b1c26de35 Set the focus the subject input when creating a new forum/channel or channel message. 
Set the forum/channel message to read when expanding the message feed.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4891 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-02-05 14:56:27 +00:00
thunder2
ff0d6ff25a Optimized some internals in the news feed items 
- std::string -> const std::string&
- QObjectList -> QSet<QObject*>

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4870 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-02-01 12:21:14 +00:00
thunder2
0ee35b55f4 Added new widget for hashing files. 
Added new common class FilesDefs to handle informations of file types like icons and names.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4713 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-12-07 13:08:12 +00:00
csoler
f77bb8136f added icon for rscollection file type 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4665 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-11-09 14:02:15 +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
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
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
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
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
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
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
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
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
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
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
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
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
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
e42c7b6323 fixed the layout of ForumMsgItem 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4196 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-05-12 16:33:11 +00:00
thunder2
0619463948 Fixed some more utf8 handling in the GUI. 
Optimized creation of the RetroShare links for forum and channel messages.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4194 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-05-08 23:11:27 +00:00
defnax
dd457e15c7 fixed back my wrong commit 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4193 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-05-08 18:43:08 +00:00
defnax
6f7dadfdc5 fixed ForumsMsgItem to not stretch the widget, when forum subject is too long, and optimized little bit. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4191 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-05-08 17:14:51 +00:00
thunder2
70c3c9678d Added new RetroShare link format to write a message 
retroshare://message?id=...[&subject=...]
Added clickable links in ForumMsgItem for the signer of the message to start the MessageComposer.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4190 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-05-07 23:14:09 +00:00
thunder2
cd8188bf09 Added new RetroShare link format to start a search 
retroshare://search?keywords=...
Enabled key "delete" to remove search results.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4185 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-05-04 10:22:49 +00:00
thunder2
73daae5992 Removed the GoTo buttons from the feeds and added clickable links. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4184 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-05-03 23:04:42 +00:00
csoler
76e404db54 suppressed channel source ID from the file source peer list 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4175 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-04-28 19:07:16 +00:00
thunder2
e5f3518225 Added new RetroShare link formats: 
retroshare://forum?
retroshare://channel?...
Added "Go to" from the news feed of forums and channels.
Added "Copy RetroShare Link" to the forum/channel tree and messagees.
Fixed style sheet of the auto download button in ChannelFeed.
Fixed german language.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4162 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-04-19 19:42:44 +00:00
chrisparker126
48d293f8b0 forgot to commit change to gui chanmsgitem for changed subscribe channel 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4140 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-04-09 17:39:43 +00:00
chrisparker126
1bef23042f auto download option: 
ability to enable and disable channels auto dl added
added gui update to channel feed
msg download not enabled yet

cache opt:
added more enable cache opt #defines to disable cache opt code





git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4133 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-04-07 22:10:10 +00:00
thunder2
5250c27fed Removed own settings for news feed. 
Added parameter to RSettingsWin::showYourself to show the options with a specific page.
Fixed german language.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4104 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-03-26 22:17:15 +00:00
defnax
be7359e804 added newsfeed settings 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4102 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-03-24 19:43:52 +00:00
thunder2
5fc7543018 Corrected some translations and fixed german language. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4006 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-01-31 22:04:28 +00:00
thunder2
13132fe248 Removed reply in ForumMsgItem in unsubscribed forums. 
Set sign checkbox to checked in authenticated forums.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3991 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-01-28 00:51:56 +00:00
defnax
24d4a5e6ce enabled copyable labels on ForumMsgItem 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3990 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-01-27 17:31:21 +00:00
defnax
f38f968473 changed the stylesheets of ForumMsgItem 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3988 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-01-27 14:00:30 +00:00
defnax
3f446d8f3c Added fast reply feature to ForumsMsgItem 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3987 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-01-27 08:34:23 +00:00
thunder2
4fb593f1b9 Fixed display of the avatar in MsgItem. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3986 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-01-26 23:09:25 +00:00
thunder2
c2a81daf01 Fixed display of the names and avatars in ForumMsgItem. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3985 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-01-26 21:36:13 +00:00
defnax
9263710f9e added to display avatars and author names for ForumMsgItem 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3984 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-01-26 09:34:48 +00:00
thunder2
693bf4dd7c Added smiley and RetroShare link support for ForumMsgItem and MsgItem. 
Added some new translations.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3965 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-01-13 22:19:20 +00:00
thunder2
dd55b2bf74 Moved strings of RsPeerDetails::autoconnect for translation to the GUI side and added integer constants for it. 
Fixed sorting of available friends in MessengerWindow.
Recompile of the GUI needed.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3952 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-01-06 18:26:39 +00:00