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
11,497 Commits 63 Branches 22 Tags 194 MiB
1c2d17b5c1
Commit Graph

576 Commits

Author SHA1 Message Date
csoler
1c2d17b5c1 Merge pull request #1077 from hunbernd/feature/image-embed3 
Make it possible to send images over chat lobby
 2017-10-24 18:47:34 +02:00
hunbernd
64481de74b Set the proper size limits 2017-10-23 17:04:20 +02:00
RetroPooh
b968974bc6 fix chat search button position 2017-10-23 17:51:39 +03:00
csoler
a00d2c912c changed lobby to char room in chat system msgs 2017-09-26 21:12:17 +02:00
Phenom
eb75946133 Fix Don't show Anonymous Icon when Images are disabled in ChatWidget 2017-07-30 15:31:10 +02:00
Phenom
8d82640f41 Fix copy of RSLink when on Only plain text mode in chat lobby. (sss 
find)
 2017-07-21 10:58:32 +02:00
Phenom
b8f742d80c Add :/icons/anonymous_blue_128.png before name for unsigned GxsId 
Unsigned is added to tooltip.
Double click on name is fixed.
 2017-07-18 14:30:31 +02:00
csoler
7d8b3796d1 Merge pull request #941 from PhenomRetroShare/Add_UnsignedInChatName 
Add [Unsigned] before name in chat for unsigned (anonymous) GxsID.
 2017-07-17 22:18:53 +02:00
Phenom
82addce867 Change RetroShareLink creation methodes as static 
And remove this warning:
 2017-07-16 13:12:07 +02:00
Phenom
a16ff426ae Add [Unsigned] before name in chat for unsigned (anonymous) GxsID. 2017-07-14 19:16:39 +02:00
Gioacchino Mazzurco
5c71d520fa async chat disabled by default in GUI 
Chat GUI is not ready to show properly GxsTrans async messages
 2017-05-30 16:44:35 +02:00
csoler
b341fea170 merged upstream/master 2017-05-21 13:49:41 +02:00
Phenom
7acefda943 Fix Chat Font setting saving. 
And don't use native dialog.
 2017-05-19 18:40:17 +02:00
csoler
c0c5cc52db Merge branch 'master' into gxs_mail_experiments 2017-05-13 21:08:16 +02:00
Phenom
a869a37802 Fix Lobby's sound notification. 
Lobby "message arrived" sound play depends of notify ChatRooms settings.
 2017-05-08 15:29:37 +02:00
csoler
6cb499065f fixed compilation with qt4 2017-05-08 10:06:40 +02:00
defnax
24eca4a64f Moved status icon column to the last position 2017-05-07 19:39:20 +02:00
Gioacchino Mazzurco
5159e326c7 Merge branch 'master' into gxs_mail_experiments 2017-05-05 15:44:22 +02:00
Phenom
4fbcc1e85f Add Double Click on Name for Chat to add their name in text writer. 2017-04-29 22:14:18 +02:00
Phenom
6f2d7bbca0 Fix Clang warnings: implicit conversion from 'double' to 'int' 
warning: implicit conversion from 'double' to 'int' changes value from
2.5 to 2 [-Wliteral-conversion]
        QSize buttonSize = QSize(iconSize + QSize(FMM,FMM));
 2017-04-17 21:42:13 +02:00
Phenom
07b67e9cc9 Fix Clang warnings: 'PopupDistantChatDialog::init' hides overloaded 
virtual function

warning: 'PopupDistantChatDialog::init' hides overloaded virtual
function [-Woverloaded-virtual]
                virtual void init(const DistantChatPeerId& peer_id);
/retroshare-gui/src/gui/chat/PopupChatDialog.h:49: hidden overloaded
virtual function 'PopupChatDialog::init' declared here: different number
of parameters (2 vs 1)
        virtual void init(const ChatId &chat_id, const QString &title);
 2017-04-17 21:41:38 +02:00
Phenom
eea49d96bf Fix Clang warnings: change ChatDialog::init definition 
warning: 'PopupChatDialog::init' hides overloaded virtual function [-
Woverloaded-virtual]
    virtual void init(const ChatId &chat_id, const QString &title);
                 ^
/retroshare-gui/src/gui/chat/ChatDialog.h:87: hidden overloaded virtual
function 'ChatDialog::init' declared here: type mismatch at 1st
parameter ('ChatId' vs 'const ChatId &')
    virtual void init(ChatId id, const QString &title);
                 ^
 2017-04-17 21:40:25 +02:00
Phenom
e0225efef3 Fix Clang warnings: 'ChatLobbyDialog::init' hides overloaded virtual 
function

warning: 'ChatLobbyDialog::init' hides overloaded virtual function [-
Woverloaded-virtual]
    virtual void init();
                 ^
