24105 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
zotlabs	f612dfa3f8	sql error	2020-06-17 17:54:52 -07:00
Zot	5aa6f99af3	Merge branch 'dev_homeinstall_reminder' into 'dev' ... homeinstall - reminder for different web servers See merge request zot/zap!31	2020-06-17 03:45:21 +02:00
OJ Random	a53d046ca7	homeinstall - reminder for different web servers	2020-06-16 16:39:55 +02:00
zotlabs	e63e93e4bb	Merge branch 'dev' into release	2020-06-15 20:55:39 -07:00
zotlabs	7509e820f8	change repo branch references	2020-06-15 20:54:54 -07:00
zotlabs	2f71f58a15	Merge branch 'dev'	2020-06-15 18:16:50 -07:00
zotlabs	672aedaf75	rev update	2020-06-15 18:16:35 -07:00
zotlabs	1282d7ddc5	Merge branch 'dev' of ../p3 into dev	2020-06-15 18:12:34 -07:00
zotlabs	d28f957b54	move php-id3 and text_languagedetect from composer (/vendor) back to /library because their autoloaders are no longer supported in composer and no longer work in some distros. The packages themselves are unmaintained and it is unlikely they will be fixed upstream. This leaves HTMLPurifier to be fixed - which is in progress and should happen in the next several days.	2020-06-15 18:01:20 -07:00
zotlabs	32d414d173	Merge branch 'dev' of ../p3 into dev	2020-06-15 01:04:00 -07:00
zotlabs	2d3d34d38a	rephrase the htconfig template	2020-06-15 00:39:36 -07:00
zotlabs	b44f194aa8	Deprecate the term 'master' from the codebase.	2020-06-15 00:29:56 -07:00
zotlabs	e39b6c0a24	Revert "composer update" ... This reverts commit f446b1bd58.	2020-06-14 18:42:43 -07:00
Mike Macgirvin	f446b1bd58	composer update	2020-06-15 09:49:34 +10:00
zotlabs	f7674f0f2e	rev update	2020-06-14 05:02:40 -07:00
zotlabs	4b9dbe54f0	revision	2020-06-14 05:02:01 -07:00
zotlabs	8415f780ec	remove blacklist/whitelist	2020-06-14 04:58:27 -07:00
zotlabs	a2c4d094f4	remove incorrect legacy code	2020-06-13 16:02:48 -07:00
zotlabs	cd630a661d	Merge branch 'dev'	2020-06-10 18:26:45 -07:00
zotlabs	0cf18bad16	Don't render Friendica or other bbcode source for messages originating in ActivityPub space. Just use the HTML.	2020-06-10 18:20:46 -07:00
zotlabs	943b3250e5	Merge branch 'dev'	2020-06-10 17:12:38 -07:00
zotlabs	966d167162	regressions detected in activity_filter name autocomplete, also string update	2020-06-10 17:11:40 -07:00
zotlabs	b791a894e0	reduce icon overloading	2020-06-10 13:43:21 -07:00
zotlabs	1217c4e80e	Merge branch 'dev'	2020-06-09 21:45:17 -07:00
zotlabs	635e9735ee	syntax (missing quote)	2020-06-09 21:44:43 -07:00
zotlabs	b809565b3d	mod_acl: illogical query paren grouping, add abook_alias search to a place where it had not been added previously and should have been	2020-06-09 21:41:08 -07:00
zotlabs	755aee1852	Merge branch 'dev'	2020-06-09 21:34:49 -07:00
zotlabs	705a6959e6	double encoding	2020-06-09 21:34:31 -07:00
zotlabs	925991f61d	Merge branch 'dev'	2020-06-09 21:08:54 -07:00
zotlabs	65f2035193	change display order of activity_filter elements	2020-06-09 21:08:09 -07:00
zotlabs	7945b80219	re-activate 'by name' stream_filter	2020-06-09 20:42:01 -07:00
zotlabs	f62b7ca51c	Merge branch 'dev'	2020-06-09 18:36:34 -07:00
zotlabs	c170ab7dc8	missing paren	2020-06-09 17:51:47 -07:00
zotlabs	6a501fa8ea	pubstream not picking up all local content when network pubstream enabled	2020-06-09 17:45:22 -07:00
zotlabs	83da4edd38	timestamp	2020-06-09 16:37:31 -07:00
zotlabs	72d4af28c1	check return value of PermissionLimits::Get() - in case it's false.	2020-06-09 16:33:50 -07:00
zotlabs	81c3b2d635	spelling correction in a comment	2020-06-08 22:42:58 -07:00
zotlabs	8d1e35e8cb	remove css width limit on task text input control so it will better line up with other widgets	2020-06-04 16:29:25 -07:00
zotlabs	cd09557ecb	Merge branch 'dev'	2020-06-02 22:04:15 -07:00
zotlabs	1564b28b01	release	2020-06-02 22:04:00 -07:00
zotlabs	66eaa87e2d	'personal posts' missing a lot of stuff	2020-06-02 21:19:17 -07:00
zotlabs	4a9a5dae03	cache improvement	2020-06-02 20:36:21 -07:00
zotlabs	40d2526b6d	clarify the descriptions	2020-06-02 16:54:26 -07:00
zotlabs	fcc0b9fa47	unify the mention styles w/r/t @ placement	2020-06-02 03:46:11 -07:00
zotlabs	bfbf4cb59e	typo	2020-06-02 01:35:09 -07:00
zotlabs	437bbf8338	use the xchan_url for human-followed links. always.	2020-06-01 22:43:33 -07:00
zotlabs	8c92aef775	more work on smart mentions	2020-06-01 22:36:55 -07:00
zotlabs	de66229561	strings	2020-06-01 21:55:01 -07:00
zotlabs	ffb5434a1f	Merge branch 'dev'	2020-06-01 21:47:22 -07:00
zotlabs	c33876d7a0	surface the tag_username setting	2020-06-01 21:46:26 -07:00