Commit Graph

4668 Commits

Author SHA1 Message Date
Phenom
79fb8dfe04 Merge branch 'master' into Fix_ChatWidgetLastCursorFormatting 2015-08-23 17:49:19 +02:00
Cyril Soler
e9aa4ff43b Merge pull request #3 from chozabu/copy_version_info_button
add button to copy version info in first level about box
2015-08-23 11:15:05 -04:00
sehraf
d1deef0733 fixed new lines in certificate string 2015-08-23 16:43:34 +02:00
Cyril Soler
7bd41e9fcb Merge pull request #4 from chozabu/grouter_stats_basic_names
minor tweak to list friends in order they are shown on graph
2015-08-23 10:15:10 -04:00
Phenom
023473443b When the file in the link already exists, RS open it. 2015-08-23 12:03:46 +02:00
sehraf
791fb78ed9 renaming details and details2 for better clarification 2015-08-23 09:58:31 +02:00
sehraf
ad499e6bd6 renamed 'pubkey' to 'certificate' and removed empty location names 2015-08-23 09:55:43 +02:00
Phenom
326a33059d Fix ChatWidget last cursor formatting.
To test it, search a text that will be colored a end.
New messages lose their format.
2015-08-22 17:38:35 +02:00
Phenom
c44afc092e Merge branch 'master' into Fix_ChatWidgetSearchTextThreshold 2015-08-22 17:02:43 +02:00
Phenom
b1fd29033b Merge branch 'master' into AddHTML_TextOptimization_0.6 2015-08-22 16:38:20 +02:00
Phenom
5c970100f1 Fix ChatWidget search text label threshold. 2015-08-22 16:31:08 +02:00
thunder2
334ddf8efc Enabled sort by columns other than name combined with sort by state in FriendList. 2015-08-22 00:57:26 +02:00
thunder2
176c3abd8c FriendSelectionWidget:
- Added sort by state
- Moved buttons "All"/"None" into context menu

MessageComposer:
- Removed double details action
2015-08-21 19:24:24 +02:00
thunder2
4923c47eb3 RSTreeWidget:
- Added possibility to add own actions to header context menu
- Added resort of items
2015-08-21 19:24:23 +02:00
Phenom
02775c6fb4 Add HTML Text Optimization by exporting styles. 2015-08-20 17:55:20 +02:00
sehraf
04a1c10a56 fixed UTF-8 group names 2015-08-19 19:12:38 +02:00
sehraf
941959cc86 conversion from QSettings to XML 2015-08-19 19:08:48 +02:00
thunder2
48c3eedcf5 Removed "CONFIG += console" for Windows release build. 2015-08-19 13:22:31 +02:00
thunder2
3b40f0e0c8 FriendList:
- Show information of the "best" ssl item on the gpg item only when the gpg item is not expanded.
- Calculate the icon height from the font metrics
- Show the information text with normal font and color
2015-08-19 11:04:50 +02:00
csoler
42bbf76035 fixed display of software revision in main window (patch from ASmith) 2015-08-18 20:21:45 -04:00
sehraf
80d765e1d6 small fix 2015-08-18 23:17:29 +02:00
sehraf
36349814a6 added import/export friendlist 2015-08-18 23:05:22 +02:00
Cyril Soler
f6b830d5aa Merge pull request #35 from hunbernd/chat-fix
Chat fix. Thx for this.
2015-08-15 21:46:22 -04:00
hunbernd
16859a1d3a Fix: chatlobby toaster not working 2015-08-15 23:37:33 +02:00
defnax
4a50a62cc8 Merge branch 'master' of https://github.com/RetroShare/RetroShare 2015-08-14 12:38:36 +02:00
hunbernd
0402e53f15 Fix: empty line duplication bug
to reproduce:
hit: a<enter><enter>b
the result will be: a<br><br><br>b
the empty line is two lines high
2015-08-13 22:13:21 +02:00
thunder2
4095d9d5c9 Switched retrieve of posts in GxsMessageFramePostWidget from "requestMsgRelatedInfo" to "requestMsgInfo". 2015-08-13 22:09:46 +02:00
defnax
e66707111b Moved IP Filter Widgets into Tabs 2015-08-13 13:48:57 +02:00
defnax
7472f81940 Merge branch 'master' of https://github.com/RetroShare/RetroShare 2015-08-11 17:01:53 +02:00
defnax
9d291aa6f6 update windows build scripts
changed gxs id icon for linked with profile.
2015-08-11 16:44:59 +02:00
thunder2
a765016240 Moved column show/hide from context menu of the tree to the context menu of the header in IdDialog. 2015-08-11 16:01:43 +02:00
thunder2
e73e68d860 Reduced the size of the status icon on the avatar image in FriendList. 2015-08-11 13:40:02 +02:00
defnax
783465bc89 forget to commit this, for the Search Filter DHT IPs 2015-08-10 18:27:29 +02:00
Cyril Soler
13e77fb7e5 Merge pull request #19 from sehraf/pr-fix_crash_on_shutdown
Thx sehraf. Indeed, the object was created twice, before your patch. Not good.
2015-08-09 17:04:24 -04:00
thunder2
9d0b0664f1 Fixed hide offline friends in ServicePermissionsPage 2015-08-09 22:30:47 +02:00
thunder2
c9197864c6 Fixed typo.
Updated english translation.
2015-08-09 15:52:26 +02:00
thunder2
d5c95c4b28 Fixed layout of the ServicePermissionsPage 2015-08-08 22:46:31 +02:00
thunder2
9265145ca7 Updated english translation 2015-08-08 21:14:02 +02:00
thunder2
87f2e6da37 FriendList:
- Removed avatar column
- Removed state column
- Added combined avatar and status icon
- Added status icons in 64px
- Renamed "Hide state" to "Show state"
- Added sort by name and state