/retroshare-gui/src/gui/chat/ChatDialog.h:87: hidden overloaded virtual
function 'ChatDialog::init' declared here: different number of
parameters (2 vs 0)
    virtual void init(ChatId id, const QString &title);
                 ^
 2017-04-17 21:37:17 +02:00
Gioacchino Mazzurco
2630ed4573 Merge branch 'master' into gxs_mail_experiments 2017-03-13 22:57:33 +01:00
mestaritonttu
b4445675ec Added period 2017-03-07 13:34:53 +02:00
csoler
1e1fe7708f fixed styles loading in chat. Added missing history/compact/colored style 2017-03-02 22:30:51 +01:00
RetroPooh
328168d9a7 add space after quoting sign 2017-03-02 20:03:16 +03:00
Gioacchino Mazzurco
08161db43b PopupDistantChatDialog fix some strings 2017-03-02 00:08:12 +01:00
Gioacchino Mazzurco
953b70fbe4 Improve async distant chat, fix chat msg receiving 
DistantChatService::initiateDistantChatConnexion(...) made notification
  message optional (enabled by default)
p3ChatService removed duplicion avoidance as it is not necessary
p3ChatService::sendStatusString(...) send status only if peer is online
protect p3ChatService::mDistantGxsMap with mutex as operation on it may
  be done by different threads
p3ChatService::receiveGxsMai(...) set chat message item peer id with
  distant tunnel id, so it is recognized as a distant message later
made p3GxsTunnelService::makeGxsTunnelId(...) static as it need no
  access to this, now it can be used easier by other components
rename RsGxsMailItem::recipientsHint to recipientHint as for now only
  one recipient is possible (TODO: update documentation too)
GxsMailsClient::receiveGxsMail(...) changed paramethers for better
  abstracion, now destination id is passed too because it is usually a
  very useful information
ChatWidget some adaptation to async chat, a couple of method have been
  deprecated too
PopupDistantChatDialog::updateDisplay(...) adapt message shown to the
  user to the new async chat paradigm (TODO: need review)
 2017-03-01 23:31:13 +01:00
csoler
99cf69a98c Merge pull request #703 from RetroShare/v0.6-ImprovedGUI 
V0.6 improved gui
 2017-02-26 20:14:34 +01:00
Phenom
3452821fb9 Add Shift+Enter to create new line in chat widget when Ctrl+Enter option 
is disabled. Proposed by MMT1

In the same time I fix the completer only when chat is lobby.
 2017-02-26 11:31:43 +01:00
csoler
67af166c0c moved Options window into a new Preferences tab 2017-01-26 22:35:33 +01:00
csoler
ca5fa7afa8 Merge pull request #653 from RetroPooh/master 
chatlobby option to disable sending typing notifications; friend connect wizard minor tweaks
 2017-01-23 21:11:22 +01:00
csoler
baa9713384 partially changed lobby->chat room in displayed strings in the GUI 2017-01-21 21:38:10 +01:00
RetroPooh
0ca477d01b add chatlobby option to disable sending typing notifications 2017-01-20 22:26:50 +03:00
felisucoibi
717b455699 Merge pull request #13 from felisucoibi/0.6-buttons 
0.6 buttons renamed chat lobbies to chat rooms
 2017-01-18 10:55:01 +01:00
felisucoibi
837bb76d33 Update CreateLobbyDialog.cpp 2017-01-18 10:31:50 +01:00
felisucoibi
564618764b Merge branch 'master' of https://github.com/RetroShare/RetroShare 2017-01-18 00:48:00 +01:00
felisucoibi
66ab7c9eab Update ChatLobbyUserNotify.cpp 2017-01-17 16:49:36 +01:00
RetroPooh
f079e99642 fix mute option in chatlobby id menu 2017-01-17 17:21:51 +03:00
csoler
e7a119f22c added a warning and skip files with missing hash in copy link 2017-01-15 21:13:27 +01:00
csoler
f314e7d330 simplified code in PR/630 2017-01-15 20:56:44 +01:00
RetroPooh
75d717c2df fix 2017-01-15 20:29:59 +03:00
RetroPooh
cef62e30fc fix 2017-01-13 18:20:19 +03:00
RetroPooh
8ae9eff928 chatlobby id context menu - fix reputation change actions 2017-01-12 16:26:35 +03:00
RetroPooh
10ba3a6364 chatlobby id context menu - fix display conditions 2017-01-12 16:26:06 +03:00
RetroPooh
36dbdee409 show in people - enabled for yourself; Votes in tooltip; lastpost 1970 to Never 2017-01-11 22:44:27 +03:00
unknown
c2214c8cfa chatlobby id menu - add open people tab for id 2017-01-09 18:22:47 +03:00
unknown
cc3b8bde52 lobby id dialog - add vote neutral option 2017-01-09 16:05:23 +03:00
unknown
bc43cb8cf0 small gui tweaks 2017-01-07 23:29:24 +03:00