Commit Graph

6237 Commits

Author SHA1 Message Date
csoler
5eda5a5bcb
changed "lobby" into "chat room" in chat room info panel 2018-09-24 20:55:44 +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
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
csoler
59b3754771
fixed new position of pinned post, and forbid pinning up non top level posts 2018-09-06 10:47:05 +02:00
csoler
59887124ac
fixed transmission of pinned posts when a forum is edited 2018-09-06 10:17:50 +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
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
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
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
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
csoler
c294971633
Merge pull request #1289 from G10h4ck/jsonapi
Implement automatic JSON API generation
2018-08-28 19:11:08 +02:00
csoler
b5eabf7af7
improved banned files UI and fixed deadlock 2018-08-25 20:18:54 +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
sehraf
fe22465869
fix proxy indicators not being updated 2018-08-25 17:53:30 +02:00
Gioacchino Mazzurco
396fe49312
Merge branch 'master' into jsonapi 2018-08-22 16:59:42 +02:00
csoler
e5e566051b
added logic to compute ban list from friend nodes and own opinions 2018-08-19 21:11:17 +02:00
csoler
af7556610a
added option whether to trust friend nodes for banned files 2018-08-19 15:52:35 +02:00
csoler
a2804a70ec
added context menu and removal feature for banned files 2018-08-19 15:09:43 +02:00
csoler
a7ee85495d
added fill routine for banned files list 2018-08-16 23:18:29 +02:00
csoler
e17c4d0e40
added a dialog to edit banned files 2018-08-16 22:22:47 +02:00
csoler
50e03a539c
basic infrastructure for banning unwanted file content 2018-08-16 18:49:36 +02:00
csoler
65e3684c46
added missing update of selected admin ids list 2018-08-16 16:25:04 +02:00