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
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
G10h4ck
56422a97b8
Merge pull request #1 from sehraf/jsonapi
...
add chat and fix compilation
2018-07-25 00:35:32 +02:00
Gioacchino Mazzurco
d2a62b03ee
Fix deep search returning 0 results
2018-07-25 00:29:36 +02:00
Gioacchino Mazzurco
b4dd89dd87
Fix deep search returning 0 results
2018-07-25 00:27:39 +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
sehraf
7af5075891
fix jsonapi.h
2018-07-24 20:59:20 +02:00
