Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity
9,186 Commits 63 Branches 22 Tags 194 MiB
269f9457be
Commit Graph

402 Commits

Author SHA1 Message Date
csoler
e449e709b5 attempt to improve/clarify relationship between nodes and PGP keys. Removed duplicate options and splitted ConfCerDialog into a dialog to show nodes certificates and PGP key information 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8232 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-05-12 20:30:44 +00:00
csoler
b4355cdcd1 fixed typo in naming and removed inconsistent entries from friend list menu. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8227 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-05-09 21:43:01 +00:00
electron128
a8458037d5 re-enabled hide of status column in friends list 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8209 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-05-03 09:15:42 +00:00
csoler
69612c0c86 updated TODO list. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8147 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-04-19 20:29:06 +00:00
csoler
c9d5c7b3cb turned some std::list<PeerId> into std::set, as it automatically prevents duplicates 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8138 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-04-17 21:36:22 +00:00
csoler
20deecd6d3 removed infinite loop when openning a rscollection file 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8135 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-04-14 21:40:34 +00:00
csoler
5e50423915 fixed icons in FriendSelectionWidget and MsgComposer. Also added disable/enable for From field depending on which type of recipient is used. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8087 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-03-27 22:16:12 +00:00
csoler
e40460bdcc new notify capability of chat lobbies: message counting, nickname occurrence counting and specific text counting. Also sorts out notify tab in Settings (Patch from Phenom, slightly modified: gui layout/text + added a flag to enable/disable user defined text grep) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8082 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-03-26 22:17:48 +00:00
csoler
78604a831a fixed constructors in button-on-text widget (Patch from Phenom) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8070 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-03-22 12:55:59 +00:00
csoler
bd2026458e improvement of FriendList (Patch from Sehraf) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8065 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-03-21 21:58:05 +00:00
csoler
ed014b0d34 added notification for VOIP calls (Patch from Phenom) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8063 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-03-21 21:25:17 +00:00
csoler
3f116e0e73 added scale and wheel-event resizing to RSGraphWidget 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8062 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-03-21 18:40:21 +00:00
csoler
55988a5796 fixed update of info in ShareDialog (patch from Sentry). Also updated the text to replace Friends by friend nodes 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8052 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-03-19 20:39:59 +00:00
thunder2
a23e563c6b Click on a certificate in a message (MessageWidget) shows the add friend wizard only once. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8036 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-03-16 14:40:30 +00:00
thunder2
d6ca3ffc27 Added waiting indicator to group tree for channels/posted when using "Mark all as read/unread". 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8020 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-03-14 21:13:28 +00:00
thunder2
cdf9a5b4d4 Optimized search of feed items in RSFeedWidget by using a map instead of QTreeWidgetItemIterator. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8013 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-03-12 13:59:56 +00:00
csoler
6585cfca2c fixed compilation on debian squeeze. Removed placeHolder properties in CreateGxsForumMsg.ui and GxsGroupDialog.ui which need to be set in the cpp. Added a new DEFINE=NO_SQLCIPHER to compile without sqlcipher when sqlcipher cannot be found (no sqlcipher is available on debian squeeze). 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7941 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-02-13 19:34:38 +00:00
thunder2
326501f1f7 Added placeholder text to RSFeedWidget 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7933 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-02-09 21:13:07 +00:00
csoler
0c0f35e064 removed unused code in AvatarDefs 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7932 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-02-09 20:47:58 +00:00
csoler
b731999f99 added avatars for GXS ids in distant chat 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7928 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-02-08 17:38:30 +00:00
csoler
ccee594a28 half way through enabling GXS avatars into distant chat. Converted AvatarWidget to use a generic ChatId instead of RsPeerId. Still need to add own Id to PopupDistantChatDialog and properly compute own name. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7924 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-02-07 22:43:53 +00:00
thunder2
5dd26de35b Used AvatarDialog to choose an avatar for an identity. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7913 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-02-05 00:10:37 +00:00
thunder2
6cad38bd7c Fixed deadlock in RSGraphWidget (Patch from Cyril) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7908 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-02-04 10:56:19 +00:00
defnax
96bf79daae Added Avatar Dialog at the moment for own peerid, soon for gxs avatars change. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7905 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-02-03 19:17:35 +00:00
thunder2
eff55b2591 Fixed removing of a node in friends list. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7869 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-01-24 00:59:32 +00:00
csoler
34f968a112 merged new GRouter model (branch v0.6-NewGRouterModel 7837-7863). Provides a fully functional distant messaging system. The asynchronous part will be implemented shortly 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7867 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-01-23 19:28:10 +00:00
defnax
b155c36170 renaming strings and changed icons for Network/People 
added Peer def for Identities.


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7862 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-01-23 14:42:28 +00:00
csoler
e8f5f44318 started implementation of new Global Router model. Switched msg service to use it (much simpler now!), and updated GUI. Implemented half the tunnel management logic. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-NewGRouterModel@7838 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-01-11 22:18:28 +00:00
defnax
3755d540b7 Moved Search Filter to the top of the Selection Widget 
Added a Filter ComboBox for Message Composer, to switch Show types.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7835 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-01-11 00:53:16 +00:00
csoler
4d26726a88 fixed unread chat cound in FriendsDialog, fix display of status in distant chat (Patch from electron) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7832 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-01-10 13:13:41 +00:00
defnax
abc33296a7 Added a info Frame, when adding a Distant Peer to the send list. 
Added Default blue forum icons for own Forums.
Changed default text color for own group & online status text color
Switch icon when Contacts View is hided.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7816 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-01-03 01:40:23 +00:00
defnax
d26ea4a642 Enabled to display identity icons for Distant peers on Message Composer and on Friend Selection Widget 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7811 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-12-30 23:14:34 +00:00
thunder2
530fcab61d Renamed "location" to "node" in gui (Patch from Henry) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7802 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-12-30 11:11:08 +00:00
thunder2
1b77e09684 Set text in HeaderFrame to elided label. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7801 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-12-30 10:40:58 +00:00
csoler
13d7866171 simplification of the chat interface to libretroshare using a single unified class for chat IDs. Used a common chat widget for all chats including broadcast. Opens the way to having plugins send/recv chat messages. Patch from Electron. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7800 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-12-29 21:41:05 +00:00
thunder2
6c3a6f161f Added a new base class RSTextEdit with placeholder for Qt < 5.2 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7792 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-12-25 02:39:40 +00:00
defnax
dff43792b6 Set a minimum size for Status Button. 
Fixed when the FriendList columns are hidden, set header sizes to default.
Changed profile settings icon.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7790 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-12-24 01:40:08 +00:00
defnax
4ae50dd1f8 Changed column order 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7786 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-12-23 17:07:07 +00:00
thunder2
3f3c1983c8 Fixed some typos (patch from Henry) 
Updated english translation

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7777 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-12-22 15:44:47 +00:00
thunder2
a3b844da6b Fixed some typos (patch from Henry) 
Updated english translation

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7770 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-12-17 18:02:52 +00:00
csoler
93f77a0e2c improved network statistics for GXS net service. Added number of available messages for unsubscribed forums in GUI. Should be done as well for channels. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7760 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-12-16 06:54:15 +00:00
thunder2
78c71ab011 Added new class StyledElidedLabel and used it for nick name and channel label. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7757 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-12-14 17:05:43 +00:00
thunder2
ba6903150d Fixed compile with Qt 5 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7755 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-12-14 00:40:33 +00:00
defnax
f23bb941a0 * removed spaceritem to not stretch 
* hide state by default

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7743 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-12-09 19:29:53 +00:00
thunder2
24567d3d90 Moved font size definitions from ui files to default qss. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7736 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-12-08 00:08:35 +00:00
thunder2
90c3c24412 Moved font size definitions from ui files to default qss. 
Added new base class StyledLabel to emulate the missing font-size by factor in qss.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7733 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-12-06 22:09:44 +00:00
thunder2
09dbb63a78 Reduced speed of scrolling of RSFeedWidget 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7707 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-11-24 23:55:51 +00:00
csoler
30d9671ca6 added setFlags method in Id combo box. Removed possibility to send anonymous distant messages (too risky). Improved the logic in message composer GUI. Fixed bug when key not available in message encryption/signing routine. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7705 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-11-24 21:02:18 +00:00
defnax
b3a33206b1 * Enabled Sort by State Menu Action 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7696 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-11-21 12:10:26 +00:00
defnax
4cdd83cc89 * Enabled by default to display Friends Avatar on Friendslist 
* Changed for RS 0.6 the status icons
* beautify the status string which displays after nicknames

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7695 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-11-21 01:54:21 +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
d45a935b3c improved display of popularity 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7643 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-10-26 16:29:09 +00:00
csoler
90b57337f5 fixed display of TOR connexions in the friend list 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7642 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-10-26 16:24:45 +00:00
thunder2
cfd6a7b8b5 Fixed navigate to channel post when clicking a channel post link. 
Fixed navigate to forum message when clicking a forum message link.
Fixed copy of forum message link to clipboard

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7640 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-10-25 23:52:33 +00:00
thunder2
a3af37c7e4 Fixed start of chat with right or double click on a friend item (not location) in friend list. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7633 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-10-25 12:26:09 +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
csoler
1f1c51b7d3 Used RSGraphWidget for bandwidth window too; Cleaned up remaining unused graph classes; Added a few missing params to RSGraphWidget; End of graph work. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7616 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-10-17 19:47:05 +00:00
csoler
b51c34d23b improved display of graphs 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7614 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-10-16 19:17:17 +00:00
csoler
01fdb95c30 small fixes in number display 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7613 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-10-15 22:16:23 +00:00
csoler
8c1bf3cf8d improved RSGraph class. Used it for Turtle statistics and bandwidth statistics as well 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7612 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-10-15 22:00:49 +00:00
csoler
3d49af2b2b fixed RTT graph. Added colors, and new options to RSGraphWidget. Still needs to draw names for different colors 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7610 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-10-14 20:25:23 +00:00
csoler
1757a85e57 improved RSGraph class. Not finished yet. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7609 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-10-13 22:05:50 +00:00
thunder2
bd1add2e20 Fixed Windows compile 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7606 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-10-12 21:38:27 +00:00
csoler
9d2a22bbb0 added missing file 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7605 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-10-12 21:12:58 +00:00
csoler
d79f5e10fb Improvements of People dialog. Patch from Phenom (slightly modified). 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7603 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-10-12 20:07:12 +00:00
thunder2
bec735b60a Added the delete of the TokenQueue in some destructors to fix crashes. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7597 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-10-12 10:46:09 +00:00
thunder2
894addedb4 Fixed some compiler warnings 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7590 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-10-09 15:17:42 +00:00
csoler
8c2ba8b980 added a structure in GxsNetService to record who sends info about groups, so as to dynamically compute group popularity. The GUI needs to be improved to update regularly so as to reflect current values for popularity. For now only subscribing/unsubscribing and new messages trigger the update 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7587 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-10-07 21:42:44 +00:00
csoler
9efc43f41c Big progress for People dialog. Phenom work. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7573 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-09-28 20:46:56 +00:00
thunder2
f60b37a213 Added a new setting to channels to enable/disable threaded loading. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7484 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-08-06 17:41:22 +00:00
thunder2
7a65ad1a14 Added threaded loading of channel posts. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7480 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-08-01 18:54:55 +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
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
thunder2
d20ce41c96 - Removed all usages of the old windows icon (rstray3.png) and used the standard icon of the application 
- Added possibility to change the icon of the GxsGroupDialog

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7471 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-07-24 23:26:04 +00:00
thunder2
6792348402 - Moved settings for user notify into the base class 
- Removed defines TRAYNOTIFY_...

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7470 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-07-24 20:01:12 +00:00
thunder2
d6408daafc Added new option to hide the tabbar with one open tab in forums and channels. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7450 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-07-14 21:29:51 +00:00
thunder2
383a035bdb - Added new translatable strings (patch from Henry) 
- Updated english translation

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7447 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-07-10 18:37:21 +00:00
thunder2
bd58cca832 Added UserNotify to gxs channels and forums. 
Count new messages by retrieving all messages of all subscribed groups until getServiceStatistic is available.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7435 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-07-06 10:32:13 +00:00
thunder2
48e5a49cd5 Added new base class for a subscribe button - SubscribeToolButton. 
Added subscribe and auto-download button to channel dialog.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7431 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-07-05 18:33:11 +00:00
thunder2
c5e41f0eaf Merged revision 7414 from v0.5.5 
Added parts of patch from Bogdan:
- Fixed double declare of variable item in GroupTreeWidget::calculateScore


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7418 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-06-29 19:54:53 +00:00
defnax
c9ef2a77b5 Added a Header Frame for Collection Editor 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7391 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-05-29 15:50:46 +00:00
defnax
e65f73a44d Added new Patch from Phenom (AddRSCollectionEditor_v0.6_7386) 
Some Improvements : added submenu, Edit and view mode.


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7388 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-05-29 14:49:45 +00:00
defnax
5e1099f47f Fixed GxsGroup TreeWidget's Context Menu by Phenom 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7387 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-05-29 13:34:08 +00:00
defnax
f54162db76 Added a tooltip for Clear Button 
Set a fixed size for ForumThreadWidget's Search Filter

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7386 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-05-27 23:59:18 +00:00
chrisparker126
0dabe4b8a1 support for retroshare links in gxs forums 
- only group can link at the moment

