csoler
c9b30f5a72
fixed merged with upstream/master
2018-08-28 23:42:24 +02:00
csoler
b09eb57e94
fixed small bug in deletion of banned file
2018-08-28 23:16:35 +02:00
G10h4ck
2be556c767
Merge pull request #1318 from zapek/msys2_build_fix
...
fixed webui files generation under MSYS2
2018-08-28 19:55:36 +02:00
csoler
c294971633
Merge pull request #1289 from G10h4ck/jsonapi
...
Implement automatic JSON API generation
2018-08-28 19:11:08 +02:00
Gioacchino Mazzurco
dd55ddea95
Add more consistency checks to serialization code
...
As suggested by Cyril
2018-08-28 15:20:41 +02:00
Gioacchino Mazzurco
3094146c13
RsLoginHelper::attemptLogin clear cached passphrase after usage
...
Thanks Cyril for suggestion
2018-08-28 14:35:29 +02:00
Gioacchino Mazzurco
4bc6919ba9
Friendly android-service build error if wrong compile options
2018-08-28 14:33:52 +02:00
Gioacchino Mazzurco
75e882bb9f
Make NotifyClient class again
2018-08-28 14:12:09 +02:00
Gioacchino Mazzurco
40c2a8e469
Improve JSON API documentation following Cyril suggestion
2018-08-28 14:05:02 +02:00
csoler
5f18d26738
removed unused member depth from search results to avoid confusion while ensureing backward compatibility is kept
2018-08-27 23:36:21 +02:00
csoler
fd25f8336e
Merge pull request #1329 from sehraf/pr_small-fixes
...
small fixes
2018-08-27 10:56:29 +02:00
Gioacchino Mazzurco
1dfe64443f
Improve documentation
2018-08-26 11:39:26 +02:00
Gioacchino Mazzurco
45306910d4
Update Appveyod build badge
2018-08-25 23:31:16 +02:00
Gioacchino Mazzurco
8fd903ac90
Improve JSON API documentation
2018-08-25 22:36:47 +02:00
Gioacchino Mazzurco
e878ba99b2
Add support for default parameters value in jsonapi-generator
2018-08-25 22:24:49 +02:00
csoler
2fab33d37f
fixed a few bugs in ban file list management
2018-08-25 20:52:06 +02:00
csoler
b5eabf7af7
improved banned files UI and fixed deadlock
2018-08-25 20:18:54 +02:00
Gioacchino Mazzurco
85c3332fae
Add JSON API support to retroshare-nogui
2018-08-25 19:13:34 +02:00
csoler
c14d898901
added some debug info to file control system and fixes a problem with sending TS
2018-08-25 18:44:29 +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
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
