Commit Graph

8790 Commits

Author SHA1 Message Date
zeners
a5aa997947 webui: using m.route() 2016-01-06 22:20:32 +01: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
zeners
408f379db8 webui: requesthandling improved
- shutdown-detecting
- waiting for password
- requestFail available
- thennables for requests and cache
- req.request method selectable, default POST
2016-01-06 01:45:01 +01:00
csoler
7b3fd53bb9 added correct timestamp in msg list response items for GXS. To be tested. 2016-01-05 19:24:40 -05:00
zeners
2f94f416ba Merge branch 'master' into webui 2016-01-05 21:31:06 +01:00
Cyril Soler
141f0927e3 added tooltip and fixed text in connect friend dialog 2016-01-05 14:22:38 -05:00
zeners
62ee95e706 webui: splitting rs() into rs() and rs.request() 2016-01-05 20:01:47 +01: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
electron128
03e2a18be1 added readme and todo 2016-01-04 11:14:10 +01:00
electron128
fd12b25cdd webui: make login work 2016-01-04 10:24:31 +01:00
zeners
c7cbd257a5 Merge branch 'master' into webui 2016-01-03 23:54:56 +01:00
zeners
d60fcfec3d webui: adding prototype for main, accountselect, menu 2016-01-03 23:40:57 +01:00
csoler
9f7af84347 added debug output for encryption/decryption of transactions 2016-01-03 17:33:14 -05: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
electron128
ddbf7c8fa2 mithril-webui: make automatic update work 2016-01-03 17:25:14 +01:00
electron128
ddd91e228a initial commit of retroshare backend for mithril webui 2016-01-03 16:34:03 +01:00
electron128
bb51e62387 mark empty list as list in libresapi statetokenserver 2016-01-03 16:33:09 +01:00
csoler
1082a8d19a updated ubuntu changelog 2016-01-02 18:59:05 -05:00
electron128
363c4e0b14 started mithril.js based webui 2016-01-02 15:52:17 +01: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
8ec0e10019 updated v0.6-Circles with latest trunk 2016-01-01 22:18:43 -05:00
csoler
9da8a8abc3 fixed compilation of RsNxsTransaction encryption code 2016-01-01 21:37:27 -05:00
csoler
6ecd2991e7 merged with latest trunk 2016-01-01 15:15:19 -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