added more nxs tests and better cleanup
- test ability sync with a delayed circle load 

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7384 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-05-27 21:14:05 +00:00
defnax
bcff888eb7 Added new Gui Design changes from Pheonom, Added new ListWidget for Page selection, via settings can switch to use List or Toolbar AddFrameListeInsteadOfToolBar_v0.6_7357.patch 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7360 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-05-10 02:38:47 +00:00
csoler
3766449bec fixed display of message links in composer window and message window. Still takes several attempts to display correctly. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7352 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-05-08 08:39:04 +00:00
csoler
a946504bb5 fixed RS link so as to send messages to GXS ids. Remaining issue: a link might need to be clicked several times before it works 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7351 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-05-08 07:52:28 +00:00
csoler
a5d88d967e added code to transmit the sender GXS id in the message widget. Still need to make distant message links work 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7347 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-05-07 20:53:16 +00:00
defnax
06fe72e0d8 Removed Left side ToolBar. 
Moved Info, About & Options to the Top ToolBar
Moved Add Friend Button to Friends Dialog

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7311 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-04-29 11:52:13 +00:00
thunder2
50fcd401b1 Show "Add group" action in context menu of FriendList without groups. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7273 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-04-13 14:54:49 +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
91c49fa992 added ElidedLabel to be used in places where labels might be too long and therefore trigger an unwanted window resize. This is currently used as forum thread titles (Patch from Phenom) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7045 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-20 20:03:24 +00:00
drbob
46518ebf51 revert GUI part of svn commit 7042 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-initdev@7043 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-20 07:29:54 +00:00
chrisparker126
f3afc128ee Chozabu patch 
- New db created for parent group id field, you will all previous gxs data
- posted now support sub post topics

