1445 commits

Author	SHA1	Message	Date
zotlabs	b0b67fbcc4	Merge branch 'master' of ../hz into dev	2018-06-13 16:28:08 -07:00
zotlabs	254a6be277	null db fields in mod_invite	2018-06-13 16:25:50 -07:00
Mario Vavti	9e29c13678	fix issue #1219	2018-06-09 16:38:15 +02:00
Mario Vavti	c4778e5e24	restrict cid filter to unthreaded order (makes much more sense that way imho and the query is a lot faster) and slighty change order of the filters	2018-06-09 10:58:01 +02:00
Mario Vavti	1fbc131469	if unthreaded and cid and not pf, query author only	2018-06-08 23:19:30 +02:00
Mario Vavti	b3928f3d2a	escape query string	2018-06-07 22:45:07 +02:00
Mario Vavti	d3bc50e18d	do not query for parents if $conv and $nouveau are set	2018-06-07 21:58:09 +02:00
Mario Vavti	dd4b8529c2	Merge remote-tracking branch 'mike/master' into dev	2018-06-06 20:13:03 +02:00
Mario Vavti	5d1d6299cd	add the pf argument to the forum notification links	2018-06-06 18:02:25 +02:00
zotlabs	d6f98ab88e	some work to make menus editable by visitors with webpage write permissions; this needed to revise the link structure so that the page specified an owner channel in the url. Otherwise we could only operate on menus owned by local_channel(). Have done some basic regression testing but have not yet fully tested guest editing functionality.	2018-06-05 21:12:42 -07:00
Mario Vavti	7188e719ef	rely on the pf argument to determine if we deal with a forum or not. xchan_pubforum is not set for all public forums in the forum filters for some reason.	2018-06-05 11:56:30 +02:00
Mario Vavti	6019a34da2	be specific about the term type and do not sort the results	2018-06-04 15:54:18 +02:00
Mario Vavti	8b76b5a0a6	improve network cid query	2018-06-03 23:03:30 +02:00
Mario Vavti	3d3e7bafd5	distinct is needed or it can heavily impact pagination in certain situations (5 per page instead of 20). Add ordering to the select clause to mitigate errors in postgres and add item_thread_top = 1 for slightly better performance.	2018-06-03 17:31:50 +02:00
Mario Vavti	a42ff1e6d4	missing $perm_sql	2018-06-03 13:27:06 +02:00
Mario Vavti	8189408190	finalize filters and forum notifications	2018-06-02 22:11:11 +02:00
Mario Vavti	db0a3a7534	some more work on forum notifications	2018-06-02 15:39:38 +02:00
Mario Vavti	53efd4e470	unread forum notifications - wip/unfinished	2018-06-01 23:22:52 +02:00
Mario Vavti	b438ffead4	Merge remote-tracking branch 'mike/master' into dev	2018-05-31 13:06:33 +02:00
Mario Vavti	cbaaa1c57f	merge groups and filed posts into activity filters	2018-05-31 13:05:32 +02:00
zotlabs	fc31ecdab0	autocomplete private mail addresses based on substring in either the name or webbie (prevously required an '@' to trigger a webbie search)	2018-05-30 17:30:17 -07:00
Mario Vavti	6bfc5aa96c	strpos does not work with arrays :(	2018-05-30 23:15:43 +02:00
Mario Vavti	5505f5fa02	restrict the network/channel navbar search to content and hashtags	2018-05-30 22:55:28 +02:00
Mario Vavti	6349a7417f	make navbar search use the module search function in /network and /channel	2018-05-30 22:40:22 +02:00
Mario Vavti	881406f82b	remove redundant reference for order	2018-05-30 14:54:39 +02:00
Mario Vavti	9fcb3bf2e8	first cut on restructuring the previously called network tabs	2018-05-30 14:02:58 +02:00
zotlabs	7d088c8d56	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge	2018-05-29 17:51:36 -07:00
zotlabs	ed3d3b6f27	provide possibility of using different orderings (post, commented) on channel page	2018-05-29 17:35:44 -07:00
git-marijus	bca3113fba	Merge pull request #1202 from aninf-wo/dev ... include photos.php	2018-05-29 08:41:31 +02:00
zotlabs	ddebbcc0a0	hubzilla issue #1200	2018-05-27 17:46:25 -07:00
Herbert Thielen	4f3be92a0d	include photos.php ... required for photo_calculate_scale()	2018-05-27 17:57:35 +02:00
zotlabs	76d8e59e9b	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge	2018-05-21 21:15:24 -07:00
zotlabs	1061027071	new_channel - make text strings translatable and use the name as a base for the nick if you try to create without entering a nick	2018-05-21 20:17:17 -07:00
zotlabs	a403611ac9	update response types	2018-05-21 19:34:03 -07:00
zotlabs	2b3f931c85	oauth2 discovery per draft-ietf-oauth-discovery-10	2018-05-21 19:25:03 -07:00
Mario Vavti	a8274bbfb3	missing permission description	2018-05-21 09:25:57 +02:00
Mario Vavti	7dadbbbac7	bring jot reset to some more places	2018-05-21 09:13:14 +02:00
Mario	469809183d	update oauth related tables to use bigint/int(10) for user_id column. this is to be more consistent with the rest of the tables and fixes issue #1180	2018-05-20 22:42:47 +02:00
Mario Vavti	9e1af2492f	more local_channel() is not string	2018-05-20 14:15:46 +02:00
Mario Vavti	4eb40528a9	local_channel() is not string	2018-05-20 14:07:30 +02:00
Mario Vavti	7e99931733	implement jot reset button	2018-05-20 09:23:44 +02:00
Mario Vavti	6abbadf6c8	Merge remote-tracking branch 'mike/master' into dev	2018-05-19 10:20:14 +02:00
zotlabs	8b4af7cf0b	hubzilla issue #1086, pending count on admin summary page	2018-05-19 00:54:47 -07:00
Mario Vavti	1ca6ef0f60	Merge remote-tracking branch 'mike/master' into dev	2018-05-19 08:45:41 +02:00
zotlabs	dae89ce91c	wrong default param for pubstream_incl (this checkin also picked up a few minor and hopefully non-significant changes)	2018-05-18 16:57:45 -07:00
Mario Vavti	7f7e049397	an attempt to fix the new_channel validation situation	2018-05-18 21:30:07 +02:00
Mario Vavti	12c571a187	missing include	2018-05-16 10:47:18 +02:00
zotlabs	aac5fd96cc	provide function to fetch photo contents from url	2018-05-15 16:51:04 -07:00
Mario Vavti	de63e40a70	we must now provide the full path to the profile image for the cavatar plugin to work	2018-05-15 10:20:20 +02:00
zotlabs	062dea8e13	code whitespace and formatting	2018-05-14 22:10:21 -07:00