Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity
11,942 Commits 63 Branches 22 Tags 194 MiB
dcb3f79e4c
Commit Graph

6033 Commits

Author SHA1 Message Date
csoler
5b5a2bef81 split tor control into two parts 2017-12-21 18:16:32 +01:00
csoler
c2d55799e1 storage of chat room icons in local variables to avoid re-reading them from qrc everytime (patch from sss) 2017-12-21 17:06:49 +01:00
csoler
e87b25794f added Tor control window 2017-12-21 15:32:42 +01:00
csoler
5ca2d5e27b added retrotor option in global .pri, and TorControl code 2017-12-21 10:43:28 +01:00
csoler
3007fec1b2 fixed colors in keyring with new ModelIndex based view (patch from sss) 2017-12-16 17:46:44 +01:00
csoler
acbcba8a64 attempt to fix icon sizes in identity dialog 2017-12-07 17:20:42 +01:00
csoler
d2c8ba1a86
Merge pull request #1117 from chelovechishko/qdarkstyle_fix 
Some fixes for qdarkstyle.qss
 2017-12-04 16:33:45 +01:00
csoler
22292fc2a1
Merge pull request #1118 from RetroPooh/net_settings_antifreeze 
fix freezes in network settings
 2017-12-04 16:32:37 +01:00
csoler
621ed71eeb
Merge pull request #1120 from sehraf/pr_fixForumDownloadAll 
Fix 'download all' button for forum.
 2017-12-04 16:31:48 +01:00
csoler
0503f42d13
Merge pull request #1119 from RetroPooh/chan-fix-cyr 
fix cyrillic text sent wrong in channel post
 2017-12-04 16:30:29 +01:00
sehraf
49b4057522 fix 'download all' button for forum. 
Now all file links are opened in one collection dialog instead of each link in one separate dialog.
 2017-12-02 15:00:24 +01:00
chelovechishko
98d2772732 gui: make forums_dialog slightly more readable sometimes 
in qdarkstyle.qss
 2017-12-02 17:10:15 +09:00
RetroPooh
8ec69dfb72 fix cyrillic text sent wrong in channel post 2017-11-29 19:23:52 +03:00
RetroPooh
a88c2efab1 fix freezes in network settings 2017-11-29 17:17:49 +03:00
defnax
b99a1a56ef fixed the emote file for unshown emotes on gui 2017-11-28 19:36:39 +01:00
Chelovechishko
d1cdba891f gui: fix probably mistake with names in qdarkstyle.qss 
Don't sure, but who cares?
 2017-11-27 15:42:52 +09:00
Chelovechishko
8c34a50e23 gui: fix default color of some text in friends list in qdarkstyle.qss 2017-11-27 15:41:30 +09:00
Chelovechishko
d566a2a842 gui: fix keyring background color in qdarkstyle.qss 2017-11-27 15:41:17 +09:00
Chelovechishko
c05dd3030c gui: fix doubled semicolons in qdarkstyle.qss 2017-11-27 15:39:23 +09:00
csoler
c8c90ab892
Merge pull request #1115 from PhenomRetroShare/Add_CopyComment 
Add Copy action for Gxs Comments.
 2017-11-22 20:31:49 +01:00
cyril soler
49d2366c2a fixed windows compilation 2017-11-21 09:29:52 +01:00
csoler
d90514453e
Merge pull request #1114 from PhenomRetroShare/Fix_DisableReplyToSystemMessage 
Disable ReplyTo if System Message.
 2017-11-20 23:18:53 +01:00
csoler
d1d66bb8bf
Merge pull request #1079 from csoler/v0.6-Keyring 
V0.6 keyring
 2017-11-20 23:17:16 +01:00
Phenom
46a6bdc6e5 Add Copy action for Gxs Comments. 2017-11-18 19:48:38 +01:00
Phenom
71efb9f2a0 Disable ReplyTo if System Message. 2017-11-18 18:49:42 +01:00
csoler
ce14219cee merged with upstream/master 2017-11-14 21:39:46 +01:00
csoler
9f8f0e98be fixed column names in keyring 2017-11-14 21:36:04 +01:00
csoler
ba7cf4995b
Merge pull request #1037 from RetroPooh/searchspy 
Searchspy
 2017-11-14 20:53:24 +01:00
