Commit Graph

8470 Commits

Author SHA1 Message Date
csoler
994bfaf902 updated TODO 2016-01-09 13:54:24 -05:00
Cyril Soler
e01b1a4a21 Merge pull request #245 from csoler/v0.6-Messaging
fixed serialization error (missing call) for received Distant msg hash map
2016-01-09 11:00:57 -05:00
csoler
ee84ab732d fixed serialisation error (missing call) for received Distant msg hash map 2016-01-09 10:58:49 -05:00
electron128
b125cb1f1e fix the bug where a filter is applied in friends file list even if view mode is tree and search box is hidden. Problem was: SharedFilesDialog::FilterItems() is called from multiple places. The check if we should filter or not is now in the filter function itself. 2016-01-09 12:09:43 +01:00
electron128
a118870db9 if file in friends file list is available locally or is being downloaded, then show it in red like in search.
The color is hardcoded, because it is not possible to style arbitrary QObjects with stylesheets.
closes #195
2016-01-09 12:01:32 +01:00
Cyril Soler
9f4256cd00 Merge pull request #244 from csoler/v0.6-Messaging
disabled part of msg re-sending code in order to improve it later
2016-01-08 23:19:45 -05:00
csoler
fe02167ad7 disabled part of msg re-sending code in order to improve it later 2016-01-08 23:18:45 -05:00
Cyril Soler
56a844b58d Merge pull request #243 from csoler/v0.6-Messaging
V0.6 messaging
2016-01-08 23:08:14 -05:00
csoler
a540ffd9a2 removed two debug outputs from MessageDialog 2016-01-08 22:52:01 -05:00
csoler
3f6964bb8b added back messages to sent box 2016-01-08 22:50:03 -05:00
csoler
75edb46c99 added auto-resend of unsent messages. Fixed display of From field in outbox 2016-01-08 20:48:47 -05:00
csoler
0c591f08ae added auto re-send of distant messages after global router notified the message cannot be sent. Added a map n p3msgService to avoid receiving multiple times the same message. 2016-01-07 22:22:05 -05:00
csoler
9651f430d5 fixed wrong usage of local client ids in global router causing distant messages to stay in outbox forever. 2016-01-07 21:01:50 -05:00
defnax
81e2a597e9 Fixing People Margins
Update emotes file
2016-01-07 19:25:52 +01:00
csoler
4484b08b50 cleaned up the problem of outgoing messages being shown with the from from field. 2016-01-07 00:04:52 -05:00
csoler
3d6fa0cf8d fixed bug causing turtle to keep asking for a tunnel after a distant chat is closed if not connected 2016-01-06 18:38:27 -05:00
csoler
61f8e73c36 improved text of warning against pasting pgp keys in connect wizard 2016-01-06 18:12:15 -05:00
csoler
984ce2d3ad removed circles tab from IdDialog. Came from a difficult manual merging between dos and unix encoded files 2016-01-06 18:07:20 -05:00
Cyril Soler
7da2ad14ec re-enabled previously disabled code in rsgxsnetservice, that proved useful 2016-01-06 10:31:59 -05:00
csoler
6398b7b9d6 added comment in rsgxsnetservice.cc 2016-01-05 23:00:26 -05:00
csoler
3fa8d863b5 removed time-stamp-ing of messages on client side in locked_genReqMsgTransaction() as it is already handled when receiving messages, and the need to stamp non subscribed groups is not justified anymore 2016-01-05 22:53:56 -05:00
csoler
678afe7a0f fixed stupid mistake in previous commit (GXS transaction timestamp) 2016-01-05 22:27:00 -05:00
csoler
7b3fd53bb9 added correct timestamp in msg list response items for GXS. To be tested. 2016-01-05 19:24:40 -05:00
Cyril Soler
141f0927e3 added tooltip and fixed text in connect friend dialog 2016-01-05 14:22:38 -05:00
defnax
496546e8ca Merge branch 'master' of https://github.com/RetroShare/RetroShare 2016-01-05 18:25:44 +01:00
defnax
19011ba002 clean up emotes, removed some unused.
changed icons for emotes button.
reduze the size of the emoticons
2016-01-05 18:23:43 +01:00
Cyril Soler
9fd0fc54cc fixed bandwidth measurement in pqistreamer 2016-01-05 11:44:05 -05:00
defnax
e6cd4a4c55 Merge pull request #240 from sehraf/pr-smiley-whitespace
Add whitespaces around smileys.
2016-01-05 16:09:14 +01:00
sehraf
54f9912c32 Add whitespaces around smileys.
Only replace smileys with an image when they are surrounded by whitespaces.
This fixes smileys in links and other text that happen to include the sequence for a smiley.
2016-01-05 15:01:22 +01:00
csoler
f1f111f096 merged 2016-01-04 20:05:44 -05:00
Bogdan Cristea
e04b9334e0 corrected compilation inst on openSUSE 2016-01-04 15:25:22 +02:00
csoler
fddc008951 merged with origin 2016-01-03 17:31:22 -05:00
Cyril Soler
3d5042b8f4 Merge pull request #237 from G10h4ck/master
p3ServiceControl: Optimize checkFilter(...), solve memory leak removi…
2016-01-03 14:29:33 -05:00
Gio
05fd33b87e p3ServiceControl: Optimize checkFilter(...), solve memory leak removing mSerialiser, code cleanup 2016-01-03 20:04:06 +01:00
csoler
1082a8d19a updated ubuntu changelog 2016-01-02 18:59:05 -05:00
electron128
4953324a3c Merge pull request #235 from PhenomRetroShare/Fix_MakeMACOS_PluginWorking
Make Plugin working in Mac OSX.
2016-01-02 14:53:24 +01:00
Phenom
c5e6f62382 Make Plugin working in Mac OSX. 2016-01-02 14:19:53 +01:00
csoler
b6b5f9cd17 fixed some of the issues reported by coverity scan (mainly uninitialised class members) 2016-01-01 22:36:07 -05:00
csoler
ab3939cd9a added missing update of mClientMsgUpdateMap, causing both a memory leak and an inconsistency in TS 2016-01-01 11:12:06 -05:00
electron128
22c00fc638 fixed free() in UdpLayer::recv_loop 2016-01-01 14:07:15 +01:00
electron128
58672e83a6 fix the logic to prevent using invalid iterators.
First make a valid iterator, then dereference it. Not the other way round.
This bug can randomly prevent gxs group stats from being collected from peers.
2016-01-01 13:51:35 +01:00
electron128
3b2eae4f49 fixed memory leak by using stack memory instead of heap memory 2016-01-01 12:17:08 +01:00
electron128
9cb81f57ea don't create wiki dataservice if wiki is not enabled for compile 2016-01-01 12:01:49 +01:00
electron128
72812be7be added missing initialisation of integers in GxsForumThreadWidget 2016-01-01 11:54:59 +01:00
electron128
55ea8a54f8 init pointer in RsServer 2016-01-01 11:49:03 +01:00
electron128
7efb763191 restore stream state of std::cerr after printing hex number 2016-01-01 11:38:29 +01:00
electron128
640d71b8af removed delete of RsTemporaryMemory 2016-01-01 11:09:49 +01:00
Cyril Soler
d24ff5a4d1 Merge pull request #232 from G10h4ck/master
print_stacktrace is OS specific
2015-12-31 19:42:50 -05:00
Gio
78959326b6 print_stacktrace is OS specific 2016-01-01 00:45:01 +01:00
csoler
e872727868 updated dos->unix convertion script 2015-12-31 17:37:05 -05:00