Commit Graph

3943 Commits

Author SHA1 Message Date
defnax
a621dcc4d1 clean up old icons
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7169 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-03-06 15:35:34 +00:00
defnax
76ecaffccb updated the MinGW build bat files
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7168 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-03-05 22:46:37 +00:00
defnax
e21564f72e cleanup old icons
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7155 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-02-28 17:54:52 +00:00
defnax
ddf811f80a added new icons and splash images from Feal, cleaning up old icons, still need more cleanup
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7154 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-02-28 17:01:14 +00:00
defnax
265bc65299 changed the default identity icons
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7133 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-02-19 16:20:19 +00:00
drbob
4bdd7b3b4d - Correct missed parts for fixed updateGroup.
- Updated IdDialog to support Modifying Opinions on GxsIds.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7132 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-02-19 11:11:06 +00:00
defnax
b785132cbe Fixing layout changes in Id Edit Dialog
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7113 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-02-13 11:55:14 +00:00
drbob
d65bdca1ec Improved GxsGroupDialog for Show / Edit of Groups.
- Added Show/Edit Menu Options for all services.
 - Fixed up BUTTONBOX_OK bugs.
 - Tested name changes for all services.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7102 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-02-09 10:43:59 +00:00
defnax
c626feeed5 improving they combobox layout direction, for better look.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7097 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-02-06 16:49:15 +00:00
drbob
bbd28256b6 fixed circlesComboBox enabled in gui.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7093 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-02-05 07:08:29 +00:00
defnax
307404fa0f improving the layout for the hidden checkbox
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7089 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-02-04 18:34:13 +00:00
drbob
f51efde985 added missing header for Linux.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7088 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-02-04 08:10:44 +00:00
chrisparker126
accdf7e982 fixed segfault in forum show dialog
prob merge issue

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7085 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-02-02 23:17:07 +00:00
drbob
a4f0221d89 Added in Icons to GxsIDs.
Can support:
	- "Unique" Icon based of GxsID.
	- Icon indicating PGP/Anon.
	- Icons for RecognTags.

Needs more work to Make Unique Icons look good.
and Add Icon sets.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7084 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-02-02 11:25:11 +00:00
csoler
10bf083ca3 imported IdEditDialog.ui from v0.6-initdev branch
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7081 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-02-01 15:55:03 +00:00
defnax
d706a98dd6 merging the ui changes
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7079 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-02-01 15:18:33 +00:00
drbob
c0738eec7f Merging branches/v0.6-initdev into trunk.
These split at 6672 -> 7075, so quite a bit merge.
libretroshare compiles - but untested.
retroshare-gui needs GenCertDialog.ui and IdEditDialog.ui to be properly merged. (compile errors).
some plugins will be broken.
retroshare-nogui is untested.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7078 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-02-01 14:16:15 +00:00
csoler
1aa2e221d2 put compilation error in place and redirect users to branch 0.5.5.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7071 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-01-29 20:07:48 +00:00
csoler
1d19938295 added jpeg to the list of image extensions for messages/avatars/etc
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7067 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-01-28 21:38:11 +00:00
csoler
730554d397 improved gui message for known peers that are not friends
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7066 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-01-28 21:33:17 +00:00
drbob
08f442d65b updated version.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7065 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-01-28 09:03:34 +00:00
drbob
3b71e8e140 Improvements to enable Edit/Show of GxsGroups.
NB: The actual update doesn't happen yet - mainly just the display of info.
  - Fixed up Constructor, and loading of MetaData via TokenService.
  - Fixed up Enabled / ReadOnly for Show.
  - Updated children to match new functionality.
  - Fixed up Show in Circles Dialog too.
  - removed a few compile errors.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-initdev@7062 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-01-28 07:57:58 +00:00
defnax
5896de972e update changelog
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7057 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-01-25 14:48:51 +00:00
csoler
91c49fa992 added ElidedLabel to be used in places where labels might be too long and therefore trigger an unwanted window resize. This is currently used as forum thread titles (Patch from Phenom)
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7045 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-01-20 20:03:24 +00:00
drbob
46518ebf51 revert GUI part of svn commit 7042
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-initdev@7043 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-01-20 07:29:54 +00:00
chrisparker126
f3afc128ee Chozabu patch
- New db created for parent group id field, you will all previous gxs data
- posted now support sub post topics

