mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-08-10 23:30:14 -04:00
Merged branch v0.5-GenericTunneling into trunk (Rev. 6284 to 6410).
- adds turtle router as a generic tunneling service - made ftServer a client of the service. Now turtle file items are handled in ftServer - added new client: p3MsgService to send/recv pgp-encrypted distant messages - added new client: p3ChatService to perform private (AES-encrypted) distant chat through tunnels. - The GUI is disabled for now, since it needs some polishing before being fully usable. git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6411 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
commit
dc2521cf71
62 changed files with 5031 additions and 1989 deletions
|
@ -275,6 +275,7 @@ HEADERS += rshare.h \
|
|||
gui/TurtleRouterStatistics.h \
|
||||
gui/AboutDialog.h \
|
||||
gui/ForumsDialog.h \
|
||||
gui/CreateMsgLinkDialog.h \
|
||||
gui/forums/ForumDetails.h \
|
||||
gui/forums/EditForumDetails.h \
|
||||
gui/forums/CreateForum.h \
|
||||
|
@ -333,6 +334,7 @@ HEADERS += rshare.h \
|
|||
gui/profile/StatusMessage.h \
|
||||
gui/chat/PopupChatWindow.h \
|
||||
gui/chat/PopupChatDialog.h \
|
||||
gui/chat/PopupDistantChatDialog.h \
|
||||
gui/chat/ChatTabWidget.h \
|
||||
gui/chat/ChatWidget.h \
|
||||
gui/chat/ChatDialog.h \
|
||||
|
@ -471,6 +473,7 @@ FORMS += gui/StartDialog.ui \
|
|||
gui/MainWindow.ui \
|
||||
gui/TurtleRouterDialog.ui \
|
||||
gui/TurtleRouterStatistics.ui \
|
||||
gui/CreateMsgLinkDialog.ui \
|
||||
gui/forums/CreateForum.ui \
|
||||
gui/forums/CreateForumMsg.ui \
|
||||
gui/forums/ForumDetails.ui \
|
||||
|
@ -580,6 +583,7 @@ SOURCES += main.cpp \
|
|||
gui/TurtleRouterStatistics.cpp \
|
||||
gui/MainWindow.cpp \
|
||||
gui/ForumsDialog.cpp \
|
||||
gui/CreateMsgLinkDialog.cpp \
|
||||
gui/forums/ForumDetails.cpp \
|
||||
gui/forums/EditForumDetails.cpp \
|
||||
gui/forums/CreateForum.cpp \
|
||||
|
@ -642,6 +646,7 @@ SOURCES += main.cpp \
|
|||
gui/channels/ChannelUserNotify.cpp \
|
||||
gui/chat/PopupChatWindow.cpp \
|
||||
gui/chat/PopupChatDialog.cpp \
|
||||
gui/chat/PopupDistantChatDialog.cpp \
|
||||
gui/chat/ChatTabWidget.cpp \
|
||||
gui/chat/ChatWidget.cpp \
|
||||
gui/chat/ChatDialog.cpp \
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue