Commit Graph

4491 Commits

Author SHA1 Message Date
Gioacchino Mazzurco
528317d374 libresapi: silent /chat/initiate_distant_chat
Avoid to forge the
[Starting distant chat. Please wait for secure tunnel to be established]
message on requesting chat id from API as it is a nuisance in most
libresapi use cases
2017-06-06 18:57:32 +02:00
BabushkaRetroShare
7fb0419c75
Typo fixes 2017-06-04 20:34:10 +02:00
csoler
1967204821 restored GXS trans cleanign delay 2017-06-04 18:43:12 +02:00
csoler
831b560780 moved deletion of msgs in GxsTransport inside the service thread 2017-06-04 18:37:38 +02:00
csoler
861dab32a5 Merge pull request #863 from G10h4ck/qmlapp_pex_alpha
Multiple improvements to android qml app and libreaspilocal
2017-06-03 13:27:21 +02:00
csoler
fb7ac7a8f6 fixed mismatched free/delete (free is used in rschatitems.cc to delete avatars) 2017-06-02 23:10:43 +02:00
Gioacchino Mazzurco
efdfa4666b Merge branch 'libresapi_attempt_connection' into qmlapp_pex_alpha 2017-06-02 10:39:42 +02:00
cyril soler
8e7e70035a fixed compilation for windows 2017-06-01 10:16:30 +02:00
Gioacchino Mazzurco
59b77da6a2 Merge branch 'master' into qmlapp_pex_alpha 2017-05-31 12:11:15 +02:00
csoler
1ebcc6006b Merge pull request #861 from RetroShare/v0.6-GxsTransport
V0.6 gxs transport
2017-05-30 22:22:06 +02:00
csoler
832ba69b69 fixed up cleanup for GxsTransport 2017-05-30 21:38:59 +02:00
csoler
a7eb167f96 fixed a bug in RsThread which made finished threads unaware of their state 2017-05-30 20:57:20 +02:00
csoler
5410c51ab9 added cleanup thread for GxsTransport 2017-05-30 20:45:39 +02:00
csoler
0868b64436 fixed uninitialized memory read in GxsTrans msg Id 2017-05-28 22:49:07 +02:00
Phenom
28119b5094 Fix Windows Compilation 2017-05-28 12:57:36 +02:00
csoler
6d76624e91 fixed uninitialized memory read in grouter 2017-05-27 23:16:20 +02:00
csoler
eea63ac217 minor code cleaning in p3GxsTrans (struct->class for consistency, sendMail->sendData), added popularity+subscribed status display in statistics 2017-05-27 22:19:52 +02:00
csoler
7c439983de Merge pull request #842 from csoler/v0.6-GxsTransport
V0.6 gxs transport
2017-05-26 22:04:33 +02:00
csoler
a3096f26a5 added data hash to GxsTrans display 2017-05-26 20:28:44 +02:00
csoler
4fa6cbe6e6 fixed display in GxsTrans stats widget 2017-05-26 18:42:52 +02:00
csoler
14b9a54773 added group data retrieval to GxsTransStatistics 2017-05-25 16:56:29 +02:00
sehraf
a3ee85a30d Add I2P BOB support to libretroashare and RetroShare GUI 2017-05-24 19:40:01 +02:00
csoler
a136fb6fda added display of ongoing record status for GxsTrans. Unfinished. 2017-05-22 23:54:55 +02:00
csoler
fbeb6ff98d added infrastructure for gathering statistics about GxsTransport. Unfinished. 2017-05-21 15:57:10 +02:00
csoler
dbc23969f4 Merge pull request #830 from Gottox/fix-libressl
fix building with libressl
2017-05-21 14:52:20 +02:00
csoler
33ab7faec4 Merge pull request #831 from Gottox/fix-musl
fix building with musl libc
2017-05-21 14:49:13 +02:00
csoler
b341fea170 merged upstream/master 2017-05-21 13:49:41 +02:00
Enno Boland
a578acdea8 fix building with musl libc 2017-05-21 10:54:19 +02:00
Enno Boland
2046d9eaae fix building with libressl 2017-05-21 10:48:58 +02:00
csoler
a439fbf63e fixed bug (due to new serializer) that caused a wrong hash to be computed when sending distant messages 2017-05-20 23:01:56 +02:00
csoler
162095bf20 fixed count of unread/new posts by not counting older versions 2017-05-20 22:37:31 +02:00
csoler
51710c10a0 merge comments between channel item versions 2017-05-20 17:33:05 +02:00
Gioacchino Mazzurco
de9a44fac7 Merge branch 'v0.6-GxsTransport' into qmlapp_pex_alpha 2017-05-15 19:16:08 +02:00
Gioacchino Mazzurco
10ec52718d Fix GxsTrans related serialization regressions 2017-05-15 19:13:29 +02:00
Gioacchino Mazzurco
745462a61b Merge branch 'v0.6-GxsTransport' into qmlapp_pex_alpha 2017-05-15 15:05:07 +02:00
Gioacchino Mazzurco
93a6b7dcd4 Fix serialization regression in async chat 2017-05-15 15:00:21 +02:00
csoler
c0c5cc52db Merge branch 'master' into gxs_mail_experiments 2017-05-13 21:08:16 +02:00
csoler
3cc79fb242 Merge pull request #774 from PhenomRetroShare/Fix_LobbyTopic
Fix Lobby Topic not send on invite.
2017-05-10 20:00:42 +02:00
csoler
11708c8a34 Merge pull request #814 from csoler/v0.6-ImprovedGUI
prevent to remove old forum messages that have follow-ups.
2017-05-09 22:44:00 +02:00
csoler
bd9a8ae3aa prevent to remove old forum messages that have follow-ups. 2017-05-09 22:39:15 +02:00
csoler
0af05d2517 patch to avoid re-asking for rejected plugins when the executable is upgraded. 2017-05-09 19:07:17 +02:00
csoler
34dd68d7bf Merge pull request #809 from csoler/v0.6-FT
fixed previous commit
2017-05-08 23:05:16 +02:00
csoler
e0cb0f4847 fixed previous commit 2017-05-08 23:04:04 +02:00
csoler
9a0df3f757 Merge pull request #804 from PhenomRetroShare/Fix_Warnings
Fix warnings
2017-05-08 22:21:28 +02:00
csoler
4a2f5f0f82 Merge pull request #808 from csoler/v0.6-FT
added a per-friend upload slots limit in FT. Default is 0=unlimited
2017-05-08 22:02:38 +02:00
csoler
8a86b9ed7d added a per-friend upload slots limit in FT. Default is 0=unlimited 2017-05-08 22:00:51 +02:00
Gioacchino Mazzurco
f67617a449 Add override and final placeolders for old GCC compatibility 2017-05-08 16:57:37 +02:00
Phenom
d02cba5a91 Fix Lobby Topic not send on invite. 2017-05-08 15:38:36 +02:00
Gioacchino Mazzurco
ccaf4881a8 Merge branch 'master' into qmlapp_pex_alpha 2017-05-08 13:38:29 +02:00
Phenom
4a2f688f14 Fix Windows Compilation:
pqi/authssl.cc: In member function 'virtual X509*
AuthSSLimpl::SignX509ReqWithGPG(X509_REQ*, long int)':
pqi/authssl.cc:929:3: error: jump to label 'err' [-fpermissive]
   err:
   ^
pqi/authssl.cc:872:22: error:   from here [-fpermissive]
                 goto err;
                      ^
pqi/authssl.cc:877:24: error:   crosses initialization of 'unsigned
char* p'
         unsigned char *p=buf_in;
                        ^
pqi/authssl.cc: In member function 'virtual bool
AuthSSLimpl::AuthX509WithGPG(X509*, uint32_t&)':
pqi/authssl.cc:1091:1: error: jump to label 'err' [-fpermissive]
 err:
 ^
pqi/authssl.cc:1027:8: error:   from here [-fpermissive]
   goto err;
        ^
pqi/authssl.cc:1035:17: error:   crosses initialization of 'unsigned
char* p'
  unsigned char *p=buf_in;
                 ^
2017-05-08 13:01:34 +02:00