csoler
556f93c4a9
Merge pull request #1108 from RetroPooh/smallfixes2 
fix mail fields stretching with CC BCC
 2017-11-14 20:51:25 +01:00
RetroPooh
1f207ba05c create collection dialog filename as dir name 2017-11-14 19:52:48 +03:00
RetroPooh
5d6225ab98 sort by time, nicer look 2017-11-14 00:14:16 +03:00
csoler
1669cd48c8 use "download..." menu with RsCollectionDialog with multiple files and directories 2017-11-13 22:08:05 +01:00
RetroPooh
f369ac1c81 fix mail fields stretching with CC BCC 2017-11-13 19:05:16 +03:00
csoler
5997c10495 fixed bug causing RsCollection to fail on remote files. Now using RsCollectionDialog when downloading directories from friend shared files 2017-11-12 22:46:29 +01:00
csoler
c0951b301e
Merge pull request #1040 from RetroPooh/searchmultinames2 
allow multiple filenames display for a single hash in search
 2017-11-12 21:33:21 +01:00
csoler
240d3a6f35
Merge pull request #1104 from RetroPooh/linkaddrtooltips 
add tooltips with address to urls
 2017-11-11 16:33:30 +01:00
csoler
cb7724312e
Merge pull request #1105 from RetroPooh/smallfixes1 
Smallfixes1
 2017-11-11 16:31:33 +01:00
RetroPooh
9b66e7e83d fix non-latin peer name display in bw stats 2017-11-10 18:32:18 +03:00
RetroPooh
792f7ff7eb fix status led icons for distant chat 2017-11-10 18:31:41 +03:00
RetroPooh
df244fd44d add tooltips with address to urls 2017-11-10 16:01:11 +03:00
csoler
7feb630c92
Merge pull request #1102 from csoler/v0.6-Links2 
use of RsCollectionDialog for processing single file links. Only "ext…
 2017-11-08 20:11:26 +01:00
csoler
6a8bc8baf8 use of RsCollectionDialog for processing single file links. Only "extra" links still require the older processing system because RsCollections cannot have sources for each entry 2017-11-08 18:11:46 +01:00
Phenom
ee7e950f5f Fix CppCheck in RsButtonOnText 
/retroshare-gui/src/gui/common/RsButtonOnText.cpp:13: warning:
Cppcheck(uninitMemberVar): Member variable 'RSButtonOnText::_textEdit'
is not initialized in the constructor.
/retroshare-gui/src/gui/common/RsButtonOnText.cpp:13: warning:
Cppcheck(uninitMemberVar): Member variable
'RSButtonOnText::_textEditViewPort' is not initialized in the
constructor.
/retroshare-gui/src/gui/common/RsButtonOnText.cpp:13: warning:
Cppcheck(uninitMemberVar): Member variable 'RSButtonOnText::_textCursor'
is not initialized in the constructor.
/retroshare-gui/src/gui/common/RsButtonOnText.cpp:21: warning:
Cppcheck(uninitMemberVar): Member variable 'RSButtonOnText::_textEdit'
is not initialized in the constructor.
/retroshare-gui/src/gui/common/RsButtonOnText.cpp:21: warning:
Cppcheck(uninitMemberVar): Member variable
'RSButtonOnText::_textEditViewPort' is not initialized in the
constructor.
/retroshare-gui/src/gui/common/RsButtonOnText.cpp:21: warning:
Cppcheck(uninitMemberVar): Member variable 'RSButtonOnText::_textCursor'
is not initialized in the constructor.
/retroshare-gui/src/gui/common/RsButtonOnText.cpp:32: warning:
Cppcheck(uninitMemberVar): Member variable 'RSButtonOnText::_textEdit'
is not initialized in the constructor.
/retroshare-gui/src/gui/common/RsButtonOnText.cpp:32: warning:
Cppcheck(uninitMemberVar): Member variable
'RSButtonOnText::_textEditViewPort' is not initialized in the
constructor.
/retroshare-gui/src/gui/common/RsButtonOnText.cpp:32: warning:
Cppcheck(uninitMemberVar): Member variable 'RSButtonOnText::_textCursor'
is not initialized in the constructor.
 2017-11-07 22:15:34 +01:00
