2147 commits

Author	SHA1	Message	Date
Mario Vavti	6bf0f4225c	move file and groups filter to submenu	2018-06-01 12:11:07 +02:00
Mario Vavti	d03c27d18c	implement reset button for filters	2018-05-31 14:02:34 +02:00
Mario Vavti	7e8c7f86f0	change some strings	2018-05-31 13:13:46 +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	293e405f5b	just query for data we actually need	2018-05-30 14:09:24 +02:00
Mario Vavti	8d6441704b	add widget files and templates	2018-05-30 14:06:18 +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
Mario Vavti	dcd5f00077	Merge remote-tracking branch 'mike/master' into dev	2018-05-29 09:04:45 +02:00
git-marijus	bca3113fba	Merge pull request #1202 from aninf-wo/dev ... include photos.php	2018-05-29 08:41:31 +02:00
zotlabs	139c39c2ce	we probably don't need to delivery local items more than once	2018-05-28 22:23:40 -07: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
Mario Vavti	eb04dbc5ce	DB update to fix wrong hubloc_url for activitypub hublocs	2018-05-26 21:15:22 +02:00
Mario Vavti	33700e9cf4	differentiate between direct messages and followers-only messages	2018-05-25 15:29:59 +02:00
Mario Vavti	9cf8931136	paint the locks on private activitypub items red. their privacy model is "slightly" different from ours	2018-05-23 22:11:13 +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
zotlabs	9bf26cee6d	add hook 'get_system_apps'	2018-05-21 16:19:17 -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	55e1026c98	improve abconfig queries	2018-05-20 20:48:52 +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
git-marijus	acb114d0d1	Merge pull request #1174 from anaqreon/dev ... Rename Permission Groups to Permission Categories and clarify feature…	2018-05-20 11:42:13 +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
Andrew Manning	179eeb10a6	Rename Permission Groups to Permission Categories and clarify feature settings text.	2018-05-15 19:57:40 -04: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
zotlabs	959667c009	If somebody used hooks to create a new permission role, there was no mechanism to insert the new role into the dropdown list of roles at selection time.	2018-05-14 20:23:00 -07:00
zotlabs	c8fc3ad7cd	refactor the 'where does the register link point?' logic	2018-05-14 19:19:25 -07:00
zotlabs	229d82c4c7	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge	2018-05-14 17:23:19 -07:00
zotlabs	d9759ba63c	more refactor tags/mentions	2018-05-14 17:20:25 -07:00