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
10,582 Commits 63 Branches 22 Tags 194 MiB
51710c10a0
Commit Graph

4413 Commits

Author SHA1 Message Date
csoler
51710c10a0 merge comments between channel item versions 2017-05-20 17:33:05 +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
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
Phenom
58c812aea8 Fix Warnings: unused parameter ‘s’ 
warning: unused parameter ‘s’ [-Wunused-parameter]
 template<> uint32_t RsTypeSerializer::serial_size(uint16_t /*
type_subtype */,const uint32_t& s)
                                                                                               ^
 2017-05-08 12:17:01 +02:00
Phenom
ee7e92d6c4 Fix Warnings: this ‘if’ clause does not guard... 
warning: this ‘if’ clause does not guard... [-Wmisleading-indentation]
     if(buffer.empty())
     ^~
 2017-05-08 12:15:45 +02:00
Phenom
9b1209db68 Fix Warnings: unused parameter ‘s’ & 'n' 
warning: unused parameter ‘s’ [-Wunused-parameter]
 template<> uint32_t RsTypeSerializer::serial_size(const
PeerBandwidthLimits& s)
                                                                              ^
 2017-05-08 12:14:04 +02:00
Phenom
91e3cc3e5f Fix Warnings: variable ‘p’ set but not used 
warning: variable ‘p’ set but not used [-Wunused-but-set-variable]
  unsigned char *p,*buf_in=NULL;
                 ^
 2017-05-08 12:11:48 +02:00
Phenom
ca291b7ee6 Fix Warnings: warning: unused variable ‘i2d’ 
warning: unused variable ‘i2d’ [-Wunused-variable]
  int (*i2d)(X509_CINF*, unsigned char**) = i2d_X509_CINF;
        ^~~
 2017-05-08 12:05:58 +02:00
Phenom
9021609a6b Fix Warnings: unused variable ‘p’ 
warning: unused variable ‘p’ [-Wunused-variable]
         unsigned char *p,*buf_in=NULL;
                        ^
 2017-05-08 12:04:08 +02:00
Phenom
7892004641 Fix Warnings: unused parameter ‘member_name’ 
warning: unused parameter ‘member_name’ [-Wunused-parameter]
   static void serial_process(RsGenericSerializer::SerializeJob
j,RsGenericSerializer::SerializeContext& ctx,t_RsFlags32<N>& v,const
std::string& member_name)
                                                                                                                                                  ^~~~~~~~~~~
 2017-05-08 12:04:08 +02:00
Phenom
381aca4197 Fix Warnings: unused parameter ‘j’, 'ctx' & 'name' 
warning: unused parameter ‘j’ [-Wunused-parameter]
 void
RsChatLobbyListRequestItem::serial_process(RsGenericSerializer::SerializeJob
j,RsGenericSerializer::SerializeContext& ctx)
                                                                                   ^
 2017-05-08 12:04:08 +02:00
Phenom
dd089a9683 Fix Warnings: this ‘if’ clause does not guard 
warning: this ‘if’ clause does not guard... [-Wmisleading-indentation]
     if(service_id != RS_SERVICE_TYPE_CHAT)
     ^~
 2017-05-08 12:04:08 +02:00
Phenom
5050d4f66a Fix Warnings: unused parameter ‘indent’ 
warning: unused parameter ‘indent’ [-Wunused-parameter]
         virtual std::ostream& print(std::ostream &out, uint16_t indent
= 0) { return out; } // derived from RsItem, but should be removed
                                                                          ^
 2017-05-08 12:04:08 +02:00
csoler
b18a186c5f fixed ftExtraList to accept e2e encrypted transfers in addition to direct transfers. This fixed the drag+drop of shared files in a distant chat 2017-05-06 18:20:48 +02:00
csoler
59ac5a5bfa added on-the-fly fix of group privacy flags, so that edited groups with old un-set flags will be set automatically. Also fixes the bug preventing to grant membership on old circles 2017-05-06 16:51:38 +02:00
csoler
868c0467f2 fixed bug in serializer caused to not updating the size parameter. Also fixes unittests 2017-05-06 13:23:26 +02:00
csoler
f7f0d8ddd0 Merge pull request #800 from sehraf/pr-openssl-chacha20 
add support for openssl's chacha20-poly1305 implementation
 2017-05-05 23:10:07 +02:00
csoler
00c80b1c1e Merge pull request #797 from PhenomRetroShare/Fix_WindowsCompilation 
Fix Windows Compilation
 2017-05-05 23:06:25 +02:00
csoler
e4dde95621 Merge pull request #798 from PhenomRetroShare/Fix_TravisCompilation 
Fix UnitTest compilation
 2017-05-05 23:04:28 +02:00
sehraf
7371fdc432 add openssl chacha20 support 2017-05-05 21:01:19 +02:00
sehraf
96b4a1b2d8 add openssl chacha20-poly1305 support 2017-05-05 15:40:02 +02:00
csoler
e913f3689a fixed crash when trying to deserialize an empty buffer in rsrecogn 2017-05-04 21:40:32 +02:00
csoler
e6a7168122 merged upstream/master 2017-05-04 16:41:02 +02:00
Phenom
1c2b43b7e0 Fix UnitTest compilation 
But running failed.
 2017-05-04 15:01:25 +02:00
Phenom
d31b80c13a Fix Windows Compilation 2017-05-04 11:58:45 +02:00
csoler
4f4240d570 fixed bug in history serializer 2017-05-03 22:43:16 +02:00
csoler
214aaa7c9b added safety check for null chunks in TlvMemBlock_proxy deserialization 2017-05-03 22:20:58 +02:00
csoler
f006146ee4 merged upstream/master 2017-05-02 22:41:01 +02:00
csoler
4bee52c406 removed old unused serialization code 2017-05-02 22:34:45 +02:00
csoler
99d8b7d5d8 switched service control items to new serialization 2017-05-01 21:23:34 +02:00
csoler
3d17d31e49 Merge pull request #789 from PhenomRetroShare/Add_FriendTimeOffsetNewsFeed 
Add Friend Time Offset news feed.
 2017-04-30 22:43:10 +02:00
csoler
16b8947af1 improved serializer documentation 2017-04-30 20:31:43 +02:00
csoler
cecd9a3368 merged upstream/master 2017-04-30 20:14:23 +02:00
csoler
24c7c38016 removed old file rssrviceserialiser.h/cc 2017-04-30 20:08:30 +02:00
csoler
14076de1e0 moved code of rsservicerserialiser into rsserializer.h/cc and renamed it into RsRawSerializer 2017-04-30 19:17:44 +02:00
csoler
e401b90e02 moved rsserializer and rstypeserializer to serialiser/ 2017-04-30 16:05:37 +02:00
csoler
4f92f483fa dwicthed GxsTunnel items to new serialization 2017-04-29 23:02:44 +02:00
csoler
1159c863a2 moved wiki and wire items to rsitems/ 2017-04-29 21:50:55 +02:00
csoler
d58c638af8 switched wiki and wire items to new serialization 2017-04-29 21:46:54 +02:00
Phenom
77adc82aa2 Fix Missing messages when mark all as read. 
If message get olders versions, these ones was not marked as read. So it
left unread messages on thread despite nothing appears on tree view.
 2017-04-29 17:32:23 +02:00