13733 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
csoler	24454d5e36	revert .gitignore from previous commit	2019-10-14 13:43:24 +02:00
csoler	98c1a34ab9	Merge pull request #1683 from defnax/distant-chat-settings ... added distant chat settings for store/load	2019-10-14 13:41:52 +02:00
csoler	52b675fb6d	Merge pull request #1680 from csoler/v0.6-DistantChat ... enabled buffering for distant chat, so that msgs are sent when the tu…	2019-10-14 13:39:08 +02:00
defnax	cbfe49f0f3	added distant chat settings	2019-10-14 02:29:20 +02:00
csoler	b3156223af	fixed load/save of chat history for distant chat	2019-10-14 00:07:11 +02:00
defnax	bdea4a66ed	Merge pull request #22 from RetroShare/master ... update to master	2019-10-13 00:01:27 +02:00
csoler	4abdd3165b	Merge pull request #1668 from defnax/some-changes-for-the-feed-items ... Some changes for the feed items	2019-10-12 23:48:59 +02:00
defnax	b62dbb6461	fixed the font metrics	2019-10-12 23:41:18 +02:00
csoler	b259ceba95	Merge pull request #1681 from defnax/changes-for-forum-message-creator ... Changes for forum message creator	2019-10-12 23:04:56 +02:00
csoler	001d67cf23	Merge pull request #1677 from defnax/changes-for-satistics-window ... Changes for satistics window	2019-10-12 23:04:04 +02:00
defnax	32718c673f	Changed the toolbar icons & hide hashing groupbox by default ... * Changed the toolbar icons * Hide the hashing group box when there is no file attached * Show the warning text color in red when the size is too big	2019-10-12 22:32:14 +02:00
defnax	1ce3bd4f62	Merge pull request #21 from RetroShare/master ... update to master	2019-10-12 22:20:46 +02:00
csoler	09343e9179	enabled buffering for distant chat, so that msgs are sent when the tunnel is ok	2019-10-12 21:05:27 +02:00
defnax	7f8d0fb23f	Fixed to use GxsIdRSTreeWidgetItem on Pending packets & pending data items ... Fixed to use GxsIdRSTreeWidgetItem on Pending packets & pending data items Added to display on Pending data items the time in seconds Set text alingment for some items	2019-10-11 22:36:34 +02:00
csoler	b4da1f60e8	Merge pull request #1672 from hunbernd/fix/msys2 ... Fix msys2 build script	2019-10-11 21:15:59 +02:00
csoler	25e9a85a1c	Merge pull request #1673 from G10h4ck/short_invites_fixup ... Fix addSslOnlyFriend when adding with already known PGP	2019-10-11 21:04:32 +02:00
csoler	76395da2e9	Merge pull request #1675 from defnax/added-comment-button ... Added comment button	2019-10-11 20:43:18 +02:00
csoler	66d31d7629	Merge pull request #1678 from defnax/fix-retroshare-ipc ... Fix retroshare ipc	2019-10-11 20:42:44 +02:00
csoler	89919fff2b	Merge pull request #1679 from defnax/display-lobby-name ... Display the lobby name on rs link	2019-10-11 20:41:48 +02:00
defnax	9a616fd0dd	Display the lobby name on the rs link ... Display the lobby name on the rs link	2019-10-11 17:34:17 +02:00
defnax	db06e6e87f	fix retroshare ipc ... Patch by Cy It fixes a bug, where the IPC client process sets up the shared memory, then immediately deletes the shared memory, then notifies the main GUI that the shared memory has been set up. Then the main GUI reports an error because there is no shared memory, and can't open the link that used to be in the now deleted shared memory. So basically "$ retroshare retroshare://..." does nothing, even if the main GUI is running. At least that's what was happening for me.	2019-10-11 12:26:00 +02:00
defnax	ef5c6c3f65	Added back the routing & last sent time in (secs ago)	2019-10-10 23:00:56 +02:00
defnax	fe3eec64e9	Added to display avatar icons & fixes for context menu & format send/receive time ... Added to display avatar icons for global router & gxs transport Fixed to work context menu call for details View Updated Person details windows Display the receive/send time with date format	2019-10-10 19:56:07 +02:00
defnax	55d26b400b	added Comment button to Comment Dialog ... added comment button to CommentDialog	2019-10-09 19:26:43 +02:00
defnax	969ad81913	Merge pull request #20 from RetroShare/master ... update to master	2019-10-09 19:18:54 +02:00
defnax	2df4a1a3e8	changed icons on othe feeds too ... * changed the icons on other feeds too * Show on Forum Message Feed the Avatars	2019-10-09 18:06:30 +02:00
Gioacchino Mazzurco	f86d20d4cd	Improve readibility of terrible if	2019-10-09 15:22:24 +02:00
Gioacchino Mazzurco	63b787a504	Fix double free crash in ~pqissludp() ... Use POD type member intitialization for sockaddr_storage Cleanup a bunch of clutter	2019-10-09 14:59:46 +02:00
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