git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-initdev@7042 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-01-19 23:38:48 +00:00
csoler
efd1447a84 removed code for old certificate format.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-initdev@7041 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-01-19 14:42:16 +00:00
drbob
45bd72203e Added TOR Configuration page. Allows STD Nodes to configure Proxy too.
Moved most of hidden node parameters to this page.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-initdev@7038 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-01-19 06:27:02 +00:00
drbob
d39c5c028a fixed up hidden addresses and removed whitespace from onion address.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-initdev@7036 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-01-18 23:29:22 +00:00
csoler
037abea5eb Fixed spaces in copy/paste of rich text (Patch from Phenom)
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7035 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-01-18 22:55:14 +00:00
thunder2
741424dd72 Updated languages from Transifex
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7034 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-01-18 21:23:56 +00:00
csoler
affdd49001 made cert of versions 0.5 and 0.6 incompatible. Removed old cert format parse/display
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-initdev@7033 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-01-18 16:53:19 +00:00
drbob
ee09c3ce9c Allow Local Address to be saved and modified in hidden mode.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-initdev@7030 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-01-18 05:05:35 +00:00
drbob
bbe3ee8d2f - Switched to new RsAccounts interface.
- Reworked ServerPage to support HiddenNode configuration.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-initdev@7028 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-01-18 02:35:06 +00:00
csoler
735eb7a5c6 updated version numbers
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7026 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-01-17 17:53:12 +00:00
csoler
09467cf87e updated ts files
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7025 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-01-17 17:47:38 +00:00
defnax
bdecf3def1 Improving some layouts for the Feed Items
Update Splash Image

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7024 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-01-17 00:40:28 +00:00
csoler
b8c65db00e limit max number of feed items to 500, to avoid flooding possibility. Improved text
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7023 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-01-16 20:51:13 +00:00
csoler
8594d68985 improved text for security item
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7022 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-01-16 20:20:17 +00:00
csoler
bbdc978d00 improved display/fixed bugs in security item
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7021 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-01-16 19:57:08 +00:00
defnax
6fa0d894d0 clean up SecurityItem, removed unused old stuff
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7020 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-01-16 17:52:41 +00:00
defnax
7f71619c93 changed the default stylesheet color for the Security Feed
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7019 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-01-16 17:36:01 +00:00
csoler
613f822133 added new feed item types and logic to show connection attempts from forged certificates (e.g. bad signature, bad certificate)
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7018 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-01-15 20:19:17 +00:00
thunder2
9eaea5de12 Updated english translation
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7012 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-01-14 11:41:34 +00:00
defnax
ff8e30db55 Enabled to display the Notes text on the Post Item
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7011 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-01-12 14:53:57 +00:00
defnax
c869fd863d Âdded to change the string for the OK Button, for each different GXS Group Dialog .
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7010 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-01-11 22:02:05 +00:00
thunder2
e78d14c67b Fixed compile with Qt 5
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7008 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-01-11 18:34:38 +00:00
defnax
90fa8128d0 Enabled, to get selectable/copyable by mouse the RS version number Label
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7007 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-01-11 13:42:04 +00:00
defnax
97cd659679 Improving Posted Links, changed some strings, added a info label, not allow blank posts without a title.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7005 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-01-10 18:41:08 +00:00
defnax
2c59fe8ab5 redesign the Posted Links Item, to look more user friendly
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7000 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-01-09 02:05:20 +00:00
thunder2
dacec52e4f Fixed display of the nickname for the chat lobbies.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6998 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-01-08 11:37:16 +00:00
csoler
630824aa1b Updated the notification system. Main changes are:
- the notification system is now a service, p3Notify, that is a public RsNotify.
- RsNotify does nothing except providing a registration system for new notify clients.
- Clients should derive a notify client from the NotifyClient class and register it to rsNotify
- all registered clients get all notifications, so only derive the needed methods. This should allow 
  plugins to get notifications as well.
