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,916 Commits 63 Branches 22 Tags 194 MiB
5f36500d02
Commit Graph

4577 Commits

Author SHA1 Message Date
csoler
b9a620ee39 disable IP filter tab when using a hidden node 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8407 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-06-10 19:12:46 +00:00
thunder2
20c27b7957 Used ElidedLabel for the forum name to avoid the horizontal growing of the forum list. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8406 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-06-09 23:21:16 +00:00
thunder2
d37df7b37e Set the status of the message to read when the user read it in the news feed. 
Remove the message news feed when the user reads the message in the message list.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8405 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-06-09 22:57:01 +00:00
thunder2
50cad976a9 Added warning to IdEditDialog, when the lenght of the nickname is too short or too long. 
Used StyledElidedLabel for the nickname in Idialog to avoid the horizontal growing of the right widget.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8402 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-06-09 08:33:34 +00:00
thunder2
578e15ffa7 Updated languages from Transifex 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8401 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-06-08 13:35:40 +00:00
thunder2
6b923c4305 Fixed typos in strings (Patch from Henry). 
Updated english translation.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8399 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-06-08 10:58:56 +00:00
electron128
e1fbd77d80 removed empty #ifdef Q_WS_WIN 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8397 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-06-08 08:50:09 +00:00
csoler
59eb4205ac fixed typo in previous commit 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8395 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-06-07 20:28:50 +00:00
csoler
eb383e4a29 added sounds to debian packaging rules and to executable 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8394 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-06-07 20:23:38 +00:00
thunder2
31680458bd Added new button in ConnectFriendWizard to paste a certificate of your friend from the clipboard. 
Updated english translation.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8393 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-06-07 18:28:17 +00:00
thunder2
24a07702f2 Some more optimizations of SoundManager 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8392 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-06-07 17:35:58 +00:00
thunder2
acfa384f7f - Added default sounds (on first start and a new button in sound settings) 
- Added new sound files
- Optimized SoundManager
- Saved relative path to sound file for portable version
- Updated english translation


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8391 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-06-07 12:40:25 +00:00
electron128
c55e8043a5 fixed typos (reported by unknown translator) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8390 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-06-07 12:07:09 +00:00
defnax
98c0a71949 added sound file 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8389 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-06-07 01:31:54 +00:00
defnax
4bd1e774e3 Added to change title/subtitle when its a Friend request 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8388 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-06-06 17:12:15 +00:00
csoler
ea7a5a5929 fixed bug causing false alarms of wrong reported IP from friends. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8385 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-06-06 13:50:11 +00:00
thunder2
72085de44b Fixed compiler warning in StyledLabel 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8382 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-06-06 12:58:14 +00:00
thunder2
b88f4058a8 Moved set of banner pixmap and title format of ConnectFriendWizard to standard stylesheet. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8381 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-06-06 12:25:17 +00:00
csoler
d69e03efd6 added tooltip to security item 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8379 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-06-06 11:30:31 +00:00
thunder2
46d8d59a83 Updated english translation. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8378 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-06-05 15:24:32 +00:00
csoler
a58ee4f3e6 added missing tooltips 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8376 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-06-04 20:35:59 +00:00
csoler
6c7d86d659 improved GUI layout. changed filtering strategy: now all is collected but only a subset is banned, according to user input. Default is to only ban IP ranges auto-generated and home-made ranges. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8375 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-06-04 20:26:57 +00:00
csoler
a49b1c7c0c removed debug output 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8373 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-06-04 20:24:29 +00:00
electron128
9e1a368061 added search and highlighting to network graph (patch from Chozabu) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8368 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-06-04 13:36:34 +00:00
thunder2
399340ef38 Fixed layout of security feed item 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8363 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-06-03 23:23:55 +00:00
thunder2
d3c4110c7e Fixed typos in strings (Patch from Henry). 
Updated english translation.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8358 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-06-03 17:20:28 +00:00
thunder2
df5d69540a Added ip address to the info in SecurityIpItem 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8357 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-06-03 17:16:06 +00:00
thunder2
2b5dca3a39 Fixed typo in SecurityIpItem. 
Updated english translation.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8356 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-06-03 15:17:43 +00:00
thunder2
fb28284be3 Added a notify in SecurityIpItem when the ip address was added to the whitelist. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8355 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-06-03 15:14:26 +00:00
defnax
d959d27e41 Display Info Label's on Conclusion Page, when its a Friend request. 
Added default stylesheet's for the labels

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8354 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-06-03 15:04:24 +00:00
thunder2
5fd9ab59d7 Fixed crash in settings "IP Filters" when removing the last row of whitelist or blacklist. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8353 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-06-03 14:35:14 +00:00
thunder2
82d7ab6052 Used the service permission flag "Require white list clearance" in pqissl 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8351 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-06-03 14:01:46 +00:00
thunder2
22a7d2eeeb Added new feed item when a wrong external ip address is reported. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8350 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-06-03 12:38:23 +00:00
thunder2
e8c60816cf Added default and standard style to SecurityIpItem 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8349 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-06-03 08:39:18 +00:00
electron128
871cf4994e hide voting buttons in channels (backend is missing) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8348 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-06-03 07:32:20 +00:00
thunder2
92ba54a499 Fixed typos in strings (Patch from Henry). 
Updated english translation.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8347 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-06-02 21:48:11 +00:00
thunder2
9bef4502b1 Added feed item to notify a blacklisted ip address. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8346 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-06-02 21:36:26 +00:00
csoler
bfe59bedf0 fixed uninitialised memory read 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8345 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-06-02 20:56:29 +00:00
electron128
0ff1825a43 fixed avatar display 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8344 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-06-02 17:32:05 +00:00
csoler
777c915be2 load/save of banlist comments. Removed unused menu entries. Added auto-fill of input fields on sleection 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8343 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-06-02 13:02:20 +00:00
csoler
25c0dfe69e added IP whitelist to connect friend wizard. Disabled page for Friend Request, since the job can be handled by the Conclusion page just as well. If possible the duplicated code should be removed. Missing: add IP to conclusion page when coming from security item 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8342 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-06-02 08:00:30 +00:00
csoler
ab62eaee32 added one flag for requiring whitelist clearance before connect. Added GUI checkboxes to set it. Still needs the IP in connect wizard. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8339 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-06-01 19:44:36 +00:00
electron128
8e0be294ee fix more typos in strings (patch from Henry) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8338 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-06-01 18:46:33 +00:00
electron128
e88009d0d3 fixed compile (patch from Phenom) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8337 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-06-01 16:35:00 +00:00
electron128
875df4e2c2 fix typos in strings (patch from Henry) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8335 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-06-01 14:20:26 +00:00
electron128
da722292f6 show new identity dialog when creating a forum post and no identities exist 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8334 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-06-01 08:55:30 +00:00
electron128
511bc12ef3 fixed typo 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8332 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-06-01 08:52:58 +00:00
thunder2
1c507bddd8 Fixed drawing transparent background of RsButtonOnText. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8330 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-05-31 23:07:37 +00:00
thunder2
aeb5d1120f Fixed layout of From, Recipient, Subject and Tags in MessageComposer. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8329 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-05-31 22:15:20 +00:00
thunder2
feaffedbb6 Fixed and updated english translation. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8324 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-05-31 11:19:20 +00:00
csoler
94649dfbfd fixed uninitialised memoy read causing non saving of whitelist ranges 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8323 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-05-30 21:48:45 +00:00
csoler
bb74d08f33 add/remove from lists. Load/save from user whitelist/blacklist 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8321 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-05-30 20:29:06 +00:00
csoler
b2967418ff added load/save of banlists 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8320 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-05-30 19:34:30 +00:00
csoler
f699855b7d added whitelist system and GUI for it. Not used in pqissl yet. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8319 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-05-30 13:57:10 +00:00
csoler
4ebc87b9c2 added possibility to include manually some IP ranges 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8315 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-05-29 18:03:14 +00:00
defnax
86eb9a33d6 Fixing the Label layout 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8314 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-05-29 16:12:39 +00:00
csoler
b0acf6dd59 improved display of banlist 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8313 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-05-29 16:07:35 +00:00
electron128
6b2cdaf9e1 replaced multiple location warning with a location selector menu 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8311 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-05-29 14:01:33 +00:00
defnax
6b87ca2414 Set default tab back to Network Configuration 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8310 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-05-29 10:39:50 +00:00
electron128
cec8a15b28 added chat friend and message friend actions to FriendsList/Friend context menu 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8309 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-05-29 10:07:12 +00:00
csoler
562c7c2c20 working version of IP banning lists. Default settings should keep users safe from traffic re-routing based on DHT masquerading. Some GUI bugs remain. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8308 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-05-28 21:44:43 +00:00
csoler
38aefdf62f first UI prototype for IP ban list system. Not yet usable. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8305 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-05-27 21:30:40 +00:00
defnax
76642e4710 Set default stylesheet for the Edit Identity info label. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8304 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-05-27 12:20:59 +00:00
defnax
085d499ab0 Changed the default column size for thread title 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8300 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-05-27 11:40:13 +00:00
thunder2
4b1055ce2d Updated english translation. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8298 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-05-27 09:45:02 +00:00
electron128
cee1819b7d added toasters for incoming audio/video call to voip plugin (patch from Phenom) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8295 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-05-26 15:19:57 +00:00
electron128
c1061a1e9d fix black background in chunkmap display with Qt5 (patch from sehraf) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8294 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-05-26 12:21:48 +00:00
electron128
cbdadfb3bf show error string form plugin loading as tooltip in gui (patch from Phenom) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8291 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-05-25 15:12:20 +00:00
csoler
a1082e9f41 fixed bug due to using a static in the wrong place 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8285 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-05-21 21:44:29 +00:00
csoler
e27ff0698e added testing button for incoming TOR connections ;-) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8284 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-05-21 21:12:48 +00:00
electron128
18a4bef840 added additional button to show statistics window in settings->node 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8283 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-05-21 11:18:55 +00:00
electron128
f803f1552c reduce memory corruption in voip plugin 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8282 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-05-21 09:31:26 +00:00
electron128
807b7378df improved GenCertDialog (patch from Henry) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8281 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-05-21 09:03:58 +00:00
thunder2
5d194d2a9a Fixed layout of the ip addresses in ConfCertDialog 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8280 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-05-20 22:17:09 +00:00
csoler
c462801772 fixed black background in statistics with qt5 (patch from sehraf) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8279 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-05-20 19:50:10 +00:00
thunder2
98c6097767 Fixed default style for Windows. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8278 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-05-20 00:05:47 +00:00
thunder2
69c1df7e2d - Removed randomly forced updating of GUI in RsGxsUpdateBroadcastBase 
- Added group changed notify when visible count or suppliers count of a group has changed
- Fixed suppliers count

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8277 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-05-19 21:40:19 +00:00
csoler
7d324569ca suspended unfinished code to determine TOR status 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8273 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-05-18 19:12:15 +00:00
electron128
66345f5a8c improved IdEditDialog: added explanation text, removed unused space 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8270 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-05-17 13:18:42 +00:00
electron128
699dc50b3f in ChatLobbyWidget: show dialog to create a new identity when there is no own identity 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8269 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-05-17 10:13:32 +00:00
csoler
789b76f7b4 added a button to clear the IP address list. Also started to add diagnostic for TOR status. This is unfinished so it does not work yet. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8268 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-05-17 10:00:00 +00:00
csoler
bcf0c9a9ed improved layout of server (network) and transfer config pages. Removed some useless options (enable turtle), and added some tooltips 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8267 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-05-16 13:59:26 +00:00
electron128
66242ce068 show if TCP connection is incoming or outgoing (modified patch from sehraf) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8265 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-05-16 11:19:53 +00:00
electron128
3d3a163a75 show info about node creation after import of pgp key (patch from Henry) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8264 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-05-16 09:33:06 +00:00
csoler
514dd91fe6 fixed compilation 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8263 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-05-15 20:46:00 +00:00
csoler
7fd2b214d5 force loading of own ID to get a proper name to display in chat lobby dialog 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8259 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-05-15 16:15:45 +00:00
csoler
76fdbce10d improved alignment of IPs in friend list 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8258 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-05-15 14:45:44 +00:00
csoler
1560da7ad9 improved layout of forum thread widget. Removed one almost empty line. Hide unscribe button when already subscribed. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8257 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-05-15 14:30:37 +00:00
csoler
ef8291e226 updated names of transfers and server pages in config 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8256 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-05-15 13:46:33 +00:00
csoler
fd992161e1 draw bottom legend after data curves in RSGraphWidget 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8255 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-05-15 13:35:51 +00:00
csoler
0e16733ce0 only show relevant entries in statistics graphs 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8254 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-05-15 13:12:46 +00:00
csoler
819c7b66c5 improved RSGraphWidget to take the current time as reference for all curves 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8253 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-05-15 12:40:47 +00:00
csoler
487a52a669 fixed PGP/SSL key size combo box (patch from sehraf, modified) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8252 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-05-15 10:19:57 +00:00
csoler
723d540ce3 fixed text in transfers dialog popup menu 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8251 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-05-15 09:57:35 +00:00
csoler
82d530b990 disable signature checkbox when the certificate only has self signature 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8250 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-05-15 09:35:39 +00:00
csoler
a955cbfc09 changed the text from me to you 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8249 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-05-15 09:33:54 +00:00
electron128
c01680808f replace identity with profile in GernCertDialog (patch from Henry) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8246 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-05-14 13:18:58 +00:00
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
csoler
4c94617bb0 randomly force full update of RsGxsUpdateBroadcastBase so as to get fresh statistics about GXS groups from time to time 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8226 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-05-09 13:25:03 +00:00
electron128
21d62edca2 fixed comment voting 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8224 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-05-09 09:28:38 +00:00
electron128
71ca750fc8 hide unimplemented reputation functions in comment tree widget 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8223 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-05-08 18:08:27 +00:00
electron128
f23b3447f9 improved text of gxs share group key feature in posted and channels 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8222 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-05-08 17:48:39 +00:00
electron128
0f84059fe6 fixed creation and edit of channel/forum/posted group. Force display of correct stacked widget page in GxsGroupDialog. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8215 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-05-03 16:42:58 +00:00
electron128
444730d19c fixed performance problem in 8207 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8213 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-05-03 12:28:08 +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
electron128
80e82dbde6 show group owner in channel/forum/posted's details tab 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8208 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-05-03 07:58:04 +00:00
electron128
c080609168 show forum author in gui 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8207 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-05-02 18:50:34 +00:00
electron128
451718660a show gxs message store period in gui, set forums store period to one year 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8206 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-05-02 18:48:10 +00:00
electron128
e663fa608c allow 30 unicode symbols for identity name, instead of 30 bytes 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8205 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-05-02 07:57:59 +00:00
thunder2
735a27f8da Removed maximum value from chat lobby participants list. 
Saved size of participants list in profile.
Removed show/hide button to get more space. The participants list can be colapsed by moving the splitter to the right frame border.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8204 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-05-02 00:22:30 +00:00
csoler
30ead08a1d removed useless column in forum thread widget 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8203 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-05-01 19:36:24 +00:00
csoler
b999ccc34b removed useless thread line, kept link copy functionality, used a GxsIdLabel to show the by_label correctly, added hide/show of labels when not useful 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8201 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-05-01 15:20:23 +00:00
electron128
d6e708fdd5 - changed sound button tooltip 
- added auto subscribe status to lobby tooltip
- removed wrong info from forums help

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8191 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-04-30 07:06:16 +00:00
csoler
b654d7b21d only reset GxsIdChooser to default item on first load. Fixes the bug of current identity that keeps changing in chat lobbies 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8190 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-04-29 21:05:44 +00:00
electron128
7ba6b24122 added web interface to tray menu 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8181 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-04-28 14:55:13 +00:00
electron128
bb2f131464 added checkbox to hide offline peers in permission matrix (modified patch from sehraf) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8180 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-04-28 13:57:02 +00:00
electron128
f659ba71e5 fixed rslinks with " 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8179 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-04-28 13:24:16 +00:00
csoler
a52031ac58 fixed small bug in global router causing incoming messages to be in SENT mode 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8176 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-04-27 22:01:31 +00:00
thunder2
ff6f14b7de Fixed Windows compile 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8175 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-04-27 09:26:43 +00:00
csoler
75cf2a674e improved display of grouter internal info 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8174 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-04-26 20:10:18 +00:00
csoler
67ced81660 proper sorting of peers by connection state in permission matrix (patch from Sehraf) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8172 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-04-26 19:09:35 +00:00
csoler
f926be29c7 corrected missing include 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8167 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-04-24 16:41:34 +00:00
csoler
e3e5a38efe added missing include 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8166 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-04-24 16:37:54 +00:00
electron128
127c104e5e added web interface to retroshare-gui 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8165 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-04-24 14:31:13 +00:00
csoler
a63829b4ec fixed error msg due to broadcast chat trying to call statusUpdate() 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8160 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-04-23 18:54:44 +00:00
electron128
9ebe33c9de fixed chat lobby context menu to allow to toggle auto subscribe 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8157 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-04-22 17:33:53 +00:00
defnax
7a2c1347fe Fixed wrong placeholder text 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8156 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-04-21 21:21:31 +00:00
defnax
7d594e22ad added for hidden label own stylesheet 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8155 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-04-21 20:55:38 +00:00
csoler
77a33cd445 removed unnecessary debug output 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8153 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-04-21 20:09:20 +00:00
csoler
9fa87de6e3 cleaned the code in grouter, removed warning 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8151 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-04-21 19:02:14 +00:00
csoler
be3aa18381 added max ID size check on 2 remaining fields in iddialog 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8150 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-04-21 18:42:56 +00:00
thunder2
a0631e3991 Fixed crash in GxsIdDetails::process (GxsIdDetails::mInstance == NULL) by adding one global instance of GxsIdDetails. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8149 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-04-20 22:28:19 +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
fce6b7edf3 changed default data rates (it is better to have some prople need to reduce it than everyone need to increase it). Added placeholder in gen cert dialog for TOR 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8145 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-04-19 18:35:36 +00:00
csoler
0199a4728c improved cert creation dialog 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8144 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-04-19 18:30:07 +00:00
csoler
2c687928d6 fixed a few GUI items in the TODO list 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8143 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-04-19 15:34:14 +00:00
csoler
057b2afa4e improvement of global router after first test phase. Fixed a number of bugs. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8141 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-04-18 19:59:27 +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
e52976b3e6 fixed genCertDialog. Still needs to prevent text fields to stretch into super small lines (how can i do this??) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8132 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-04-13 22:07:55 +00:00
csoler
9677cb4934 removed unwanted entry to change nickname in chat lobbies 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8131 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-04-13 19:06:24 +00:00
csoler
dc4d33d621 fixed server page: removed hidden node option from combo box. Added a label with correct tooltip 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8130 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-04-13 19:00:09 +00:00
csoler
2ecd582273 half-way through async messaging. Redesigned global router pipeline so as to merge traffic from turtle and friend/routing matrix. Only turtle traffic currently enabled. Should provide minimal functionality 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8127 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-04-09 21:34:50 +00:00
csoler
2f2d01dc41 set max GxsId nickname size to some arbitrary value to avoid crazy long nicknames crafted to break the GUI. This should also be checked when de-serialising groups at a wider scale for group names in general 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8125 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-04-09 19:53:01 +00:00
csoler
a4f6500772 fix for revision number in ubuntu/debian (patch from heini, untested) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8118 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-04-04 15:37:54 +00:00
electron128
a37ab6f644 fixed compile on Linux with Qt5 (patch from sehraf) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8116 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-04-04 10:12:05 +00:00
csoler
e9c6b3da73 partly fixed TOR status page (patch from Sehraf) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8109 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-04-02 19:23:01 +00:00
csoler
65da6090fe fixed display of TOR information for hidden nodes (patch from Sehraf) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8108 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-04-02 18:22:55 +00:00
csoler
69c44ef9ef improved display of ciphers giving TLS version 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8104 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-04-01 18:29:59 +00:00
csoler
3f7d41e5bc fixed keyword splitting in chat lobby notify system (Patch from Phenom) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8097 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-03-29 14:12:34 +00:00
defnax
6b584e9ae9 Hide by default key length combobox, for advanced users get visible via advanced checkbox 
Set stylesheet for a Info Label
Changed Window icon to higher resolution

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8096 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-03-29 13:41:29 +00:00
defnax
7ef30432f2 Not show to much technical detail on a info Label. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8095 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-03-28 20:34:16 +00:00
csoler
50caf89655 fixed up nickname completion in chat lobbies 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8092 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-03-28 16:33:33 +00:00
csoler
1991d6992d fixed distant peer naming in combo box for recipient selection. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8091 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-03-28 15:49:43 +00:00
csoler
ceac258552 fixed naming and completion in recipient addresses in MessageComposer 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8090 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-03-28 15:46:47 +00:00
csoler
d514b939b5 fixed completer for message composer. Still need to fix slot editingRecipientFinished() 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8088 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-03-27 22:57:58 +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
electron128
d65adeb2ea disabled debug print of DHT requests, disabled debug print in p3Peers::getProxyServer(), added missing newlines in debug prints (modified patch from Hypfer) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8084 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-03-27 18:41:44 +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
9d2b6faf9c fixed bug with default chat lobby identity causing settings to show an empty list. Also fixed up GxsIdChooser 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8081 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-03-26 21:20:57 +00:00
electron128
7e03f3944b don't store name, location name and date in new SSL certs. Location name is now stored in an extra file. Backwards compatible to old locations and old peers. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8072 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-03-25 08:19:45 +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
thunder2
21575dd416 Fixed path of config file RSPeers.conf 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8068 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-03-22 10:45:57 +00:00
drbob
926dd3c8e4 Updated GUI to use new Message / Mail interface. 
Configuration is in MessageInterface.h for the moment



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8067 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-03-22 04:52:53 +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
81c3c59266 use RSLinks to handle recommendation message (Patch from Sehraf) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8064 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-03-21 21:42:40 +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
thunder2
fbc521cbc5 Fixed content of GxsIdChooser for Qt 5 by setting dynamicSortFilter to false. 
Change in the default value
Qt 4 = false
Qt 5 = true

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8058 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-03-20 14:52:10 +00:00
electron128
6dff335515 use notify for gxs events. Removed the previous polling based system. Now multiple clients can receive gxs changes. This also fixes the always growing changes queue in rs-nogui. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8057 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-03-20 10:39:17 +00:00
csoler
62dba4aee4 made 2 different pages in ConfCertDialog for PGP key and RS certificate. Removed the old format checkbox. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8055 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-03-19 22:27:52 +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
electron128
4d51240442 removed the constraint of sharing own files only in channels. Replaced it by a warning, to allow peers to post from other locations etc. (port from v0.5.5 rev. 6198) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8045 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-03-18 14:12:31 +00:00
electron128
71a8dba487 GxsGroupDialog: allow to create groups without author 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8044 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-03-18 13:36:38 +00:00
electron128
148fd8bb05 GxsIdChooser: request only data for own ids (was requesting all ids before) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8043 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-03-18 13:33:38 +00:00
electron128
13b964d0f5 fixed compile with Qt 5 (modified patch from Phenom) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8040 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-03-17 16:21:23 +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
a967405c84 Added one more check of RsAutoUpdatePage::eventsLocked to GxsIdDetails::process 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8035 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-03-16 12:57:12 +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
csoler
c811d71738 added mask to select which icons to show in RsGxsIdTreeWidgetItem. Kept only avatar in ChatLobby participant list 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8019 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-03-14 19:19:34 +00:00
csoler
48ea291d95 moved signature validation and encryption one level up into p3IdService. Added timestamp for GXS identities and auto-removal after 7 days. Updated display in IdDialog 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8015 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-03-14 14:33:23 +00:00
thunder2
b46c3b4852 Moved TokenQueue, TokenResponse, UIStateHelper and mGroupId from the classes GxsMessageFramePostWidget/GxsForumThreadWidget to the base class GxsMessageFrameWidget. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8014 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-03-13 19:33:37 +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
6ef761e4e5 added jpeg format to thumbnail creation/loading (patch from cave) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8012 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-03-11 20:20:32 +00:00
defnax
4dede651c7 use right status ions 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8008 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-03-09 23:00:29 +00:00
thunder2
325a383fba - Added re-check of "Not found" identities for chat lobby participants list. 
- Added check of RsAutoUpdatePage::eventsLocked to GxsIdDetails::timerEvent.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8006 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-03-09 20:41:14 +00:00
thunder2
f7d3730080 Fixed missing spaces in chat style. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8001 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-03-08 16:31:15 +00:00
csoler
f60d8cbb1a fixed completion in chat lobbies 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8000 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-03-08 13:56:29 +00:00
thunder2
400d3179e8 Fixed display of version information. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7998 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-03-08 13:31:44 +00:00
csoler
fb3d5ca9ac removed auto-subscribe when no identity is available. Added warnign for the need to create an identity 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7993 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-03-07 14:49:33 +00:00
csoler
b29d5e2d6b fixed message tooltip for loading ids 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7992 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-03-07 14:27:32 +00:00
csoler
8d494ecaf8 fixed display of systray message for chat lobbies 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7991 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-03-07 14:06:10 +00:00
csoler
f9c78ebd61 merged in new lobbies with GXS ids. Old peers and new peers cannot see each others lobby lists. Invitations still work and can be used to transfer a lobby ID between versions. Messages of old and new peers will not be visible to each other 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7986 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-03-06 21:13:23 +00:00
thunder2
eccb2db7c2 Fixed refill of author column in forums. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7971 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-02-25 11:55:31 +00:00
drbob
f371ca6a98 Trimmed whitespace from URL to fix internal retroshare links. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7970 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-02-24 10:45:05 +00:00
drbob
6d26eda0f9 Added Retroshare links support to PostedItems (don't seem to work yet). 
Enabled cancel button in CreateComment Dialog.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7969 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-02-24 10:31:45 +00:00
drbob
cf9b196b26 Improved URL handling in Posted Item. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7968 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-02-23 12:28:20 +00:00
thunder2
5e9acac013 Optimized GxsIdDetails::process to load the gxs details directly when the caller is the gui thread. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7967 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-02-22 15:06:27 +00:00
thunder2
41750b0d27 Removed not used base class GxsIdTreeWidget. 
Used QPixmap instead of QIcon to draw the gxs image in GxsIdTreeWidgetItem.
Fixed use of transparent background in GxsIdDetails::GenerateCombinedPixmap (formerly GxsIdDetails::GenerateCombinedIcon).

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7965 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-02-22 11:52:33 +00:00
csoler
7178285d60 avoid calling rsGxsChannels::setMessageReadStatus() when the message status is already what we want. Removed one warning that has been cleared. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7964 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-02-22 10:10:34 +00:00
csoler
ab9cb2b600 removed mentions to encrypted messages. Replaced by distant, with the appropriate flags. Removed old msg encryption code 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7963 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-02-20 10:34:11 +00:00
csoler
3a7ef25adf small fix in nnumbering posted widgets 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7962 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-02-20 10:30:49 +00:00
csoler
63752af168 fixed recommendation signature (patch from sehraf) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7960 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-02-19 20:32:09 +00:00
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