Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-15 10:54:22 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity
12,632 Commits 63 Branches 22 Tags 195 MiB
395cf57ece
Commit Graph

12632 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
csoler
395cf57ece
merged upstream/master 2018-10-20 14:48:11 +02:00
csoler
cfe95a57a0
Merge pull request #1377 from G10h4ck/jsonapi 
GXS deep search notify results also of already known groups
 2018-10-20 14:47:37 +02:00
csoler
9e632ce995
Merge pull request #1375 from csoler/v0.6-GxsFix2 
created a connexion between token and meta data of created posts and …
 2018-10-20 14:42:58 +02:00
csoler
ff92b36aa6
Merge pull request #7 from G10h4ck/csoler-v0.6-GxsFix2 
Fix compilation with deep search and remove dead code
 2018-10-20 14:14:44 +02:00
Gioacchino Mazzurco
2d497d7303
Fix compilation with deep search and rm dead code 2018-10-20 14:07:39 +02:00
Gioacchino Mazzurco
aca29e3ea7
Merge branch 'v0.6-GxsFix2' of https://github.com/csoler/RetroShare into csoler-v0.6-GxsFix2 2018-10-20 13:51:11 +02:00
csoler
b5dbdcb601
fixed compilation of web UI files on linux 2018-10-20 13:51:01 +02:00
Gioacchino Mazzurco
5699d81ae7
GXS deep search notify results also of known groups 2018-10-20 13:48:16 +02:00
csoler
abcd687416
Merge pull request #1374 from csoler/v0.6-ImprovedGUI 
patch from sss to fix deadlocks on forum fill thread. To be tested
 2018-10-19 22:05:29 +02:00
G10h4ck
450ed27b17
Merge pull request #1376 from G10h4ck/jsonapi 
JSON API authorize token in createLocation
 2018-10-19 16:36:11 +02:00
Gioacchino Mazzurco
9e2c4ce49e
JSON API authorize token in createLocation 
Solve uncoherent 401 behaviour at first use without login
 2018-10-19 15:10:15 +02:00
Gioacchino Mazzurco
945775e9f5
Fix deep search compiling on 32bit time_t targets 2018-10-18 04:27:30 +02:00
csoler
9b4c48c540
created a connexion between token and meta data of created posts and grps 2018-10-16 22:40:27 +02:00
csoler
21a92d69b4
merged upstream/master 2018-10-16 20:51:10 +02:00
Gioacchino Mazzurco
2bb24075c4
Print warning also when serializing negative rstime_t 2018-10-16 16:19:23 +02:00
G10h4ck
03cdd6c7b6
Merge pull request #1363 from G10h4ck/jsonapi 
New cross-platform target retroshare-service
 2018-10-16 16:06:09 +02:00
csoler
37c515bcb5
patch from sss to fix deadlocks on forum fill thread. To be tested 2018-10-15 20:57:21 +02:00
thunder2
617ed25a19 Modified Windows Build Environment 
- Removed commandline switch "version"
- Added MinGit for determining version information during compile process
- Added sigcheck to determine version of the executable
 2018-10-14 17:47:31 +02:00
thunder2
c7563f1efd Fixed Windows compile with MSYS2 2018-10-14 15:28:41 +02:00
thunder2
6e1de5b5ed Fixed Windows compile with MinGW 2018-10-14 15:28:20 +02:00
csoler
fae02741d4
Merge pull request #1370 from sehraf/pr_remove-debug-output 
remove debug output
 2018-10-14 15:00:09 +02:00
csoler
bbf855fefb
Merge pull request #1371 from csoler/v0.6-BugFixing 
fixed bug in recent commit that broke turtle generic search
 2018-10-13 23:00:29 +02:00
csoler
74022a5e10
fixed bug in recent commit that broke turtle generic search 2018-10-13 22:59:26 +02:00
Gioacchino Mazzurco
15b729b35c
Fix crash in p3Peers::loadCertificateFromString 
This function is part of the public API so it must be safe to call with
any input, before this commit if would crash if feeded with a broken or
empty certificate radix string.
 2018-10-12 22:28:44 +02:00
csoler
9c90b32def
fixed dangerous memcpy in RsTurtleGenericSearchResultItem::clone() function 2018-10-12 22:19:07 +02:00
sehraf
e6febe0297
remove debug output 2018-10-12 18:20:55 +02:00
Gioacchino Mazzurco
fc14300b06
Re-add ftServer::requestDirDetails implementation 
The implementation has disappeared merging master causing linking error
 2018-10-10 23:43:01 +02:00