RSTreeWidget:
- Added version for load/save state
- Added method setColumnCustomizable
2015-08-08 20:27:19 +02:00
AsamK
ef5fca5e5e Resolve nicks from gxsId in lobby chat history 2015-08-07 19:08:10 +02:00
defnax
c168765bb2 Added tab for the DHT TreeWidgets for better view
Added a search Filter for DHT IP addresses
2015-08-07 15:14:47 +02:00
sehraf
48bb8b48c9 sequel to 6b2ed2fb2d 2015-08-05 23:45:45 +02:00
thunder2
789df68582 - Added update of version information for Windows build
- Added template file version.html.in
- Removed RS_BUILD_NUMBER from Windows executable FileVersion
2015-08-04 15:15:49 +02:00
csoler
9e978e1442 updated version info to new hexa format 2015-08-02 19:10:59 +02:00
Chozabu
453415fd3e minor tweak to list friends in order they are shown on graph 2015-07-31 16:42:39 -04:00
Chozabu
69d23a4982 add button to copy version info in first level about box 2015-07-31 16:40:45 -04:00
electron128
9897def2cc fix #21 typo "defaut" instead of "default" in switch statement in RSGraphWidget (patch from Chozabu) 2015-07-31 17:27:04 +02:00
electron128
6b2ed2fb2d fix #20 crash on shutdown with plugins enabled. Settings window did leak plugin config pages (patch from hunbernd) 2015-07-31 17:26:52 +02:00
electron128
d004056f67 fixed position of scaled/highlighted nodes in node graph (patch from Chozabu) 2015-07-31 17:26:22 +02:00
electron128
a9ef48d133 webui: added chat 2015-07-31 17:26:11 +02:00
csoler
1939ea9f54 added correct image file for finished transfers 2015-07-31 17:25:54 +02:00
csoler
2a47095599 removed unused method for OutQueue statistics; improved BW curve display; fixed a few display bugs 2015-07-31 17:24:19 +02:00
csoler
685ddbbf0a fixed a few bugs in statistics GUI. Still misses names and proper curve display
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8612 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-07-31 17:23:31 +02:00
thunder2
c76141ed65 Added missing initialization in
- pqissl
- pqissludp
- PeerConnectStateBox
- RsTlvBanListEntry
- RsServer
- TcpStream
- PGPCertificateInfo
- peerConnectAddress
- AudioInputConfig
- SpeexInputProcessor
- xProgressBar
- TBoard