Phenom
214e382a0a Fix CppCheck in ChatWidget.cpp 
/retroshare-gui/src/gui/chat/ChatWidget.cpp:482: warning:
Cppcheck(clarifyCondition): Boolean result is used in bitwise operation.
Clarify expression with parentheses.
 2017-11-07 22:14:28 +01:00
Phenom
88d84e0249 Fix CppCheck in FlowLayout.h 
/retroshare-gui/src/gui/common/FlowLayout.h:77: warning:
Cppcheck(uninitMemberVar): Member variable
'FlowLayoutItem::m_isSelected' is not initialized in the constructor.
/retroshare-gui/src/gui/common/FlowLayout.h:77: warning:
Cppcheck(uninitMemberVar): Member variable 'FlowLayoutItem::m_isCurrent'
is not initialized in the constructor.
 2017-11-07 22:13:44 +01:00
Phenom
25f1a919e0 Fix CppCheck in ToasterItem.h 
/retroshare-gui/src/gui/toaster/ToasterItem.h:35: warning:
Cppcheck(noExplicitConstructor): Class 'ToasterItem' has a constructor
with 1 argument that is not explicit.
 2017-11-07 22:13:07 +01:00
Phenom
9f5d08110c Fix CppCheck in RSTextBrowser.h 
/home/phenom/GIT/RetroShare/trunk/retroshare-gui/src/gui/common/
RSTextBrowser.h:11: warning: Cppcheck(noConstructor): The class
'RSTextBrowser' does not have a constructor.
 2017-11-07 22:11:04 +01:00
Phenom
0b8d684195 Fix CppCheck in framecatcher.cpp 
/retroshare-gui/src/util/framecatcher.cpp:28: warning:
Cppcheck(uninitMemberVar): Member variable 'framecatcher::length' is not
initialized in the constructor.
 2017-11-06 22:20:44 +01:00
Phenom
deb6693248 Fix CppCheck in idle.cpp 
/retroshare-gui/src/idle/idle.cpp:118: warning:
Cppcheck(knownConditionTrueFalse): Condition 't>0' is always true
 2017-11-06 22:20:44 +01:00
Phenom
589e61ff67 Fix CppCheck in rsettings.cpp 
/retroshare-gui/src/gui/settings/rsettings.cpp:43: warning:
Cppcheck(passedByValue): Function parameter 'fileName' should be passed
by reference.
 2017-11-06 22:20:44 +01:00
Phenom
5554f4a739 Fix CppCheck in MimeTextEdit.h 
/retroshare-gui/src/gui/common/MimeTextEdit.h:29: warning:
Cppcheck(noConstructor): The class 'MimeTextEdit' does not have a
constructor.
 2017-11-06 22:20:44 +01:00
Phenom
8438d7052b Fix CppCheck in GroupTreeWidget.h 
/retroshare-gui/src/gui/common/GroupTreeWidget.h:47: warning:
Cppcheck(uninitMemberVar): Member variable 'GroupItemInfo::adminKey' is
not initialized in the constructor.
/retroshare-gui/src/gui/common/GroupTreeWidget.h:68: warning:
Cppcheck(noConstructor): The class 'GroupTreeWidget' does not have a
constructor.
 2017-11-06 22:20:44 +01:00
csoler
225058a9dc
Merge pull request #1100 from hunbernd/feature/image-embed3 
Fixed resize bug
 2017-11-05 19:37:03 +01:00
hunbernd
5d03ceb360 Fixed resize bug 2017-11-05 18:58:07 +01:00
csoler
b42694165a
Merge pull request #1086 from PhenomRetroShare/Fix_SpeedQueuePositionSorting 
Fix Speed/Queue Position column sorting
 2017-11-05 13:57:31 +01:00
