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 |
|
jolavillette
|
51ba879bb7
|
bandwidth control improvement
|
2020-05-14 23:28:20 +02:00 |
|
jolavillette
|
1f547aaefe
|
bandwidth control improvement
|
2020-05-14 23:13:36 +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 |
|
Phenom
|
f6260a95ae
|
Add Votes when calling getPostData.
|
2020-05-13 00:36:14 +02:00 |
|
csoler
|
2ad9d86385
|
Merge pull request #1933 from PhenomRetroShare/Fix_RsElidedItemDelegateAbs
Fix RSElidedItemDelegate abs to use std one.
|
2020-05-12 23:07:08 +02:00 |
|
csoler
|
e6edae27be
|
Merge pull request #1922 from PhenomRetroShare/Fix_SomeWarnings
Fix some warnings
|
2020-05-12 23:05:34 +02:00 |
|
csoler
|
19d235aed4
|
Merge pull request #1924 from defnax/new-spam-box
Added New Spam Box
|
2020-05-12 23:01:46 +02:00 |
|
csoler
|
391ecd10dd
|
Merge pull request #1929 from defnax/fixing-posteditem-signal-slots
[PostedItem] Fixing for some buttons the signal slots...[Expand,Notes, Voting]
|
2020-05-12 22:47:25 +02:00 |
|
defnax
|
30116598ff
|
Merge pull request #1932 from defnax/enable-additional-colors-for-syntax-higlighting
Enable the additional colors for the highlighting
|
2020-05-12 22:07:26 +02:00 |
|
Phenom
|
ba7a4db934
|
Fix RSElidedItemDelegate abs to use std one.
|
2020-05-12 19:56:11 +02:00 |
|
csoler
|
12a9dc5a79
|
fixed UI bugs reported by jolavillette
|
2020-05-12 18:53:51 +02:00 |
|
jolavillette
|
7349f42154
|
Merge remote-tracking branch 'upstream/master' into pqihandlerOptim
|
2020-05-12 17:06:11 +02:00 |
|
defnax
|
1232d71446
|
Enable additional colors for the highlighting
|
2020-05-12 15:32:25 +02:00 |
|
Phenom
|
bc27863d23
|
Fix SharedFilesDialog take long time to update.
This is due to Qt bug: https://bugreports.qt.io/browse/QTBUG-11438
Thanks to Jolavillette
|
2020-05-12 14:10:33 +02:00 |
|
defnax
|
d8ca92da1b
|
Merge pull request #1930 from PhenomRetroShare/Add_MoreQuoteColors
Add more color for quotted text.
|
2020-05-12 14:09:09 +02:00 |
|
Phenom
|
e492945612
|
Add more color for quotted text.
|
2020-05-12 03:06:01 +02:00 |
|
csoler
|
2bfaadce0b
|
attempt to fix crash in revoke ids from circle
|
2020-05-11 19:02:33 +02:00 |
|
defnax
|
2ec021e1cf
|
Fixing Indentation
|
2020-05-11 14:42:28 +02:00 |
|
defnax
|
d1c065559e
|
Merge pull request #1926 from PhenomRetroShare/Fix_GroupTreeWidgetQSS
Fix GroupTreeWidget with RSElidedItemDelegate for StyleSheet.
|
2020-05-11 14:39:17 +02:00 |
|
defnax
|
9f91ac1454
|
Fixing for some buttons the signal slots
|
2020-05-11 14:20:33 +02:00 |
|
csoler
|
fa9b99a88e
|
Merge pull request #1927 from PhenomRetroShare/Fix_PostedItemLoadingThread
Fix PostedItem loading thread.
|
2020-05-10 20:23:42 +02:00 |
|
Phenom
|
c268f998e6
|
Fix PostedItem loading thread.
Wait loading is finished before destruct.
|
2020-05-10 19:49:07 +02:00 |
|
Phenom
|
c6350ff044
|
Fix GroupTreeWidget with RSElidedItemDelegate for StyleSheet.
|
2020-05-10 18:42:24 +02:00 |
|
csoler
|
cb1fe154f3
|
removed debug info
|
2020-05-10 18:40:31 +02:00 |
|
csoler
|
766da8117a
|
added missing update of membership status flags when an id is removed from the invitee list
|
2020-05-10 18:37:03 +02:00 |
|
csoler
|
a7d89f1fbb
|
hide moderator list in new forum feed item
|
2020-05-10 13:48:57 +02:00 |
|
csoler
|
3ae173f104
|
removed debug info in circles
|
2020-05-10 13:47:53 +02:00 |
|
csoler
|
8f12dd6322
|
fixed bug in chat room notify
|
2020-05-10 13:33:20 +02:00 |
|
defnax
|
9b84617ebe
|
Fixing indentation
|
2020-05-10 00:04:17 +02:00 |
|
defnax
|
c297311b61
|
Fixing column display
|
2020-05-09 23:42:54 +02:00 |
|
csoler
|
6f6e0de5f1
|
merged with upstreamm/master
|
2020-05-09 22:33:27 +02:00 |
|
csoler
|
cfcd68e661
|
Merge pull request #1923 from RetroShare/revert-1920-Fix_GroupTreeWidgetQSS
Revert "Fix GroupTreeWidget with RSElidedItemDelegate for StyleSheet."
|
2020-05-09 22:31:50 +02:00 |
|
csoler
|
df92000147
|
Revert "Fix GroupTreeWidget with RSElidedItemDelegate for StyleSheet."
|
2020-05-09 21:49:13 +02:00 |
|
csoler
|
e09bf7c261
|
added a check to prevent SEGV when sending a notification about a group we updated
|
2020-05-09 21:30:51 +02:00 |
|