6213 Commits

Author	SHA1	Message	Date
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