Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity
12,705 Commits 63 Branches 22 Tags 194 MiB
c4ae4c21b1
Commit Graph

12705 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
csoler
4a309b827a
fixed compilation with libressl2.7 (patch from sss, modified) 2018-09-05 21:00:34 +02:00
Gioacchino Mazzurco
aa03cc00d3
Temporarily disable qmake step on Travis CI OS X 2018-09-05 12:57:13 +02:00
Gioacchino Mazzurco
72d220b2c6
Merge branch 'master' into jsonapi 2018-09-05 00:18:07 +02:00
Gioacchino Mazzurco
7787f9d62f
Merge branch 'master' into jsonapi 2018-09-05 00:17:21 +02:00
Gioacchino Mazzurco
a194e4cf56
Make JSON API server bind address configurable 
Enforce it being 127.0.0.1 by default, I assumed 127.0.0.1 was restbed
default, but as reported by sehraf is not alwayd the case

JSON API bind address now is also configurable via commandline on
retroshare-android-service and retroshare-nogui, while it obey the
configuration of webui (execept for that port is incremented by 2)
in retroshare-gui
 2018-09-05 00:08:56 +02:00
csoler
703d709624
updated ubuntu changelog 2018-09-04 20:53:52 +02:00
csoler
1392c7c6fe
prevent editing of pinned posts 2018-09-04 20:21:42 +02:00
csoler
d856566c69
added comment in the post sorting code 2018-09-03 22:02:32 +02:00
csoler
69c6860d8d
removed debug output 2018-09-03 21:58:31 +02:00
csoler
37b53033db
fixed sorting with pinned posts 2018-09-03 21:55:26 +02:00
Gioacchino Mazzurco
68e130a1fd
Temporarily disable Travis CI Mac OS X build 
After Travis CI upgraded to Mac OS X 10.13 the build is broken due to
errors with missin symbols in <cmath> inclusion, we haven't been able
to figure out how to fix those error, so to avoid false broken CI on
pull request Tavis CI build for Mac OS X is disabled until someone
figure aout how to fix those errors.
 2018-09-03 15:12:23 +02:00
csoler
59535eac8a
added a flag for moderating messages to help removign them when the author is not a moderator anymore 2018-09-02 17:07:40 +02:00
csoler
e7d721b3de
ensure pinned posts always stay grouped together 2018-09-01 18:40:28 +02:00
Gioacchino Mazzurco
4acbf775a5
retroshare-android-service can be built without libresapi 2018-09-01 16:16:15 +02:00
Gioacchino Mazzurco
7f74313552
JSON API close restbed session before shutting down 2018-09-01 15:54:11 +02:00
Gioacchino Mazzurco
7a37c11e47
Prevent crash calling uninitialized service via JSON API 2018-09-01 15:29:09 +02:00
Gioacchino Mazzurco
cc6f0b1f05
Expose RsPeers JSON API 
Added also new method for better usability via the API that allow to add
  friend directly for RetroShare invitation (supports also URL) without
  having to call to mulptiple metods to set IP etc.
  RsPeers::acceptInvite
  /rsPeers/acceptInvite
 2018-08-30 21:45:51 +02:00
Gioacchino Mazzurco
a8ddec03fc
Expose more login related JSON API 
/rsLoginHelper/isLoggedIn to check if already logged in
/rsAccounts/getCurrentAccountId to get the id of current selected
  account, beware that an account may be selected without actually logging in
 2018-08-30 19:09:50 +02:00
Gioacchino Mazzurco
a9b1a15b43
jsonapi-generator handle multiple services per file 
Before this commit jsonapi-generator was able to parse only one service
instance pointer per file, so only the first one got exposed now it
handle also files where more then one service instance pointer is
declared
 2018-08-30 19:02:50 +02:00
csoler
5c2f714ada
merged with upstream/master 2018-08-30 14:50:16 +02:00
csoler
380ebf2a5c
added UI to pin up posts 2018-08-30 14:07:14 +02:00
csoler
e5f65e950c
added login to pin up posts 2018-08-30 11:48:37 +02:00
csoler
e12c17c6f0
added show of moderators in forum details 2018-08-30 11:08:49 +02:00
csoler
4c076b60aa
added proper initializing of existing moderators 2018-08-30 10:54:52 +02:00
csoler
910aea77af
Merge pull request #1325 from csoler/v0.6-ContentFiltering 
V0.6 content filtering
 2018-08-29 22:10:58 +02:00
csoler
65304a301a
added last relay (a.k.a which direct friend) of search results in sources column 2018-08-28 23:57:16 +02:00
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