Removed unused member:
- xProgressBar


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8611 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-07-13 11:03:18 +00:00
thunder2
2a6e1d0a8c Removed unused member from ProfileManager.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8609 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-07-13 08:27:49 +00:00
csoler
989f80786e saving current work on new bandwidth display. Still need to add names for services/peers, and use an appropriate curve style
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8608 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-07-13 03:04:36 +00:00
thunder2
9279cc17b1 Added missing restore of ostream format (std::dec) in CreateLobbyDialog::createLobby.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8606 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-07-12 22:00:10 +00:00
thunder2
737da1201d Fixed crash in ChatMsgItem::removeItem when "mParent == NULL".
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8605 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-07-12 21:56:12 +00:00
thunder2
a9094f8faf Fixed crash in ChatLobbyUserNotify::subMenuClicked when using "Remove All" of the chat lobby notifier.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8603 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-07-12 21:10:03 +00:00
electron128
951a1f9454 fixed wrong include line in ui file
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8602 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-07-12 11:41:40 +00:00
electron128
402e77d532 added missing include
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8601 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-07-12 08:57:38 +00:00
csoler
9471a91795 added basic functions to collect bandwidth info in pqistreamer both ways; added a sorting method in BWGraphSource to create curves from extracted BW info. Still not yet functional
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8600 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-07-12 04:04:18 +00:00
thunder2
409db56a59 Removed dead code from ImHistoryBrowser::fillItem.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8597 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-07-12 01:27:27 +00:00
thunder2
8691a911aa Fixed possible crash in DetailsDialog::setFileHash by checking return value of dynamic_cast.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8596 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-07-12 01:19:28 +00:00
thunder2
86a5c2e656 Fixed possible crash in ChatLobbyDialog::init by checking return value of dynamic_cast.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8591 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-07-12 00:54:42 +00:00
csoler
6e4045124c fixed wrong include line in ui file
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8588 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-07-11 23:30:07 +00:00
csoler
2d04a991fb added missing file
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8587 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-07-11 21:07:21 +00:00
csoler
975b2d8783 moved all bw graph files in statistics. Removed outqueue info widget. Created new cpp files to host the bw graph code. Started minimal UI to display bw information. The goal is to create a widget for displaying selective bw info [work in progress]
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8586 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-07-10 03:24:39 +00:00
thunder2
621abee8da Enabled Messenger Window in system tray icon.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8585 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-07-09 21:36:32 +00:00
csoler
249c827f95 improved debug info in a few places
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8584 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-07-09 20:55:11 +00:00
thunder2
c0ad7d3e46 FriendList:
- Added customize of columns with RSTreeWidget.
- Reduced display menu.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8583 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-07-09 20:53:28 +00:00
thunder2
e8e02b9c79 Added customize of columns to RSTreeWidget.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8582 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-07-09 20:23:52 +00:00
csoler
46a4273668 added back functionality to choose DL directory for each channel
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8581 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-07-07 00:52:52 +00:00
thunder2
f91ca2b47e Removed generate of channel messages.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8580 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-07-06 23:35:52 +00:00
thunder2
b7bbe3c937 Optimized fill of forums when modifying the read state.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8579 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-07-06 14:17:02 +00:00
thunder2
00007768f1 Fixed overlay icon (star) for tray icon.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8578 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-07-06 09:10:57 +00:00
csoler
0dbd5a22a0 fixed up permission matrix icons
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8577 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-07-04 19:07:17 +00:00
csoler
13e25ea432 fixed icon sizes in lobby participant list
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8576 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-07-03 20:27:30 +00:00
csoler
bdb85a3f54 fixed up FileTransferInfoWidget for high DPI
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8575 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-07-01 20:04:12 +00:00
csoler
d3257e4455 fixed a few more icons (help icons, grou tree widgets, bullets)
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8573 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-06-30 16:44:58 +00:00
csoler
ebc8bb072c fixed a few icons and sizeHint functions. Removed unused SFListDelegate files from compilation
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8571 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-06-29 16:08:17 +00:00
electron128
18df09e032 fixed typo in server page "127.0.01"
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8570 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-06-29 13:28:29 +00:00
csoler
4e08cd2f83 fixed wrong icon path for Transfers tab
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8569 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-06-29 12:01:28 +00:00
thunder2
3a71b8b662 Added stylesheet to plugins.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8563 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-06-28 10:11:47 +00:00
thunder2
686fec496f Moved fix font from GenCertDialog to qss (Modified patch from Henry).
Added defaults to ui without style sheet

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8562 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-06-27 13:18:57 +00:00
csoler
b8434a649e added a few 128px icons
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8561 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-06-27 11:47:37 +00:00
csoler
6003b0d0d2 setup new icons directory and qrc file generation script
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8560 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-06-27 09:42:25 +00:00
csoler
8822d12707 fixed sizes in GxsIdTreeWidgetItem
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8559 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-06-27 09:14:20 +00:00
csoler
765e2a15ed fixed fnt size problems in global router stats window
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8558 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-06-26 18:33:03 +00:00
thunder2
a53a7525c0 Fixed typo in string (Patch from Henry).
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8557 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-06-26 16:42:36 +00:00
thunder2
227e7121cc Added disable/enable of GxsIdDetails process.
Disabled GxsIdDetails process when filling gxs id's in forums.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8556 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-06-26 11:44:45 +00:00
thunder2
c3b794afb2 Fixed compile with Qt 5
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8555 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-06-26 08:14:09 +00:00
csoler
7d541318b3 further improvements to layouts and sizes for high DPI screens
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8554 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-06-25 20:11:39 +00:00
csoler
7334e4d5de first attempt at fixing statistics layout for high DPI screens, using the font metrics to determine the scaling ratio
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8553 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-06-24 20:55:09 +00:00
thunder2
da8b6cbae1 Optimized load of forums by moving the avatar handling for the tooltip to the tooltip creation.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8552 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-06-24 19:27:52 +00:00
csoler
d81a1c3900 removed useless debug info
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8548 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-06-23 19:36:47 +00:00
electron128
23f04b1622 limit width of typing label to 400px, to prevent long names from stretching the chatwidget (patch from Henry)
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8545 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-06-23 16:37:53 +00:00
thunder2
2d26a329c6 Removed fix height of header frame in FriendsDialog.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8544 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-06-23 14:31:27 +00:00
thunder2
f6865fcce8 Fixed font size of locale and remote file list content.
The header still need to be fixed.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8542 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-06-23 12:19:33 +00:00
thunder2
1ae0df1ad2 Removed unnecessary settings from MessagesDialog.ui
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8540 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-06-22 12:54:21 +00:00
electron128
cfdbbc71c2 corrected caps in MessageComposer (patch from Henry)
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8539 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-06-22 10:57:05 +00:00
electron128
99efa00c14 changed strings "Location" to "Node" (patch from Henry)
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8538 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-06-22 10:42:35 +00:00
thunder2
0626255bbb Updated languages from Transifex
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8536 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-06-21 10:11:45 +00:00
thunder2
00cf152a24 Used QTextBrowser to show the channel description for unsubscribed groups to avoid the horizontal growing of the channel list.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8535 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-06-21 01:00:01 +00:00
electron128
a1febb2c54 in RSStyle use list.clear instead of list.empty, which was probably a bug
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8529 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-06-19 11:39:34 +00:00
thunder2
a0c0b9afa5 Fixed memory leak in GuiExprElement.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8527 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-06-18 16:29:29 +00:00
electron128
6a924cb854 fixed pasting of rslinks with special characters with Qt5
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8519 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-06-18 12:53:54 +00:00
electron128
99f0868f3f fixed strings in IdDialog (patch from Henry)
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8518 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-06-18 11:26:00 +00:00
thunder2
846d5f4f50 Optimized fill of feed items by moving the fill of the hidden area to the first expand of the frame.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8514 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-06-17 18:59:12 +00:00
electron128
4cb081f4ff make IP connect state string fully translatable (patch from Henry)
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8513 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-06-17 17:18:52 +00:00
defnax
8234155f5e Use a better icon for "linked to your profile"
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8505 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-06-16 19:45:47 +00:00
defnax
1e95534e41 Enabled ordered/bullet list for Message Composer
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8504 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-06-16 19:34:31 +00:00
csoler
3b889e595a changed default news feeds to include security_IP, remove Peer connects (this one drives most people crazy)
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8496 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-06-16 18:41:13 +00:00
defnax
0755786037 Set again the default tab Network settings
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8488 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-06-16 13:32:12 +00:00
electron128
3ed1be74a6 updated english translation
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8484 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-06-16 11:57:35 +00:00
electron128
d3f33b029e change label "Security Ip" to "Ip security" in feed settings(patch from Henry)
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8483 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-06-16 11:04:30 +00:00
defnax
ec6f6ea009 Added a second color button to Message Composer, for set text background color.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8480 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-06-15 22:23:35 +00:00
thunder2
6adeb52e93 Fixed possible dereference of null pointer in NotifyPage.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8478 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-06-15 22:00:00 +00:00
thunder2
b9f83eca10 Fixed unitialized member lastUpdateListTime on ChatLobbyDialog.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8469 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-06-15 18:21:28 +00:00
thunder2
d2ddab0ab9 Fixed logically dead code in ChatLobbyWidget::getTreeWidgetItem.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8466 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-06-15 17:45:15 +00:00
thunder2
6e0ede2817 Fixed uninitialized pointer read in FlowLayoutItem::dropEvent.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8459 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-06-14 23:17:55 +00:00
thunder2
0ca37f6756 Added version information of the libraries to HelpDialog.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8446 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-06-14 17:45:26 +00:00
csoler
94ba973987 fixed situation leading to uninitialised message content in MessageDialog
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8442 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-06-14 15:20:25 +00:00
csoler
3eb673dc53 fixed 2 uninitialized memory read
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8441 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-06-14 15:15:41 +00:00
csoler
5c5538c572 fixed uninitialised variable in RSCollectionDialog
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8439 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-06-14 15:03:41 +00:00
csoler
7de30b91e7 removed ambiguous expression that confuses coverity, in TransfersDialog
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8438 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-06-14 14:58:07 +00:00
csoler
7172e7cd35 fixed addess of delete iterator
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8437 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-06-14 12:54:01 +00:00
csoler
c4a33eb0e0 removed false positive access beyond range of iterator
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8436 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-06-14 12:48:12 +00:00
csoler
a34d9a07af fixed bug in using invalid iterator in ChatLobbyNotify
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8433 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-06-14 10:09:08 +00:00
csoler
f53f451596 fixed bug in using invalid iterator in ChatLobbyNotify
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8432 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-06-14 09:57:45 +00:00
csoler
8cb423f20d fixed use of pointer after memory ownership transferred to QCache
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8429 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-06-14 09:21:24 +00:00
thunder2
ad4f57d756 Added own flag and new checkbox in settings for security ip feed items.
Changed NewsFeed::addUnique for SecurityIpItem to compare the ip addresses.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8424 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-06-13 01:28:01 +00:00
csoler
f360e9d0ba fixed password handling in deferred signature algorithm (in case of cancel, enter wrong passphrase, etc)
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8423 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-06-12 21:04:11 +00:00
thunder2
46c5e08f31 Removed banner pixmap for the ConnectFriendWizard of the standard style.
QWizard cannot be resized horizontal when a banner pixmap is set.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8422 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-06-12 20:19:32 +00:00
electron128
d9e1473533 fixed whitespaces in strings (patch from Henry)
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8421 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-06-12 08:27:26 +00:00
electron128
dd4760c25f changed "Owned by node" into "Owned by" in IdDialog (patch from Henry)
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8420 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-06-12 07:22:04 +00:00
csoler
44de13c94f added explanation to IP change security item in a tooltip
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8417 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-06-11 20:59:41 +00:00
csoler
74c01423f0 improved login system: do not re-ask for passphrase when user clicks cancel. Removed warning stating that maybe passphrase is wrong
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8415 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-06-11 20:31:52 +00:00
csoler
258c4e4afd improved/removed debug info
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8413 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-06-11 18:47:52 +00:00
thunder2
53daf911fb Changed string TOR to Tor.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8412 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-06-11 14:30:26 +00:00
thunder2
d71d26f026 Fixed crash in context menu of the id list in IdDialog when no row is active.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8410 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-06-11 08:08:10 +00:00
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