git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-initdev@7042 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-19 23:38:48 +00:00
defnax
50ebd781e5 * Corrected the layout of the Connect Progress Dialog 
* Added few more file type icons for "cpp", "h" nd "c"
* Corrected some strings
* Moved Uploads to Downloads Tab. 

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6986 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-04 19:54:07 +00:00
defnax
469da4914f Added a default FileType icon for the "patch" and "diff" extensions. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6983 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-03 19:32:53 +00:00
thunder2
abd6b46ca0 Added a custom context menu for pasting RS-links to the base class MimeTextEdit and removed the custom context menu from derived classes. 
Updated english translation.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6977 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-12-30 19:12:16 +00:00
csoler
57c66bd06f forgot to commit this: show correct connect address (local or global) depending on the current status 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6932 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-12-08 14:12:02 +00:00
thunder2
6dbcc3e99b Code maintenance for Qt 5: 
- Added new options to retroshare-gui.pro for Qt 5
- Added new file QtVersion.h with macros to compile with Qt 4 and Qt 5
  - QHeaderView::setResizeMode -> QHeaderView::setSectionResizeMode
  - QHeaderView::setMovable -> QHeaderView::setSectionsMovable

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6849 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-10-19 13:25:06 +00:00
thunder2
3e15a7bb86 Code maintenance for Qt 5: 
- Fixed some missing headers
- Fixed some deprecated functions

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6845 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-10-19 02:07:01 +00:00
thunder2
135a5e579a Code maintenance for Qt 5: 
- Replaced Qt::WFlags with Qt::WindowFlags.
- Removed path "QtCore/" and "QtGui/" from the includes.
- Replaced "QString::toAscii()" with "QString::toLatin1()".

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6843 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-10-18 21:10:33 +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
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
defnax
440968cb98 Added a icon label to RSImageBlockWidget 
changed some icons for encrypted messages

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6762 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-09-25 15:58:01 +00:00
thunder2
6a9dfed408 Added new action "Load images always for this message" to image blocking. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6760 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-09-24 20:19:21 +00:00
thunder2
6b1613d8bb - Added blocking of embedded images (+ settings) to forums and messages 
- Added image support for forum messages
- Renamed LinkTextBrowser to RSTextBrowser
- Updated english translation

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6752 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-09-23 19:53:26 +00:00
csoler
dd6fbe44ab added selection box to show only friends (already translated) in message composer 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6708 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-09-07 14:02:24 +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
e5d8860e21 Moved friend recommendations into the ConnectFriendWizard 
Updated english translation

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6679 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-09-02 22:51:26 +00:00
thunder2
495cc17da3 Moved service permission matrix to the left toolbar 
Updated english translation

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6678 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-09-02 21:48:23 +00:00
csoler
abd8c1e32f improved name support for distant peers in messages 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6653 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-08-30 20:40:28 +00:00
thunder2
cc92fdfc81 Moved the filter edit and the display button from FriendsDialog and MessengerWindow into FriendList. 
Updated english translation

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6649 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-08-30 12:24:39 +00:00
thunder2
21eed4c956 - Moved display button and new forum/channel button into GroupTreeWidget 
- Fixed size of display button in FriendsDialog
- Updated english translation

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6645 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-08-29 20:32:14 +00:00
defnax
b5c6875706 Added default icon for the Status Message Button 
changed some default context menu icons

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6643 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-08-28 23:27:46 +00:00
csoler
2109c05d26 fixed security checking of collection files to avoid xml bombs 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6634 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-08-28 19:10:55 +00:00
drbob
fd66a963d2 Improvements for ProgressDialog. 
- Launch progress dialog after connectWizard.
 - fix display of location on connectWizard.
 - add cleanup code to ProgressDialog.
 - Qt4.7 bugfix.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6616 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-08-26 07:24:37 +00:00
