Commit Graph

14502 Commits

Author SHA1 Message Date
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
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
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
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
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
defnax
f6f508d1ba Added second icon for inactivity status 2020-05-14 16:22:39 +02:00
defnax
4f25ab3fe8
Merge pull request #1938 from defnax/forum-fonts-settings
Added forum settings for Font size & contrast
2020-05-14 14:29:13 +02:00
defnax
926aa2ad68
Merge pull request #1937 from defnax/stylesheet-fixes
Disabled uneeded qproperty-textColorQuote
2020-05-14 13:58:36 +02:00
csoler
e6d9c49426
Merge pull request #1931 from PhenomRetroShare/Fix_SharedFilesLongTimeUpdate
Fix SharedFilesDialog take long time to update.
2020-05-14 00:00:22 +02:00
defnax
86ec01e991 Added forum settings for Font size & contrast 2020-05-13 19:37:44 +02:00
defnax
b610ce7627
Merge pull request #1154 from chelovechishko/net_bolshe_slyozok
gxsforums: make forum's messages respectful to chat options
2020-05-13 14:05:55 +02:00
defnax
c4315851d5 Disabled uneeded qproperty-textColorQuote 2020-05-13 12:10:17 +02:00
Phenom
65631353e8 Fix FriendsFiles list when on FlatView 2020-05-13 11:01:55 +02:00