Commit Graph

8394 Commits

Author SHA1 Message Date
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
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
csoler
b6b04dcd67 added script to convert files to unix format 2015-12-31 17:28:42 -05:00
csoler
6392d657aa fixed [dos] LF in IdDialog.h 2015-12-31 16:50:52 -05:00
csoler
7e1b4abd33 updated ubuntu changelog 2015-12-31 14:23:57 -05:00
Cyril Soler
a6ee7ccd0c Merge pull request #230 from G10h4ck/ss_port_invalid_family
Check sockaddr_storage is not null before using it and call sockaddr_storage_port
2015-12-31 14:15:14 -05:00
csoler
fac152423a updated todo list 2015-12-31 13:58:36 -05:00
Gio
c5feafa1d2 Add missing stacktrace.h 2015-12-31 19:56:50 +01:00
Gio
1303d855e6 more cleanups + sanitize p3Peers::getPeerDetails avoid to look for port on null sockaddr_storage 2015-12-31 19:32:46 +01:00
defnax
37a3c46173 Fixing Margins 2015-12-31 16:40:06 +01:00
Gio
ed7f958f95 Add stacktrave.h, sanitize p3LinkMgrIMPL::retryConnectTCP avoid to look for port on null sockaddr_storage 2015-12-31 15:42:22 +01:00
electron128
69f6bd0ea9 insert the newest channel posts first and the oldest last (modified patch from Eugene Tooms) 2015-12-31 14:02:51 +01:00
csoler
8a41554754 fixed some leaking memory issues in loadList() methods, and also increased consistency by not returning non empty list with deleted items inside 2015-12-30 18:20:09 -05:00
csoler
48750cdb51 merged 2015-12-30 17:18:22 -05:00
Cyril Soler
ae16fc887d Merge pull request #229 from G10h4ck/master
Fix memory leak in getLocalAddresses
2015-12-30 17:13:27 -05:00
Gio
9c24203082 Fix memory leak in getLocalAddresses 2015-12-30 22:47:51 +01:00
csoler
cefa5d9f9e fixed missing SSL_free when a new connection replaces the existing one 2015-12-30 13:55:15 -05:00
csoler
aabfcb975c fixed missign initialisation of err in pqissludp.cc 2015-12-30 13:51:56 -05:00
Cyril Soler
d1bc89232c Merge pull request #228 from csoler/v0.6-GxsDebug
V0.6 gxs debug
2015-12-30 13:44:18 -05:00
csoler
0299691a54 removed overkill test that would cause sending updates to peers when no messages are available (thx jo) 2015-12-30 11:14:10 -05:00
Cyril Soler
f8be606e7d Merge pull request #227 from PhenomRetroShare/Fix_DefaultGxsId
Fix default Identity on Chat
2015-12-30 10:03:32 -05:00
Phenom
894328b6c1 Fix default Identity on Chat
This was reseted by a new listitem after it was restored.
2015-12-30 15:57:28 +01:00
csoler
682930938b merged PR 219 from Jolavilette+Phenom, with some minor modifications 2015-12-29 23:40:09 -05:00
csoler
2fe646c5cb merged PR 219 from Jolavilette+Phenom, with some minor modifications 2015-12-29 23:39:52 -05:00
Cyril Soler
7486d546d4 Merge pull request #226 from G10h4ck/master
Guard checkNetAddress debug, unary + comment clarification
2015-12-29 17:59:31 -05:00
Gio
3cfa22e35b Guard checkNetAddress debug, unary + comment clarification 2015-12-29 23:51:16 +01:00
csoler
9e0dc01110 changed the reset of client map into a reset f server map when subscribing a group 2015-12-29 17:31:35 -05:00
Cyril Soler
2d438b7407 Merge pull request #162 from G10h4ck/getLocalAddresses
Get local addresses
2015-12-29 16:39:15 -05:00