Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-15 02:44:20 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity
12,413 Commits 63 Branches 22 Tags 195 MiB
4acbf775a5
Commit Graph

6187 Commits

Author SHA1 Message Date
csoler
c294971633
Merge pull request #1289 from G10h4ck/jsonapi 
Implement automatic JSON API generation
 2018-08-28 19:11:08 +02:00
Gioacchino Mazzurco
f5d306c7b1
Made JSON API port configurable from retroshare-gui 
Use port used by webui + 2
 2018-08-25 18:39:32 +02:00
sehraf
fe22465869
fix proxy indicators not being updated 2018-08-25 17:53:30 +02:00
Gioacchino Mazzurco
396fe49312
Merge branch 'master' into jsonapi 2018-08-22 16:59:42 +02:00
csoler
93ab975b72
reverted commit 5925aa06fe by request from Phenom 2018-08-06 22:59:37 +02:00
csoler
4a961a8762
Merge pull request #1310 from PhenomRetroShare/Fix_DisableCMarkButton 
Disable CMark Button on ChatWidget if not defined.
 2018-08-03 18:32:59 +02:00
csoler
77d5dfe18d
Merge pull request #1311 from sehraf/pr_improve_service_id 
Add wrapper function to convert uint16_t service IDs to internal unsi…
 2018-08-01 20:48:55 +02:00
sehraf
97194fd092
Add wrapper function to convert uint16_t service IDs to internal unsigned int. 
Use it when looking up service names.
 2018-08-01 20:47:02 +02:00
csoler
50867d2503
fixed clicking on external url in MessageWidget 2018-08-01 20:31:48 +02:00
Phenom
5f66a45a15 Disable CMark Button on ChatWidget if not defined. 2018-08-01 18:40:40 +02:00
csoler
c948517c3d
Merge pull request #1306 from csoler/v0.6-TorOnly 
V0.6 tor only
 2018-07-31 14:18:24 +02:00
csoler
cc1a05ddc9
fixed certificate creation in TorAuto mode 2018-07-27 12:33:06 +02:00
csoler
22bc40e3cc
udated GenCertDialog with new layout 2018-07-26 19:25:30 +02:00
csoler
74ec558c45
reworked GenCertDialog with node type on top level 2018-07-26 09:39:26 +02:00
csoler
62b9a74324
fixed running with TorControl in new mode 2018-07-25 15:31:18 +02:00
csoler
d1a375cbd0
removed RETROTOR #ifdef and started using RsAccounts::isTorAuto() instead. Unfinished yet. 2018-07-25 11:37:40 +02:00
csoler
0f758902cd
started cleaning the mess with rsAccounts: only exposed useful functionality of rsAccount beyond a static class and removed all references to rsAccounts in the code 2018-07-24 23:47:32 +02:00
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
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
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
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
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
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
b9436fbef2
fixed leading zeroes problem in title bar 2018-07-17 10:08:39 +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
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
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
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
csoler
4a64ea5f1f
added optional use of dist sync in GroupFrameDialog 2018-07-05 14:00:04 +02:00
csoler
0e37de3e11
made retrieval of group data manual instead of automatic 2018-07-05 11:43:55 +02:00
csoler
47e760a2c5
added a few missing mutexes in prevent searches to be shown when already known 2018-07-05 10:11:12 +02:00
csoler
2067b106e4
fixed missing code in passing turtle group data result to client service 2018-07-04 23:54:26 +02:00
csoler
8ad454723a
added group data request when search items are selected 2018-07-04 21:42:09 +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