- updated the code to call RsServer::notify()->[notification method] from inside libretroshare
- pqiNotify has been removed.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6996 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-01-07 22:51:22 +00:00
defnax
3cc8c144a8 corrected uploads name column item size
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6995 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-01-07 20:58:56 +00:00
defnax
03c27dcdc3 fixed temporary to load the Wiki Groups Tree at startup, auto update seems not to work.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6994 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-01-07 19:14:38 +00:00
defnax
b7bb1c25cb * Enabled the Filter Line edit for filtering friends, by nick/ID for Create Circles Dialog's Known Identities Widget.
* Set some minimum header sizes for some items
* Enabled sorting for the QTreeWidget's

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6991 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-01-06 18:31:12 +00:00
thunder2
3e13311be0 Fixed slot for signal "filesPreModChanged" and "filesPostModChanged" on SharedFilesDialog.
The list of files is now updated also when the tab is visible.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6990 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-01-05 22:51:54 +00:00
thunder2
aff10a352c Optimized filling of shared files (local and remote).
Added cache to RemoteDirModel.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6989 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-01-04 22:39:34 +00:00
defnax
50ebd781e5 * Corrected the layout of the Connect Progress Dialog
* Added few more file type icons for "cpp", "h" nd "c"
* Corrected some strings
* Moved Uploads to Downloads Tab. 

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6986 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-01-04 19:54:07 +00:00
defnax
469da4914f Added a default FileType icon for the "patch" and "diff" extensions.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6983 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-01-03 19:32:53 +00:00
thunder2
92fabf4c56 Modified the patch from electron.
Moved the calls to the plugin to ChatWidget for use with all types of chats (private chat, chat lobby and distant chat).
Recompile needed

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6980 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-01-02 00:56:46 +00:00
defnax
7b0a6afa56 patch "chatdialog_allow_buttons_from_different_plugins_3" from electron. ChatDialog allows now Buttons from different Plugins.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6979 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-01-01 22:25:49 +00:00
defnax
0e134d0a92 Added to change the text for the Play Button, when file is not a media file.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6978 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-01-01 16:58:52 +00:00
thunder2
abd6b46ca0 Added a custom context menu for pasting RS-links to the base class MimeTextEdit and removed the custom context menu from derived classes.
Updated english translation.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6977 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-12-30 19:12:16 +00:00
csoler
3b381b9d22 patch "Fix_ChannelNotificationFeedLink" from Phenom. Allows to finish loading a channel before jumping to the linked post
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6973 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-12-27 22:15:53 +00:00
csoler
03c68c1276 patch "AddSearchFilesourceSorted_6951.diff" from Phenom. Adds correct sorting for search results.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6972 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-12-27 20:25:49 +00:00
defnax
93c331f40b * Enabled min and max buttons for settings window
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6967 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-12-27 19:59:25 +00:00
defnax
51ed2ca9f9 * Changed the logo size for some news feed items to use same size for better look.
* Added to display blue/black forum message icons for the forum feeds, when forum is anon or signed. 

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6966 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-12-27 18:24:13 +00:00
csoler
490abbeffc fixed small issue in chat lobby list. Not yet the cause for the ghost lobby
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6964 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-12-26 21:44:02 +00:00
csoler
cb7dccf0b8 added lobby ID as tooltip to lobby list
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6963 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-12-26 19:35:12 +00:00
defnax
9d78ad8942 renaming strings
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-initdev@6962 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-12-25 17:16:17 +00:00
defnax
beedc07de8 Added a default background color for the Channel Message Logo for a better look and feel, removed stretching of the logo, set a minimum size, background is now filled black.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6960 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-12-23 20:03:46 +00:00
chrisparker126
39909b705f merging rs_gxs-finale to v0.6 branch
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-initdev@6953 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-12-21 18:20:47 +00:00
thunder2
dbfe3f6c51 Updated languages from Transifex
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6952 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-12-20 18:51:12 +00:00
thunder2
607458dad7 Added missing language files.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6943 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-12-13 16:12:16 +00:00
thunder2
3d48e8b4cb - Added language Catalan (ca_ES)
- Updated english translation
- Updated languages from Transifex

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6942 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-12-13 15:08:36 +00:00
thunder2
a0f6b6f36c Fixed version file rsguiversion.in
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6934 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-12-08 14:38:35 +00:00
csoler
57c66bd06f forgot to commit this: show correct connect address (local or global) depending on the current status
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6932 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-12-08 14:12:02 +00:00
csoler
f6bdbd5e21 removed HandleRichText.cpp from last commit
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6931 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-12-08 13:52:47 +00:00
csoler
6380f6121c moved defines for version to .h, as it is super hard to script the replacement of the defines in the cpp file
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6930 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-12-08 13:50:10 +00:00
csoler
01588f6f53 fixed bug introduced in 6910, due to calling member on deleted mCreator
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6914 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-11-28 19:43:14 +00:00
csoler
75c178082f fixed last received time stamp so that it displays the last time data was actually received
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6910 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-11-27 20:01:09 +00:00
defnax
eab486f5db Added back the Subscribe Button to Channels
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6905 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-11-21 00:02:33 +00:00
thunder2
c447ab2829 Channels:
- Use destination directory when manually downloading a file from a channel
- Show destination directory in channel details
- Fixed utf8 issue when choosing the destination directory

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6902 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-11-16 13:21:25 +00:00
csoler
fc56b95d3f show fingerprint in ConfCertDialog, and splitted the string with spaces. Removed the use of the ambiguous peer id for both pgp and locations ids
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6900 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-11-09 22:52:26 +00:00
thunder2
a20109a8ee Fixed version files (*.in)
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6894 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-11-05 23:53:39 +00:00
csoler
f3750d0d61 added copy-rs-link to SubFileItem (Patch from Phenom)
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6887 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-11-02 14:56:22 +00:00
thunder2
5304865fc4 Added freeze option in NetworkView (Modified patch from K. Eisentraut)
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6879 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-10-27 23:07:47 +00:00
drbob
bd0b1a5ac5 Updated SVN revision number for v0.5.5b.
Moved #defines to code files for better encapsulation.
Removed other references to #defines.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6877 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-10-25 00:42:49 +00:00
thunder2
0ad20e6911 Updated german and french language from Transifex
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6876 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-10-24 07:42:13 +00:00
thunder2
758b5d0079 Updated languages from Transifex
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6875 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-10-23 11:07:17 +00:00
thunder2
e6d67ebf5a Code maintenance for Qt 5:
- Added some more includes needed by MinGW-w64 for GXS

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6874 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-10-23 09:23:32 +00:00
defnax
e80330e7c5 changed some icons for the context menu in transfers dialog
added default stylesheets

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6872 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-10-22 16:07:31 +00:00
thunder2
ad45aa18c4 Fixed Typo (patch from Henry)
Updated english translation

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6870 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-10-22 09:24:29 +00:00
drbob
d31a34bd95 hack for testing purposes.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs_finale@6869 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-10-22 03:42:20 +00:00
thunder2
5f3d5a7a2c Fixed loading of translations with dependencies (Qt 5)
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6868 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-10-21 22:46:59 +00:00
defnax
3e7913ee22 update help page
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6867 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-10-21 22:03:28 +00:00
defnax
764a6b31ca update authors page
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6865 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-10-21 21:42:14 +00:00
thunder2
9095e9bd75 Code maintenance for Qt 5:
- Added some more includes needed by MinGW-w64

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6860 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-10-21 11:00:49 +00:00
thunder2
3a72b27632 Code maintenance for Qt 5:
- Changed code for GXS

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6859 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-10-21 09:27:12 +00:00
drbob
2ce92da8ad GUI modifications to incorporate RecognTags.
- Enable EditDialog for own Ids.
	- Addition, parsing and removal of Tags in IdEditDialog.
	- Display of Tags (only text) in GxsId Label/Chooser/TreewidgetItem ..

