Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-25 23:49:35 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity
14,585 Commits 63 Branches 22 Tags 196 MiB
3354246805
Commit Graph

7305 Commits

Author SHA1 Message Date
csoler
da968379d6
improved design: moved channel details+posts into tabs, and added tabs for comments+post details 2020-06-03 21:06:37 +02:00
csoler
5a6c8de005
fixed abstract item model for channels. Display still missing 2020-06-02 22:22:36 +02:00
csoler
198733a763
started implementing an abstract item model for channels 2020-06-01 22:00:49 +02:00
defnax
6b786b3604
Merge pull request #1985 from defnax/emojiandstylesheets 
Added missed facepalming emoji & stylesheet fixes
 2020-05-30 14:00:23 +02:00
Phenom
70e2a1a801 Fix qss StyleSheet dark theme item color for gtk users 
gtk users can't set Qt system theme.
 2020-05-30 12:40:42 +02:00
defnax
28508c47ce
Merge pull request #1968 from defnax/added-mail-settings-for-emoticons 
Added mail settings for emoticons
 2020-05-29 18:27:01 +02:00
defnax
22618de00c * Added missed facepalming emoji & stylesheet fixes 
* Added missed facepalming emoji
* Added default stylesheets for Messages selection & hover
* Added default selection color for the Main Window ListView
 2020-05-29 18:16:59 +02:00
defnax
d1d4b47877
Merge pull request #1974 from hunbernd/feature/msys2enhancements 
[WIP] Improved msys2 build scripts
 2020-05-24 22:36:21 +02:00
defnax
178b37a95f small ui fixes & changes 
* Update the context menu icons for attachments
* Display the File type icon for attachments
* on reply load the tags
 2020-05-24 02:28:54 +02:00
hunbernd
a11dc09790 Build webui 2020-05-23 22:05:44 +02:00
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
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
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
Phenom
60615e4532 Add PlaceHolder in Message Tree. 
And fix some mistakes.
 2020-05-21 15:30:02 +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
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
edae2faf2c Fixing background of a frame to be transparent 2020-05-18 01:24:37 +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
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
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
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
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
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
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
a7d89f1fbb
hide moderator list in new forum feed item 2020-05-10 13:48:57 +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
df92000147
Revert "Fix GroupTreeWidget with RSElidedItemDelegate for StyleSheet." 2020-05-09 21:49:13 +02:00
defnax
d2794ed6d2
Merge pull request #1920 from PhenomRetroShare/Fix_GroupTreeWidgetQSS 
Fix GroupTreeWidget with RSElidedItemDelegate for StyleSheet.
 2020-05-09 18:19:34 +02:00
csoler
0c3b8641af
fixing some bugs in circles backend 2020-05-09 18:07:56 +02:00
Phenom
826e969fae Fix GroupTreeWidget with RSElidedItemDelegate for StyleSheet. 2020-05-09 14:43:45 +02:00
Phenom
546e87fd39 Fix warning: ‘op’ may be used uninitialized in this function 
../../../trunk/retroshare-gui/src/gui/Identity/IdDetailsDialog.cpp: In
member function ‘void IdDetailsDialog::modifyReputation()’:
../../../trunk/retroshare-gui/src/gui/Identity/IdDetailsDialog.cpp:
327:30: warning: ‘op’ may be used uninitialized in this function [-
Wmaybe-uninitialized]
  327 |  rsReputations->setOwnOpinion(id,op);
      |  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~
 2020-05-09 14:36:06 +02:00
Phenom
e3846f981c Fix warning: control reaches end of non-void function 
../../../trunk/retroshare-gui/src/gui/common/FriendListModel.cpp: In
member function ‘QVariant RsFriendListModel::displayRole(const
RsFriendListModel::EntryIndex&, int) const’:
../../../trunk/retroshare-gui/src/gui/common/FriendListModel.cpp:716:1:
warning: control reaches end of non-void function [-Wreturn-type]
  716 | }
      | ^
 2020-05-09 14:34:48 +02:00
