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,927 Commits 63 Branches 22 Tags 194 MiB
b9d4651f07
Commit Graph

10927 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
csoler
caa36b4623 Merge pull request #807 from PhenomRetroShare/Fix_ToasterPositionSetting 
Fix Toaster Position Setting.
 2017-05-08 22:17:09 +02:00
csoler
d74bb2abad Merge pull request #806 from PhenomRetroShare/Fix_LobbySoundNotification 
Fix Lobby's sound notification.
 2017-05-08 22:16:39 +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
39646f32f0 qml app removed unused icon 2017-05-08 20:44:15 +02:00
Gioacchino Mazzurco
d0b881f5e0 Added view to show/edit contact details 
Split ColorHash.qml in a new file so it is reusable
ContactSort.js preferred contacts goes before non preferred
Contacts.qml use proper id for listview
Contacts.qml removed fingerprint popup
GxsIdentityDelegate.qml simplified, move link generation to ContactDetails.qml
 2017-05-08 20:35:15 +02:00
csoler
52a04e1f4a updated ubuntu changelog 2017-05-08 18:25:06 +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
594ab53ef2 Fix Toaster Position Setting. 2017-05-08 15:37:33 +02:00
Phenom
a869a37802 Fix Lobby's sound notification. 
Lobby "message arrived" sound play depends of notify ChatRooms settings.
 2017-05-08 15:29:37 +02:00
Phenom
79bbe0e5bb Fix Commit #77adc82 
Fix Missing messages when mark all as read.
 2017-05-08 14:54:25 +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
Gioacchino Mazzurco
8f306346a4 Merge branch 'gxs_mail_experiments' into qmlapp_pex_alpha 2017-05-08 12:33:40 +02:00
Phenom
5022ef00d4 Fix Warnings: this ‘if’ clause does not guard... 
warning: this ‘if’ clause does not guard... [-Wmisleading-indentation]
     if(!mPosterId.isNull())
     ^~
 2017-05-08 12:26:37 +02:00
Phenom
f352939154 Fix Warnings: 
warning: this ‘if’ clause does not guard... [-Wmisleading-indentation]
     if(! rsIdentity->getIdDetails(gxs_id,details))
     ^~
 2017-05-08 12:25:29 +02:00
Phenom
bf47edfd12 Fix Warnings: 
warning: this ‘if’ clause does not guard... [-Wmisleading-indentation]
             if(_hash.isNull())
             ^~
 2017-05-08 12:22:46 +02:00
Phenom
523730f31a Fix Warnings: unused parameter ‘resp’, 'req' & 'resp' 
warning: unused parameter ‘resp’ [-Wunused-parameter]
  virtual void gxsDoWork(Request &req, Response &resp)
                                                 ^~~~
 2017-05-08 12:21:08 +02:00
Phenom
a6acc72c89 Fix Warnings: this ‘if’ clause does not guard... 
warning: this ‘if’ clause does not guard... [-Wmisleading-indentation]
     if(data.isRawData())
     ^~
 2017-05-08 12:18:51 +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
Gioacchino Mazzurco
8e9b3c97d5 Fix missing include 2017-05-08 12:03:42 +02:00
csoler
add529ffd3 Merge pull request #803 from PhenomRetroShare/Fix_UnitTest 
Fix UnitTest
 2017-05-08 11:41:34 +02:00
Phenom
4e2db2f50a Fix UnitTest 2017-05-08 11:31:32 +02:00
csoler
9714409309 Merge pull request #802 from csoler/v0.6-ImprovedGUI 
moved passphrase box into start dialog, and removed blank logo, repla…
 2017-05-08 10:57:00 +02:00
csoler
de0f8b9595 moved passphrase box into start dialog, and removed blank logo, replaced it by RS splash logo 2017-05-08 10:51:15 +02:00
csoler
6cb499065f fixed compilation with qt4 2017-05-08 10:06:40 +02:00
csoler
84c81588bb disabled show OpMode status on default 2017-05-08 09:39:18 +02:00
Gioacchino Mazzurco
ea8f800003 Port GxsTrans to new serialization system 
RsItem added some comment and more verbose error reporting
RsTypeSerializer added support for RsItem derived classes as members
  added utility macros for better readability of the code and easier
  handling of RsItem derived members
  RS_REGISTER_SERIAL_MEMBER(I)
  RS_REGISTER_SERIAL_MEMBER_TYPED(I, T)
  RS_REGISTER_ITEM_TYPE(T)

RsNxsMsg::serial_process use new macros for better readability and to
 have an exemple of usage with RsTlvItem derived class
Fix undefined reference to RsNxsMsg::print
 2017-05-08 00:19:11 +02:00
defnax
24eca4a64f Moved status icon column to the last position 2017-05-07 19:39:20 +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
Gioacchino Mazzurco
f7f36f697e fixup! Merge branch 'master' into gxs_mail_experiments 2017-05-05 17:52:44 +02:00
Gioacchino Mazzurco
5159e326c7 Merge branch 'master' into gxs_mail_experiments 2017-05-05 15:44:22 +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