TODO:
	- Add icon sets for RecognTags.
	- display of Tags as Icons.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs_finale@6855 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-10-20 09:56:12 +00:00
thunder2
c8b8daf110 Code maintenance for Qt 5:
- Changed qInstallMsgHandler to qInstallMessageHandler
- Changed qt_use_native_dialogs to filedialog_hook (Windows only)

Removed unused method Rshare::winEventFilter and signal Rshare::shutdown (Windows only)

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6852 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-10-19 23:41:23 +00:00
thunder2
f10f029d45 Code maintenance for Qt 5:
- Added usage of QUrlQuery
- Removed QSound::isAvailable()
- Changed Qt::escape() to QString::toHtmlEscaped()
- Changed QAbstractItemModel::setSupportedDragActions() to virtual QAbstractItemModel::supportedDragActions()

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6851 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-10-19 20:59:55 +00:00
thunder2
6dbcc3e99b Code maintenance for Qt 5:
- Added new options to retroshare-gui.pro for Qt 5
- Added new file QtVersion.h with macros to compile with Qt 4 and Qt 5
  - QHeaderView::setResizeMode -> QHeaderView::setSectionResizeMode
  - QHeaderView::setMovable -> QHeaderView::setSectionsMovable

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6849 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-10-19 13:25:06 +00:00
csoler
230caadb89 patch from lmanuel to beautify the DL progressbar
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6848 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-10-19 12:59:24 +00:00
thunder2
3e15a7bb86 Code maintenance for Qt 5:
- Fixed some missing headers
- Fixed some deprecated functions

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6845 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-10-19 02:07:01 +00:00
thunder2
30103ef5f2 Added display of Qt version in AboutDialog.
Updated english translation

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

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6843 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-10-18 21:10:33 +00:00
csoler
69862404d6 fixed to/from for encrypted messages
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6842 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-10-18 14:31:13 +00:00
csoler
b9a79db9b0 removed some debug output
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6841 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-10-17 18:45:59 +00:00
csoler
be2c8807c3 allow Dist msgs for friends with all locations lost
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6839 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-10-16 20:53:38 +00:00
csoler
7ba1827b4c removed potential deadlock in method called from notify
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6838 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-10-16 20:42:34 +00:00
csoler
26c1ce8025 fixed response to distant peer when not actually a friend. Added warning when key is not available
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6837 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-10-16 20:20:41 +00:00
csoler
cd43900eb9 added flag and icon for message that was successfuly decrypted
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6836 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-10-16 20:02:28 +00:00
csoler
292bdfa324 allow to change destination directory for queued files (modified patch from Phenom)
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6835 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-10-16 19:02:15 +00:00
defnax
783f73476b set default chat lobby icon
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6834 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-10-16 12:30:28 +00:00
csoler
08c585df2d fixed typo
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6830 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-10-14 19:57:06 +00:00
csoler
c608d7ed69 updated english strings
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6828 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-10-13 15:57:12 +00:00
csoler
e1d907bb95 fixed typo
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6827 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-10-13 15:31:34 +00:00
csoler
48839249c0 changed version string to 0.5.5b
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6826 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-10-13 12:23:00 +00:00
csoler
8e220c691b added help string for notify page
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6825 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-10-13 12:16:46 +00:00
csoler
cf8d6682da added help string for relays
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6824 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-10-13 12:02:50 +00:00
csoler
7d3f8b5c10 added help string to plugins page
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6823 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-10-13 11:43:15 +00:00
csoler
5865c80a76 added new tree items for subscribed lobbies. Helps spoting them in the list (Patch from Phenom)
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6821 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-10-11 20:46:25 +00:00
defnax
9d73b1f4af update button colors
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6820 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-10-11 18:45:01 +00:00
thunder2
a50c899ff3 Moved help browser from MainPage to a new base class named FloatingHelpBrowser for global usage.
Added FloatingHelpBrowser to the option window (help text not including).
The help text can be specified for the ConfigPages in the method "helpText".

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6818 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-10-09 09:31:40 +00:00
defnax
fa6bc5fe39 Added a warning info label for the make friend Wizard
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6817 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-10-08 16:45:14 +00:00
defnax
1d83754385 fixed to show the General tab by default
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6816 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-10-08 14:24:21 +00:00
defnax
d4b64ae551 Added a default stylesheet for the send button
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6815 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-10-08 13:58:56 +00:00
csoler
9b8d597c0d added fingerprint to cryptopage
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6813 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-10-07 21:01:05 +00:00
csoler
e4e28c733c added the possibility to distant chat with unverified identities, while warning the user about it. Should help distant chatting.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6812 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-10-07 20:49:02 +00:00
chrisparker126
25d721b6fe Code change to test group edit
- can modify group names and content now
 
 Group edit code fixes

