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
6,318 Commits 63 Branches 22 Tags 194 MiB
7815efb16f
Commit Graph

82 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
csoler
5aedf393b2 patch from Phenom to encode non standard character in file names correctly in RS links 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6600 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-08-23 20:34:50 +00:00
csoler
9cfce22f88 added DynDNS to RS certificate link if available 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6488 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-07-06 20:27:29 +00:00
csoler
4868a90d81 patch from Henry morgan to fix soem typos (e.g misspelled connexion into connection) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6460 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-06-24 21:23:50 +00:00
csoler
c45f2776ed added missing call to ChatDialog::chatFriend() 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6435 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-06-17 18:53:47 +00:00
csoler
69bf523c7a Enabled distant chat system. 
Added system to collect and create chat invites from pgp keys.
Finished the GUI (some layouts need fixing, especially the link creation window).
Still needed: QoS on generic turtle data items. Will need a new item class for any anyway.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6433 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-06-16 14:39:44 +00:00
thunder2
27d72c6fba Fixed some compiler warnings 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6421 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-06-10 13:27:24 +00:00
csoler
34e6fb6fa2 fixed a few gui issues with acceptance of unknown peer 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-GenericTunneling@6345 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-04-29 22:32:58 +00:00
csoler
ca279ec0c2 first version of distant messages. Still needs some debugging 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-GenericTunneling@6344 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-04-29 20:44:48 +00:00
csoler
ff867d0fe5 most of the protocol for distant chat works! Still needs some testing. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-GenericTunneling@6315 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-04-18 21:41:13 +00:00
csoler
dc0193ae66 added popup chat window for distant chat, decryption code for private chat links. (W) does not compile 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-GenericTunneling@6310 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-04-16 21:13:42 +00:00
csoler
46ec44ceea fixed some display bugs 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-GenericTunneling@6307 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-04-14 21:45:02 +00:00
csoler
e7871b598b added code to create/paste/read private chat and msg links 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-GenericTunneling@6305 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-04-13 22:40:17 +00:00
csoler
9e8b9b6c05 added first brand of chat/msg link creator/editor. Not functional yet 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-GenericTunneling@6304 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-04-13 13:12:13 +00:00
csoler
6e9d1beda9 fixed auto-raise of pages that are not in the top level 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6141 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-02-23 14:29:36 +00:00
csoler
718314af75 removed debug info, added missing error message 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6140 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-02-23 13:24:16 +00:00
csoler
6571279b70 fixed (again) bug with bad chars notification 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6007 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-17 20:58:35 +00:00
csoler
dc57acb20c fixed bug in notification of substituted chars in RetroShareLink 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5995 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-16 16:28:00 +00:00
csoler
bb7645549f extended character filtering to fit a common denominator for all filesystems 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5979 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-13 22:48:36 +00:00
csoler
892057b53e added replacement of \ and / in filenames from RsLinks 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5978 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-13 22:13:58 +00:00
thunder2
224ece5795 Added patch from Henry 
- renamed own/your to my
- renamed gpg to pgp
Updated english translation.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5907 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-28 19:58:14 +00:00
csoler
929f872544 Added new link type: EXTRA_FILE, to allow sendign links with sources included so as to trigger direct transfer. 
This makes possible to send files through chat without permitting tunnel access to the files. The client requests
the file as a direct transfer only, using the supplied source.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5799 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-10 22:59:51 +00:00
csoler
e753f22909 fixed flags conflicts 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-FileSharingPermissions@5758 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-02 13:52:29 +00:00
defnax
886f84b929 patch from Henry Morgan to correct spelling mistakes in source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5662 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-10-11 10:28:24 +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
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
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
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
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
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
thunder2
dcf23e0ccb Fixed usage of utf8 characters in certificate links (gpg and location name) (Patch from Asamk) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4935 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-02-13 21:09:38 +00:00
thunder2
8675eb9225 Added translation for "[ ... Missing Message ... ]". 
Fixed german language.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4934 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-02-13 20:40:36 +00:00
csoler
98086e125b added missing IPs to certificate links 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4924 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-02-11 14:49:04 +00:00
thunder2
d5479940d1 Fixed RetroShare links with " characters in the name. 
Removed not used plugins from the .pro file.
Removed some warnings from lupdate.
Fixed german translation.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4903 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-02-08 12:11:15 +00:00
thunder2
886faa89ba Fixed RetroShare links with "#" and "&" characters in the name. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4901 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-02-07 22:56:19 +00:00
thunder2
7c11c6efac Added missing return and removed compiler warnings. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4830 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-01-21 21:14:11 +00:00
csoler
51cfb0c5fe added retroshare certificate links: allows to paste certificates everywhere. Users need to click on them to launch the make friend wizard on the certificate. Certificates can be copied from each location of the Friends list 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4812 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-01-18 20:31:30 +00:00
thunder2
030874ca41 Added the size of the collection to the link only for files (missing test). 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4723 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-12-10 21:59:42 +00:00
thunder2
d07dbffa69 Added the real size of all files of a collection to the link when added with drag and drop. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4722 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-12-10 21:38:38 +00:00