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
7,450 Commits 63 Branches 22 Tags 194 MiB
578e15ffa7
Commit Graph

4373 Commits

Author SHA1 Message Date
csoler
f2a8a293cf improved GUI for Posted 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7959 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-02-19 20:23:39 +00:00
thunder2
233fab7b6b Hide share of key in forums 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7957 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-02-18 23:07:25 +00:00
csoler
9e31d2714d hide reputations which are not used yet (patch from sehraf 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7956 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-02-18 22:09:51 +00:00
csoler
d2c4c3bb09 added new flag to allow peers auto-download recommended files from trusted neighbor nodes, which give the possibility to push data to other nodes 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7955 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-02-18 19:07:58 +00:00
defnax
110df28979 Added tooltip on key id column. 
Hide Id Type column by default.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7953 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-02-17 21:31:14 +00:00
thunder2
219e94910e Hide score label in channel post item 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7949 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-02-16 19:23:31 +00:00
thunder2
c79fa0747e Fixed initial size of the splitter in IdDialog. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7947 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-02-16 15:45:53 +00:00
defnax
f81593fde9 Disable Send Message button for own Identities. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7946 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-02-16 15:33:35 +00:00
drbob
f5880bf655 Fixed GUI - to allow people to post to subscribed Topics. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7945 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-02-16 11:05:33 +00:00
csoler
6e8e5efb90 fixed a few bugs in distant chat protocol (allow re-negociation of DH parameters if decryption fails, correct passing of own gxs id for server side), making the system more reactive. Also fixed the issue of avatar not showing up. Changed the tunnel naming system to something specific to distant chat. WARNING: this version cannot distant chat with previous versions. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7943 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-02-14 20:55:05 +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
csoler
8b1d94fe3e fix (by thunder) to avoid calling QPixmap outside the main thread, causing some avatars to fail to load 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7938 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-02-11 07:00:52 +00:00
defnax
6c9dffaa40 Set default palette & stylesheet for the Channel infoWidget. 
Enabled word wrap and copyable text.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7937 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-02-11 00:52:20 +00:00
thunder2
0a1698f8c8 Used RsGxsGroupId instead of std:string for id/name in IdEditDialog/GxsidChooser. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7936 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-02-10 12:55:16 +00:00
defnax
05d25a83d5 Added a send message button on header frame. 
set default border stylesheet for the Avatar Label.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7935 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-02-10 01:14:44 +00:00
thunder2
d89cee8bdd Added info pane for unsubscribed channels 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7934 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-02-09 22:11:19 +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
90a2d2a160 fixed bug in control of available identities for signature in MessageComposer 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7931 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-02-09 20:47:04 +00:00
csoler
140ef988a5 fixed bug in distant msg composer checking 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7929 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-02-08 20:43:34 +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
thunder2
a7b902a0ee Added new strings to translation. 
Updated english translation.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7927 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-02-08 15:47:15 +00:00
thunder2
8351510841 Receiving a shared key: 
- Added notify of the group id and the refresh of the gui
- Added system message (create of message disabled)
- Added possibility to show a news feed item

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7926 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-02-08 01:01:48 +00:00
thunder2
961641c186 RetroShareLink: 
- Fixed create unknown ssl certificate
- Fixed process of person link

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7925 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-02-08 00:00:57 +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
defnax
3b5644c474 added columns context menu entry, to hide optional some columns 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7923 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-02-07 20:24:27 +00:00
csoler
030c69d95b restored some code removed by mistakein 7904 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7921 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-02-07 09:53:33 +00:00
csoler
e6d92bf44e separated "owned by you" and "linked to your node" which are two different things; fixed bug showing chat menu for own identity 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7919 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-02-05 20:37:24 +00:00
csoler
6620269f31 fixed typo in column addressing 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7918 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-02-05 20:28:50 +00:00
csoler
9dcb3b2555 removed unused code 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7917 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-02-05 19:53:22 +00:00
defnax
f3715a1257 Fixed Scale QLabel content 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7915 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-02-05 15:55:19 +00:00
defnax
8a87e2503d set item icon size 22x for Identity icons. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7914 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-02-05 11:51:08 +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
defnax
b0a8eba546 fixed compile 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7912 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-02-04 23:36:37 +00:00
csoler
5ae5d4f0a1 added avatar to GxsId tooltip (see in forums). Removed thread data race due to multiple threads accessing the static data member image_cache, causing avatars to not show up randomly. I do not have a clean solution yet on how to restore this cache 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7911 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-02-04 23:05:56 +00:00
csoler
52901c1ddb removed unused code in ServicePermissionPage 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7910 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-02-04 20:38:02 +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
0ebc1223b3 Set Light gray background color for the identicons for better look n feel. 
Fixed to scale QLabel content.
Moved to display Avatars on ID Dialog into a QLabel

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7907 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-02-03 22:16:21 +00:00
csoler
7642ba1c1f added load/save to service permission matrix 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7906 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-02-03 21:28:32 +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
csoler
64f8b4c539 removed all permission system. Kept the use-as-direct-source option. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7904 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-02-02 22:32:30 +00:00
csoler
a018f17af7 switch to standard identity icon format for defautl icons (patch from Phenom, slightly modified) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7903 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-02-02 21:59:44 +00:00
csoler
8e8860d1bd fixed design of PermissionMatrix. Improved scroller. Fixed bug not showing permissions correctly. Added help text. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7902 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-02-02 21:42:41 +00:00
defnax
88c6af3b74 Enabled to display extern gxs Avatars on ID Details Dialog 
Moved remove button under the add btn,for better look.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7901 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-02-02 00:47:49 +00:00
csoler
63a3051d3c added global switch on/off per service 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7900 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-02-01 20:34:30 +00:00
csoler
2a9551a41a added auto-update to permission matrix 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7899 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-02-01 15:08:18 +00:00
csoler
b2c2b7fc85 implemented dedicated widget for service permission matrix. Permissions are not saved yet, and we also need a default switch 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7898 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-02-01 14:38:19 +00:00
thunder2
c04693faba Removed "Send" button in CreateGxsForumMsg and used "Ok" button of the buttonbox to send a message. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7892 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-01-31 12:23:56 +00:00
thunder2
9a9ea9b55a Fixed icon to toggle participants frame in chat dialog. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7890 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-01-31 11:23:09 +00:00
thunder2
7cfd50f860 Fixed another crash in IdEditDialog::createId when avatar is not set. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7887 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-01-29 17:51:25 +00:00
thunder2
4cab5dc743 Fixed crash in IdEditDialog::updateId when no avater is set. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7886 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-01-29 16:09:32 +00:00
thunder2
b7f4e292f1 Fixed compile with Qt 5 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7885 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-01-29 14:43:31 +00:00
defnax
6be1cb82b9 Added remove Avatar functionality 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7882 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-01-27 16:36:27 +00:00
defnax
d2d0b2ae61 Added own Avatar Label on Person Details 
Fixed layout.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7881 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-01-26 23:37:27 +00:00
csoler
a94465fd3a allow to change own avatar for already existing identity. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7879 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-01-26 19:56:32 +00:00
defnax
3a64bc2601 Added Button for Set Avatar, added border stylesheet for the Avatar label. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7877 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-01-26 16:50:01 +00:00
csoler
481ee246b5 added avatars to identities. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7875 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-01-25 22:09:12 +00:00
defnax
b321953789 revert context menu changes 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7874 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-01-25 14:14:03 +00:00
thunder2
f02948c54c Removed timeout of waiting tokens in TokenQueue (gui) and increased timeout of requests in libretroshare from 30 seconds to 2 minutes. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7873 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-01-25 12:29:33 +00:00
defnax
7c850aaa02 changed dialog to none blocking mode 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7872 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-01-25 12:24:10 +00:00
defnax
4a4ea80110 Added Person details dialog, for popup mode view. 
changed from setEnabled to setVisible, to not show up the disabled actions for Own Ids. 

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7871 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-01-24 19:27:19 +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
0e3cd003ad Fixed reply Author on forums 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7865 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-01-23 17:43:29 +00:00
defnax
483934100a clean up security feed item 
Added Send Message context menu action for Identities List

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7864 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-01-23 16:35:06 +00:00
csoler
5967ee535f fixed free/delete mess in GRouter 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-NewGRouterModel@7863 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-01-23 15:16:04 +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
defnax
e5203e1f6a rename string 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7861 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-01-23 13:24:08 +00:00
csoler
e0308eacd2 fixed up cache loading issues on get key. Polished grouter stats. Improved sending logic. Distant msgs now work 100% (sync-ed) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-NewGRouterModel@7860 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-01-23 12:13:13 +00:00
thunder2
8600b39384 Show size of attached files in MessageWidget with friendly unit. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7857 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-01-22 22:54:41 +00:00
csoler
1998ddd765 fixed gui bits. Improved message handlign logic and notification 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-NewGRouterModel@7854 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-01-22 14:33:19 +00:00
thunder2
32c9fe7eca Moved checkbox for news feed sort order from settings to NewsFeed 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7852 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-01-20 18:06:56 +00:00
defnax
8006484242 Set Combobox Right to Left 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7847 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-01-15 16:09:01 +00:00
thunder2
94ec83fcdb Removed version files from retroshare-gui. 
Moved header file with version information to retroshare/rsversion.h.
Added version information to Windows executable.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7845 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-01-14 23:26:51 +00:00
thunder2
7f58460e5f Added DEPENDPATH to pro files 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7842 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-01-12 23:14:35 +00:00
csoler
8cb3ae6d2e added code to generate 3072 and 4096 bit PGP keys at startup (Patch from Serhaf) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7841 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-01-12 22:02:43 +00:00
defnax
7bc98f1cd5 Fixed label and combobox size 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7840 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-01-12 12:01:20 +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
6aaaa1a07e Moved ID ComboBox at the top, before recipient or Subject fields, to switch faster and easy Identity. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7836 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-01-11 14:39:18 +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
csoler
bef921f70c fixed font handling for chat config page (Patch from HM) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7826 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-01-08 19:12:47 +00:00
defnax
64c8048981 Added to Display File size of the attached files 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7825 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-01-08 01:02:21 +00:00
thunder2
8f9e212e14 Rolled back changes on splitter stretch factor in IdDialog 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7824 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-01-07 12:46:29 +00:00
thunder2
7cf4ef4f8b Changed statusbar hashing label to ElidedLabel 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7823 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-01-07 11:47:10 +00:00
csoler
f9439f2bac Typo found by cppcheck (thx to G10H4ck) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7822 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-01-05 20:00:32 +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
a753f31987 Fixed icon 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7813 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-01-01 14:06:45 +00:00
defnax
557fe7b2ba Changed on the Message Composer when adding GXS Identity to the "To" field, for user friendly display look like a email address. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7812 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-12-31 12:39:33 +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
defnax
57640379a8 Fixed placeholder display on GXS Group Dialog 
Changed sign icon on create forum message, added a "Post as:" label before gxs id chooser

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7810 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-12-30 21:35:34 +00:00
thunder2
499bb00b82 Added icons to GxsIdChooser 
Fixed display of "Create new Identity" without an identity

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7809 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-12-30 21:22:45 +00:00
defnax
892fd75bb5 Fixed to hide Search Box Action when ChatWidget is used on FriendsDialog 
Fixed Incoming Nickname Text color, which looks for your eyes better then green.
Added fixed size for the splitter in Identity

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7808 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-12-30 18:49:54 +00:00
defnax
8ab94e380c set fixed size for the participants list. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7805 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-12-30 15:44:36 +00:00
csoler
326d91d4c7 fixed VOIP compilation (patch from electron) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7803 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-12-30 14:26:04 +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
defnax
535fe875e4 update language strings 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7799 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-12-28 14:03:26 +00:00
defnax
72daac10c1 Added a new StackedPage for the Show mode (GXS Group Dialog), clean up the code. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7798 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-12-27 23:51:45 +00:00
thunder2
51825d851c Fixed filter of description in group tree of forums, channels and posted. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7797 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-12-27 22:13:29 +00:00
thunder2
f7a08a53a1 Updated languages de, es and ru from Transifex 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7796 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-12-27 17:56:35 +00:00
defnax
83ecc4e8b4 Added PlaceHolderText for Name/Description (gxs Group Dialog) 
Set the description Text field to read only for the Show Mode
Display at Header Channel name (Show Mode)
Display Subscribers on Channels

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7793 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-12-25 17:05:26 +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
thunder2
e5f0e6fcc7 IdDialog: 
- optimized fill
- fixed utf8 issue
- added new strings to translation
- added load/save of ui state
- fixed splitter resize
- fixed sensitive state of menu items in context menu
Updated english translation

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7791 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-12-24 14:43:06 +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
thunder2
417f66a566 Removed buttons to create a new identity 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7789 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-12-24 00:10:15 +00:00
defnax
810a5cacc0 Fixed to display mail icon when Distant Message is read. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7788 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-12-23 19:58:49 +00:00
thunder2
47f0f7236e Added new entry to GxsIdChooser to create a new identity. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7787 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-12-23 19:07:57 +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
defnax
d958910089 Fixed the Play Button text, if its not a media file, display right text. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7785 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-12-23 16:02:00 +00:00
thunder2
244b8e406e Removed some debug outputs in ServerPage 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7784 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-12-23 15:53:36 +00:00
csoler
e0f786913b fixed layout of comment dialog 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7782 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-12-23 11:41:57 +00:00
thunder2
2d100b70af Fixed some strings in settings window 
Updated english translation

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7781 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-12-23 10:37:35 +00:00
thunder2
7a562cfe9c Added patch from Henry 
- Fixed some typos
- Fixed utf8 issue in DhtWindow



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7780 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-12-23 10:16:27 +00:00
thunder2
4bb15cd211 Added patch from Henry 
- Changed string for translation
- Fixed utf8 issue in ServicePermissionsPage
Updated english translation


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7779 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-12-22 21:54:49 +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
defnax
a895261bd5 Set a Text Alignment when Status Label is hided/shown. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7774 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-12-20 16:53:42 +00:00
defnax
f0d3d66e3f Moved the VoIP Buttons to the top right corner on the Chat Window. 
Moved Search Filter feature into a frame, to hide by default for a clean Chat Window, optional enable from the menu.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7772 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-12-19 12:17:58 +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
db565b07b2 fixed display of group summary when navigating with mouse 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7764 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-12-16 19:21:46 +00:00
csoler
a270dec5c9 fixed utf8 in forum names 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7763 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-12-16 19:20:53 +00:00
defnax
419d63c730 fixing stretching 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7762 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-12-16 17:22:56 +00:00
thunder2
55be6675af Added size limit for chat types - Public, Private, Lobby, Distant 
Set the size limit for private and distant chat to unlimited.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7761 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-12-16 10:39:56 +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
defnax
3157bdff91 Set to display a placeholder text when status message is empty. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7758 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-12-15 15:53:10 +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
defnax
2036f379de * Disabled own location display on Friends Frame. 
* Removed the Fixed size for Messages ListWidget
* Update stylesheets

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7756 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-12-14 15:46:20 +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
thunder2
398f446300 Changed some more splitter behaviour when resizing the window. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7754 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-12-13 23:32:23 +00:00
defnax
4654d5d3f1 Added a warning MessageBox when closing Forum Post Dialog. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7753 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-12-13 12:36:43 +00:00
thunder2
212e5c28f2 Added user notify for chat lobbies. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7752 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-12-12 23:50:35 +00:00
thunder2
d87778172e Set the list with buttons in MainWindow and friend list in FriendsDialog to fixed when resizing the window. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7749 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-12-12 19:44:45 +00:00
thunder2
a8b08c9957 Optimized polling in TokenQueue 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7748 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-12-11 22:40:03 +00:00
thunder2
f9846c02ab Removed unecessary space around the main pages. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7746 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-12-11 00:13:40 +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
defnax
a9b56819cd Moved own frame for Avatar,status,nick display to the top of FriendsList. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7742 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-12-09 18:17:32 +00:00
thunder2
96bfdec362 Moved font size definitions from ui files to default qss. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7737 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-12-08 01:04:57 +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
csoler
b7e94fce99 added keep-alive packets to distant chat. Improved the tunnel management logic. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7735 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-12-07 21:51:30 +00:00
thunder2
ea53e41c9c Moved font size definitions from ui files to default qss. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7734 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-12-07 16:27:24 +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
defnax
4cbc6c1cdb Clean up Peer and SecurityItem feeds 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7732 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-12-06 15:29:41 +00:00
defnax
b11459329b * Moved to display own video at bottom and Friend at top. 
* Added to display system message text when call is stopped.
* Fixing spaces on chat window.
* Clean up chatwidget buttons, moved text color to the font menu button

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7731 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-12-06 14:21:36 +00:00
defnax
e44b8fa872 Fixed Layout Spacing 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7729 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-12-05 14:54:34 +00:00
defnax
1648842dd6 * Moved to Display the Video Widget on the right side 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7727 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-12-04 13:49:04 +00:00
thunder2
6d32524837 Rolled back commit 7720 and fixed forum search by content issue introduced in revision 7716. 
Fixed load/save of filter type in settings.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7722 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-11-30 22:56:50 +00:00
csoler
f511786a6a properly reset cursor block format in FriendsDialog (Patch from phenom) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7721 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-11-29 18:46:18 +00:00
csoler
d164428bf9 fixed forum search by content (patch from Phenom) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7720 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-11-29 18:45:01 +00:00
defnax
3d6b5371f7 Set a fixed size for the Messages search filter. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7718 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-11-29 12:54:36 +00:00
defnax
981df0c7e0 * Enabled Minimize/Maximize Button for File Transfer details dialog. 
* Clean up Buttons on ChatWidget, for Fonts use now Font Button.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7717 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-11-28 16:33:56 +00:00
thunder2
1fff74656e Optimized fill of forums 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7716 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-11-27 22:45:34 +00:00
thunder2
f692116207 Simplified usage of GxsIdDetails and removed some QTimer. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7714 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-11-27 00:55:48 +00:00
defnax
e68eb075af Changed rs logo icons, for better look and feel on the Taskbar 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7710 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-11-25 23:21:46 +00:00
defnax
03cee1b998 * Hide by default the Attachments Recommend Files list. 
* Changed the tooltips for the Hide/Show Button , "Download all" Button now with default text.
* Moved files count label before "Recommend Files" label

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7708 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-11-25 01:01:43 +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
csoler
7b8cdd685d cleaned up ChatStyle.cpp from obvious comments 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7703 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-11-23 19:22:57 +00:00
defnax
03d4d5e949 Added HTML Text Optimization by Phenom 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7701 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-11-22 22:16:22 +00:00
defnax
c731525b23 update the windows build bat`s 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7700 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-11-22 13:32:26 +00:00
thunder2
55c4cf895a Fixed the set of read state of forum messages in feed item. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7697 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-11-21 23:07:51 +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
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
csoler
7014a8f171 reworked logic of distant chat so as to handle multiple conversations at once and cope with multi-tunneling system. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7693 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-11-20 23:18:14 +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
csoler
06065ef623 added selection of which identity we talk as when multiple GXS identities are available 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7691 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-11-18 15:55:31 +00:00
defnax
5b3872a041 corrected naming 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7690 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-11-18 15:42:52 +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
csoler
fd20f629dc fixed GUI for distant chat: correct display of peer names, chat window on client shows up when chat is openned. Window on server only shows up when first message is received. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7688 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-11-17 21:56:41 +00:00
csoler
8480d46eb5 improved the logic in distant chat. Now all traffic is referred to by the GXS id of the contact instead of virtual peer id which would change with tunnel route. Work still needed to fix up the GUI 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7687 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-11-16 22:46:18 +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
defnax
cefa8000a1 Added new stylesheet qdarkstyle 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7681 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-11-15 18:10:53 +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
defnax
dcabaf780d Fixed some Stylesheet's 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7679 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-11-15 16:11:38 +00:00
thunder2
33f785f200 Added notify of received groups and messages for forums and channels to libretroshare. 
Show GxsChannelPostItem in NewsFeed.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7675 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-11-13 22:03:12 +00:00
defnax
fcb7b6c340 * Added to change dynamicly the share key info description. 
* Added default stylesheet for the info label. 

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7673 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-11-11 20:12:53 +00:00
defnax
9912aa1c4f Small Fix (Phenom) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7667 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-11-08 15:53:49 +00:00
csoler
8edc8511c3 fixed adding groups to message recipient (Patch from Phenom, modified) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7664 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-11-07 19:06:23 +00:00
defnax
38bc87412d hide by default the status column, enable from the display menu. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7663 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-11-06 16:15:23 +00:00
csoler
a3736a02d2 added systray menu in status bar. Helps people without a systray (Patch form Phenom) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7660 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-11-02 20:29:06 +00:00
csoler
d07a26f96d saving tool button position (patch from Phenom) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7659 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-11-02 20:21:01 +00:00
defnax
16be0a16f9 changed the chat bubbles when typing/chat on the private chat, which displays on the Taskbar & window icon 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7658 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-11-02 13:20:48 +00:00
csoler
5d13dee029 fixed compilation after removing operators!= (patch from phenom) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7655 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-11-02 09:40:51 +00:00
defnax
42b8ea6602 Changed the MainWindow icon to a higher resolution for better look & feel, when the logo is displayed on the Taskbar, same for the im status icons. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7653 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-11-01 16:39:06 +00:00
csoler
ea5b923428 added very basic display of outqueue statistics in BwCtrlWindow. Removed unnecessary list::size() calls in pqistreamer 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7652 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-10-31 21:24:42 +00:00
defnax
a5db669883 Added to change header image and text on Share Key Dialog. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7645 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-10-27 13:12:48 +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
defnax
bdc83c6748 fixed the frame margins 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7641 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-10-26 16:00:57 +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
6c2cc75f2b Set standard style of public/lobby chat to compact colored. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7639 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-10-25 17:09:06 +00:00
thunder2
392159ae4b Fixed navigate to forum and channel group when clicking a forum/channel link. 
Navigate to post/message is still a todo.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7638 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-10-25 15:50:00 +00:00
csoler
929599ad7f fixed display of unknown PGP keys in IDDialog. Removed debug output 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7637 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-10-25 13:16:47 +00:00
csoler
6488f5a9f4 using GxsIdChooser in message composition dialog 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7636 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-10-25 13:15:29 +00:00
csoler
c5e65486aa fixed bad connect in notifyQt for chat window 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7635 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-10-25 13:14:55 +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
26f93c2a55 fixed display of unknown hash in turtle router dialog 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7632 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-10-25 11:48:02 +00:00
thunder2
2963d71284 Enable "Next unread" button in forum without an active post. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7631 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-10-25 11:06:24 +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
491a655889 patch update from Phenom to fix up comparisons 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7626 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-10-20 16:42:32 +00:00
drbob
566d8ca07c Fixed up DHT Stats window so you can maximise any section with splitters. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7621 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-10-18 04:47:26 +00:00
csoler
c2404fcea7 fixed other compilation bug. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7618 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-10-17 21:57:33 +00:00
csoler
f2e0341794 fixed compilation 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7617 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-10-17 21:41:29 +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
bd96859704 removed unused code 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7611 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-10-14 20:36:22 +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
csoler
6e2df7e0de extended group share keys to Posted 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7608 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-10-13 18:31:47 +00:00
defnax
adbfa89c7b set a bigger font size for the radio items 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7607 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-10-13 15:19:16 +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
thunder2
d365efa493 Updated todo strings 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7604 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-10-12 20:36:31 +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
csoler
20786dbfeb forgot modif from last commit 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7602 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-10-12 19:52:51 +00:00
csoler
edd7bf7c31 created a generic class for graphs, and used it for DHT. The plan is to use the same class to draw all graphs. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7601 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-10-12 19:04:43 +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
thunder2
1bfa4df911 Fixed missuse of message flag UNPROCESSED as indicator for a NEW message 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7598 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-10-12 15:53:23 +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
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
thunder2
210357ab21 Switched MessagesDialog from QTreeView to QTreeWidget and use GxsIdRSTreeWidgetItem to show the gxs id for a distant message. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7593 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-10-09 22:04:12 +00:00
thunder2
a82ce123bb Fixed initial fill of the contact list in message composer when only trusted people is checked. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7591 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-10-09 15:19:17 +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
thunder2
dd1f88a1bb Replaced external library libcrypt32-cygwin.a by libcrypt32.a from MinGW for Windows compile. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7588 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-10-08 16:44:25 +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
b3bedd592d fixed display of channels with publish key 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7585 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-10-06 19:18:09 +00:00
csoler
0f025efb13 fixed wrong include line 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7584 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-10-05 21:30:18 +00:00
csoler
d0469ccfc3 implemented publish key sharing between peers for channels. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7582 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-10-05 19:14:05 +00:00
thunder2
d0238810b7 Common folders for libraries, includes and binaries of all external libraries for Windows compile. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7580 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-10-05 15:31:00 +00:00
defnax
9f12ebaddf Enabled Antialiasing for QGraphicsView 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7578 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-10-02 16:23:29 +00:00
csoler
77a367bc8a fixed inconsistency in Defines 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7577 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-10-01 19:43:31 +00:00
defnax
cb1da0d3d3 enabled by default to inform me via Message a Friend request from a known peer 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7576 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-10-01 14:55:35 +00:00
defnax
80c49e2a62 Added forgotten files 
Added some useful labels for the people page

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7575 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-09-29 14:47:34 +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
csoler
28277c53df antialiasing of channel images 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7572 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-09-28 20:19:52 +00:00
csoler
58e338a1ff restaured tunnel names in the gui 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7571 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-09-28 19:41:47 +00:00
csoler
2b6d6db201 added Qt socket test to update TOR led. This is a very basic test that does not prove the presence of TOR on the socket. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7570 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-09-28 19:24:03 +00:00
thunder2
3d38367d75 Forums: 
- Load all messages (not only latest)
- Fixed flat view

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7569 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-09-28 12:14:57 +00:00
defnax
65d2249bf4 Removed Edit/Delete ID Buttons, for better look and feel and get more space for the search filter, use Edit/Delete from context menu. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7566 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-09-27 14:24:40 +00:00
defnax
afb883e012 renamed combobox item 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7564 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-09-26 15:34:07 +00:00
csoler
eede11a772 - removed "use olf key format" from certificate export 
- improved GXS Id display when unsigned
- use ProfileManager to export own PGP key pair in keyring and profile.


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7562 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-09-25 20:14:21 +00:00
thunder2
37ddbf63cc Fixed count of new and unread messages for Channels and Posted. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7561 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-09-24 23:57:47 +00:00
csoler
3a0e944ecf fixed fonts for IDs in Identities 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7560 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-09-24 21:00:40 +00:00
csoler
5167106504 compacted layout in Identity: remove one line 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7559 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-09-24 20:53:07 +00:00
csoler
d3594d8063 improved naming and layout in Identities 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7558 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-09-24 20:48:16 +00:00
csoler
e93c814427 improved display in Identity tab 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7557 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-09-24 20:13:19 +00:00
defnax
c074d3abc3 Removed Add Friend Button from Friends Dialog 
Removed Distant Chat page from Settings

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7556 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-09-24 14:58:05 +00:00