csoler
f6ca7b2a07
disabled compilation of cmark until it gets fixed
2018-07-24 20:59:20 +02:00
csoler
a21c2724f5
disabled compilation of cmark until it gets fixed
2018-07-24 20:59:20 +02:00
sehraf
e6acb52d17
add simple chat support
2018-07-24 20:09:45 +02:00
thunder2
7128a04525
Added Xapian to Windows build environment
2018-07-24 16:03:32 +02:00
thunder2
b85359d60a
Added missing include to TurtleRouterDialog.cpp
2018-07-24 14:26:17 +02:00
csoler
e2bb3aef1b
disabled compilation of cmark until it gets fixed
2018-07-23 17:20:57 +02:00
csoler
3272ee0719
disabled compilation of cmark until it gets fixed
2018-07-23 17:20:13 +02:00
Gioacchino Mazzurco
1bc518041c
Experiment of notification via NotifyClient + JSON API
2018-07-23 14:52:17 +02:00
Gioacchino Mazzurco
130007b578
Merge branch 'master' into jsonapi
2018-07-23 13:44:01 +02:00
G10h4ck
fbc4e4205d
Merge pull request #1292 from G10h4ck/deep_search
...
Content search for channels trough xapian
2018-07-23 11:48:55 +02:00
Gioacchino Mazzurco
e8c9ba52b2
Improve code quality after Cyril review
2018-07-23 11:18:32 +02:00
csoler
08cf225fff
Merge pull request #1301 from PhenomRetroShare/Fix_RemoveSearchLineInFriendSelectionWidget
...
Remove unneeded Search: text in FriendSelectionWidget.ui
2018-07-23 09:44:29 +02:00
Gioacchino Mazzurco
6f8c2f6f41
Fix compilation if deep_search is disabled
2018-07-22 23:39:06 +02:00
G10h4ck
99f35275cb
Merge pull request #999 from PhenomRetroShare/Add_CMark
...
Add CommonMark in ChatLobbyDialog
2018-07-22 23:03:37 +02:00
Gioacchino Mazzurco
51c25219bb
Fix compiling with old GCC
2018-07-22 22:47:30 +02:00
Gioacchino Mazzurco
d9aa37219c
Revert "DROP before merge. Reduce INTEGRITY_CHECK_PERIOD"
...
This reverts commit ce61174d79
2018-07-22 21:45:43 +02:00
Gioacchino Mazzurco
f97dc8a125
Properly plug deep search in GXS search
...
Some modifications breaks retrocompatibility of GXS search:
remove horrible templated RsTypeSerializer::serial_process for
RsGxsGroupSummary with hardcoded member names
RsGxsGroupSummary doesn't use old TLV serialization format anymore
RsGxsGroupSummary remove unused description member
RsGxsGroupSummary derive from RsSerializable and use serialization
helper macro
Add autor id and signature flags to the index so there is no need to
retrive them from GXS, thus improving performances
RsGroupNetworkStats initialize members properly
RsGxsGroupSummary rename members to follow usual mMemberName convention
2018-07-22 21:33:40 +02:00
Phenom
d03ee1c0b0
Add CommonMark in ChatLobbyDialog
2018-07-22 10:32:17 +02:00
csoler
82c9084ca4
Merge pull request #1303 from csoler/v0.6-GXS-DistSync3-TurtleSearch
...
fixed deadlock due to turtle calling addVirtualPeer for client servic…
2018-07-22 00:22:51 +02:00
csoler
2ab12a2ef5
fixed deadlock due to turtle calling addVirtualPeer for client services inside a mutex protected zone (breaks mutex order service > turtle)
2018-07-22 00:21:45 +02:00
Gioacchino Mazzurco
6982ae6cd5
Improve retrocompatibility with older xapian
2018-07-21 13:35:05 +02:00
Gioacchino Mazzurco
ff166b2295
Merge branch 'master' into deep_search
2018-07-21 12:57:05 +02:00
Gioacchino Mazzurco
8149ef9e45
Install xapian dependency in Continuos Integration
2018-07-21 01:17:28 +02:00
csoler
e72ef242c9
Merge pull request #1298 from csoler/v0.6-DebianPackaging
...
V0.6 debian packaging
2018-07-20 19:16:58 +02:00
Gioacchino Mazzurco
3fc9ff3fef
WIP Plug deep search into GXS search
2018-07-20 15:29:37 +02:00
Gioacchino Mazzurco
a31b06ab60
Merge branch 'master' into deep_search
...
Needed to make deep search and GXS search cooperate
2018-07-20 13:15:11 +02:00
csoler
d4fce07e4c
changed lrand48 to RSRandom for cross-plateform compatibility, in rsgxsnettunnel.cc
2018-07-19 23:46:31 +02:00
csoler
2bab688dec
fixed merge with upstream/master
2018-07-19 23:22:24 +02:00
csoler
b8062f2e21
Merge pull request #1294 from csoler/v0.6-GXS-DistSync3-TurtleSearch
...
V0.6 gxs dist sync3 turtle search
2018-07-19 22:59:43 +02:00
csoler
dac885e24d
made randomBias initilized with true random bytes at start
2018-07-18 21:22:38 +02:00
csoler
9b0a4b966e
removed extra call to loadConfiguration()
2018-07-18 21:20:51 +02:00
G10h4ck
61087d232a
Merge pull request #1302 from sehraf/pr_use_system_rapidjson
...
Add auto detection of installed rapidjson
2018-07-18 19:04:47 +02:00
csoler
b9436fbef2
fixed leading zeroes problem in title bar
2018-07-17 10:08:39 +02:00
sehraf
55e99ef0d1
add auto detection of installed rapidjson
2018-07-16 23:22:04 +02:00
csoler
a52c94d23c
improved display of encryption master key
2018-07-15 19:15:05 +02:00
csoler
1de31493a9
fixed up display of GXS net tunnel info
2018-07-15 19:09:12 +02:00
csoler
01d48256a4
Merge pull request #1300 from PhenomRetroShare/Fix_ChangeLobbyToRoomInCreateLobbyDialog
...
Change Lobby text to Room in CreateLobbyDialog.
2018-07-15 18:31:22 +02:00
Phenom
aaea97d06f
Remove unneeded Search: text in FriendSelectionWidget.ui
2018-07-15 16:53:52 +02:00
Phenom
820841668e
Change Lobby text to Room in CreateLobbyDialog.
2018-07-15 16:37:33 +02:00
csoler
cca986ad75
added more info to tunnel display
2018-07-15 15:07:24 +02:00
csoler
34e924f99b
added visualisation for GXS net tunnels (unfinished)
2018-07-15 14:40:50 +02:00
csoler
fd45d44826
added interface to get statistics about GxsNetTunnel
2018-07-15 11:14:58 +02:00
csoler
b20bd0a454
added admin list to forum group data
2018-07-15 10:13:04 +02:00
csoler
80f4907d66
Merge pull request #1227 from RetroPooh/openlocal
...
bring back open local file on link click
2018-07-10 11:20:43 +02:00
G10h4ck
4b6fd5d944
Merge pull request #1296 from chelovechishko/namespaces
...
fix ODR violations caused by same names for different things
2018-07-09 10:55:07 +02:00
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
b3dddeafdf
add missing namespaces
2018-07-06 23:55:12 +09:00
csoler
0c45217fc0
merged upstream/master
2018-07-05 17:41:30 +02:00