git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs_finale@6811 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-10-06 21:07:31 +00:00
csoler
120a27d9c7 - added RsCompress with memory compression methods based on ZLib (already linked)
- added test code for RsCompress methods
- used compression to compress file lists so as to reduce bandwidth usage



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-initdev@6809 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-10-06 20:12:34 +00:00
defnax
ed44bc6884 enabled wordWrap for the topic label
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6808 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-10-06 16:07:37 +00:00
csoler
e9ccc323a2 added new delegate for BW statistics window. Changed column names to more appropriate values (Patch from Phenom)
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6806 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-10-06 12:19:13 +00:00
csoler
7cd9ca9f09 Added proper sorting of DL files according to sources (Patch from Phenom)
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6805 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-10-06 12:09:36 +00:00
chrisparker126
9470e5562a Added update capability to forums ui
Added timestamp check for group update in nxs
decided to add control variable to allow meta changes in updates rather than none


git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs_finale@6803 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-10-05 11:36:31 +00:00
csoler
f3f7a40ad7 changed the connect wizard so that we can add someone key to keyring without making friend. Made connection progress dialog only show up when really making friend
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6801 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-10-04 20:55:16 +00:00
csoler
a9290e9dd7 fixed image resizing for channel thumbnails. Apparently there is a bug in Qt preventing Qt::KeepAspectRatioByExpanding to work correctly
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6800 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-10-04 19:40:29 +00:00
thunder2
b49ba8b98f Changed the additional buttons of ChatLobbyDialog and AudioPopupChatDialog to QToolButton.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6798 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-10-04 12:13:09 +00:00
csoler
695e417fd5 changed std::wstring for std::string+utf8 in chat, and messages
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-initdev@6795 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-10-03 21:41:34 +00:00
thunder2
bf9270dd54 Removed the external library pthreads 2.8.0 on Windows build and used the library of MinGW (version 2.8.0 too). This fixes header mixup of both versions.
Switched to the release version of pthread so the name of the dll changes from pthreadGC2d.dll to pthreadGC2.dll. The new dll can be found in the bin directory of MinGW.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6794 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-10-03 16:23:02 +00:00
drbob
a455bcc5d2 Increased RRT graph range, for new improved statistics.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-initdev@6788 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-10-02 03:22:43 +00:00
defnax
6ae9178712 Added a new frame for the Plugin Buttons, add the plugin buttons before the send button.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6785 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-10-01 20:21:57 +00:00
thunder2
959c9c2aca Fixed compile on Windows when using shadow build.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6784 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-10-01 13:50:34 +00:00
thunder2
45f6ec7320 Moved info widget for encrypted messages in MessageWidget above subject.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6780 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-09-29 23:04:21 +00:00
csoler
ccc2574599 fixed include
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-initdev@6778 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-09-29 12:51:56 +00:00
csoler
4e259fecfd allow max storage duration to be 0, in which case we keep all history
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6777 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-09-29 12:10:59 +00:00
drbob
ba157e4891 Fixes for visState -> vs_disc & vs_dht.
Added RTT Gui.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-initdev@6775 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-09-29 07:10:19 +00:00
thunder2
4dd77457ad Added info widget for encrypted messages in MessageWidget.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6774 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-09-28 22:05:38 +00:00
csoler
40ed94f7fb removed copy/paste of links of type PERSON in friendlist. This caused confusion and did not provide anything useful since the creation of the full certificate links
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6771 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-09-27 21:40:51 +00:00
csoler
e21d869006 - added history parameters for chat lobbies
- added max storage time for items in chat history. Avoids filling up the history with chat from volatile peers.
- worked out the layout in config->ChatPage in a more compact design and added help
- set the max size of chat messages to 6000 bytes instead of 2000 which was a bit too low
- default max number of lobby messages saved in each lobby is 20. Avoids flooding for peers who havn't configured it yet.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6770 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-09-27 21:18:44 +00:00
thunder2
72c7569619 Fixed compile of libretroshare on Windows.
Cleaned some includes of openssl.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-initdev@6769 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-09-26 23:53:06 +00:00
csoler
be2025382b restrict last commit to left mouse button
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6766 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-09-25 20:19:24 +00:00
csoler
1d0c7b2e2f highlight peers in network graph according to friendship distance from selected node
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6765 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-09-25 20:13:57 +00:00
thunder2
1dd9d0e49f Moved stylesheet from ShareManager to Standard.qss.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6763 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-09-25 17:24:42 +00:00
defnax
440968cb98 Added a icon label to RSImageBlockWidget
changed some icons for encrypted messages

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6762 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-09-25 15:58:01 +00:00
thunder2
3ced628dc3 Fixed showing info page in ChatLobbyWidget.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6761 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-09-24 21:09:49 +00:00
thunder2
6a9dfed408 Added new action "Load images always for this message" to image blocking.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6760 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-09-24 20:19:21 +00:00
csoler
0a3419c692 fixed bug showing play for unfinished files and preview for finished ones
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6759 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-09-24 19:07:44 +00:00
defnax
715984249c * Added a default stylesheet for the generate button
* hide/show the correct info labels at top.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6756 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-09-24 14:04:19 +00:00
defnax
83abd53872 moved the Info Page to the UI, the get look more user friendly
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6754 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-09-23 22:31:52 +00:00
csoler
cda8557b73 added entropy collection system based on mouse movement to location/identity creation, to make keys less predictable
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6753 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-09-23 20:55:34 +00:00
thunder2
6b1613d8bb - Added blocking of embedded images (+ settings) to forums and messages
- Added image support for forum messages
- Renamed LinkTextBrowser to RSTextBrowser
- Updated english translation

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6752 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-09-23 19:53:26 +00:00
csoler
5beefde701 patch from Phenom to add columns and sorting to chat lobbies (modified: removed unused Delegate code)
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6749 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-09-19 19:22:17 +00:00
defnax
6dbbf83783 improving posted item
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6743 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-09-16 22:12:45 +00:00
defnax
45c0da0f0f changed default header text
and context menu icons

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6737 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-09-13 18:31:37 +00:00
defnax
d076848f92 changed the default style layout of profile creation dialog.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6736 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-09-13 17:19:34 +00:00
defnax
0ae1a8a101 update the nsis script
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6734 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-09-12 23:06:54 +00:00
defnax
8770551c72 update changelog
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6729 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-09-10 22:23:21 +00:00
thunder2
4f9a107e83 Hide ip column in friend list by default
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6728 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-09-10 22:04:39 +00:00
thunder2
961f079882 Fixed version number (*.in)
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6727 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-09-10 21:10:11 +00:00
thunder2
0d41814aef Updated languages from Transifex ;-)
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6726 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-09-10 20:55:59 +00:00
csoler
1af7d88d56 fixed showing the filehash in hash column for the parent file only. The combined hash+tunnel id is used to give a unique id to each source, but should not be displayed
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6724 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-09-10 18:33:22 +00:00
drbob
894c2d965e fixed version number.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6723 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-09-09 05:03:26 +00:00
drbob
1d6f99de0d mods to support hidden nodes, and hidden certificate sharing.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-initdev@6721 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-09-09 02:11:43 +00:00
thunder2
23f4ac23db Updated english translation
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6719 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-09-08 19:48:48 +00:00
csoler
f474663fc2 removed tabs in help strings that caused translated text to show arrows
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6718 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-09-08 15:08:36 +00:00
thunder2
3879622fb9 Fixed version number in retroshare-gui
Updated english translation

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6713 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-09-08 10:15:12 +00:00
defnax
54314c0b89 update vote icons
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6712 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-09-07 23:37:33 +00:00
csoler
5e81b6158c fixed headers in Network Dialog. New strings are already translated. Patch from Phenom
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6709 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-09-07 14:06:08 +00:00
csoler
dd6fbe44ab added selection box to show only friends (already translated) in message composer
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6708 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-09-07 14:02:24 +00:00
thunder2
9bec763c4b Fixed encoding of special chars in RetroShare link after patch in revision 6600.
Added space to encoding and changed encoding to hex (e.g. %20 instead of %32).

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6705 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-09-07 12:30:41 +00:00
csoler
2cca7a3b02 updated version number to 0.5.5 prior to release
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6703 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-09-07 08:21:13 +00:00
drbob
683e75aeef Removed Forums / Channels / Blogs stuff.
and made GUI recompile.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-initdev@6702 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-09-07 04:21:48 +00:00
csoler
436f37fbb8 removed the 1 from the 1st column of the keyring
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6698 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-09-06 19:10:51 +00:00
thunder2
ec6218d0e8 Fixed some typos and added new strings to translation (Patch from Henry)
Updated english translation

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6694 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-09-05 20:18:47 +00:00
thunder2
04e543a154 Show gray icons for not subscribed lobbies.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6693 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-09-05 20:12:24 +00:00
defnax
22ee98f897 Fixed to use the correct sized Icon
Fixed item in Network Dialog

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6690 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-09-05 15:48:44 +00:00
thunder2
d59801088d Fixed font size and color of the version number in AboutDialog
Update english translation

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6689 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-09-05 13:15:47 +00:00
thunder2
a9a919de55 Fixed compile on Linux.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6688 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-09-05 11:24:29 +00:00
thunder2
79606aafaa Updated english translation
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6687 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-09-05 09:28:20 +00:00
defnax
40ded5d97d Added a headerFrame to Create distant chat
Enabled default context menu icons for Subscribe, Unsubscribe actions
Added a default stylesheet for the info label

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6686 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-09-05 00:57:48 +00:00
thunder2
f66ef5d3b4 Fixed compile on Linux
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6684 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-09-03 21:06:13 +00:00
defnax
6dbe3f3669 Added a tabwidget for the addresses info, to get more space, and the dialog looks little bit less.
Some changes on Circle Dialog with icons and layout fixes.
Changed tray new message icon, to look or use same like from the Toaster.
Added context menu icons on MessagesDialog

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6680 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-09-02 23:01:24 +00:00
thunder2
e5d8860e21 Moved friend recommendations into the ConnectFriendWizard
Updated english translation

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

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6678 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-09-02 21:48:23 +00:00
csoler
3f66f9d338 removed top level icons in lobby list. Only kept the icons in front of each lobby. Makes the list clearer
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6677 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-09-02 20:23:52 +00:00
defnax
211d206038 Changed some icons for the Identity Dialog
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6676 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-09-02 19:20:47 +00:00
thunder2
90bac2a18e Fixed some strings
Updated english translation

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6675 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-09-02 17:16:54 +00:00
drbob
f74de6242d fixed up Qt version issue.
QDateTime::toMSecsSinceEpoch() is not available in old versions of Qt.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6674 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-09-02 03:40:59 +00:00
defnax
93bac8e7bc changed for Wiki Pages item icon
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6671 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-09-02 00:59:57 +00:00
defnax
f143ff3525 moved the "new topic" button to the groupTreeWidget
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6670 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-09-02 00:44:19 +00:00
defnax
0416a0d888 Added Search Filter to the ChatLobbyWidget
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6669 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-09-02 00:08:38 +00:00
thunder2
4559b48a9d Use sslid to add a location when accepting a friend request from the security item with a known pgp key.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6668 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-09-01 22:18:39 +00:00
csoler
8239c69963 fixed Qt version issue with QDateTime method
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6667 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-09-01 21:08:57 +00:00
csoler
a6905df48c Put last DL column in order
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6666 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-09-01 13:56:05 +00:00
defnax
2212293493 added voting icons for the buttons
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6664 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-09-01 00:12:45 +00:00
defnax
d91c0a1eb5 Added voteup/votedown icons to the comments tree context menu
Added icons for Top and New buttons in Posted Links

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6663 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-08-31 21:47:00 +00:00
csoler
ff67c7eea4 fixed MsgFeedItem for encrypted distant msgs
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6662 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-08-31 21:46:04 +00:00
defnax
9488a6a33d improving posted dialog design
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6660 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-08-31 19:23:49 +00:00
csoler
19808587e9 fixed display of toaster for distant msgs
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6659 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-08-31 13:12:26 +00:00
csoler
abd8c1e32f improved name support for distant peers in messages
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6653 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-08-30 20:40:28 +00:00
defnax
8aaa4db85c Changed icons and default text
fixed layout, at bottom display only Create and Cancel Buttons

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6652 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-08-30 16:30:23 +00:00
defnax
2aa3201774 Added a default stylesheet, for the lobby info label.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6651 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-08-30 15:41:53 +00:00
thunder2
d6194164a5 Moved the send button in ChatWidget back to the toolbar below the input.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6650 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-08-30 12:42:11 +00:00
thunder2
cc92fdfc81 Moved the filter edit and the display button from FriendsDialog and MessengerWindow into FriendList.
Updated english translation

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6649 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-08-30 12:24:39 +00:00
defnax
0fb66c4af4 added/changed icon
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6648 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-08-30 01:28:30 +00:00
thunder2
0051782aef Changed help buttons from QPushButton to QToolButton to use auto raise effect.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6647 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-08-29 22:02:04 +00:00
csoler
7be951eebf changed reply to forum post signer to use distant messaging
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6646 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-08-29 20:52:28 +00:00
thunder2
21eed4c956 - Moved display button and new forum/channel button into GroupTreeWidget
- Fixed size of display button in FriendsDialog
- Updated english translation

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6645 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-08-29 20:32:14 +00:00
defnax
4ee3bec87e created new splash and about screen images, which colors
looks like the rs logo.

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

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6643 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-08-28 23:27:46 +00:00
csoler
cefe23504b fixed icons in chat lobby list (patch from phenom)
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6641 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-08-28 21:13:35 +00:00
csoler
477c05e71f reset block format for text (Patch from Henry)
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6640 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-08-28 20:36:37 +00:00
csoler
5f3be942d3 fix (Phenom) for about dialog
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6639 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-08-28 20:29:52 +00:00
csoler
08a8868865 patch from phenom to fix date display in chat history
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6638 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-08-28 20:25:06 +00:00
csoler
c3af05b0bf made help browser close on click
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6637 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-08-28 20:14:37 +00:00
csoler
dbb8e4980e removed time shift warning (too invasive), and replaced it by a warning in the help panel of chat lobbies
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6636 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-08-28 20:02:09 +00:00
csoler
2109c05d26 fixed security checking of collection files to avoid xml bombs
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6634 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-08-28 19:10:55 +00:00
defnax
a7af0516e7 Added "Send Message" functionality to NetworkDialog, to send a distant message to a known peer.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6633 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-08-28 15:37:11 +00:00
thunder2
ef2d202c07 Fixed compile with Qt 4.7
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6630 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-08-27 19:57:10 +00:00
thunder2
5155c99296 Set the active lobby tree item in the tree when activating the lobby from the toaster.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6629 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-08-27 15:26:11 +00:00
thunder2
e99b202b51 Added missing set of service permission flags when adding a friend in ConnectFriendWizard with signing the key.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6628 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-08-27 10:57:57 +00:00
thunder2
fa503f1603 Updated english translation
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6627 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-08-27 08:45:45 +00:00
defnax
43fecc2307 changed the peer details icon
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6625 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-08-26 23:52:06 +00:00
thunder2
68a1e46b0d Fixed display of icons in chat lobby tree.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6624 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-08-26 23:37:13 +00:00
defnax
21eabaa5d9 fixed the default stylesheet's for ProfileManager/CreateLobbyDialog
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6623 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-08-26 21:47:44 +00:00
thunder2
6b8f4b2265 Fixed showing utf8 characters in DetailsDialog
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6622 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-08-26 20:55:35 +00:00
csoler
8549e10d1c rework and code cleaning in customPopupMenu for Transfers (Patch from Phenom)
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6620 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-08-26 17:56:30 +00:00
defnax
d249786b6c changed the default font size to 9
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6617 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-08-26 16:15:29 +00:00
drbob
fd66a963d2 Improvements for ProgressDialog.
- Launch progress dialog after connectWizard.
 - fix display of location on connectWizard.
 - add cleanup code to ProgressDialog.
 - Qt4.7 bugfix.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6616 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-08-26 07:24:37 +00:00
