Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-16 03:14:31 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity
12,643 Commits 63 Branches 22 Tags 195 MiB
3c6dd1af1c
Commit Graph

6270 Commits

Author SHA1 Message Date
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
csoler
80f4907d66
Merge pull request #1227 from RetroPooh/openlocal 
bring back open local file on link click
 2018-07-10 11:20:43 +02:00
G10h4ck
4b6fd5d944
Merge pull request #1296 from chelovechishko/namespaces 
fix ODR violations caused by same names for different things
 2018-07-09 10:55:07 +02:00
csoler
93aa5442a5
Merge pull request #1293 from chelovechishko/chalod 
several fixes to chat gui
 2018-07-08 16:58:56 +02:00
chelovechishko
b3dddeafdf add missing namespaces 2018-07-06 23:55:12 +09:00
csoler
0c45217fc0
merged upstream/master 2018-07-05 17:41:30 +02:00
csoler
4a64ea5f1f
added optional use of dist sync in GroupFrameDialog 2018-07-05 14:00:04 +02:00
csoler
0e37de3e11
made retrieval of group data manual instead of automatic 2018-07-05 11:43:55 +02:00
csoler
47e760a2c5
added a few missing mutexes in prevent searches to be shown when already known 2018-07-05 10:11:12 +02:00
csoler
2067b106e4
fixed missing code in passing turtle group data result to client service 2018-07-04 23:54:26 +02:00
csoler
8ad454723a
added group data request when search items are selected 2018-07-04 21:42:09 +02:00
chelovechishko
74075fdded gui: do not show the quote section of context menu in chat if 
no text selected
 2018-07-04 23:18:21 +09:00
chelovechishko
b3fb7abf99 gui: reduce size of icons in chat for font.height lesser than 26 2018-07-04 22:46:01 +09:00
chelovechishko
77c3eae976 gui: check for show "is typing" before time call 2018-07-04 00:34:45 +09:00
chelovechishko
b950e12bcf gui: disable quote option if no text is selected in chat 2018-07-04 00:19:36 +09:00
chelovechishko
5925aa06fe gui: anchor not only first word of nickname, if any 2018-07-03 23:33:29 +09:00
chelovechishko
4eb060e154 gui: do not attempt to create context menu if idlist is empty 
...and other side effects
 2018-07-02 21:19:57 +09:00
Gioacchino Mazzurco
1dd707710b
Merge branch 'master' into extra_locators_merge 2018-07-02 12:22:23 +02:00
cyril soler
1b2b3113ca fixed previous commit caused by an apparent bug in qtcreator when updating code 2018-07-02 10:21:38 +02:00
cyril soler
e6db04e2b5 cancelled previous commit, because it sort of breaks the update of forum lists. 2018-07-02 09:45:17 +02:00
cyril soler
abc5b840d2 added queuedConnection type in fillDisplay() between RsGxsBroadcastWidget and RsGxsBroadCastBase. 2018-07-02 09:36:28 +02:00
csoler
a6edf47e00
removed debug/experimental channel search from files tab 2018-06-26 22:25:06 +02:00
csoler
00dfa0f3c2
added fallback for GXS GroupMessage UI to look into cached distant group data 2018-06-26 22:20:02 +02:00
Gioacchino Mazzurco
cb11ad92ea
Merge branch 'master' into jsonapi 2018-06-26 15:19:25 +02:00
Gioacchino Mazzurco
502459a25a
Cleanup rapidjson inclusion 
Fix compilation error of android service
 2018-06-26 15:12:16 +02:00
Gioacchino Mazzurco
15f39129f1
Complete GxsChannels JSON API with blocking methods 
RsGxsIfaceHelper::requestStatus expose it to JSON API
Implemented RsGxsIfaceHelper::waitToken to wait for GXS operations
RsItem::serial_process fix doxygen warning as it's a comment not documentation
RsTypeSerializer add JSON conversion methods for double [de]serialization not
	implemented yet
RsTypeSerializer_PRIVATE_{FROM,TO}_JSON_ARRAY fix doxygen warning as it's a
	comment not documentation
make GxsChannels::ExtraFileHash a bit more reasonable
jsonapi-generator fix unused variable warning if there is no input or output
	paramethers
jsonapi-generator fix generation for inerithed jsonapi methods
Convert to RsSerializable some Gxs structs for the JSON API
 2018-06-26 13:20:24 +02:00
csoler
a5d1a154a4
remove channel/posted/forum info when no group is selected 2018-06-25 23:08:10 +02:00
csoler
08b436e5f4
added display of searched groups 2018-06-24 23:15:22 +02:00
Gioacchino Mazzurco
b4d2ce82c1
RsTokenService use enum for request status 2018-06-24 18:56:48 +02:00
csoler
e351d7257e
added retrieval of search results in UI 2018-06-24 16:55:38 +02:00
Gioacchino Mazzurco
7ad337c8d2
Implement automatic JSON API generation 
qmake file add jsonapi-generator target to compile JSON API generator
qmake files add rs_jsonapi CONFIG option to enable/disable JSON API at compile
  time
RsTypeSerializer pass down same serialization flags when creating new context
  for nested objects serial job
RsGxsChannels expose a few methods through JSON API as example
Derive a few GXS types (RsGxsChannelGroup, RsGxsChannelPost, RsGxsFile,
  RsMsgMetaData) from RsSerializables so they can be used for the JSON API
Create RsGenericSerializer::SERIALIZATION_FLAG_YIELDING so JSON objects that
  miss some fields can be still deserialized, this improve API usability
SerializeContext offer friendly constructor with default paramethers
Add restbed 4.6 library as git submodule as most systems doesn't have it yet
Add a bit of documentation about JSON API into jsonapi-generator/README.adoc
Add JsonApiServer class to expose the JSON API via HTTP protocol
 2018-06-24 16:28:33 +02:00
csoler
6ccc7654d6
added code to notify GxsBroadcast system with new distant search results 2018-06-23 22:25:36 +02:00