Phenom
f27d312885 Move some Fixed Color to Qss files 2017-11-04 23:37:02 +01:00
Phenom
8072d245f3 Use macro for priority values instead of constants. 2017-11-04 13:58:13 +01:00
Phenom
c5c406bb98 Fix Speed/Queue Position column sorting 2017-11-04 13:58:13 +01:00
csoler
37f6e7e13b
Merge pull request #1064 from PhenomRetroShare/Fix_OpModeRestore 
Fix OpMode Restore
 2017-11-03 23:49:30 +01:00
defnax
1bcebb8dd5 attempt to fix 2017-11-03 13:26:51 +01:00
defnax
fc26ebcdc4 Fixed one Emojione icon 2017-11-03 13:04:38 +01:00
defnax
eb6bc792c5 reorder the main people emoticons 2017-11-03 03:02:40 +01:00
csoler
48bd1517fc removed useless root item in RsCollection dialog 2017-11-02 23:16:30 +01:00
csoler
2d18335da4 added tool button to choose DL directory in rscollection dialog 2017-11-02 22:52:30 +01:00
csoler
638160833c remove filename field in RsCollectionDialog when downloading a collection of links 2017-11-02 22:46:53 +01:00
csoler
42c720fe6e
Merge pull request #1082 from RetroPooh/forumoptsimagescb 
fix saving of forum options checkbox for load images
 2017-11-01 20:36:57 +01:00
csoler
d8c4f88b27
Merge pull request #1094 from PhenomRetroShare/Add_HideFileLabelInChannelPost 
Hide zero File Label (size) in channel post.
 2017-11-01 20:34:35 +01:00
defnax
f409e8efe2 Update to Emojione 3.0 2017-11-01 00:24:03 +01:00
Phenom
a4eedf7287 Hide zero File Label (size) in channel post. 2017-10-30 18:35:56 +01:00
csoler
9ad635a665 added post into forum menu entry in SharedFilesDialog 2017-10-29 20:33:56 +01:00
csoler
0c97d5bc3c added sorting of channels to push to, and auto-fill of channel subject 2017-10-27 22:03:42 +02:00
csoler
2e9f5202e0 fixed compilation 2017-10-26 19:41:13 +02:00
csoler
299d0b6d75 added missing test for subscribed channels in share-on-channel menu 2017-10-26 19:40:36 +02:00
RetroPooh
54d49f1e33 friendlist - hide id column by default 2017-10-26 00:05:45 +03:00
RetroPooh
f8fca19e1b removed wrong tooltip for hidden node in options 2017-10-25 23:07:34 +03:00
RetroPooh
5296641f29 fix saving of forum options checkbox for load images 2017-10-25 20:50:34 +03:00
csoler
f6b7d1e9a3 fixed merging bug 2017-10-24 22:12:38 +02:00
csoler
f959218a24 fixed conflict 2017-10-24 21:53:19 +02:00
csoler
0fbf5ccb07 code optimization in keyring (commit from sss) 2017-10-24 19:01:24 +02:00
csoler
1c2d17b5c1 Merge pull request #1077 from hunbernd/feature/image-embed3 
Make it possible to send images over chat lobby
 2017-10-24 18:47:34 +02:00
hunbernd
cd5eb5cb77 Got rid of QMath 2017-10-24 18:23:22 +02:00
csoler
06f489ec61 Merge pull request #1065 from csoler/v0.6-Links2 
V0.6 links2
 2017-10-23 22:14:06 +02:00
csoler
603ea7e96e removed debug info from RsCollection 2017-10-23 22:12:52 +02:00
csoler
f4fae15de7 Merge pull request #1078 from RetroPooh/addfr-cb 
fix checkboxes state for already accepted/signed keys on add friend d…
 2017-10-23 21:15:40 +02:00
csoler
ead8cb2901 Merge pull request #1076 from RetroPooh/chatsearchbut 
fix chat search button position
 2017-10-23 21:13:56 +02:00
csoler
e441caec49 Merge pull request #1074 from RetroPooh/sett-nodiscocb 
removed show discovery checkbox from network options, it is in appear…
 2017-10-23 21:11:08 +02:00