csoler
1554e17f48 patch from Stefan Sperling to allow compilation on OpenBSD
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6613 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-08-25 21:06:29 +00:00
csoler
5bf1ce8f07 hability to delete some lines in chat history browser (Patch from Phenom)
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6612 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-08-25 20:45:59 +00:00
csoler
d1d2fbb869 added attach picture system to broadcast (Patch from Phenom)
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6611 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-08-25 20:41:50 +00:00
csoler
2d3cb91cd8 added DL path to columns in transfers and changed variable names to easy code reading (Patch from Phenom)
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6610 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-08-25 20:35:29 +00:00
csoler
c007cb1051 link from hashed file is paste in edit window, not in sent messages (Patch from Phenom)
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6609 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-08-25 20:24:47 +00:00
csoler
4db4742f00 fixed up completer for nicknames in chat lobbies (Patch from Phenom)
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6608 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-08-25 20:22:41 +00:00
csoler
348c860d6e fixed up icons in sharedFilesDialog (Patch fromPhenom)
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6607 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-08-25 20:19:01 +00:00
csoler
283785cd70 end of Phenom patch for chat Icon activity
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6606 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-08-25 20:13:51 +00:00
defnax
ff7b56da36 added newsfeed notify icon
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6605 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-08-25 16:05:45 +00:00