Commit Graph

12555 Commits

Author SHA1 Message Date
csoler
37c515bcb5
patch from sss to fix deadlocks on forum fill thread. To be tested 2018-10-15 20:57:21 +02:00
csoler
ec8e8ebafa
fixed merging with upstream/master 2018-10-05 21:38:36 +02:00
csoler
dbd52c0c9c
fixed bug in previous commit 2018-10-05 17:01:54 +02:00
csoler
4de0498208
fixed bad signature checking code for config files 2018-10-05 16:54:36 +02:00
csoler
c6d0203557
added debug output to see which config files are loaded/saved 2018-10-04 19:22:49 +02:00
csoler
fb21e427be
removed saving of GxsTrans configuration in class destructor, causing lock up when quitting RS 2018-10-04 19:14:21 +02:00
csoler
6c4d1c34e3
fixed removal of "share on channel"/"share on forum" menu entries in own files 2018-10-04 18:50:11 +02:00
csoler
9c493453cc
Merge pull request #1358 from csoler/v0.6-ImprovedGUI
select GxsIds as default list to chose msg destination from
2018-10-03 15:28:37 +02:00
csoler
81fc3b7921
select GxsIds as default list to chose msg destination from 2018-10-03 15:25:53 +02:00
csoler
64f1d78670
Merge pull request #1357 from csoler/v0.6-ImprovedGUI
when replying to a msg, always select an ID to author the msg that wa…
2018-10-03 15:07:50 +02:00
csoler
83a987936d
when replying to a msg, always select an ID to author the msg that was in the destination list 2018-10-03 15:02:37 +02:00
csoler
79a8b2183f
Merge pull request #1353 from csoler/v0.6-FileLists
V0.6 file lists
2018-09-30 13:31:26 +02:00
csoler
3d0ad54f12
Merge pull request #1352 from PhenomRetroShare/Fix_Warnings
Fix warnings
2018-09-29 20:33:32 +02:00
csoler
0ef47e25c6
Merge pull request #1355 from Josep-San/GUI_Upload_Header_Context-Menu
Added context menu for Upload list headers to hide/show columns.
2018-09-29 20:30:31 +02:00
csoler
443dbdfbef
fixed small bug breaking display of flat mode in files 2018-09-29 19:04:23 +02:00
Josep-San
4578b4403a Added context menu for Upload list headers to hide/show columns. 2018-09-28 15:38:39 +02:00
csoler
752275f813
fixed various display bugs in extra file list 2018-09-27 22:14:00 +02:00
csoler
54ec49dc03
make extra shared file list appear only when non empty 2018-09-27 21:56:41 +02:00
csoler
e1698429de
fixed display of size 2018-09-27 21:46:00 +02:00
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