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,735 Commits 63 Branches 22 Tags 194 MiB
9d49ca0e4c
Commit Graph

6301 Commits

Author SHA1 Message Date
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
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
csoler
a1a5b80779
fixed using moderator id to edit msg 2018-08-12 16:29:36 +02:00
csoler
5b1c150acb
added background for post pinning and logic to edit others posts 2018-08-12 15:30:07 +02:00
csoler
ded9c21617
added selection boxes to add forum moderators 2018-08-09 21:18:37 +02:00
csoler
93ab975b72
reverted commit 5925aa06fe by request from Phenom 2018-08-06 22:59:37 +02:00
csoler
4a961a8762
Merge pull request #1310 from PhenomRetroShare/Fix_DisableCMarkButton 
Disable CMark Button on ChatWidget if not defined.
 2018-08-03 18:32:59 +02:00
csoler
77d5dfe18d
Merge pull request #1311 from sehraf/pr_improve_service_id 
Add wrapper function to convert uint16_t service IDs to internal unsi…
 2018-08-01 20:48:55 +02:00
sehraf
97194fd092
Add wrapper function to convert uint16_t service IDs to internal unsigned int. 
Use it when looking up service names.
 2018-08-01 20:47:02 +02:00
csoler
50867d2503
fixed clicking on external url in MessageWidget 2018-08-01 20:31:48 +02:00
Phenom
5f66a45a15 Disable CMark Button on ChatWidget if not defined. 2018-08-01 18:40:40 +02:00
csoler
c948517c3d
Merge pull request #1306 from csoler/v0.6-TorOnly 
V0.6 tor only
 2018-07-31 14:18:24 +02:00
csoler
cc1a05ddc9
fixed certificate creation in TorAuto mode 2018-07-27 12:33:06 +02:00
csoler
22bc40e3cc
udated GenCertDialog with new layout 2018-07-26 19:25:30 +02:00
csoler
74ec558c45
reworked GenCertDialog with node type on top level 2018-07-26 09:39:26 +02:00
csoler
62b9a74324
fixed running with TorControl in new mode 2018-07-25 15:31:18 +02:00
csoler
d1a375cbd0
removed RETROTOR #ifdef and started using RsAccounts::isTorAuto() instead. Unfinished yet. 2018-07-25 11:37:40 +02:00
csoler
0f758902cd
started cleaning the mess with rsAccounts: only exposed useful functionality of rsAccount beyond a static class and removed all references to rsAccounts in the code 2018-07-24 23:47:32 +02:00
csoler
f6ca7b2a07
disabled compilation of cmark until it gets fixed 2018-07-24 20:59:20 +02:00
csoler
a21c2724f5
disabled compilation of cmark until it gets fixed 2018-07-24 20:59:20 +02:00
thunder2
b85359d60a Added missing include to TurtleRouterDialog.cpp 2018-07-24 14:26:17 +02:00
csoler
e2bb3aef1b
disabled compilation of cmark until it gets fixed 2018-07-23 17:20:57 +02:00
csoler
3272ee0719
disabled compilation of cmark until it gets fixed 2018-07-23 17:20:13 +02:00
Gioacchino Mazzurco
130007b578
Merge branch 'master' into jsonapi 2018-07-23 13:44:01 +02:00
G10h4ck
fbc4e4205d
Merge pull request #1292 from G10h4ck/deep_search 
Content search for channels trough xapian
 2018-07-23 11:48:55 +02:00
csoler
08cf225fff
Merge pull request #1301 from PhenomRetroShare/Fix_RemoveSearchLineInFriendSelectionWidget 
Remove unneeded Search: text in FriendSelectionWidget.ui
 2018-07-23 09:44:29 +02:00
Gioacchino Mazzurco
f97dc8a125
Properly plug deep search in GXS search 
Some modifications breaks retrocompatibility of GXS search:
  remove horrible templated RsTypeSerializer::serial_process for
    RsGxsGroupSummary with hardcoded member names
  RsGxsGroupSummary doesn't use old TLV serialization format anymore
  RsGxsGroupSummary remove unused description member
  RsGxsGroupSummary derive from RsSerializable and use serialization
    helper macro
Add autor id and signature flags to the index so there is no need to
  retrive them from GXS, thus improving performances
RsGroupNetworkStats initialize members properly
RsGxsGroupSummary rename members to follow usual mMemberName convention
 2018-07-22 21:33:40 +02:00
Phenom
d03ee1c0b0 Add CommonMark in ChatLobbyDialog 2018-07-22 10:32:17 +02:00
csoler
b8062f2e21
Merge pull request #1294 from csoler/v0.6-GXS-DistSync3-TurtleSearch 
V0.6 gxs dist sync3 turtle search
 2018-07-19 22:59:43 +02:00
csoler
dac885e24d
made randomBias initilized with true random bytes at start 2018-07-18 21:22:38 +02:00
csoler
b9436fbef2
fixed leading zeroes problem in title bar 2018-07-17 10:08:39 +02:00
csoler
a52c94d23c
improved display of encryption master key 2018-07-15 19:15:05 +02:00
csoler
1de31493a9
fixed up display of GXS net tunnel info 2018-07-15 19:09:12 +02:00
Phenom
aaea97d06f Remove unneeded Search: text in FriendSelectionWidget.ui 2018-07-15 16:53:52 +02:00
Phenom
820841668e Change Lobby text to Room in CreateLobbyDialog. 2018-07-15 16:37:33 +02:00
csoler
cca986ad75
added more info to tunnel display 2018-07-15 15:07:24 +02:00
csoler
34e924f99b
added visualisation for GXS net tunnels (unfinished) 2018-07-15 14:40:50 +02:00
csoler
b20bd0a454
added admin list to forum group data 2018-07-15 10:13:04 +02:00