G10h4ck
b2bbd66f66
Merge pull request #1328 from csoler/v0.6-FT
...
moved UI notification for turtle FT search results into ftServer, in …
2018-08-25 18:35:52 +02:00
G10h4ck
41f7235ed0
Merge pull request #2 from sehraf/pr_improve_json
...
Multiple fixes on json handling by sehraf
2018-08-25 18:05:56 +02:00
Gioacchino Mazzurco
c50405c070
Expose /rsFiles/turtleSearchRequest via JSON API
...
Expose new async C++ API RsFiles::turtleSearchRequest with callback
Modernize TurtleFileInfo serialization code keeping retrocompatibility
2018-08-25 17:58:04 +02:00
sehraf
9557a5246e
remove unnecessary locking, print log entries also to stdout
2018-08-25 17:54:34 +02:00
sehraf
fe22465869
fix proxy indicators not being updated
2018-08-25 17:53:30 +02:00
sehraf
c754435944
fix deserialisation and improve PRINT job
2018-08-25 17:10:01 +02:00
Gioacchino Mazzurco
a8b2532d3b
Fix warning #pragma once used in main file
...
Probably a copy paste error made during license cleanup
2018-08-25 17:04:42 +02:00
sehraf
588295e1e5
make RsGroupInfo serializable
2018-08-25 16:52:46 +02:00
sehraf
4d03b906b8
convert values properly to string
2018-08-25 16:51:49 +02:00
Gioacchino Mazzurco
31f0a42b86
Merge branch 'csoler/v0.6-FT' into jsonapi
...
Needed to exopse JSON API for file search
2018-08-25 16:14:42 +02:00
Gioacchino Mazzurco
b98246ee21
Fix location creation via JSON API
...
To complete location creation login is needed
2018-08-25 00:19:26 +02:00
csoler
8eebe53d75
moved UI notification for turtle FT search results into ftServer, in order to allow easier libresAPI calls
2018-08-24 16:12:05 +02:00
Gioacchino Mazzurco
afb92999d8
Enable JSON conversion for RsGxsImage via MemBlockProxy
2018-08-24 00:31:25 +02:00
Gioacchino Mazzurco
afeb408f7a
Expose more RsFiles via JSON API
...
FileInfo remove dead static members
2018-08-23 22:38:21 +02:00
Gioacchino Mazzurco
4d30d4f32b
Avoid cloning huge unused restbed openssl dependency
2018-08-23 15:47:01 +02:00
Gioacchino Mazzurco
18feb23c77
Suggest shallow submodules for jsonapi dependencies
2018-08-23 14:20:24 +02:00
Gioacchino Mazzurco
3b72f912e4
Improve API
...
Manually expose /rsFiles/getFileData to stream/preview files
Automatically expose a bunch of methods via JSON API
Implement serial_process for std::pair
2018-08-23 01:39:26 +02:00
csoler
3055897425
added filter in p3turtle against banned hashes in tunnel requests and search results
2018-08-22 21:57:56 +02:00
Gioacchino Mazzurco
ab6a5c07cc
RsLoginHelper::createLocation expose capability of creating hidden locations
2018-08-22 17:22:27 +02:00
Gioacchino Mazzurco
8f7bacbb35
Remove #pragma once in .cc file
...
It was probably introduced by copy paste error on license cleanup
2018-08-22 17:00:22 +02:00
Gioacchino Mazzurco
396fe49312
Merge branch 'master' into jsonapi
2018-08-22 16:59:42 +02:00
csoler
365464623a
added load/save of banned files and handling of banned files information from friends
2018-08-21 11:20:02 +02:00
csoler
0b176a0fe5
added sending of banned file info
2018-08-20 23:30:05 +02:00
csoler
e5e566051b
added logic to compute ban list from friend nodes and own opinions
2018-08-19 21:11:17 +02:00
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
Gioacchino Mazzurco
fe8c2c4683
Merge branch 'jsonapi' of github.com:G10h4ck/RetroShare into jsonapi
2018-08-16 23:51:35 +02:00
Gioacchino Mazzurco
4b6f751b09
Implement JSON API generation for async API calls
...
Move JSON helpers to util/rsjson.* for better usability
Implement JSON ostream manipulator to print compact and pretty JSON
Use lambdas for API wrappers, integrate better and avoid namespace
pollution
Removed experimental JSON API for notify client wrapper, notifications
can be implemented automatically with moderns async API calls
Implement and automatically expose to JSON API
RsGxsChannels::turtleSearchRequest(
const std::string& matchString,
const std::function<void (const RsGxsGroupSummary&)>& multiCallback,
std::time_t maxWait )
2018-08-16 23:48:21 +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
csoler
65e3684c46
added missing update of selected admin ids list
2018-08-16 16:25:04 +02:00
Gioacchino Mazzurco
b7f5d4286f
RsGxsNetService::receiveTurtleSearchResults fix deadlock
...
Avoid notifing observer while the mutex is locked by storing results in
a temporary set
2018-08-16 14:26:41 +02:00
csoler
a1a5b80779
fixed using moderator id to edit msg
2018-08-12 16:29:36 +02:00
csoler
5b1c150acb
added background for post pinning and logic to edit others posts
2018-08-12 15:30:07 +02:00
csoler
ded9c21617
added selection boxes to add forum moderators
2018-08-09 21:18:37 +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
146f920164
changed win32-x to appveyor
2018-08-03 21:21:53 +02:00
zapek
2848359f77
fixed webui files generation under MSYS2
2018-08-03 20:09:32 +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