csoler
b2750392f2 Merge pull request #1073 from RetroPooh/hid1 
disable nat/dht indicators for hidden mode, hide irrelevant network o…
 2017-10-23 21:09:54 +02:00
csoler
1d7d53a95a Merge pull request #1070 from RetroPooh/posted-descr 
fix descriptions display in Posted
 2017-10-23 21:07:23 +02:00
RetroPooh
e2bbbad590 fix checkboxes state for already accepted/signed keys on add friend dialog 2017-10-23 20:01:35 +03:00
hunbernd
64481de74b Set the proper size limits 2017-10-23 17:04:20 +02:00
RetroPooh
b968974bc6 fix chat search button position 2017-10-23 17:51:39 +03:00
hunbernd
f434e6559b Use binary search to find the right file size 2017-10-23 15:31:18 +02:00
hunbernd
c17a8e7d51 Optimalizations 2017-10-23 15:31:18 +02:00
hunbernd
af4817378c Convert image into 4 bit color table format 2017-10-23 15:31:17 +02:00
hunbernd
9af2730879 Downscale image automatically 2017-10-23 15:31:17 +02:00
RetroPooh
4a1ddccd8e removed show discovery checkbox from network options, it is in appearance now 2017-10-23 12:24:56 +03:00
Pooh
4594c1ae9c Update MainWindow.cpp 2017-10-23 11:51:22 +03:00
Pooh
1cc65066dd Update ServerPage.cpp 2017-10-23 11:49:05 +03:00
Pooh
a0f6a741b1 Merge branch 'master' into hid1 2017-10-23 11:46:39 +03:00
RetroPooh
78037a66be disable nat/dht indicators for hidden mode, hide irrelevant network options elements 2017-10-23 11:42:03 +03:00
csoler
0359795cae fixed regression preventing context menu to open in destination directory for RsCollection 2017-10-22 20:08:22 +02:00
csoler
01c82c3eb7 Merge pull request #1072 from hunbernd/fix/html-in-forum-title 
Part of the forum title is not displayed when it is enclosed in < >
 2017-10-22 20:02:27 +02:00
hunbernd
0c39b5c021 Fix bug causing RS to crash at startup when some icons were removed from toolbar 
For example: disabled plugins
 2017-10-22 19:44:14 +02:00
hunbernd
4e16042b75 Part of the forum title is not displayed when it is enclosed in < > 2017-10-22 19:11:52 +02:00
RetroPooh
723016e930 fix descriptions display in Posted 2017-10-22 19:39:44 +03:00
csoler
6a0ccc4444 added means to select download directory in RsCollectionDialog 2017-10-22 18:28:36 +02:00
csoler
ee2120a5bc fixed bug causing FileTree links to open empty 2017-10-22 17:36:19 +02:00
csoler
f50351063d Merge pull request #1069 from RetroPooh/postbuttonlabels 
add text labels to post buttons in forums and channels; fix version s…
 2017-10-22 16:00:08 +02:00
csoler
34eb971f5b Merge pull request #1068 from RetroPooh/winsize 
add windows size/pos saving
 2017-10-22 15:57:24 +02:00
