Commit Graph

11718 Commits

Author SHA1 Message Date
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
0931779c6f Merge pull request #1081 from Artistic-Cabbage/close-fd-after-blacklist
Add missing close after blacklisted connection attempt.
2017-10-25 18:51:16 +02:00
Arthur Cruchon
39759993fb Add missing close after blacklisted connection attempt. 2017-10-25 17:42:09 +02: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
7af436d9b4 Merge pull request #1075 from Kcchouette/patch-1
Fix some markdown checkbox
2017-10-23 21:12:26 +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
Kcchouette
e24febf96e Fix some markdown checkbox 2017-10-23 14:52:10 +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
csoler
a81956c390 Merge pull request #1071 from hunbernd/fix/crash-at-startup-removed-buttons
Fix bug causing RS to crash at startup
2017-10-22 20:01:49 +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
csoler
9cc09d6d2b Merge pull request #1067 from PhenomRetroShare/Fix_SecurityIpItemIsSame
Fix SecurityIpItem isSame
2017-10-22 15:55:48 +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
edffbc3670 fixed bug in removing top dirs when creating file hierarhies 2017-10-21 18:09:26 +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