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

2991 Commits

Author SHA1 Message Date
defnax
c5ad4ba206 improved request page design 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5435 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-08-17 13:45:05 +00:00
thunder2
21e97a47df Added a new page for user request to ConnectFriendWizard. 
The page is shown instead of the conclusion page when the user clicks on the certificate link in a message of type user request.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5432 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-08-16 10:20:34 +00:00
defnax
aedac9738a update installer translation 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5431 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-08-16 07:27:07 +00:00
csoler
2b20ab7fca fixed crashes with poping ConfCertDialog with incomplete certificate 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5429 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-08-15 20:08:18 +00:00
csoler
a9d19528a0 fixed uninitialized memory read 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5428 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-08-15 19:03:14 +00:00
thunder2
0e0458e40c Fixed empty certificate string in ConnectFriendWizard when click on a certificate link. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5426 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-08-15 14:49:42 +00:00
defnax
c992cb6aea Enabled to display Plugin Version, on Plugin Item 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5424 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-08-15 12:33:46 +00:00
defnax
26109d88c4 * Hide the import/export button, and set the new identity CheckBox set checked, when start a new Profile generation from Profile Manager. 
* Set PluginItem icon size to 24

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5423 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-08-15 09:34:24 +00:00
thunder2
cfe72859bf Added automatic clean of the friend certificate in ConnectFriendWizard. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5422 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-08-14 23:20:33 +00:00
csoler
b714d68523 fixed code for certificate link generation. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5420 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-08-14 19:31:47 +00:00
csoler
a940537331 fixed certificate paste. We need more appropriate code at this place. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5419 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-08-14 18:57:45 +00:00
defnax
73c8da5438 update translation 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5418 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-08-14 15:37:21 +00:00
defnax
4c1ac6084b updated Spanish translation (from Senpai) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5417 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-08-14 14:49:12 +00:00
thunder2
d1dbae80e9 Fixed compile. Renamed file "contact-new22.png" to "contact_new22.png" 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5416 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-08-14 12:08:26 +00:00
defnax
6e80f97125 set a icon for the pushbutton 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5415 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-08-14 09:34:40 +00:00
defnax
9d3d457630 replaced QListWidget with QTreeWidget for Display the Identities 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5413 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-08-13 22:53:55 +00:00
csoler
878855e356 fixed include 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5411 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-08-13 19:46:02 +00:00
csoler
60f51c358c - added new certificate format in ConfCertDialog and ConnectFriendWizard, with a button to switch to old format if necessary 
- added automatic cleaning of certificates in both formats
- grouped all certificate cleaning/parsing code in rscertificate.cc
- removed unused files cleanupxpgp.h/cc
- added upper/lower case to rsid template.

The new format is to be tested. It is supposed to be much more robust than the previous format,
in particular, allowing any string for location names.


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5410 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-08-13 19:37:50 +00:00
defnax
6b76abd1cc fixed compile 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5408 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-08-13 18:46:33 +00:00
defnax
1457a3b965 Added a basic Profile Manager 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5407 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-08-13 15:37:21 +00:00
defnax
7009b46461 update translation strings 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5402 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-08-11 16:11:37 +00:00
defnax
9609c96c9b Added new Chat style Bubble, generated by Victor for RetroShare 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5401 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-08-11 13:39:47 +00:00
defnax
e0403eceb0 update nsis script 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5397 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-08-08 22:09:16 +00:00
defnax
d9dec7bdbd Added a vertical spacer, to not stretch the content of the groupbox. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5396 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-08-08 15:10:53 +00:00
defnax
86aa6b8a62 Fixed, hide Import Identity button, when creating a new key. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5395 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-08-08 14:28:03 +00:00
thunder2
2921cbaf23 Show count of new messages in the toolbar. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5394 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-08-08 10:48:29 +00:00
defnax
121d49e5d1 * Corrected description text 
* Set header text color white

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5393 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-08-08 10:13:26 +00:00
defnax
abbdf5c4eb enabled colored nicknames 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5392 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-08-08 09:50:55 +00:00
csoler
702263686e - fixed a few bugs in cert creation window: 
* private key was not correctly added to private keyring
   * self signature validation was reported unsuccessful when unknown signatures where found