Gioacchino Mazzurco
b3d73ba6a5
Suppress aliasing warning in DirDetails and DirStub 
Order of serialization doesn't matter ATM as we use those only for
  JSON API.
Those classes should be rewritten anyway with proper naming of the
  memebers and using std::uintptr_t instead of void* and rstime_t for
  timestamps
 2018-10-10 23:32:32 +02:00
G10h4ck
047ae7f723
Merge branch 'master' into jsonapi 2018-10-10 22:23:28 +02:00
csoler
18eee374f1
Merge pull request #1361 from sehraf/pr_jsonfy-rsMsg 
[jsonapi] add most remaining functions of rsMsg
 2018-10-10 22:04:32 +02:00
csoler
09b109d522
Merge pull request #1364 from G10h4ck/safer_time 
Use safer rstime_t instead of time_t
 2018-10-10 22:03:51 +02:00
Gioacchino Mazzurco
a47eec14e4
Print a warning if deserialized rstime_t is negative 2018-10-10 21:54:50 +02:00
Gioacchino Mazzurco
321fc8a8d4
Implement mostly decent JSON API for channels and post creation 
Now the possible id of the cannel/post is returned and channel/post is
indexed on creation without having to wait for gxsutil scan to happen

Note that the id is correct in normal usage, but if one try to overload
the API per eventually get the id of another channel/post with same data
but created by a different call, it is not dangerous so one trying to
overload the API is just getting a possibly wrong but equivalent
channel/post id returned.
 2018-10-10 06:40:56 +02:00
Gioacchino Mazzurco
c05c376351
Expose /rsFiles/requestDirDetails via JSON API 
This method is useful to browse own shared directries, or directries
shared by friends whith browseable permission
 2018-10-09 22:58:17 +02:00
Gioacchino Mazzurco
2139090f5d
Fix bug in JSON t_RsFlags32 deserialization 
If the member was not present in the JSON it was zeroed while it should
be left untouched in that case.
This was discovered because in JSON API defualt argument value for
methods wasn't onored for t_RsFlags32 arguments.
 2018-10-09 22:43:15 +02:00
Gioacchino Mazzurco
205743e0ff
retroshare-service add missing doxygen dependency on OBS 2018-10-09 18:14:23 +02:00
Gioacchino Mazzurco
74129f670a
jsonwrappersincl target always fails if doxygen fail 2018-10-09 18:06:21 +02:00
Gioacchino Mazzurco
7798e50123
Expose JSON API for ForceDirectoryCheck 2018-10-09 11:34:57 +02:00
Gioacchino Mazzurco
406822b5ec
Expose JSON API for file filtering 2018-10-09 11:34:56 +02:00
Gioacchino Mazzurco
2556af692e
Add OBS packaging recipes for retroshare-service 2018-10-08 23:56:05 +02:00
Gioacchino Mazzurco
a89c29030a
Add missing rstime include in jsonapi 2018-10-08 11:56:47 +02:00
G10h4ck
b8af13f0b7
Merge pull request #3 from hunbernd/fix/win64 
Fix building error about losing precision on Win x64
 2018-10-07 22:29:42 +02:00
hunbernd
b7d5944b9c Fix building error about losing precision on Win x64 2018-10-07 21:53:16 +02:00
Gioacchino Mazzurco
6db23267c3
retroshare-gui fix windows compilation error due to time_t usage 2018-10-07 15:51:02 +02:00
Gioacchino Mazzurco
72d8364370
libresapi fix compile error on windows due to time_t usage 2018-10-07 14:41:14 +02:00
Gioacchino Mazzurco
ddf3164545
Fix ctime(&rstime_t) error on windows 
rstime_t not neccesary in those cases so use plain time_t instead
 2018-10-07 14:41:13 +02:00
Gioacchino Mazzurco
77d938bf52
Remove _USE_32BIT_TIME_T windows define 
Why did we added it in first place?
 2018-10-07 13:07:22 +02:00
Gioacchino Mazzurco
329050a9c2
Use safer rstime_t instead of time_t 
Avoid problems to serialization on different platforms, without breaking
nested STL containers serialization.

The conversion have been made with sed, and checked with grep, plus
kdiff3 visual ispection, plus rutime tests, so it should be fine.
 2018-10-07 13:07:06 +02:00
sehraf
137bd9cd6d
jsonapi: fix nested std types 2018-10-06 23:50:29 +02:00
Gioacchino Mazzurco
f5158b3a9f
Allow CORS in JsonApiServer 2018-10-06 18:57:14 +02:00