drbob
b566d6d69c Added ConnectProgressDialog - to help people workout why RS is not connecting. 
- Pops up when you do a "Connect Attempt" from the FriendList.




git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6590 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-08-22 07:30:54 +00:00
defnax
ebbf6d9e26 Added a headerFrame to Service Permissions Dialog 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6583 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-08-21 16:26:34 +00:00
csoler
0b0010ff59 improved completion for chat (Patch from Phenom) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6515 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-07-18 21:50:32 +00:00
csoler
7c6a7edfde Sorted out the mess in friends list: 
- removed entries from rightmost menu:
	* add friend: removed, already on the left bar
	* add group, recommendations and service perms => moved to context menu in friend list
	* create chat lobby: removed. Not relevant.
	* avatar and state string: removed. Can be done right at right, by clicking on the things.
- removed rightmost menu
- icons in context menu still need fixing.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6512 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-07-16 22:33:45 +00:00
thunder2
9eeacf7f83 GxsForums: 
- optimized steps of the progressbar when loading
- added UIStateHelper
- removed debug output
- added Todo button

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6500 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-07-12 17:24:11 +00:00
thunder2
f02cc51409 Identity: 
- Redesigned dialog
- Fixed high CPU usage when showing reputation list
- Added todo button

UIStateHelper:
- Added new base class for easier handling of ui elements with token request (show "Loading", set enable state, ...)

