csoler
6848a586f3
merged upstream/master
2018-07-08 21:17:48 +02:00
csoler
0bc77749d0
Merge pull request #1278 from sehraf/pr_improve-nogui-password-entry
...
handle backspace when entering password
2018-07-08 16:59:52 +02:00
csoler
93aa5442a5
Merge pull request #1293 from chelovechishko/chalod
...
several fixes to chat gui
2018-07-08 16:58:56 +02:00
chelovechishko
74075fdded
gui: do not show the quote section of context menu in chat if
...
no text selected
2018-07-04 23:18:21 +09:00
chelovechishko
b3fb7abf99
gui: reduce size of icons in chat for font.height lesser than 26
2018-07-04 22:46:01 +09:00
chelovechishko
77c3eae976
gui: check for show "is typing" before time call
2018-07-04 00:34:45 +09:00
chelovechishko
b950e12bcf
gui: disable quote option if no text is selected in chat
2018-07-04 00:19:36 +09:00
chelovechishko
5925aa06fe
gui: anchor not only first word of nickname, if any
2018-07-03 23:33:29 +09:00
G10h4ck
39c88ea247
Merge pull request #1291 from G10h4ck/extra_locators_merge
...
Share extra locators via certificate
2018-07-02 17:16:21 +02:00
chelovechishko
4eb060e154
gui: do not attempt to create context menu if idlist is empty
...
...and other side effects
2018-07-02 21:19:57 +09:00
Gioacchino Mazzurco
418c42bd11
Extra locators in cert invite made optional
2018-07-02 13:50:02 +02:00
Gioacchino Mazzurco
1dd707710b
Merge branch 'master' into extra_locators_merge
2018-07-02 12:22:23 +02:00
cyril soler
1b2b3113ca
fixed previous commit caused by an apparent bug in qtcreator when updating code
2018-07-02 10:21:38 +02:00
cyril soler
e6db04e2b5
cancelled previous commit, because it sort of breaks the update of forum lists.
2018-07-02 09:45:17 +02:00
cyril soler
abc5b840d2
added queuedConnection type in fillDisplay() between RsGxsBroadcastWidget and RsGxsBroadCastBase.
2018-07-02 09:36:28 +02:00
csoler
5ffd7a2352
Merge pull request #1290 from sehraf/pr_fix_json_uint64
...
fix json uint64
2018-06-28 21:05:34 +02:00
sehraf
f7625e3526
fix json uint64
2018-06-28 20:25:10 +02:00
Gioacchino Mazzurco
502459a25a
Cleanup rapidjson inclusion
...
Fix compilation error of android service
2018-06-26 15:12:16 +02:00
csoler
2f159efb10
Merge pull request #1288 from csoler/v0.6-GxsFix
...
changed std::vector into std::set in notification system, hence remov…
2018-06-22 22:06:59 +02:00
csoler
a7f1adc49a
added comment
2018-06-21 18:55:29 +02:00
csoler
cadc697882
removed reload of currently selected identity during full reload of Id list in People as it caused some blinking
2018-06-21 17:27:15 +02:00
csoler
84699db744
changed std::vector into std::set in notification system, hence removing lots of std::find(std::vector::begin(),std::vector::end(),T), causing quadratic costs in multiple places.
2018-06-21 15:46:59 +02:00
G10h4ck
9090205747
Merge pull request #1284 from G10h4ck/improve_build
...
Improve build and Windows Continuos Integration
2018-06-19 11:53:07 +02:00
csoler
5aadb4c1d3
Merge pull request #1285 from csoler/v0.6-GxsFix
...
fixed re-load of GXS groups (forums/channels) when the read flag is c…
2018-06-18 22:46:37 +02:00
csoler
6139632378
changed back RsGxsUpdateBroadCast.cpp to dos line ending
2018-06-18 22:37:31 +02:00
csoler
2e7398ac9b
removed debug info
2018-06-18 22:35:22 +02:00
csoler
79e676edbe
fixed re-load of GXS groups (forums/channels) when the read flag is changed
2018-06-18 22:27:05 +02:00
Gioacchino Mazzurco
3c678f2a28
Fix windows build if MINGW_PREFIX is defined
2018-06-11 16:05:25 +02:00
Gioacchino Mazzurco
8a901e658c
Improve appveyor CI
2018-06-11 14:29:07 +02:00
Gioacchino Mazzurco
1f76108a9e
Remove some cruft from build files
2018-06-11 14:21:28 +02:00
Gioacchino Mazzurco
6805875333
Finally get rid of the annoying MASQUARADING typo
2018-06-10 15:10:13 +02:00
Gioacchino Mazzurco
6010104127
Merge commit '9886840b79d617a32764ad52ef4747f5fd999250'
2018-06-09 18:10:22 +02:00
Gioacchino Mazzurco
9886840b79
Provide proper constructor for SerializeContext
...
Deprecate constructor that depends on deprecated declarations.
2018-06-09 17:59:11 +02:00
Gioacchino Mazzurco
1825b263f0
ChunkMap::reAskPendingChunk fix unused parameter warning
2018-06-09 17:21:59 +02:00
Gioacchino Mazzurco
5d237c8753
Improve libresapi qmake files
2018-06-09 17:08:13 +02:00
thunder2
5953e7bbe8
Windows build environment
...
- Added "-spec win32-g++" to build.bat
- Added "--no-check-certificate" to download-file.bat
- Fixed build installer
2018-06-08 17:01:28 +02:00
thunder2
4eda277922
Added missing declare of metatype
2018-06-08 17:00:37 +02:00
cyril soler
8edb1f7535
fixed problem causing infinite loop of net reset in p3NetMgr
2018-06-08 14:32:56 +02:00
G10h4ck
f3b0f7af1f
Merge pull request #1280 from G10h4ck/channels_apiv2_improvements
...
Channels apiv2 improvements
2018-06-07 17:53:42 +02:00
G10h4ck
e5c72481ad
Merge pull request #1281 from G10h4ck/filesharing_apiv2_improvements
...
Extend a bit filesharing JSON API v2
2018-06-07 17:53:26 +02:00
Gioacchino Mazzurco
508951d26f
Improve channels JSON API v2
...
list_channels return only with metadata (including the data produced
very big JSON saturating some client buffer implementation)
add get_channel_info to get full channel data with optional thumbnail
thumbnail is sent by default but can be avoided adding
"want_thumbnail":false to the JSON query
rename get_channel to get_channel_content
2018-06-07 15:00:11 +02:00
Gioacchino Mazzurco
e81b81dff1
libresapi improve qmake optional builds
2018-06-07 14:59:00 +02:00
Gioacchino Mazzurco
3eff851cdb
Improve deprecation of RS_TOKREQ_ANSTYPE_*
2018-06-07 14:57:31 +02:00
Gioacchino Mazzurco
d7b366de23
RS-gui Solve unused parameter warning
2018-06-07 14:54:58 +02:00
sehraf
9a64f80182
handle backspace when entering password
2018-06-03 17:16:10 +02:00
csoler
6bb1d3c509
updated ubuntu changelog
2018-06-01 22:35:06 +02:00
csoler
f663600be5
fixed makeSourcePackage.sh
2018-06-01 22:27:59 +02:00
csoler
9b16e3338f
removed conflicts to retroshare06 in debian control file
2018-06-01 18:21:18 +02:00
csoler
8ceb597310
removed non relevent directories from debian archive
2018-05-30 21:57:13 +02:00
csoler
b0f391d66f
fixed compilation and re-licensed zeroconf/
2018-05-30 21:45:18 +02:00
