Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-02-14 14:01:45 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity
13,536 Commits 63 Branches 22 Tags
Commit Graph

13536 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gioacchino Mazzurco
93bfbb6ede
Fix addSslOnlyFriend when adding with already known PGP 
If the PGP key is available add as full friend.
Without this change when the PGP key of a non-friend is available
  the SSL-id is added in peer list but the PGP-id is not added as PGP
  friend, at same time skip_pgp_signature_validation is false, because
  we have the full PGP, so the connection attempt is refused, when it
  should be verified with PGP and accepted.
 2019-10-09 02:06:55 +02:00
Gioacchino Mazzurco
1b071d106f
Fix p3GxsChannels::createCommentV2 2019-10-07 18:37:44 +02:00
Gioacchino Mazzurco
ab93d31d17
Remove some RsPeers related dead code 2019-10-06 23:20:18 +02:00
Gioacchino Mazzurco
563260d012
Merge branch 'master' of github.com:RetroShare/RetroShare 2019-10-06 23:05:11 +02:00
Gioacchino Mazzurco
89819dd945
Add JSON API to list PGP friends 2019-10-06 23:03:14 +02:00
csoler
c0e8aa1024
Merge pull request #1596 from hunbernd/feature/risechatlenght 
Rise public chat message size
 2019-10-06 22:16:09 +02:00
csoler
b7e3300689
Merge pull request #1670 from csoler/v0.6-GXS-DistSync 
fixed bug causing crash when forum being displayed is deleted
 2019-10-06 00:18:58 +02:00
csoler
398c943f40
fixed bug causing crash when forum being displayed is deleted 2019-10-06 00:12:28 +02:00
csoler
5bd07b4a55
Merge pull request #1634 from deferredreward/master 
fixed typo strenghten => strengthen across all locations
 2019-10-05 17:29:02 +02:00
Gioacchino Mazzurco
db3aefcd0b
Improve error reporting in createChannelV2 2019-10-05 15:53:46 +02:00
G10h4ck
529dc2aa00
Merge pull request #1654 from PhenomRetroShare/Fix_Assignment_Operator_Warning 
Fix implicitly-declared operator= warnings
 2019-10-04 17:45:52 +02:00
Phenom
5c46a8fd4d Fix implicitly-declared operator= warnings 
/libretroshare/src/gxs/rsgds.h:54: warning: implicitly-declared
'ContentValue& ContentValue::operator=(const ContentValue&)' is
deprecated [-Wdeprecated-copy]
   54 |     MsgLocMetaData(const MsgLocMetaData& meta){ msgId =
meta.msgId; val = meta.val;}

/libretroshare/src/gxs/rsgds.h:69: warning: implicitly-declared
'ContentValue& ContentValue::operator=(const ContentValue&)' is
deprecated [-Wdeprecated-copy]
   69 |     GrpLocMetaData(const GrpLocMetaData& meta){ grpId =
meta.grpId; val = meta.val;}

From 248 to 146 warnings.
 2019-10-04 17:28:50 +02:00
csoler
b539ebe826
Merge pull request #1646 from G10h4ck/fixup_channels_api 
Avoid crash when subscribeToChannel is fed with invalid channel id
 2019-10-03 20:31:31 +02:00
csoler
0566d08087
Merge pull request #1658 from defnax/attach-picture-button-in-forum-post-dialog;-message-size-check- 
Attach picture button in forum post dialog & message size check
 2019-10-03 14:35:09 +02:00
csoler
423f20231c
Merge pull request #1661 from G10h4ck/short_invites_fixup 
Fix setting port when adding from short invite with dyndns
 2019-10-03 09:40:28 +02:00
Gioacchino Mazzurco
b77924b368
Fix setting port when adding from short invite with dyndns 2019-10-01 17:43:52 +02:00
G10h4ck
1732177669
Merge pull request #1645 from G10h4ck/short_invites_fixes 
Allow friend information  update from short invite
 2019-09-30 23:37:55 +02:00
csoler
6849e0d6a4
Merge pull request #1657 from defnax/improved-look-feel-profile-generation-dialog 
Improved look feel profile generation dialog
 2019-09-30 23:13:48 +02:00
defnax
6be6f74602 Rename text "Please choose a profile name and password..." 2019-09-30 22:38:15 +02:00
csoler
2dc03a64bc
Merge pull request #1653 from defnax/removed-default-stylsheets-from-titlebar-frames 
Removed default stylesheets from titlebar frames
 2019-09-30 22:05:54 +02:00
csoler
f04b32eef8
Merge pull request #1650 from csoler/v0.6-ShortInvites 
fixed error handling when you enter your own certificate in connect f…
 2019-09-30 21:46:52 +02:00
