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

13705 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
hunbernd
8c804ed601 Deploy retroshare-service 
Deploy dependencies needed by imageformat dlls
 2019-10-08 23:14:27 +02:00
hunbernd
29ae250646 Added missing dependencies 2019-10-08 22:25:45 +02:00
csoler
bae85aac53
Merge pull request #1667 from hunbernd/fix/links 
Some tweaks for posted links
 2019-10-07 22:44:48 +02:00
csoler
3e8ca897bf
Merge pull request #1666 from defnax/fixed-toolbar-frames 
Fixed toolbar frames
 2019-10-07 22:28:11 +02:00
csoler
b3b083d6dc
Merge pull request #1671 from hunbernd/fix/retrosharepri 
Fixed misleading comments in retroshare.pri
 2019-10-07 21:47:40 +02:00
Gioacchino Mazzurco
1b071d106f
Fix p3GxsChannels::createCommentV2 2019-10-07 18:37:44 +02:00
defnax
05b0a4703f
Merge pull request #19 from RetroShare/master 
update to master
 2019-10-06 23:28: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
defnax
98f35cf8af Changed the Channed feeds icons 
Changed the Channed feeds icons
 2019-10-06 21:23:19 +02:00
hunbernd
145ecbd3b2 Fixed misleading comments in retroshare.pri and no_retroshare_service switch 
Note: the default state of the switches was not changed
 2019-10-06 13:58:10 +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
defnax
d089762e12 Changes for thumbnail display & subcribe buttons 
* Changes for Thumbnail display & subscribe buttons
* Display Poster thumbnails without wasted empty space
*Display the thumbnail as Poster, 1:1 or 16:9 format
*Moved the Subscribe buttons to the left
 2019-10-05 21:13:15 +02:00
defnax
f7b56ca340
Merge pull request #18 from RetroShare/master 
update master
 2019-10-05 21:00:37 +02:00
hunbernd
c91dc58c98 Removed the icon of other topics, because subscribed and popular don't have one. 2019-10-05 18:17:03 +02:00
hunbernd
d836694ce2 Reset to the first page when changing topics 2019-10-05 17:50:00 +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
defnax
dd96419ffb
Merge pull request #17 from RetroShare/master 
Improve error reporting in createChannelV2
 2019-10-05 16:39:39 +02:00
defnax
d78811ab5e Fixed the toolbar frames 
before used wrong names for the default stylesheet
 2019-10-05 16:02:44 +02:00
Gioacchino Mazzurco
db3aefcd0b
Improve error reporting in createChannelV2 2019-10-05 15:53:46 +02:00
defnax
bd0482b939
Merge pull request #16 from RetroShare/master 
update to master
 2019-10-04 19:05:12 +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
defnax
ba9d8d5953
Merge pull request #15 from RetroShare/master 
update master
 2019-10-03 14:24:57 +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
hunbernd
9385f0c8c1 Display the full URL 
There was no way to see the full URL, only the site
 2019-10-02 13:45:17 +02:00
Gioacchino Mazzurco
b77924b368
Fix setting port when adding from short invite with dyndns 2019-10-01 17:43:52 +02:00
defnax
5ffb404231
Merge pull request #14 from RetroShare/master 
update master
 2019-10-01 13:56:04 +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
Gioacchino Mazzurco
6b71c57a54
Calm down p3netmgr at least when internet connection is not available 
Solve compiler warnings, delete tons of cruft and deadcode
 2019-09-29 17:59:32 +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