Commit Graph

12239 Commits

Author SHA1 Message Date
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
1a01181ef4
Merge pull request #1063 from PhenomRetroShare/Fix_BlankPageWhenClearLobbyInWebInterface
Fix Blank Page When Clear Lobby in Web Interface
2017-11-01 20:35:29 +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
csoler
2d8e9d5bc8
Merge pull request #1090 from csoler/v0.6-DHT
tried to improve DHT size estimation code
2017-11-01 20:33:54 +01:00
csoler
a9c43627ab removed debug info. Added explaination about the new method 2017-11-01 20:31:49 +01:00
Gioacchino Mazzurco
fe5dd00c4d Add context to debug message 2017-11-01 14:34:01 +01:00
Gioacchino
346d5c15a4
Merge pull request #1087 from Emotyco/libresapilocal_debug
Added: Debug output in Android app of callback functions
2017-11-01 14:13:04 +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
69278e6e87 only print non empty buckets 2017-10-30 11:07:36 +01:00
csoler
9f9c34ca13 tried to improve DHT size estimation code 2017-10-30 10:58:48 +01:00
csoler
b77e895691
Merge pull request #1084 from csoler/v0.6-Links2
added sorting of channels to push to, and auto-fill of channel subject
2017-10-29 21:31:10 +01:00
csoler
337980e433
Merge pull request #1088 from csoler/v0.6-FileLists
added display of hashing speed. Changed hashing buffer size to 10MB t…
2017-10-29 21:28:12 +01:00
csoler
3bb694f439 added display of hashing speed. Changed hashing buffer size to 10MB to improve performance 2017-10-29 21:24:34 +01:00
csoler
9ad635a665 added post into forum menu entry in SharedFilesDialog 2017-10-29 20:33:56 +01:00
Konrad
c41f6a29a5 Added: Debug output in Android app of callback functions 2017-10-29 19:40:37 +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
Gioacchino
0c3fc05491 Merge pull request #1066 from Emotyco/libresapi_filesharing
Added a few filesharing handlers in libresapi
2017-10-26 08:18:30 +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
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