- enabled key import when no key is present


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5389 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-08-07 19:16:17 +00:00
defnax
4581067b78 enabled new icons for toolbar notify 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5388 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-08-06 23:22:24 +00:00
defnax
d3739b251b Added new icons 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5383 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-08-06 15:18:19 +00:00
thunder2
1d558ff56d Fixed german language. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5382 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-08-05 21:57:54 +00:00
thunder2
b21e66241b Reworked notification code in system tray. 
Added a base class and a possibility for the main dialogs and the plugins (derived from MainPage) to provide a notifier.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5381 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-08-05 20:12:55 +00:00
defnax
049b4bd577 update readme 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5379 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-08-05 15:03:12 +00:00
thunder2
70aabe11f0 Switched off optimized compile on Windows (again). 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5376 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-08-02 23:25:28 +00:00
thunder2
fe95818384 Switched on optimized compile on Windows (again). 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5370 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-08-02 00:15:35 +00:00
thunder2
dda24f0875 Fixed bad default value for filter column in ForumsDialog. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5367 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-08-01 12:50:28 +00:00
defnax
2bcc910943 renamed project file 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5361 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-07-31 11:36:00 +00:00
csoler
a2b6b97ef9 added systray notifications for chat lobbies. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5357 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-07-30 13:27:40 +00:00
drbob
4e7cae83b2 fixed incorrect spelling of headers... 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5354 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-07-30 11:21:50 +00:00
thunder2
a360419f97 Enabled some more translations in news feed items and fixed german translation. 
Removed not needed file "Thumbs.db" in skin directory.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5350 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-07-29 20:24:09 +00:00
drbob
ceb4298208 Updated forumV2 support forms to latest version (from forums/) 
* Can now create new forum & post/reply messages. 
 	Flags have not been finished for these.
 * Edit/Details are not yet complete.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5347 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-07-28 21:09:53 +00:00
