Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-17 03:44:31 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity
15,490 Commits 63 Branches 22 Tags 195 MiB
80ed4e0e25
Commit Graph

15490 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
defnax
74646413c4 Added mail settings for emoticons 2020-05-23 00:16:49 +02:00
csoler
f422c7249a
Merge pull request #1966 from PhenomRetroShare/Fix_ChannelMarkAllRead 
Fix Channels Mark All as Un/Read.
 2020-05-22 18:23:55 +02:00
csoler
eeca7c6d3a
Merge pull request #1963 from csoler/v0.6-GxsGroup 
fixed compilaiton of photoshare due to changes in GxsChange class
 2020-05-22 18:21:33 +02:00
Gioacchino Mazzurco
77f818f0b3
Fix JSON API compilation error introduces in f6260a95ae 2020-05-22 17:52:05 +02:00
Phenom
ee0cc25b13 Fix Channels Mark All as Un/Read. 2020-05-22 12:33:54 +02:00
defnax
d6748b17d5
Merge pull request #1964 from defnax/Chat-widget 
Moved Fonts to bottom & Chat notify to top
 2020-05-22 12:20:12 +02:00
defnax
e460a02f54
Merge pull request #1957 from PhenomRetroShare/Fix_IndentInChatMessage 
Fix Indent in Chat Message
 2020-05-22 12:19:53 +02:00
jolavillette
998e1a5de3 Merge remote-tracking branch 'upstream/master' into pqihandlerOptim 2020-05-22 08:12:16 +02:00
defnax
d872dd56ff Moved Fonts to bottom & Chat notify to top 2020-05-22 01:28:07 +02:00
defnax
56d8a1c819
Merge pull request #1960 from PhenomRetroShare/Fix_GxsForumModelSetMsgReadStatusDataChanged 
Fix GxsForumModel::setMsgReadStatus dataChanged call
 2020-05-21 23:38:23 +02:00
csoler
029f6c846b
Merge pull request #1962 from defnax/group-treeitem-textcolor 
Fixing Group Tree item text color
 2020-05-21 23:00:59 +02:00
csoler
82690561b6
fixed compilaiton of photoshare due to changes in GxsChange class 2020-05-21 22:45:49 +02:00
csoler
2a5adddc3b
Merge pull request #1881 from PhenomRetroShare/Add_VotesOn_getPostData 
Add Votes when calling getPostData.
 2020-05-21 22:38:06 +02:00
defnax
180a43150b Fixing Group Tree item text color 2020-05-21 21:58:23 +02:00
defnax
1f5ac32a81
Merge pull request #1958 from defnax/messages-cosmetic 
cosmetic changes in Messages
 2020-05-21 21:42:29 +02:00
defnax
3c4627bdce
Merge pull request #1961 from PhenomRetroShare/Add_MessageHideTabBarWithOneTab 
Add Message set HideTabBarWithOneTab
 2020-05-21 21:41:51 +02:00
Phenom
d4010dd8d9 Add Message set HideTabBarWithOneTab 2020-05-21 19:55:47 +02:00
Phenom
319ebd66f6 Fix GxsForumModel::setMsgReadStatus dataChanged call 2020-05-21 19:07:03 +02:00
defnax
9b5ab4bbd9 cosmetic changes 2020-05-21 17:23:56 +02:00
Phenom
0a9f7882a5 Fix Indent in Chat Message 2020-05-21 16:32:59 +02:00
defnax
ad1672a0a4
Merge pull request #1956 from PhenomRetroShare/Add_MessagePlaceHolder 
Add PlaceHolder in Message Tree.
 2020-05-21 16:17:31 +02:00
Phenom
60615e4532 Add PlaceHolder in Message Tree. 
And fix some mistakes.
 2020-05-21 15:30:02 +02:00
defnax
0a4b191384
Merge pull request #1955 from PhenomRetroShare/Fix_MessageQuickViewSelection 
Fix Message QuickView Selection for user tags
 2020-05-21 14:23:17 +02:00
Phenom
ba8d2268ea Fix Message QuickView Selection for user tags 2020-05-21 12:55:38 +02:00
defnax
76420a33bf
Merge pull request #1954 from defnax/Attachment-quickview 
Added to use the tag colors as icon
 2020-05-21 00:28:37 +02:00