RsProtectedTimer:
- Fixed compile on Windows

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6495 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-07-10 21:57:23 +00:00
thunder2
c0cc792300 Added filter of items to RSTreeWidget. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6493 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-07-09 11:58:55 +00:00
csoler
940ffd6d9c make friendlist fully resizable (Patch from phenom) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6490 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-07-06 21:45:18 +00:00
thunder2
e9db631f8f Fixed crash in completer of MimeTextEdit (Patch from Phenom) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6483 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-07-06 15:17:34 +00:00
csoler
66d38ff1bb added column with IP for connected peers (modified patch from Phenom) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6477 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-07-04 20:11:36 +00:00
csoler
90e7a3cd54 added completer to MimeTextEdit and ChatWidget (Patch from Phenom) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6475 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-07-04 19:36:12 +00:00
thunder2
61d43e8e72 Disabled refill of FriendSelectionWidget after group changed when no groups are shown. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6444 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-06-20 12:27:51 +00:00
thunder2
cac96b8317 - Added some performance optimizations in FriendSelectionWidget::peerStatusChanged 
- Fixed some ui design

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6442 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-06-19 13:18:15 +00:00
csoler
c6a7dba418 fixed initialization of friend selection dialog 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6440 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-06-18 20:32:10 +00:00
thunder2
e6c0217801 Fixed deadlock in FriendSelectionWidget (patch from Cyril) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6438 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-06-18 09:58:47 +00:00
csoler
69bf523c7a Enabled distant chat system. 
Added system to collect and create chat invites from pgp keys.
Finished the GUI (some layouts need fixing, especially the link creation window).
Still needed: QoS on generic turtle data items. Will need a new item class for any anyway.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6433 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-06-16 14:39:44 +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
0266329dc8 - Added a drop-down item to allow removing unused keys, in the Network dialog. 
- added key removal method in OpenPGP-SDK
- improved FriendSelectionDialog/Widget to enable select all/none keys, and show non friend keys
- added safe key removal method in PGPHandler. Removed keys from other locations will not cause errors.
- added backup system to public keyring, impossibility to remove public parts of owned secret keys, etc.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6382 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-05-29 21:32:02 +00:00
csoler
1dd8e9067f patch (from Henry Morgan) to make the tooltips translate-able in the group flags widget 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6317 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-04-19 21:09:05 +00:00
csoler
01a1b9dc36 patch from Henry Morgan to fix some strings 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6153 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-02-27 10:00:35 +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
ee62819389 Fixed wrong subscribeFlags in context menu of GxsForumsDialog. 
The color of the QTreeWidgetItem was stored with the same key.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6122 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-02-11 00:19:35 +00:00
thunder2
439ccc94f4 Added new dialog to set service permissions for friends. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6085 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-01-23 00:22:17 +00:00
thunder2
138a35b2a2 Enabled embedded images in private chat and messages (only for QT version 4.7.0 and higher) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6083 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-01-22 00:14:10 +00:00
thunder2
ef49000b9a FeedReader: 
- Added error handling to xml functions
- Added xslt transformation
- Added retransform of existing messages
- Redesigned preview dialog
- Enabled embed images for forum feeds
- Changed config format, switching back to an older version results in a loss of all data of the FeedReader

