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,636 Commits 63 Branches 22 Tags 194 MiB
a30e2c3400
Commit Graph

12636 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
csoler
2610f62e41
fixed display of temporary shared file text 2018-09-27 21:42:21 +02:00
csoler
c77a28c17a
added proper notification when removing an extra file 2018-09-27 21:20:06 +02:00
csoler
7ab7c7db93
added possibility to remove extra shared file 2018-09-27 16:53:08 +02:00
csoler
1383846364
added extra list view in own files. 2018-09-27 13:42:49 +02:00
Phenom
a6e3273ecb Fix qmake double use_libretroshare.pri 2018-09-26 18:05:28 +02:00
Phenom
aec68c2269 Fix qmake double using retroshare.pri 
From 544b4af4c2
 2018-09-26 17:55:58 +02:00
Phenom
590edb72f4 Fix qmake warnings: 
Makefile.retroshare-gui:7593: warning: overriding recipe for target
'temp/moc/moc_TorProcess_p.cpp'
Makefile.retroshare-gui:7572: warning: ignoring old recipe for target
'temp/moc/moc_TorProcess_p.cpp'
 2018-09-26 17:44:32 +02:00
Phenom
f420bb4644 Fix qmake warnings: 
Makefile.libretroshare:3811: warning: overriding recipe for target
'temp/linux-g++/obj/hashstream.o'
Makefile.libretroshare:3772: warning: ignoring old recipe for target
'temp/linux-g++/obj/hashstream.o'
 2018-09-26 17:36:33 +02:00
Gioacchino Mazzurco
359e11433b
jsonapi-generator add missing include 2018-09-25 20:09:06 +02:00
G10h4ck
f09bef2ac8
Merge pull request #1349 from G10h4ck/jsonapi 
Implement JSON API HTTP Basic authentication
 2018-09-25 18:10:16 +02:00
Gioacchino Mazzurco
95e0fd338f
JsonApiServer::isAuthTokenValid avoid timing attack 
Thanks Cyril for review :)
 2018-09-25 17:27:54 +02:00
csoler
1e32c1db00
Merge pull request #1346 from csoler/v0.6-ImprovedGUI 
V0.6 improved gui
 2018-09-24 21:03:01 +02:00
csoler
57577472fc
added tooltip to show identity ID in distant chat dialog 2018-09-24 20:55:44 +02:00
csoler
5eda5a5bcb
changed "lobby" into "chat room" in chat room info panel 2018-09-24 20:55:44 +02:00
Gioacchino Mazzurco
ccabf82e60
retroshare-gui now handle JsonApiServer too 2018-09-21 19:01:32 +02:00
G10h4ck
d26912ebd3
Merge pull request #1350 from zapek/jsonapi_windows_fix 
fixed JSONAPI build for Windows
 2018-09-21 12:26:50 +02:00
Gioacchino Mazzurco
1c7f02655e
Fix crash at startup if jsonapi not enabled 2018-09-21 01:40:26 +02:00
Gioacchino Mazzurco
bf98166197
RsServer fix crash on stop if shutdown callback not set 2018-09-21 01:39:48 +02:00
zapek
dc926d30c8 links with wsock32 only if the jsonapi is built 2018-09-20 23:29:36 +02:00
zapek
458a8b0878 fixed JSONAPI build for Windows 2018-09-20 22:24:05 +02:00
G10h4ck
5a63030d79
Merge pull request #1348 from zapek/windows_compilation_fix 
fixed compilation on Windows/MSYS2
 2018-09-20 12:39:02 +02:00
zapek
8f88a92900 added some comments to explain the issue 2018-09-20 10:48:46 +02:00
Gioacchino Mazzurco
add97dede0
p3face include jsonapi.h only if enabled 2018-09-19 22:02:07 +02:00
Gioacchino Mazzurco
eb77f921ec
Implement JSON API HTTP Basic authentication 
jsonapi-generator is now capable of generating API for headers outside
  retroshare/ directory
jsonapi-generator do a bit of methods parameter sanity check
JsonApiServer is now integrated in the rsinit hell like other services
Add *::exportGPGKeyPairToString to a bunch of classes in cascade
RsControl is now capable of calling back a function when retroshare is almost
  completely stopped, this is useful when running retroshare toghether with
  externally managed runloop such as QCoreApplication
