Commit Graph

6267 Commits

Author SHA1 Message Date
csoler
21a92d69b4
merged upstream/master 2018-10-16 20:51:10 +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
c7563f1efd Fixed Windows compile with MSYS2 2018-10-14 15:28:41 +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
Gioacchino Mazzurco
406822b5ec
Expose JSON API for file filtering 2018-10-09 11:34:56 +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
c6ca3c5669
Fix compilation due to RsPeers::GetRetroshareInvite 2018-10-06 02:46:09 +02:00
sehraf
150af40e09
jsonapi: convert and add getMessageCount 2018-10-04 22:43:12 +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
81fc3b7921
select GxsIds as default list to chose msg destination from 2018-10-03 15:25:53 +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
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
2610f62e41
fixed display of temporary shared file text 2018-09-27 21:42:21 +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
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
G10h4ck
f09bef2ac8
Merge pull request #1349 from G10h4ck/jsonapi
Implement JSON API HTTP Basic authentication
2018-09-25 18:10:16 +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
zapek
8f88a92900 added some comments to explain the issue 2018-09-20 10:48:46 +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
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
sehraf
1e85b05f09
get rid of cipher_version variable. use plain output from openssl 2018-09-15 14:37:40 +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
Gioacchino Mazzurco
828ff0f308
Fix some compilation error on Windows 2018-09-12 12:20:29 +02:00
Gioacchino Mazzurco
92f90178c4
RS version is now parametrizable at compile time
Avoid the need of dirty patching to set the version at build time
In case RS version is not passed as argument attempt to determine it
  using git describe, if unavailable use hardcoded default
2018-09-12 10:49:36 +02:00
csoler
b138263878
Merge pull request #1323 from csoler/v0.6-ForumAdmin
V0.6 forum admin
2018-09-11 15:17:33 +02:00
csoler
428c2670fc
fixed sorting for posts with children using a more appropriate flag for pinned posts 2018-09-10 20:29:48 +02:00
G10h4ck
cb83abf932
Merge pull request #1335 from sehraf/pr_jsonfy
Make more APIs jsonapi compatible
2018-09-10 00:29:07 +02:00
csoler
06fdaa403c
fixed sorting of pinned posts in "Lastest post in thread" mode 2018-09-09 09:55:34 +02:00
sehraf
f34d021387
make rs use the new function 2018-09-08 08:57:07 +02:00
csoler
76d16f61ef
fixed crash when no item to unban is actually selected in Banned files list 2018-09-06 22:14:17 +02:00
csoler
e01cf95ddf
fixed display of 1 chunk transfers 2018-09-06 11:46:04 +02:00