Added new base class RSPlainTextEdit with placeholder text.
New library libxslt needed

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6081 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-01-22 00:11:43 +00:00
thunder2
919fb3f62d Added patch from Anonym 
- added tooltips to GroupFlagsWidget when buttons are unchecked

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6080 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-01-19 22:04:02 +00:00
thunder2
66c4a3d71b Fixed compile with Qt < 4.7 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6073 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-01-14 22:42:48 +00:00
thunder2
ddc4a37a93 FeedReader: 
- Recalculate message count of the user notify when a feed with new items is deleted.
- Set deleted message to read and !new.
- Added test feed item in notify settings.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6072 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-01-14 22:41:31 +00:00
thunder2
a60422069c Added api for news feeds to the plugin interface. 
Added news feeds to the FeedReader plugin.
Recompile needed.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6066 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-01-08 22:07:52 +00:00
thunder2
f488dbd15a Added new option for GxsForums and FeedReader - Open all forums/feeds in new tab. 
Option=on (standard)
- no standard tab
- new tab by single click
- no menu entry "Open in new tab"

Option=off:
- standard tab (not closeable)
- open in standard tab by single click
- menu entry "Open in new tab"
- open new tab with middle mouse button


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6060 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-01-06 02:30:10 +00:00
thunder2
451c7f5eda Removed the policy TabFocus from some gui elements. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6058 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-01-03 14:08:39 +00:00