defnax
b3caf76c4b Added to use the tag colors as icon 2020-05-20 23:38:21 +02:00
csoler
fc5b28e9e1
Merge pull request #1952 from defnax/Attachment-quickview 
Quick view for Messages with Attachments
 2020-05-20 23:02:49 +02:00
csoler
cb44d42f49
Merge pull request #1935 from PhenomRetroShare/Fix_FriendsFilesFlatView 
Fix FriendsFiles list when on FlatView
 2020-05-20 22:21:09 +02:00
defnax
f96f1cf8b1 Quick view for Messages with Attachments 2020-05-20 02:03:18 +02:00
defnax
623e803584
Merge pull request #1950 from PhenomRetroShare/Fix_MessagesQuickViewUnselect 
Fix Messages Quick View unselect.
 2020-05-19 20:58:56 +02:00
Phenom
0a83e7efc5 Fix Messages Quick View unselect. 2020-05-19 19:37:37 +02:00
defnax
fd6b69bcac
Merge pull request #1943 from PhenomRetroShare/Fix_RsElidedItemDelegateStyleSheet 
Fix RSElidedItemDelegate to use StyleSheet as default but defined colors
 2020-05-19 19:28:52 +02:00
drbob
f4457b1331 Fixup how REF message are displayed 
Ensure RefImageCount is correct.
Update docs on m(Ref)GroupPtr points to
fill-in GroupPtrs on Ref Msgs.
Remove mRefAuthorName as not so useful.
Add images into Response Msgs.
Display Headshot / Images on Ref Msgs - if possible.
 2020-05-19 19:40:12 +10:00
defnax
17b9305bae
Merge pull request #1948 from defnax/fixing-darkstylesheet 
[darkstylesheet] Fixing background of a frame to be transparent
 2020-05-18 21:24:55 +02:00
drbob
fbf56fcf03 Add image handling to PulseAddDialog and PulseMessage 2020-05-18 17:35:08 +10:00
G10h4ck
6714648e53
Merge pull request #1947 from sehraf/pr_fix_RawMemoryWrapper 
fix RawMemoryWrapper serialization to json
 2020-05-18 09:24:52 +02:00
defnax
edae2faf2c Fixing background of a frame to be transparent 2020-05-18 01:24:37 +02:00
sehraf
f186422833
fix RawMemoryWrapper serialisation to json, reported by b1rdG 2020-05-17 23:43:03 +02:00
csoler
d52d9c909b
Merge pull request #1875 from csoler/v0.6-GxsGroup 
Add group change notifications (e.g. circle invites, forum moderation, etc)
 2020-05-17 22:37:03 +02:00
csoler
39288a20d8
Merge pull request #1941 from defnax/second-color-for-inactivity-status 
Added second icon for inactivity status
 2020-05-17 22:01:32 +02:00
csoler
c90b72152f
Merge pull request #1945 from b1rdG/fix-createChatLobby-checks 
Create chat lobby checks
 2020-05-17 22:00:30 +02:00
b1rdG
dafd975b51 Verify before lock the mutex 2020-05-17 14:06:07 -05:00
b1rdG
089ea76a6e Add lobby_identity check 2020-05-17 09:18:12 -05:00
Phenom
384ae46706 Fix RSElidedItemDelegate to use StyleSheet as default but defined colors 
if they are.

If none, use Base Delegate.
 2020-05-17 13:27:35 +02:00
drbob
3312faf3ea fixup button labels are prefix headers 2020-05-17 19:56:58 +10:00
drbob
f585b7a629 Enable Republish / Likes from new UI elements 
Update interface to use groupId / msgId.
Tweak PulseAddDialog for Republish & like.
Hide Like messages from showing in UI.
Wire up buttons from new UI elements.
 2020-05-17 12:10:46 +10:00
drbob
8df5a886db Move createOriginalPulse / createReplyPulse to libretroshare 
message creation logic moved to libretroshare
GUI classes cleaned up.
 2020-05-16 22:35:32 +10:00
csoler
dc03f8ff49
imprved readability of the logic in rstlvidset serialization 2020-05-16 13:13:48 +02:00
csoler
6008599f02
fixed wrong call to std::set::erase(iterator,iterator) where the iterator comes from another set, causing inconsistencies 2020-05-16 13:12:37 +02:00
drbob
11ce959b2f Improvements to UI to make behaviour more similar to twitter. 
Add new UI elements.
Can show PulseFocus or GroupFocus at the moment.
WIP, Much more work to get this finalised.
 2020-05-15 22:36:50 +10:00