Expose a bunch of methods through JSON API
retroshare-nogui remove some dead code and fix stopping from the RetroShare API
 2018-09-19 21:28:26 +02:00
zapek
ab80999ca1 fixed compilation on Windows/MSYS2 2018-09-19 15:51:09 +02:00
csoler
9a09e209ea
added context menu entry to only show current IPs instead of all known IPs 2018-09-18 22:02:18 +02:00
csoler
3c61190b4f
fixed context menu in Home->cert 2018-09-18 21:20:55 +02:00
csoler
f2514d13e2
added tooltip for certificates in Home 2018-09-17 23:03:11 +02:00
G10h4ck
ac9350d375
Merge pull request #1339 from sehraf/pr_remove-add-peer-open-code 
Remove douplicated code
 2018-09-15 22:23:35 +02:00
Gioacchino Mazzurco
43bc80de8e
JSON API export version extra too 2018-09-15 21:53:46 +02:00
Gioacchino Mazzurco
cd03953b1a
Provide meaningful devault value in rsversion.h 2018-09-15 21:07:03 +02:00
Gioacchino Mazzurco
4f4e2d2bbb
More robust automatic version determination 
Should work also with older qmake that miss take_first function
 2018-09-15 20:57:28 +02:00
G10h4ck
dde9acb40a
Merge pull request #1343 from hunbernd/fix/deprecatedversinioningscript 
Warn builders about the deprecated version_detail script instead of running it
 2018-09-15 19:44:25 +02:00
hunbernd
05537d89cb Added warning instead of running the version_detail script 2018-09-15 18:27:15 +02:00
G10h4ck
eece958aa0
Merge pull request #1340 from sehraf/pr_remove-obsolete-version-scripts 
remove obsolete version scripts
 2018-09-15 17:59:09 +02:00
csoler
0917dc2538
Merge pull request #1342 from sehraf/pr_add-TLSv1.3 
simplify TLS cipher display
 2018-09-15 14:42:17 +02:00
sehraf
0b6644cd55
get rid of unused variables 2018-09-15 14:38:57 +02:00
sehraf
1e85b05f09
get rid of cipher_version variable. use plain output from openssl 2018-09-15 14:37:40 +02:00
csoler
3c19a3929d
Merge pull request #1338 from sehraf/pr_add-TLSv1.3 
Add support for displaying TLSv1.3
 2018-09-14 22:15:31 +02:00
sehraf
9289586908
remove unused variable 2018-09-14 17:05:57 +02:00
sehraf
1faaf91ebe
G10h4ck said that there are obsolete since #1336 and should not be used anymore. 2018-09-14 17:01:52 +02:00
sehraf
dd36f81038
@G10h4ck reimplemented the code to add a peer with location and IPs in acceptInvite(). 
Remove the redundant code and use the new function for importFriendlist().

This was not tested - i use the same code in SyncFriends plugin and tested it there.
 2018-09-14 16:58:18 +02:00
sehraf
7ce2bef37b
add support for displaying TLSv1.3 2018-09-14 16:27:50 +02:00
G10h4ck
7784660d67
Merge pull request #1337 from G10h4ck/jsonapi 
Make JSON API accessible via HTTP GET method
 2018-09-14 13:25:42 +02:00
G10h4ck
d1804b480d
Merge pull request #1336 from G10h4ck/rs_version 
Clean up the mess with RetroShare version
 2018-09-14 13:24:14 +02:00
Gioacchino Mazzurco
d676ba3937
retroshare-nogui print message if JSON API is active 2018-09-13 01:46:55 +02:00
Gioacchino Mazzurco
148e46346d
JSON API accessible via HTTP GET method 
This is useful in cases where the client cannot use POST method.
/jsonApiServer/shutdown now reply before shutting down the core.
 2018-09-12 23:40:34 +02:00
Gioacchino Mazzurco
3d476f689f
Travis CI increase clone depth to get some tag for git describe 2018-09-12 20:06:52 +02:00
Gioacchino Mazzurco
4a43c254f9
appveyor increase clone depth to get some tag for git describe 2018-09-12 12:20:29 +02:00
Gioacchino Mazzurco
828ff0f308
Fix some compilation error on Windows 2018-09-12 12:20:29 +02:00