Phenom
6d53529cd4 Fix ForumThread Setting Loading 2020-05-09 12:30:32 +02:00
csoler
d7dab2ae88
fixed uninitialized memory read causing a crash (reportted y sehraf) 2020-05-09 10:55:19 +02:00
defnax
38af9244a6 added spam box 2020-05-08 23:21:38 +02:00
defnax
477f0a8a76
Merge pull request #1901 from PhenomRetroShare/Fix_ClearLayout 
Fix Clear Layout methode.
 2020-05-08 17:20:01 +02:00
defnax
f649ef943d
Merge pull request #1902 from PhenomRetroShare/Fix_SetMessageUnRead 
Fix set Un/read choice in PopupMenu on messsage dialog.
 2020-05-07 23:37:06 +02:00
defnax
0a2f2a1466
Merge pull request #1889 from PhenomRetroShare/Add_DateAndNameInCopyFromHistory 
Add Date and Name in copied text from Chat History Browser.
 2020-05-07 23:30:49 +02:00
defnax
62aaa70932
Merge pull request #1913 from defnax/fixing-comments-button-icon 
Added new icon for the Chat menu
 2020-05-07 21:46:46 +02:00
defnax
998f45fb59 Fixing spacing 2020-05-07 14:07:28 +02:00
defnax
ff88ff9d08 Reorder the Chat menu 2020-05-07 02:10:18 +02:00
defnax
e3953a1d57 Added default needed stylesheets for Messages & Forums tree 
Added default needed stylesheets for Messages & Forums tree
 2020-05-07 00:04:47 +02:00
defnax
de51f07922
Merge pull request #1903 from PhenomRetroShare/Fix_RsElidedItemDelegate 
Fix RsElidedItemDelegate for StyleSheet
 2020-05-06 13:36:29 +02:00
defnax
a8c2dc3d54 Added new icon for the Chat menu 2020-05-06 00:33:45 +02:00
defnax
c84bac7da7
Merge pull request #1912 from defnax/fixing-comments-button-icon 
Fixing comments button icon
 2020-05-05 19:34:25 +02:00
defnax
73194d2f4c
Merge pull request #1911 from defnax/fixing-posteditem-class-stylesheet 
Fixing typing icon
 2020-05-05 19:33:01 +02:00
defnax
6dec124131 Fixing comments button icon 2020-05-05 17:56:52 +02:00
defnax
f676314d48 using the correct icon for mail delete on message feeds items 2020-05-05 17:12:54 +02:00
defnax
a8e8cfbd32 Fixing typing icon 2020-05-05 16:10:30 +02:00
Phenom
e0e1411ab9 Fix PR#1907 by setting bool in the place that other. 2020-05-05 09:36:44 +02:00
csoler
e04f6d32db
Merge pull request #1908 from defnax/fixing-posteditem-class-stylesheet 
Fixed stylesheet issues on PostedItem class
 2020-05-05 08:45:15 +02:00
csoler
f7b1122782
Merge pull request #1907 from defnax/channelpostitem-fix 
Channel loading issue fix by ET
 2020-05-05 08:42:59 +02:00
defnax
c2372322e1 Fixed stylesheet issues on PostedItem class 
* Fixed stylesheet issues on PostedItem class
 2020-05-05 01:46:07 +02:00
defnax
2c0cdf398a Channel loading issue fix by ET 2020-05-04 22:27:57 +02:00
csoler
65fa29e789
fixed notifications on circle not working due to cache reload failure. That circle cache code needs a real cleanup 2020-05-04 20:54:08 +02:00
Phenom
0eaa121457 Fix RsElidedItemDelegate for StyleSheet 
Now StyleSheet is applied well.
 2020-05-04 11:35:33 +02:00
csoler
ce6abe5d66
made GxsNotify for messages with more granularity. Removed RsGxsCircleMsg class that was not used. 2020-05-03 23:20:13 +02:00
sehraf
25f0119e4d
Add back the I2P Bob confuguration page. 
It is used by both - clear net and hidden locations - to configure I2P either just as an in proxy (clear net location) or as a full service (hidden i2p location).
 2020-05-03 20:58:36 +02:00