defnax
99caf1f07f
Merge pull request #1648 from defnax/home-view-changes-for-short-invites 
Home view changes for short invites
 2019-09-30 19:58:50 +02:00
csoler
e41b64d938
added checksum section to short certificate format 2019-09-29 17:37:52 +02:00
defnax
25e966d039 added atach picture button to forum post 2019-09-29 17:32:14 +02:00
defnax
d1f245f5d6 improved look & feel on profile generation dialog 2019-09-29 16:48:31 +02:00
defnax
75dd928fbb Removed the default stylsheets from titlebar frames 
Removed the default stylsheets from titlebar frames
 2019-09-28 22:58:28 +02:00
defnax
c228e4058d
Merge pull request #13 from RetroShare/master 
Avoid netReset() if no network address is available
 2019-09-28 20:02:57 +02:00
Gioacchino Mazzurco
6788ea041a
Avoid netReset() if no network address is available 2019-09-28 18:42:13 +02:00
defnax
56b93def00
Merge pull request #12 from RetroShare/master 
update master
 2019-09-28 18:06:22 +02:00
csoler
974102e3fc
fixed error handling when you enter your own certificate in connect friend wizard 2019-09-28 17:29:24 +02:00
Gioacchino Mazzurco
1e9adc1e23
Add some documentation and fix some compiler warnings 2019-09-28 14:34:07 +02:00
Gioacchino Mazzurco
4e3ac4a9f4
Make SSL-only friend criteria stricter 2019-09-28 14:15:12 +02:00
Gioacchino Mazzurco
c07f93992c
Merge branch 'master' of github.com:RetroShare/RetroShare 2019-09-28 13:57:28 +02:00
Gioacchino Mazzurco
a169250e1c
Add support to build with miniupnpc on Android 
Necessary to workaroud issues:
  https://github.com/RetroShare/RetroShare/issues/1649
  https://github.com/mrjimenez/pupnp/issues/119
 2019-09-28 13:54:16 +02:00
defnax
7a48fee0bc Added tooltip for Show Cert Button "Show full certificate (old format)" 
* Added tooltip for Show Cert Button "Show full certificate (old format)"
* removed the tooltip for Retroshare ID
 2019-09-28 12:18:46 +02:00
Gioacchino Mazzurco
5660c73175
Allow friend information update from short invite 
Add comments explaining security of addSslOnlyFriend
 2019-09-28 10:36:33 +02:00
Gioacchino Mazzurco
3b8f6997bb
Avoid crash when subscribeToChannel is fed with invaled channel id 
Fix a couple compiler warning too
 2019-09-28 00:12:56 +02:00
G10h4ck
1480e6d0b5
Merge pull request #1644 from G10h4ck/broadcast_discovery_fingerprint 
Send PGP fingerprint in broadcast discovery
 2019-09-27 23:48:37 +02:00
G10h4ck
2a547a034e
Merge pull request #1647 from G10h4ck/circle_api_fixes 
Fail gracefully when requesting membership on an unknown circle
 2019-09-27 23:47:37 +02:00
defnax
892acd8ef8 Home View changes for Retroshare ID 
Added Label for Retroshare ID (short invites)
Show Optional the certificate with the Cert Button
 2019-09-27 20:21:40 +02:00
defnax
b50322cb3e
Merge pull request #11 from RetroShare/master 
update
 2019-09-27 20:07:31 +02:00
Gioacchino Mazzurco
86957c9843
Fail gracefully when requesting membership on an unknown circle 2019-09-27 16:57:07 +02:00
Gioacchino Mazzurco
ce3e2a2c9d
Fixup missing parametersin circle creation 2019-09-27 14:19:20 +02:00
Gioacchino Mazzurco
1705a930d4
getLocalAddresses should not need Qt for android >= 24 2019-09-25 22:15:07 +02:00
Gioacchino Mazzurco
a887d205e9
Relax RsEvent loop 2019-09-25 22:12:04 +02:00
Gioacchino Mazzurco
2aade543f3
Send PGP full fingerprint in broadcast discovery 2019-09-25 16:33:13 +02:00
defnax
8fe63273fa
Merge pull request #10 from RetroShare/master 
update master
 2019-09-25 16:25:59 +02:00
G10h4ck
5acb6c266e
Merge pull request #1571 from csoler/v0.6-ShortInvites 
[Test needed] V0.6 short invites
 2019-09-25 15:55:06 +02:00
csoler
24781a71f5
removed unused mOthersList from PeerMgr 2019-09-23 21:32:28 +02:00
csoler
d055887aa1
removed some dead code 2019-09-23 20:52:19 +02:00