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

12354 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
csoler
af7556610a
added option whether to trust friend nodes for banned files 2018-08-19 15:52:35 +02:00
csoler
a2804a70ec
added context menu and removal feature for banned files 2018-08-19 15:09:43 +02:00
csoler
a7ee85495d
added fill routine for banned files list 2018-08-16 23:18:29 +02:00
csoler
e17c4d0e40
added a dialog to edit banned files 2018-08-16 22:22:47 +02:00
csoler
50e03a539c
basic infrastructure for banning unwanted file content 2018-08-16 18:49:36 +02:00
thunder2
7bdc61e3e3 Added Windows build environment with MSYS2 2018-08-07 20:18:56 +02:00
thunder2
1eed404170 Optimized Windows build environment 2018-08-07 20:14:42 +02:00
csoler
93ab975b72
reverted commit 5925aa06fe by request from Phenom 2018-08-06 22:59:37 +02:00
G10h4ck
51bcb8155d
Merge pull request #1316 from zapek/master 
added a working procedure to compile on Windows using MSYS2
 2018-08-03 22:09:02 +02:00
zapek
0b821a4199 changed to use CONFIG+=rs_autologin for the windows build instructions instead of setting defines 2018-08-03 21:29:00 +02:00
zapek
8088550467 removed the note about the build possibly failing while generating the 
webui files because I have a fix that I will commit next
 2018-08-03 19:33:09 +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
fabd181fb7
Merge pull request #1315 from PhenomRetroShare/Fix_AppVeyorCompil 
Fix AppVeyor compil
 2018-08-03 17:40:16 +02:00
zapek
ce39f4d7f0 added a working procedure to compile on Windows using MSYS2 2018-08-03 15:15:17 +02:00
csoler
cc51298de6
fixed warning about badly overloaded function in rsexpr.h 2018-08-02 14:13:14 +02:00
Phenom
f21d35b6fa Fix AppVeyor Compilation 2018-08-02 00:39:45 +02:00
csoler
985be3504e
fixed compilation with RS_AUTO_LOGIN 2018-08-01 23:05:36 +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
0d4eafde31
fixed compilation on ubuntu with xapian 2018-07-31 18:09:11 +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
ecd45215c7
disallow empty file when loading shared file list in order to avoid malloc of size 0 2018-07-31 14:13:01 +02:00
csoler
1297d2e106
fixed double calls to pthread_exit() (one being implicit after return from main thread method) -- patch from sss 2018-07-30 10:50:32 +02:00
csoler
d7c7e35d71
fixed compilation on MacOS 2018-07-27 15:15:04 +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
Gioacchino Mazzurco
d2a62b03ee
Fix deep search returning 0 results 2018-07-25 00:29:36 +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
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
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