drbob
d5520a1cd8 Merged parallel improvements to ForumsDialog into ForumsV2Dialog. 
* Also fixed load bug for empty forums & inserting the actual Post.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5345 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-07-28 17:36:41 +00:00
csoler
0d72ad1806 fixed compilation on ubuntu (apparently QTreeWidgetItem(NULL) is not accepted 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5342 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-07-28 13:52:54 +00:00
defnax
eb16607601 fixed missed include 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5341 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-07-28 09:25:10 +00:00
drbob
2e4cc099dc Changes to allow the GXS services to compile with up-to-date GUI code. 
* Mainly just update header file locations.
 * ForumsV2Dialog needs changes/improvements from ForumsDialog applied to it.
     - This merge has broken bits of the code (#warning's inserted).



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5339 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-07-27 15:41:52 +00:00
drbob
bec1407648 Merged Code from: /branches/v0.5-new_cache_system/ into main trunk. 
- Revisions 4771 => 5334

 * This merge brings a lot of unfinished code for GXS (new cache system)
 	- See branch commits for more details.
 * Code is disabled, and should have minimal effect on trunk build.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5338 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-07-27 15:03:16 +00:00
csoler
cde076aac6 added auto-clean of certificates at load time. Removes many errors. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5337 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-07-27 14:26:05 +00:00
drbob
b8ee58ca98 Disabling GXS Services for merge back into the trunk. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-new_cache_system@5334 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-07-27 12:46:43 +00:00
drbob
da8a8ec659 updated config file for OSX compilation. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5332 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-07-27 12:30:46 +00:00
csoler
b098617802 updated french translation (Max Romeo) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5325 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-07-23 21:45:53 +00:00
thunder2
219c5db3c9 Added a new button in ChanMsgItem and ForumMsgItem to set the message as read (without expanding the message) and remove the item from the news feed. 
Redesigned ChanMsgItem.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5322 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-07-22 22:48:13 +00:00
csoler
ee77ec8c6c added warning for unsupported keys. It is triggered when no valid keypairs are found at start, and when unsupported keys pairs are found when copying the keyring 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5317 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-07-20 19:00:10 +00:00
defnax
bd1f0cc71b moved create profile button into top groupbox and changed the size 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5316 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-07-20 09:42:53 +00:00
defnax
b52fc7708f removed not needed info buttons for the infodialog 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5313 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-07-18 14:08:53 +00:00
thunder2
47d652b4ec Fixed a possible crash at startup. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5311 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-07-17 22:16:56 +00:00
csoler
cda4adbf5b moved channel action menu into right click, for better consistency 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5309 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-07-17 21:22:37 +00:00
csoler
233914c02d desactivated TrustMatrix, by the time we decide wether it is worth keeping it, and implement a better version of it 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5308 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-07-17 20:40:51 +00:00
csoler
c21fd10521 updated french translation (Max Romeo) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5307 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-07-16 21:30:47 +00:00
thunder2
9389849e53 Fixed crash when starting the help browser from friend details the second time. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5305 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-07-15 22:24:03 +00:00
thunder2
15c032468a Enabled translation (system default language) of the message box before the login to a profile. 
Fixed german translation.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5304 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-07-15 21:37:35 +00:00
thunder2
703e5def72 Removed usages of gpg.h and cleaned pro-files for Windows. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5296 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-07-14 00:02:40 +00:00
csoler
fc8dfcf65b Merged branch v0.5-OpenPGP into trunk: 
User-level changes:
==================
- libgpgme is not used anymore; it is replaced by a built-in piece of code called OpenPGP-SDK 
  (http://openpgp.nominet.org.uk/cgi-bin/trac.cgi) that was improved to be used by RetroShare
  for handling PGP keys.

- the gnupg keyring is not used anymore. Now, RetroShare has it's own gpg keyring, shared by all instances.
  On linux it's located in ~/.retroshare/pgp/. A lock system prevents multiple locations to read/write keyrings
  simultaneously.

- the trust database from gnupg is not documented, so RetroShare cannot import it. This comes from the fact that
  the GPG standard (RFC4880) asks explicitly not to export trust information. So RetroShare has it's own 
  trust DB shared by locations. This means you need to re-trust people. Sorry for that!

- at start, if no keyring is found, RS will propose to copy the gnupg keyring to use your existing keys. Clicking on 
  "OK" will do the copy, and you should find back all existing locations, except for DSA keys.

- locations for which the suitable keypair is not in the keyring will not be displayed in the login window
- locations for which the suitable keypair is not a RSA/RSA key will not be displayed. RetroShare does not
  support DSA/Elgamal keypairs yet.

- a key import/export exchange function has been added in the certificate creation window (you go there from the login
  window by clicking on "manage keys/locations". This allows to easily create a new location with the same pgp key on
  another computer. To obtain a suitable keypair using gnupg, you need to concatenate the encrypted private key and the 
  public key into an ascii file. This can be done using:
  		gpg -a --export-secret-keys [your ID] > mykey.asc
		gpg -a --export [your ID] >> mykey.asc

- importing a key with subkeys in not yet possible. Please remove subkeys before importing.

- The code has been tested for a reasonnable amount of time, but it's not possible to prevent some new bugs 
  to appear. Please report them asap supplying: call-stacks if possible, and terminal output. In particular,
  openpgp has some assert()'s that should not be triggered unless RetroShare is calling it in an improper way.

Internal changes
================
- a specific component, PGPHandler, takes care of the interface between openpgp-sdk and RetroShare
  openpgp-sdk is c-code, with it's own memory management, which has been kept well separated from 
  RetroShare.

- GPG Ids are now a specific class (not a std::string anymore) for code consistency reasons. As strings are
  still used in many places, this requires a few conversions. In particular, AuthGPG takes strings as
  function params and calls GPGHandler with the proper PGPIdType class. In the future, RetroShare should
  only use PGPIdType. The same will be done for SSL ids.

- signature cleaning is still handled by the Retroshare built-in function, not by openpgp, but we will 
  do this later.

Still to do
===========
- DSA needs subkey handling, since the encryption is performed by a Elgamal subkey. Not sure this will be done.
- GPGIds/SSLIds cleaning (meaning replace strings by appropriate types). Lots of confusion throughout the code in retroshare-gui in particular.
- key removal from keyring. This is a challenge to keep locations synchronised.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5293 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-07-13 21:53:39 +00:00
csoler
4fc3ce491a updated self-signatures 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-OpenPGP@5292 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-07-13 12:20:44 +00:00
csoler
f5c276c9b5 improved error handling 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-OpenPGP@5289 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-07-12 19:20:31 +00:00
thunder2
540f04bed5 Enabled word wrap of the description in ChanNewItem. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5288 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-07-12 10:38:22 +00:00
csoler
749dd01d77 implemented keypair import 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-OpenPGP@5287 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-07-11 16:17:49 +00:00
csoler
c9eb267165 implemented export of identity (to create additional locations easily). Import still to do... 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-OpenPGP@5285 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-07-10 21:40:53 +00:00
csoler
2ca0bf71d0 fixed bad call to isKeySupported() 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-OpenPGP@5284 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-07-10 18:30:37 +00:00
drbob
51d6396c9f Changed the Ranking list to the new retrival methods. 
Modified data display to show real info,



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-new_cache_system@5281 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-07-08 01:31:23 +00:00
csoler
fa6674fd01 removed old includes of gpgme. Updated values for trust 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-OpenPGP@5279 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-07-07 16:26:54 +00:00
drbob
388bd5da9f Tweaks to the GUI stuff to make it conform to the new interface. The major changes were: 
* New Async/Token Group/Msg Creation (required for Key generation/group Id determination). 
   This means that creating a group, and posting messages are two steps... (see PhotoAddDialog).
 * Moved some MACROS from ForumV2 to libretroshare/rsidentity for generic MsgStatus stuff (e.g. MSG_READ)



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-new_cache_system@5277 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-07-06 23:19:10 +00:00
drbob
f05d2f9b09 Improvements for New Services. 
* Forums now loads example data...
 * new Posted Service, only the basics for now.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-new_cache_system@5269 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-07-01 23:05:03 +00:00
csoler
f68cc45461 updated .pro files for compilation 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-OpenPGP@5261 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-07-01 13:15:36 +00:00
csoler
6e536ae67e fixed typo 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5251 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-06-23 13:31:28 +00:00
csoler
bad047d7fe fixed stupid bug in friendlyUnits() 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5250 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-06-23 13:28:04 +00:00
drbob
fd34bbfdaf Improved display of bandwidth data. 
- Coloured items.
	- Put N/A for peers that aren't running BwCtrl yet.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5248 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-06-22 13:03:18 +00:00
drbob
3dfbf128d8 added QueueSize to displayed information. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5246 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-06-22 01:36:23 +00:00
drbob
9fcc9277c2 shrink window size 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5244 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-06-22 00:45:55 +00:00
drbob
7501d92882 Added new display window for monitor bandwidth rates with peers. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5242 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-06-21 23:24:53 +00:00
drbob
03e2ee72e0 Major improvements to the PhotoSharing Application. 
- Editing of Photo Descriptions & Album descriptions.
	- Photo versions.
	- Default to Album description, if Photo not filled in.
	- Album Cover images.
	- SlideShow.

Todo:
	- Deletion of Photos & Albums.
	- Handle Photo Files (only thumbnails at the moment).
	- Searching.
	- Sharing options.
	- Image processing.
	- +lots more.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-new_cache_system@5239 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-06-21 15:52:49 +00:00
thunder2
1b4a963b78 Beautified messagebox when switching to the OpenPGP version. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-OpenPGP@5236 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-06-19 22:31:37 +00:00
csoler
36198b7e6a Enabled full chunk checking code: 
- unchecked chunks are not made available to swarming sources, not saved as done.
- force check now uses the simple method to put all chunks in checking mode
- force checked files can be cancelled (finally!)
- improved display (use red for active chunks, yellow for checking)
- cache file are not using chunk checking (assume_availability=true)
The code still contains the #ifdef. It should be removed soon if everything works ok.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5235 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-06-19 21:36:10 +00:00
thunder2
ef424a1e11 Fixed crash in TransfersDialog when right clicking on a download without "#define USE_NEW_CHUNK_CHECKING_CODE". 
Already corrected in the trunk.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-OpenPGP@5230 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-06-18 20:56:02 +00:00
csoler
8ef3d851de fixed bug in display of upload progress 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5228 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-06-17 13:45:17 +00:00
csoler
dba66cdd7a added check for DSA/RSA key algorithm. Disabled make friend, login and cert creation, with unsupported keys 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-OpenPGP@5221 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-06-14 20:13:31 +00:00
drbob
a8676302ce Major rewrite of New Cache Interface from the GUI side: 
- Basics of Wiki, Photo, Id are working with Local Test interface.
	- Duplicated existing Forum : ForumV2Dialog + forumv2/*
	- Modified ForumV2Dialog to use Request / Response Data retrieval.
	- Switched Id to use TokenQueue request system.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-new_cache_system@5220 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-06-14 00:36:25 +00:00
thunder2
be177ecb27 Fixed one more compiling issue. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5214 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-06-11 21:32:22 +00:00
thunder2
ee3677da2b Added and modified patch from AsamK 
- Fixed bug in Qt for Windows Vista and higher. Convert path from native separators of filenames from QFileDialog::getOpenFileName(s)

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5213 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-06-11 21:24:55 +00:00
thunder2
63104ceefc Fixed possible compiling issues on Ubuntu. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5212 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-06-10 23:47:41 +00:00
thunder2
1885fb66c4 - Enabled compile on Windows (bzip2 library needed). 
- Fixed crash after the second call to RsInit::InitRetroShare when keyring does not exist.
The instance of AuthSSL was created twice and AuthGPG was deleted without stopping the thread. Stopped the AuthGPG thread on exit of RetroShare.
- Added the correct path to the keyring for Windows in RsInit::copyGnuPGKeyrings.
- Changed the detection of the portable version on Windows from the file "gpg.exe" to the file "portable".

git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-OpenPGP@5211 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-06-10 00:29:46 +00:00
csoler
a91e859b66 added dialog box to import existing keyrings when starting the new pgp version for the first time 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-OpenPGP@5210 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-06-09 21:01:22 +00:00
thunder2
080510bc97 Added patch #3510849 from Adam (interfect) 
Capitalize "copy RetroShare key to clipboard"

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5208 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-06-09 17:59:45 +00:00
thunder2
0989897696 Fixed sorting (case insensitive, numbers) in SearchDialog. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5207 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-06-09 14:14:04 +00:00
thunder2
e5a25b94f0 Added "file:///" to "%style-dir%" for the chat styles. 
Renamed "RetorShare" to "RetroShare".
Fixed german language.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5206 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-06-08 22:06:28 +00:00
drbob
de8f4f283c Changes to WikiDialog GUI to convert to Request / Response data model. 
Also:
	- modified TokenQueue to include MSGRELATEDLIST & new Request Options.
	- updated PhotoDialog to include new Options for requests.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-new_cache_system@5205 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-06-08 22:06:23 +00:00
drbob
b94e6d9888 Converted PhotoDialog to request/response system 
- Added Generic TokenQueue to simplify the Interfacing.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-new_cache_system@5203 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-06-08 13:55:00 +00:00
drbob
bf4c250e51 Modified the Id Gui to use new async call interface. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-new_cache_system@5200 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-06-07 17:11:57 +00:00
thunder2
ff6276e920 Changed chatstyle structure from 
[RS-Dir] / stylesheets / {public | private | history} / my_chatstyle /
to
[RS-Dir] / stylesheets / my_chatstyle / {public | private | history} /

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5192 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-06-01 21:48:53 +00:00
thunder2
569d463f02 Optimized the fill of the up- and downloads in TransfersDialog. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5191 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-06-01 20:51:14 +00:00
csoler
40b1f6f053 fixed incompatibility with Qt < 4.6 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5190 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-05-25 19:29:09 +00:00
thunder2
50bc57b0fe Sort participants list in the chat lobby case insensitive. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5186 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-05-24 19:26:43 +00:00
defnax
55b6211e7e update version string and changelog 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5185 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-05-24 12:02:34 +00:00
thunder2
1855d19436 Added check for empty lobby nick name. 
Moved notify of lobby nick name change from the gui to p3ChatService.
Added missing mutex locks for p3ChatService::_default_nick_name.
Recompile needed.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5184 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-05-23 22:33:45 +00:00
thunder2
917f9913df Added patch from Imanuel 
- Added new placeholder %style-dir% for ChatStyles.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5183 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-05-23 13:24:04 +00:00
thunder2
56e156a65a Fixed replacing of %color% in ChatStyle. It should not be replaced after %message%. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5182 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-05-23 09:19:50 +00:00
thunder2
22a0f89751 Redesigned ConnectFriendWizard as ui file. 
Added new base class DropLineEdit.
Fixed german language.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5181 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-05-22 22:24:10 +00:00
thunder2
25547d0ea8 Added patch from braindead: 
changed base-class of AvatarWidget to QLabel

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5179 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-05-21 19:37:38 +00:00
thunder2
443703e61f Switched back to not optimized compile on Windows. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5178 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-05-21 19:06:16 +00:00
thunder2
a7eda64872 Fixed compile on Linux. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5177 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-05-20 16:53:28 +00:00
thunder2
b344aebbe6 Added changes from braindead: 
- simplified avatarwidget
- prepared property-dependend stylesheets

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5176 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-05-19 22:18:15 +00:00
thunder2
e2746efb85 Optimized RsCollectionDialog (still without thread). 
Enabled extended selection and mark with the key 'space'.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5173 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-05-16 18:58:52 +00:00
csoler
5fbb6448d3 main enabled notifyQt after creation of GUI 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5171 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-05-15 20:35:05 +00:00
csoler
6c9d701506 forgot ifs in notifyQt 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5170 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-05-15 20:32:36 +00:00
csoler
c0088f3e8f removed data race in QObject::connect() vs. NotifyQt signals by enabling notification signals only after GUI is created 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5169 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-05-15 20:25:53 +00:00
defnax
39c3d013f5 Improved the default recommendation text 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5166 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-05-14 14:14:38 +00:00
defnax
a25e609e2f Added a default styleSheet for the "Confirm Friend / Add as Friend" Button 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5163 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-05-12 23:44:48 +00:00
thunder2
27c0535a8a Fixed handling of html links in HandleRichText::formatText. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5162 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-05-12 16:04:18 +00:00
thunder2
dc2d6c975e - Moved HandleRichText from the folder "chat" to "util" and redesigned the source 
- Extended RsHtml::formatText to replace the RetroShare links with an image and enabled this for the certificate links in the system messages (friend recommendation and user request)
- Added new ObjectPainter for painting a button on a pixmap


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5160 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-05-12 00:40:53 +00:00
notdefine
5a3863d216 Improved mute feature, to update Blocklist, when the peer changes his name. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5159 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-05-11 20:53:27 +00:00
defnax
438651f693 update language strings and corrected connect attempt message 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5155 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-05-09 13:49:23 +00:00
notdefine
5bdd490a4d Remove debug message 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5154 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-05-07 21:43:21 +00:00
defnax
e23f7e1055 update translation strings, 
changed recommend friend context menu icon

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5152 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-05-07 14:43:25 +00:00
notdefine
d5bdae7bd9 Display old and new nickname to Peers during nickname change in ChatLobby. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5151 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-05-06 22:57:08 +00:00
notdefine
22bfcb62bc Preparation for mute Peers in the Chat Lobby. 
RS_CHAT_LOBBY_EVENT_PEER_CHANGE_NICKNAME is send, when changing nickname, so the blocklist can be updated (in future).

This will never wort for 100% as discussed in the developer forum, but should stop the most spam.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5150 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-05-06 22:19:59 +00:00
csoler
22a8e6f3c9 updated french translation (Max Romeo) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5149 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-05-06 20:32:19 +00:00
csoler
7382f7552b utf8 patch for notifyqt from AsamK 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5147 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-05-06 11:48:02 +00:00
thunder2
78fd91ce4a Fixed update (repaint) of the placeholder text of the quick view items in MessagesDialog. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5146 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-05-05 22:29:59 +00:00
thunder2
b81a911793 Friend recommendation message 
- renamed subject
- added to system message
Recompile needed


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5145 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-05-05 22:20:05 +00:00
csoler
1b80207fbe french translation update (Max. Romeo) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5143 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-05-05 18:54:55 +00:00
notdefine
94a6e1035a Add the function to Mute peers in ChatLobby via checkbox. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5142 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-05-05 14:22:21 +00:00
thunder2
2611da2f72 Changed style of the reply/forwarded message. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5141 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-05-04 23:39:36 +00:00
defnax
173ce82099 Added a title label to Friend Request Toaster, little design changes. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5140 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-05-04 14:42:06 +00:00
defnax
08e74f2dba * Removed hide/show Quickview function and moved Quickview little bit to the top. 
* Disabled to not stretch last column

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5137 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-05-03 15:42:43 +00:00
thunder2
9df55782a3 Switched on optimized compile on Windows. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5136 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-05-03 14:33:34 +00:00
defnax
5b23a0e112 update icon 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5134 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-05-03 09:44:48 +00:00
thunder2
c99fa5f342 Added patch from braindead 
- Added empty entry to stylesheet-choice for "no stylesheet" and moved method "loadStyleSheet" from MainWindow to Rshare


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5133 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-05-02 20:19:51 +00:00
thunder2
8bd1b7aa4a Added (and modified) patch from Imanuel 
- Added ability to style the system messages in chat (e.g. Lobby management)
Fixed german language.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5130 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-05-01 12:58:28 +00:00
thunder2
c331098203 Added new message flag for system messages like friend request. 
Show "RetroShare" as sender of system messages to myself.
Added new quick view in MessagesDialog to filter system messages.
Changed RetroShare link in friend request message to certificate.
Added new subject image for the system messages (defnax).
Removed not used notify in message service.
Recompile needed.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5129 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-05-01 09:18:55 +00:00
csoler
ce5e6d3949 fixed password handling 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-OpenPGP@5127 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-04-29 11:57:03 +00:00
csoler
32ac7efb42 added paste own certificate to chat/forum context menu (patch from AC) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5125 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-04-27 12:04:40 +00:00
thunder2
d28ffb9c0d Added new notify on connect attempt by the local message system. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5124 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-04-26 23:41:14 +00:00
defnax
e8b1c08ace Removed not needed field in FriendRequest Dialog 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5121 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-04-26 09:42:35 +00:00
thunder2
9501a4fe2c Added new friend request toaster from defnax. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5120 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-04-25 19:19:16 +00:00
thunder2
586e8bc042 Added patch from Imanuel 
- Fixed base path for the external stylesteets

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5119 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-04-24 19:43:38 +00:00
thunder2
3dca71330c Optimized channel loading and layout. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5118 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-04-24 15:34:22 +00:00
thunder2
83f49ac143 Added threaded loading of channels (GUI). 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5115 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-04-21 13:00:17 +00:00
thunder2
10400faf4c Removed minimal version. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5113 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-04-20 15:17:52 +00:00
notdefine
60a68210d5 Activate DHTML in Doxygen Documentation, for Fold in/out Class hierarchy images. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5102 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-04-14 14:32:00 +00:00
notdefine
67aa7e3ac8 Small change 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5101 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-04-14 14:03:28 +00:00