RetroPooh
749a34d815 add text labels to post buttons in forums and channels; fix version selector placement 2017-10-22 15:55:08 +03:00
RetroPooh
b48916ca46 add windows size/pos saving 2017-10-22 13:49:38 +03:00
Phenom
ef13e03e5a Fix SecurityIpItem isSame 2017-10-22 11:52:21 +02:00
csoler
b6aeacbed4 fixed share on channel code 2017-10-21 23:48:27 +02:00
csoler
770add8b8a added code to share a file/dir on channel 2017-10-21 21:23:40 +02:00
csoler
cbcf402e0b setup proper title in RsCollectionEditor when in download mode 2017-10-21 17:42:17 +02:00
csoler
2cfa86620c merge of trees and single files before paste in DL queue so that all use the CollectionEditor 2017-10-21 17:35:06 +02:00
csoler
fe516c6b7a fixed pasting of FileTree links in download queue 2017-10-21 16:16:23 +02:00
csoler
6581fa0429 code cleaning 2017-10-21 15:44:45 +02:00
csoler
0fbcf0148c code cleaning. Removed comments at end of conditional 2017-10-19 22:20:23 +02:00
csoler
74d5069225 renamed RsCollectionEditor into RsCollection. Added download of FileTree links 2017-10-19 22:14:04 +02:00
csoler
32be00614d various improvements to collection links 2017-10-19 10:19:56 +02:00
csoler
0f7d7544ee latest patch from sss about keyring proxy model 2017-10-18 23:24:54 +02:00
csoler
9206daca37 fixed up collection link display 2017-10-18 23:20:19 +02:00
csoler
e1d5014288 added copy links from file hierarchy 2017-10-18 22:32:15 +02:00
csoler
847c1b2bce renamed RsCollectionFile into RsCollectionEditor 2017-10-17 22:39:05 +02:00
csoler
68763f58d1 added links machinery to handle file hierarchies 2017-10-17 22:38:42 +02:00
Phenom
e63217e7de Fix OpMode Restore 2017-10-17 15:39:38 +02:00
csoler
cd1da4495e added latest patch from sss 2017-10-12 21:33:39 +02:00
csoler
c36267f640 patch from sss to make the keyring view a table with item model 2017-10-08 21:00:15 +02:00
csoler
22942dc70b fixed bug causing suffix/prefix lists to contain an empty string 2017-10-01 20:20:26 +02:00
csoler
bc05aaa9d9 switched tokenQueue speed to 10 calls/sec, thus improving loading speeds. Still need to test for CPU load 2017-09-30 18:58:31 +02:00
felisucoibi
06063c525e removed extra space 2017-09-30 11:34:18 +02:00
felisucoibi
b84c8983c4 Removed ... from text 2017-09-30 00:29:07 +02:00
felisucoibi
ef6fd38696 Changed prefixes and sifixes for startign with and ending with to be understandable. 
On internet software uses starting with and ending with instead of prefixes and sufixes, in literature is ok even in internet sometimes, but when you search for files or filter files you use the filter starting with and ending with, is not prefixes is wrong but less understandable in internet language talking about files.
 2017-09-28 22:42:30 +02:00
csoler
e66c0d1349 removed updateTotals() method. Replaced it with costless on-the-fly update of totals 2017-09-27 22:26:14 +02:00
csoler
a00d2c912c changed lobby to char room in chat system msgs 2017-09-26 21:12:17 +02:00
csoler
8eae3744dc Merge pull request #1053 from csoler/v0.6-FT 
fixd broken layout
 2017-09-25 22:14:34 +02:00
csoler
0d9b6e7c8c fixd broken layout 2017-09-25 22:09:35 +02:00
csoler
cbeefda151 Merge pull request #744 from RetroPooh/tunnel-names 
transfers - add peer names for turtle routed sources
 2017-09-25 21:35:59 +02:00
Pooh
f98f16fb15 Update TransfersDialog.cpp 2017-09-25 22:31:49 +03:00
csoler
b969f313b0 Merge pull request #1050 from csoler/v0.6-FT 
V0.6 ft
 2017-09-25 20:59:32 +02:00
Pooh
72dc1c7da4 Update TransfersDialog.cpp 2017-09-25 21:50:12 +03:00
Pooh
c47e6f620d Merge branch 'master' into tunnel-names 2017-09-25 21:43:41 +03:00
csoler
4766a8927a added an additional hard limit to directory depth, just in case 2017-09-24 23:51:47 +02:00
csoler
2a99df4d48 added UI and parameters for two new options in shared files: max share depth and ignore duplicates 2017-09-24 17:53:06 +02:00
Steve-V
82c9c95fc5 spelling fix ommitted -> omitted 2017-09-22 19:58:13 -05:00
defnax
308f8ca57a update qrc file 2017-09-19 18:34:58 +02:00
defnax
52ca6d058b Added Crystall Ball to emote file 2017-09-18 20:49:40 +02:00
Phenom
b13d985e58 Add Icon in Peer name in DL/UL List 
And don't show upload item if no peer.
 2017-09-16 19:29:10 +02:00
Phenom
d9298dcf49 Add Peer Column in Upload list 2017-09-16 19:29:10 +02:00