Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-02-02 10:35:15 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity
12,547 Commits 63 Branches 22 Tags
Commit Graph

609 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
csoler
e74be8e484 added activity status in chat lobby participants list (Patch from Phenom) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6604 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-08-24 15:07:31 +00:00
csoler
38d875fa7f avoid auto-sending text when a file is pasted in chat. The text is copied to the edit window instead (Patch from Phenom) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6602 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-08-23 20:51:21 +00:00
defnax
b07dfa4a01 added colored icon for chat notify 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6582 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-08-20 16:57:05 +00:00
defnax
20c35ea27f changed and replaced some icons (needs fresh recompile) 
changed the default headerframe colors

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6579 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-08-15 16:20:14 +00:00
csoler
0b0010ff59 improved completion for chat (Patch from Phenom) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6515 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-07-18 21:50:32 +00:00
csoler
36ea99da03 add date to chat msg if it is mroe than 1 day old 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6510 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-07-16 21:14:48 +00:00
csoler
14890ef007 added ACK system to make sure the secured tunnels for distant chat are actually working, before one starts using it. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6502 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-07-14 13:59:38 +00:00
thunder2
dc29793da6 Disabled completer in private chat. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6484 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-07-06 15:37:22 +00:00
csoler
90e7a3cd54 added completer to MimeTextEdit and ChatWidget (Patch from Phenom) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6475 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-07-04 19:36:12 +00:00
thunder2
30c4a6ef93 Added quick fix to show the plain name and title in the chat lobby. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6470 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-07-01 20:35:07 +00:00
thunder2
81874da2cc Fixed showing utf8 characters in chat lobby name 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6468 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-06-30 13:58:17 +00:00
csoler
7414659bd9 Patch (modified) from Phenom to allow auto-subscribe to chat lobbies 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6466 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-06-29 16:15:33 +00:00
csoler
b8239abf40 fixed small bug that prevented online status in chat window to be updated 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6449 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-06-20 20:19:10 +00:00
csoler
771ae5ba58 fixed transfer of color when pasting text (patch from AC) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6441 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-06-18 21:24:27 +00:00
csoler
491438055d added proper naming functions for distant chat 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6439 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-06-18 20:13:58 +00:00
csoler
b21fae52d0 improved status display for distant chat 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6437 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-06-17 21:58:26 +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
csoler
ff544da72e added proper tunnel closing mechanism with notification of the talking peer, and popups to inform the chat participants 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6430 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-06-13 21:12:07 +00:00
csoler
42db43e590 - fixed a few bugs in PopupDistantChatDialog (Possible deadlock, wrong window for private chat) 
- added method to properly close distant chat conversation (Still needs some work)
- improved chat link creation window + clipboard copy



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6426 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-06-12 21:10:09 +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
dc2521cf71 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
 2013-06-06 19:58:30 +00:00
csoler
1450ae8a5e disabled distant chat/msg by default before merge 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-GenericTunneling@6410 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-06-05 20:18:48 +00:00
csoler
0266329dc8 - Added a drop-down item to allow removing unused keys, in the Network dialog. 
- added key removal method in OpenPGP-SDK
- improved FriendSelectionDialog/Widget to enable select all/none keys, and show non friend keys
- added safe key removal method in PGPHandler. Removed keys from other locations will not cause errors.
- added backup system to public keyring, impossibility to remove public parts of owned secret keys, etc.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6382 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-05-29 21:32:02 +00:00
csoler
469b37aa60 patch from phenom to all resizing lobby participant lists 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6372 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-05-20 14:05:53 +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
cb9f174efa added tunnel state light to distant chat popup dialog. Added proper peer name. Changed method for adding widgets in the chat bar 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-GenericTunneling@6337 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-04-23 22:43:19 +00:00
thunder2
6be253e9f8 Fixed sending of status typing in chat. Modifier keys does not send typing anymore. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6324 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-04-21 20:18:58 +00:00
thunder2
be34ede8fd Enabled history for chat lobbies (not saved to disc) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6322 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-04-21 16:43:49 +00:00
csoler
56e71b51fa added notifications so that the distant chat window pops up 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-GenericTunneling@6319 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-04-19 22:24:25 +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
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