3848 commits

Author	SHA1	Message	Date
zotlabs	5831c83844	deprecate public stream uids calculations	2019-10-06 13:07:41 -07:00
zotlabs	e90c9807a0	siteinfo protocol changes	2019-10-05 14:42:38 -07:00
zotlabs	b6cc0bc6b8	more work on channel manager	2019-10-05 01:07:02 -07:00
zotlabs	01cd50952e	one more time	2019-10-04 00:31:36 -07:00
zotlabs	846f959f5c	Hopefully the final wording. Maybe, maybe not.	2019-10-03 17:59:55 -07:00
zotlabs	b7808b8e5d	usability changes to channel manage interface	2019-10-03 16:44:52 -07:00
zotlabs	0501020136	consolidate safe mode settings	2019-10-03 13:22:59 -07:00
zotlabs	b560f7b9ab	parse error	2019-10-03 12:56:49 -07:00
zotlabs	779718e9f1	cleanup messaging	2019-10-02 23:55:48 -07:00
zotlabs	b3109010a2	better selection for start of week, some Middle East countries start the week on Saturday and this option was not available.	2019-10-02 22:35:12 -07:00
zotlabs	d1d2ad823d	allow apps to be pinned,featured or both. Also some channel settings cleanup	2019-10-02 21:38:32 -07:00
zotlabs	2f663e488d	various stuff	2019-10-02 18:07:13 -07:00
zotlabs	5094a00eef	string update	2019-10-01 19:54:00 -07:00
zotlabs	ec30aeceac	list editor usability: put list members in the first column, non-members on the right	2019-10-01 19:43:53 -07:00
zotlabs	d2abf3d41f	fix the public list interfaces	2019-10-01 19:03:48 -07:00
zotlabs	5014323812	make public lists discoverable	2019-10-01 18:29:39 -07:00
zotlabs	4f2302a9eb	'Access Lists' => 'Lists'	2019-10-01 17:44:58 -07:00
zotlabs	b39b2b7b58	latest dev work on lists	2019-10-01 15:52:42 -07:00
zotlabs	4d28981569	Merge branch 'dev' of https://framagit.org/zot/zap into dev	2019-09-30 19:26:36 -07:00
zotlabs	a8e68c2e9e	ocap stuff	2019-09-30 19:25:48 -07:00
Zot	e3d10d9b2a	Merge branch 'customitems-patch' into 'dev' ... Add support for custom items / object types See merge request zot/zap!10	2019-10-01 04:25:30 +02:00
zotlabs	94c1c89396	php warning	2019-09-29 23:26:59 -07:00
zotlabs	4c271a38cc	rewrites - also remove legacy procedural module interface	2019-09-29 22:36:52 -07:00
zotlabs	67c9632d0b	more ocap stuff	2019-09-29 19:20:09 -07:00
zotlabs	c8ab4adf76	cleanup	2019-09-29 17:17:40 -07:00
zotlabs	78d82411c6	configurable like count	2019-09-26 21:46:44 -07:00
zotlabs	fadfe119d0	configurable like count display	2019-09-26 20:58:29 -07:00
zotlabs	62200601ab	bearcap work	2019-09-26 18:52:51 -07:00
zotlabs	4d4af4f1b5	nomadic and trheading updates	2019-09-26 17:05:30 -07:00
zotlabs	b01a760fd8	remove obsolete code	2019-09-25 18:39:37 -07:00
zotlabs	8a96f28df4	fixes	2019-09-24 20:03:04 -07:00
zotlabs	9cebe0094e	ensure that disabling activitypub at the channel level actually stops it dead	2019-09-24 16:11:28 -07:00
zotlabs	d1c317cfd3	Not many pleroma sites are running with recent AP fixes	2019-09-24 02:04:15 -07:00
zotlabs	fc2db4983c	superblock fix	2019-09-23 23:22:17 -07:00
zotlabs	214c47923c	once again deliver singletons	2019-09-23 20:57:55 -07:00
zotlabs	f529606c2d	Mastodon's as:alsoKnownAs is used in an incompatible way so we'll be using zot:alsoKnownAs to differentiate a true channel clone from a move.	2019-09-23 17:52:03 -07:00
zotlabs	b6ae2b7eab	more fixes	2019-09-23 16:11:36 -07:00
zotlabs	335781e40f	ensure with ap turned off the channel has no discoverable ap inbox	2019-09-22 22:48:14 -07:00
zotlabs	e8abc92038	personal activitypub setting. If the site enables activitypub, the default is on. But you can choose to turn it off.	2019-09-22 22:23:18 -07:00
zotlabs	261a5ee888	Updates and fixes	2019-09-22 20:56:30 -07:00
DM42.Net Zap Dev	042bcbdbde	Add support for custom items / object types	2019-09-22 20:44:33 -04:00
zotlabs	d2897b3c4b	rev update	2019-09-21 23:18:20 -07:00
zotlabs	2a94ecfebb	text change	2019-09-21 16:25:10 -07:00
zotlabs	73f32e33e1	let the games begin	2019-09-21 16:20:04 -07:00
zotlabs	1c9135721a	snakebite cont.	2019-09-21 15:26:55 -07:00
zotlabs	c0a7eaa53d	exploratory development	2019-09-20 18:00:29 -07:00
zotlabs	8d27732707	alias tagging issue	2019-09-19 15:30:17 -07:00
zotlabs	6d0a0d62b7	sql typo	2019-09-17 22:58:15 -07:00
zotlabs	91e94ffd81	cleanup	2019-09-17 21:25:26 -07:00
zotlabs	f707a00a4a	abook_alias	2019-09-11 20:41:16 -07:00
zotlabs	d93c9ccc2d	ongoing dev	2019-09-10 19:31:08 -07:00
zotlabs	ffc43e1c7d	heavy lifting for the next big development effort	2019-09-09 21:03:33 -07:00
zotlabs	1f160251a0	styling issues, fixes from Hubzilla	2019-09-02 20:47:34 -07:00
zotlabs	86841a78a5	minor fixes from osada	2019-08-29 21:19:00 -07:00
zotlabs	1de2bafa61	improved notification links for new connections, ongoing work on onepoll and zotfeeds, reduce core usage of item.postopts	2019-08-27 22:25:06 -07:00
zotlabs	a0e7ddd8cd	better collection parsing	2019-08-26 19:54:21 -07:00
zotlabs	d478571b6d	assorted fixes for assorted stuff	2019-08-25 17:35:14 -07:00
zotlabs	22669bb701	backport from downstream and some other minor cleanup	2019-08-20 19:25:36 -07:00
DM42.Net Zap Dev	dc0f62a097	Return in case caller needs to process further.	2019-08-19 22:35:17 -04:00
zotlabs	532def0244	bearcaps and other stuff	2019-08-15 23:53:02 -07:00
zotlabs	b9f20f4403	rev update	2019-08-14 21:21:40 -07:00
zotlabs	befa9a5ea7	update zotsh to work with owa	2019-08-14 17:03:22 -07:00
zotlabs	1131ba9096	typo	2019-08-13 23:59:45 -07:00
zotlabs	e7e22d4f2e	bug fix	2019-08-13 23:57:00 -07:00
zotlabs	a331db0803	rework the config setting to hide the cloud root	2019-08-13 22:39:20 -07:00
zotlabs	7c55bc04f6	more work to bring back zotsh - at least for local files	2019-08-13 22:30:30 -07:00
Mike Macgirvin	ba48224041	fix client.py for sabredav and no content length for directories	2019-08-14 13:15:01 +10:00
zotlabs	e704f81693	Merge branch 'dev' of https://framagit.org/zot/zap into dev	2019-08-13 19:44:25 -07:00
zotlabs	dfd771da4e	fix suggestion ignore redirection and update zotsh	2019-08-13 19:42:32 -07:00
DM42.Net Zap Dev	81bf9e37fa	Set initial values in case of multiple invocations.	2019-08-11 18:10:12 -04:00
zotlabs	c8ad9713ac	whitespace	2019-08-07 23:02:30 -07:00
zotlabs	c3e5ee026f	log this	2019-08-06 16:29:59 -07:00
zotlabs	5f2f45d306	limit new connections per day (per channel) to 50 - site configurable	2019-08-06 15:24:30 -07:00
zotlabs	79fbccdce7	add client_name to oauth2 storage	2019-08-04 17:30:07 -07:00
zotlabs	57a2fe9dd6	fix image censoring	2019-07-31 21:46:19 -07:00
zotlabs	0de97b2fc0	revert image pixelation, but provide a framework for re-implementing it in the future	2019-07-31 18:15:38 -07:00
zotlabs	e163ece9e0	add 'safe mode' over-ride to connection image pixelation	2019-07-30 22:37:55 -07:00
zotlabs	3bc243ea46	image censoring per connection	2019-07-30 17:56:35 -07:00
Zot	7a068d29d0	Merge branch 'fix-engr-units' into 'dev' ... Fix missing engr_units_to_bytes See merge request zot/zap!6	2019-07-30 05:45:37 +02:00
zotlabs	4e87935fda	affinity tool -> friend zoom; alter xchan_query to return results in hubloc_primary desc order; as hublocs have been seen in the wild with no primary	2019-07-29 19:33:36 -07:00
DM42.Net Zap Dev	dd24484383	Fix missing engr_units_to_bytes	2019-07-29 21:32:57 -04:00
zotlabs	6e7d144789	bug fixes	2019-07-25 18:48:35 -07:00
zotlabs	d8ce899bb9	cleanup	2019-07-25 17:12:48 -07:00
zotlabs	ba967609c2	Merge branch 'dev' of https://framagit.org/zot/zap into dev	2019-07-22 16:02:04 -07:00
Zot	6b5a3f4e74	Merge branch 'consolidate-rolesettings' into 'dev' ... Consolidate role settings See merge request zot/zap!5	2019-07-22 22:45:52 +02:00
zotlabs	c1fa3fd625	hyperdrive now defaults to off.	2019-07-21 19:24:14 -07:00
zotlabs	27c71dcaa5	cleanup	2019-07-18 20:38:36 -07:00
DM42.Net (Matt Dent)	07f86afa43	Consolidate role settings	2019-07-12 11:52:04 -04:00
zotlabs	c660c77ff6	allow the comment permission limit to be changed at will - no matter what permission role is in play.	2019-07-11 22:54:35 -07:00
zotlabs	cf040dea61	misc fixes	2019-07-11 22:03:17 -07:00
zotlabs	b170e01fa5	cleanup	2019-07-10 18:43:20 -07:00
zotlabs	e523f5eab7	cleanup	2019-07-07 23:35:24 -07:00
zotlabs	7341f0a7fa	Merge branch 'dev' of https://framagit.org/zot/zap into dev	2019-07-07 22:41:40 -07:00
Zot	fe2e5600f6	Merge branch 'fix-shortprofile' into 'dev' ... Fix widget to use new Libprofile See merge request zot/zap!4	2019-07-08 07:39:43 +02:00
zotlabs	39668e2752	comment threading	2019-07-07 20:11:37 -07:00
zotlabs	27a03a3a5c	misc experimental things (wip)	2019-07-07 16:32:48 -07:00
FreeToBe.Social Developer	5e6de8578e	Fix widget to use new Libprofile	2019-07-06 11:44:39 -04:00
zotlabs	7e8411c742	more app work	2019-06-30 23:36:03 -07:00
zotlabs	2925aad846	add missing module	2019-06-30 20:11:48 -07:00
zotlabs	6b1f5503a3	add photomap app	2019-06-30 20:11:08 -07:00
zotlabs	18dc941526	directory issue	2019-06-30 19:10:12 -07:00
zotlabs	1933d0f3dd	turn tasks into an app	2019-06-29 19:23:31 -07:00
zotlabs	a2a7a22c38	better handling of channel meta	2019-06-29 17:54:48 -07:00
zotlabs	df18f57217	add opengraph meta info to channel page	2019-06-29 16:37:30 -07:00
zotlabs	969b8e17a1	extend direct message definition to anything with allow_cid but *not* allow_gid	2019-06-27 18:39:08 -07:00
zotlabs	9a907fe262	make notes widget fixed height because it still doesn't play well with stickykit and I've wasted too much time trying to bludgeon it into submission.	2019-06-25 16:11:22 -07:00
zotlabs	8553af4d41	photos widget issue	2019-06-24 18:59:27 -07:00
zotlabs	8cc49657f9	tasks and notes	2019-06-24 17:35:12 -07:00
zotlabs	17599db5c9	cleanup - filter "unsafe" entries from driectory tag cloud	2019-06-20 23:17:04 -07:00
zotlabs	5e189cb14e	some early dev work for dm support	2019-06-18 19:21:31 -07:00
zotlabs	19c60b4d3d	cleanup last commit	2019-06-17 19:10:30 -07:00
zotlabs	7d768df7a6	disable hyperdrive over activitypub - that is a legacy remnant of the Osada ActivityPub server and not needed or desired here	2019-06-17 19:04:06 -07:00
zotlabs	f829665047	minor compatibility issue with hyperdrive and traditional zot sources	2019-06-17 18:32:08 -07:00
zotlabs	3396879cf0	cleanup	2019-06-16 23:38:43 -07:00
zotlabs	fc44c8bbfe	directory search args issue	2019-06-16 23:34:19 -07:00
zotlabs	9ab4d551e8	cleanup	2019-06-16 23:05:15 -07:00
zotlabs	4442f7e9b6	a couple of issue with liking profiles	2019-06-16 20:35:47 -07:00
zotlabs	0a2116345f	cleanup of linked item deletion	2019-06-16 19:18:49 -07:00
zotlabs	d2d0f24590	issues syncing liked photos	2019-06-15 18:30:10 -07:00
zotlabs	30c37497fa	misc errors and warnings	2019-06-13 23:36:16 -07:00
zotlabs	337d08b049	undo hmessages.po and hstrings.php hack	2019-06-13 22:39:40 -07:00
zotlabs	95c6d034ec	edge case in protocol	2019-06-13 18:23:48 -07:00
zotlabs	a0b73857bf	siteinfo stuff	2019-06-12 21:19:34 -07:00
zotlabs	232bd025f3	typo	2019-06-12 20:57:28 -07:00
zotlabs	a3e81c243f	delete issues	2019-06-12 02:02:43 -07:00
zotlabs	ae8d31c8b1	event stream filter	2019-06-11 22:12:25 -07:00
zotlabs	7c34e4ee79	nocomment app	2019-06-11 20:40:25 -07:00
zotlabs	32056c55d7	delete tweaks	2019-06-11 20:16:38 -07:00
zotlabs	4ec1b14bd1	event sync work	2019-06-11 19:36:55 -07:00
zotlabs	feb0214ee7	typo	2019-06-11 19:15:56 -07:00
zotlabs	9b7326f41d	event deletion testing	2019-06-11 19:14:19 -07:00
zotlabs	48dcdcaa15	file sync issues	2019-06-11 17:27:31 -07:00
zotlabs	0beca4ae42	debugging	2019-06-11 16:37:47 -07:00
zotlabs	b03fc197aa	file sync issues related to thumbnail os_storage	2019-06-11 16:32:33 -07:00
zotlabs	e9f923a5c0	fix feeds	2019-06-10 23:39:17 -07:00
zotlabs	00e0f2b822	update subthread	2019-06-10 23:21:57 -07:00
zotlabs	49183f8484	event deletion issue	2019-06-10 21:19:19 -07:00
zotlabs	f65ab4236e	revisit the hyperdrive settings and remove some obsolete "federation" settings.	2019-06-10 18:52:16 -07:00
zotlabs	a039c84e29	updates	2019-06-08 16:53:05 -07:00
zotlabs	52e6d4f48a	cleanup	2019-06-05 23:08:17 -07:00
zotlabs	0359acb32e	Deprecate global channel removal. There are a few issues which need to be addressed. The first of which is a mechanism to tell other servers to destroy your clones. The second is securing this against forgery attempts. In its current form a lot of your data is removed from around the network but the channel clones themselves may remain.	2019-06-04 23:27:11 -07:00
zotlabs	e292219db0	misc photo issues	2019-06-04 17:53:21 -07:00
zotlabs	50a11a6ea9	cleanup	2019-06-03 17:57:47 -07:00
zotlabs	25945a70db	item sync issue	2019-06-01 20:08:09 -07:00
zotlabs	5a8b25b6be	default public search to disabled.	2019-05-29 17:32:31 -07:00
zotlabs	bb97dedcdd	improve expiration +cleanup	2019-05-29 16:29:55 -07:00
zotlabs	5a1f198705	instrument => generator	2019-05-28 21:10:32 -07:00
zotlabs	ae6bfb58e7	access lists should be a default app	2019-05-28 18:34:28 -07:00
zotlabs	905917140a	support expire plus misc cleanup	2019-05-28 16:42:32 -07:00
zotlabs	b7e7b997e7	cleanup	2019-05-27 20:50:05 -07:00
zotlabs	d382f68161	the only thing worse than no doco is bad doco	2019-05-26 19:55:08 -07:00
zotlabs	dfcd2b319b	cleanup	2019-05-23 22:51:39 -07:00
zotlabs	6858ab5741	cleanup, link modal issue	2019-05-23 16:37:56 -07:00
zotlabs	604e3e7c0b	a bit of pubsites cleanup	2019-05-21 22:04:53 -07:00
zotlabs	667550ab32	spinning notifications, revert last checkin	2019-05-16 02:40:51 -07:00
zotlabs	a59489e9dd	bring back events app - calendar is not yet ready for prime time	2019-05-15 21:22:47 -07:00
zotlabs	52fe8485d7	begin refactor of mod_pubsites	2019-05-15 17:27:33 -07:00
zotlabs	7428e1358e	cleanup	2019-05-14 22:16:49 -07:00
zotlabs	e9ba43582e	add portable_id to share attributes in some cases	2019-05-13 20:28:56 -07:00
zotlabs	ee4c24970b	calendar fixes	2019-05-13 16:59:50 -07:00
zotlabs	61ad767daa	more cleanup	2019-05-12 23:57:57 -07:00
zotlabs	e9f5edbd28	missing local AS context in a couple of places	2019-05-12 22:29:16 -07:00
zotlabs	27168741b5	issue with message-id on Like activities	2019-05-12 22:11:27 -07:00
zotlabs	a73d01cfa0	cleanup	2019-05-12 20:52:10 -07:00
zotlabs	61e2cf7b5c	calendar code cleanup	2019-05-12 19:54:05 -07:00
zotlabs	75db736512	merged calendar porting fixes	2019-05-12 19:20:17 -07:00
zotlabs	fe1517022c	port calendar merge from hz	2019-05-12 18:20:37 -07:00
zotlabs	23e8c52bea	register page was missing form token	2019-05-10 18:34:27 -07:00
zotlabs	6554334f03	don't do oembed processing on naked links	2019-05-10 14:39:55 -07:00
zotlabs	d747d9b7d3	get_rpost_path() moved to a static class method and was still being referenced as a global	2019-05-07 21:50:02 -07:00
zotlabs	ff686b354b	remove techlevels	2019-05-07 19:40:49 -07:00
zotlabs	431387bce2	cleanup	2019-05-06 22:22:58 -07:00
zotlabs	6634ad9085	cleanup - implement remote purge which has been missing for a long time	2019-05-06 20:22:08 -07:00
zotlabs	e7f5ad401c	cleanup	2019-05-05 23:38:29 -07:00
zotlabs	642a1c2f2b	cleanup default icon logic	2019-05-05 21:06:02 -07:00
zotlabs	6b31b648eb	typo	2019-05-05 18:50:28 -07:00
zotlabs	687eb93153	directory entry reporting handler	2019-05-05 18:44:33 -07:00
zotlabs	c607876e36	logo update	2019-05-05 16:13:51 -07:00
zotlabs	b64858a099	directory: if safe mode is enabled, strip links from profile elements	2019-05-05 13:06:15 -07:00
zotlabs	23c4a30488	new logo, typo	2019-05-03 19:36:09 -07:00
zotlabs	22205f0490	part of dislike missing	2019-05-03 03:17:57 -07:00
zotlabs	7ea1833ffe	release fixes	2019-05-03 02:27:20 -07:00
zotlabs	51eba95a93	reactions	2019-05-02 21:21:10 -07:00
zotlabs	33ba42ba79	more work on reactions	2019-05-02 19:39:08 -07:00
zotlabs	f7971c8a57	don't provide dirsort links in mod_directory suggestion mode	2019-04-30 23:46:08 -07:00
zotlabs	79f5866137	fix suggestion ordering	2019-04-30 23:18:39 -07:00
zotlabs	dd0df677a6	resolve some of the issues associated with having multiple suggestion implementations, and add xign sync to this subsystem	2019-04-30 16:52:07 -07:00
zotlabs	6753c789f0	don't show superblocked channels in suggestions	2019-04-29 19:29:11 -07:00
zotlabs	267e620b86	Improvements to dbsync	2019-04-29 16:37:59 -07:00
zotlabs	d0fb2c5f84	minor issue with inspector and add xchan/hubloc inspector	2019-04-28 23:03:48 -07:00
zotlabs	4f92d05588	cleanup	2019-04-28 21:17:04 -07:00
zotlabs	11d41ddf10	better handling of drag/drop videos and add thumbnails if available	2019-04-26 21:01:00 -07:00
zotlabs	9bbad0db91	minor updates	2019-04-26 15:15:15 -07:00
zotlabs	5abb1a4eb0	remove "tryomebed" from bbcode and default the rpost url detection to oembed+zotobj	2019-04-19 15:38:29 -07:00
zotlabs	80bc6137fd	zot objs	2019-04-19 14:34:47 -07:00
zotlabs	0aa017d242	rework admin page	2019-04-17 21:40:35 -07:00
zotlabs	7470d0c58e	more libprofile	2019-04-17 19:19:49 -07:00
zotlabs	7748d330d2	tweak	2019-04-17 17:22:27 -07:00
zotlabs	aa9d29a0ec	start libprofile	2019-04-17 16:54:06 -07:00
zotlabs	8c1e8e5df9	cleanup	2019-04-16 23:31:36 -07:00
zotlabs	c17c7a76a3	bring back the oembed toggle	2019-04-16 17:44:42 -07:00
zotlabs	b60c842c7c	ZotObject toggle (wip)	2019-04-16 12:50:44 -07:00
zotlabs	89af6ee5ff	port photo lib updates	2019-04-15 23:43:06 -07:00
zotlabs	9c0d7b7df0	update photo files to assist porting	2019-04-15 23:25:49 -07:00
zotlabs	c4824f6fd5	add photo.expires	2019-04-15 23:03:16 -07:00
zotlabs	7364a82f5d	remove old twitter stuff	2019-04-15 21:55:59 -07:00
Mike Macgirvin	76d2f5b9b9	move phpgit to composer	2019-04-16 14:51:27 +10:00
zotlabs	89709b3b47	cleanup	2019-04-15 20:04:58 -07:00
zotlabs	fd600a57fa	cleanup	2019-04-15 17:34:29 -07:00
zotlabs	324ee0b5dc	cleanup	2019-04-14 23:50:49 -07:00
zotlabs	7743e12072	more cleanup	2019-04-14 23:41:26 -07:00
zotlabs	dffdac0757	cleanup	2019-04-14 22:31:07 -07:00
zotlabs	339b724c35	use urlify from composer	2019-04-11 23:59:44 -07:00
zotlabs	6bdf35ec67	move everything from include/environment to setup where it is used	2019-04-11 21:52:20 -07:00
zotlabs	cb2a64b036	move markdown to zlib	2019-04-11 21:10:31 -07:00
zotlabs	5cb0e7600b	some cleanup	2019-04-11 20:26:38 -07:00
zotlabs	7efc231b11	make categories app actually do something useful	2019-04-11 17:06:56 -07:00
zotlabs	1cfa2d435e	activity_filter - wrong icon	2019-04-11 13:41:41 -07:00
zotlabs	eafe31d4de	typo	2019-04-11 04:10:59 -07:00
zotlabs	736714decf	repeating event work and some fixes from upstream	2019-04-10 23:45:24 -07:00
zotlabs	0e8f34021e	schema mods for recurring events	2019-04-10 00:20:41 -07:00
zotlabs	db15d2a98e	event cleanup	2019-04-07 21:20:06 -07:00
zotlabs	7472c3af2a	really remove delegate perms	2019-04-06 16:36:23 -07:00
zotlabs	f32dfdfcf7	auto friend collections	2019-04-05 00:54:35 -07:00
zotlabs	fd02fb95d9	update obscurify	2019-04-04 19:55:17 -07:00
zotlabs	2e7e461027	piled up deliveries were not getting scheduled for localhost, probably these were piled up as the result of a queue threshhold breach	2019-04-04 19:14:32 -07:00
zotlabs	9a37e9a33a	move collections to a different button that doesn't get disabled when privacy is turned on.	2019-04-03 22:18:13 -07:00
zotlabs	98461ccf61	fix activity_filter widget collection display when groups present	2019-04-03 18:37:03 -07:00
zotlabs	3f1fff5c08	remove default mention on groups/collections when accessing via network page	2019-04-03 18:26:48 -07:00
zotlabs	0db3fd4ff4	enable the collection roles	2019-04-03 16:23:06 -07:00
zotlabs	8f4a3723da	the rest of the stuff to support collections	2019-04-03 16:22:03 -07:00
zotlabs	d22285c888	disable directory keywords when forums or collections selected	2019-04-02 19:20:40 -07:00
zotlabs	96d431fcb5	add collections to directory	2019-04-02 18:53:43 -07:00
zotlabs	b2e8b0c1da	better check for comments_closed	2019-04-01 19:50:59 -07:00
zotlabs	4bd184c47a	missing permissionlimits	2019-04-01 19:17:28 -07:00
zotlabs	7093c2d514	use affinity slider to set default affinity slider values	2019-04-01 19:04:08 -07:00
zotlabs	a441a5b901	convert new-friend activity to note since ASV2 vocabulary is incompatible with ASV1.	2019-04-01 17:00:00 -07:00
zotlabs	4dd8393976	do a better job of mapping comment policy to zot6, use photo table (not item object) to get photolink in embedphotos	2019-04-01 15:19:41 -07:00
Mike Macgirvin	04f58be4b5	Merge branch 'dev' of https://framagit.org/zot/zap into dev	2019-04-02 06:29:33 +11:00
Zot	ec249ba721	Merge branch 'patch-20190211a' into 'dev' ... Return all listeners See merge request zot/zap!1	2019-04-01 05:49:33 +02:00
zotlabs	47283ba2ef	filter out a specific unusual activity	2019-03-31 18:01:20 -07:00
zotlabs	ad021811d8	make sure enough info in edited photos is changed to actually update on the other end	2019-03-30 15:56:37 -07:00
zotlabs	42dcc86e3e	linkinfo honour link-only setting for images, local videos. Photo editing anomalies.	2019-03-30 15:01:25 -07:00
zotlabs	5bcf392816	add hierarchy to channels for collection support and other purposes	2019-03-29 13:27:23 -07:00
zotlabs	d68bdd03ed	detect comment moderation with even more precision	2019-03-28 16:41:06 -07:00
zotlabs	933fd80c79	typo	2019-03-27 21:44:08 -07:00
zotlabs	94eb4f8060	delivery: work on a copy of the data	2019-03-27 21:16:54 -07:00
zotlabs	0bb49829a6	let people know there's nothing in the moderation queue if the query returns empty	2019-03-27 20:30:12 -07:00
zotlabs	b137417f97	more work on moderation notices	2019-03-27 20:20:36 -07:00
zotlabs	4d48f5e7bf	make moderation notifications go to the right place	2019-03-27 19:20:35 -07:00
zotlabs	aaff7c54cf	jotgetlink modal	2019-03-26 17:01:55 -07:00
zotlabs	83a79d4b6b	fixes from upstream	2019-03-26 16:06:06 -07:00
zotlabs	0030bdac40	xchan_instance_url was still being referenced, add expire app	2019-03-24 22:46:31 -07:00
zotlabs	395d7ba802	make categories app translateable	2019-03-24 20:18:13 -07:00
zotlabs	2499086f69	appify categories	2019-03-24 20:08:23 -07:00
zotlabs	1595bdc2aa	cleanup/remove unused xchan fields	2019-03-24 18:40:33 -07:00
zotlabs	3a95d71821	more prep work for collections	2019-03-23 15:23:59 -07:00
zotlabs	c3e9840a7d	sync apps, fix some warnings and prepare for a jot link modal	2019-03-21 21:57:43 -07:00
zotlabs	bc4d615701	update help text for content filters	2019-03-19 17:23:33 -07:00
zotlabs	2f8b1e550b	profile gender configurability	2019-03-18 21:33:50 -07:00
zotlabs	7169bd1ebc	xss issue from upstream, messagefilter enhancements	2019-03-18 19:19:04 -07:00
zotlabs	2df403c4ec	missing function	2019-03-17 21:18:32 -07:00
zotlabs	8e6e157be8	use php_eol in all mail functions	2019-03-17 16:32:21 -07:00
zotlabs	6eb1aa277a	Revert "use CRLF for all email headers" ... This reverts commit fe89b8d137.	2019-03-16 15:12:41 -07:00
zotlabs	84a99f9d6f	Merge branch 'dev' of ../p3 into dev	2019-03-16 13:46:43 -07:00
zotlabs	fe89b8d137	use CRLF for all email headers	2019-03-16 13:44:43 -07:00
zotlabs	6b233e512a	item redirection issue	2019-03-14 17:20:36 -07:00
zotlabs	9983c5c533	missing comma	2019-03-13 18:28:23 -07:00
zotlabs	611efdf529	expose the directory publish channel setting	2019-03-12 22:49:18 -07:00
zotlabs	033b4f7178	allow per-channel notification email (default is account email). There can be more than one (comma separated).	2019-03-12 21:42:32 -07:00
zotlabs	38b1740c0c	add indexes	2019-03-12 20:41:58 -07:00
zotlabs	35e42ba156	fetch changes from upstream	2019-03-12 19:13:48 -07:00
zotlabs	5be2ad8e3a	optionally require authenticated fetches	2019-03-11 17:45:44 -07:00
zotlabs	c1bf32cdc8	enforce channel and domain blocks on object fetches	2019-03-10 17:11:35 -07:00
zotlabs	30f40fd0d2	authenticated fetch fixes	2019-03-09 13:13:04 -08:00
zotlabs	c64a973f6f	zot_record_preferred was matching a column that was not supplied	2019-03-08 14:20:24 -08:00
zotlabs	8a43ee8fa8	changes from upstream	2019-03-07 20:13:33 -08:00
zotlabs	8f9234e77a	refetch incomplete activities with receiver credentials	2019-03-07 16:12:22 -08:00
zotlabs	d7e025278a	access token issue: xchan not stored on url login	2019-03-06 19:06:49 -08:00
zotlabs	905b7e1fa9	preserve system apps during channel cloning (check those that were installed on the other site and install them locally, preserving categories)	2019-03-06 14:58:19 -08:00
zotlabs	8eb18275c0	auto configure imagick converter during install if /usr/bin/convert is executable	2019-03-05 20:36:15 -08:00
zotlabs	d9a94f350c	chunk uploads for profile and cover photos	2019-03-05 19:51:41 -08:00
zotlabs	2540983c87	begin chunked uploads for profile photos	2019-03-05 18:31:38 -08:00
zotlabs	a1af668815	more work to support collections	2019-03-05 17:27:16 -08:00
zotlabs	823a5b0c3a	reduce assumption of default php upload limit to 2M	2019-03-05 15:22:43 -08:00
zotlabs	1c4475ab0b	typo	2019-03-05 14:14:40 -08:00
zotlabs	0e7cc08276	some basic collections/pages support	2019-03-04 23:51:47 -08:00
zotlabs	054e27fc75	remove items for removed connections in the background, also only deliver toplevel sync items to clones and remove these from normal delivery, fix to oep albums which was still using hex2bin/bin2hex (these are now hashes), add content import to translated apps, allow api routes to contain an optional argument.	2019-03-04 15:39:03 -08:00
zotlabs	1aa56aa76b	add moderated permission	2019-02-28 15:14:22 -08:00
zotlabs	2eabd8cb56	code cleanup	2019-02-25 19:45:50 -08:00
zotlabs	e938b7e71e	file import issues, change min php version in setup	2019-02-25 14:57:19 -08:00
zotlabs	5baa3fa4ef	issues encountered testing content_import plugin	2019-02-24 21:36:06 -08:00
zotlabs	0092c86a6f	remove title_tosource option	2019-02-24 15:09:42 -08:00
zotlabs	ff40f44da6	modify item export api call, plus a few changes from upstream	2019-02-23 15:23:33 -08:00
zotlabs	2b21e4d6e6	fix mod_activity AS query and change the fix for urlencoding of categories in category widget to match upstream	2019-02-21 14:38:11 -08:00
zotlabs	5addb5e344	Merge branch 'dev' of ../p3 into dev	2019-02-19 16:20:16 -08:00
zotlabs	6968d93b55	missing update	2019-02-19 16:19:53 -08:00
zotlabs	90155d47a4	Merge branch 'dev' of ../p3 into dev	2019-02-19 15:00:43 -08:00
zotlabs	466de65b35	add item uuid	2019-02-19 14:59:22 -08:00
zotlabs	4e9534106c	remove extra logging	2019-02-19 13:23:07 -08:00
zotlabs	e73af6511e	fix guest file (creator) delete	2019-02-19 13:04:28 -08:00
zotlabs	db4871ae1a	cloud perms and location independent content searching	2019-02-19 12:31:39 -08:00
zotlabs	f8d3c258b2	distributed hash lookup for zot location independent urls	2019-02-18 21:07:48 -08:00
zotlabs	cb79025f2d	detection function	2019-02-18 19:06:08 -08:00
zotlabs	ee0cdbc61a	debug x-zot: protocol requests	2019-02-18 17:28:29 -08:00
zotlabs	82a85d13c9	fixes from upstream - cryptolocker protect and urlencode entries in the category widget(s)	2019-02-18 15:25:41 -08:00
zotlabs	0563c714a7	infrastructure for resolving portable zot urls	2019-02-18 14:40:46 -08:00
zotlabs	e108b7c223	fixes from upstream	2019-02-17 21:45:31 -08:00
zotlabs	4b96c88e50	more removal of unnecessary legacy stuff, string update	2019-02-17 15:00:08 -08:00
zotlabs	e3a5b2fdf8	php warnings	2019-02-14 20:44:34 -08:00
zotlabs	9b36994ef1	Merge ../p3 into dev	2019-02-14 17:08:44 -08:00
zotlabs	db9eae39b8	more string changes	2019-02-14 17:06:17 -08:00
zotlabs	a7ba84e6f2	fix forum detection	2019-02-14 16:25:06 -08:00
zotlabs	f25a48c54a	accesscontrol rename	2019-02-14 16:01:40 -08:00
zotlabs	63a75cc7d5	rename privacy groups to access lists, forums to groups	2019-02-14 15:26:37 -08:00
zotlabs	c72d19dbf2	profile photo edit date weirdness	2019-02-13 21:07:27 -08:00
zotlabs	8b5bc7303f	more work zot+	2019-02-13 19:55:36 -08:00
zotlabs	154b0e96d5	start zot+/zap+	2019-02-13 15:33:45 -08:00
DM42 - Usezot	fbd277b314	Return all listeners	2019-02-11 21:33:41 -05:00
zotlabs	880579f249	change repo locations	2019-02-11 15:55:07 -08:00
zotlabs	329f441fec	remove hyperdrive setting as it does not work reliably in all cases	2019-02-11 15:15:12 -08:00
zotlabs	4bc9620597	expose setting to block public search	2019-02-07 21:05:42 -08:00
zotlabs	e1c82b4e99	suppress duplicates arriving via legacy zot (probably during polling) with legacy message-ids	2019-02-06 20:35:14 -08:00
zotlabs	23a67081d9	misc fixes from the logs and upstream	2019-02-05 19:01:17 -08:00
zotlabs	da09048a7d	linkify_tags fixes from upstream	2019-02-03 16:57:07 -08:00
zotlabs	25c160655f	fix for missing authors and a permission fix from upstream	2019-02-03 11:45:29 -08:00
zotlabs	342f6effe1	regression in latest queue work	2019-02-03 11:21:25 -08:00
zotlabs	9c1159db0a	missing paren	2019-02-01 13:11:20 -08:00
zotlabs	ec88b2e1fa	Merge branch 'dev' of https://framagit.org/macgirvin/osada into dev	2019-02-01 12:48:25 -08:00
zotlabs	77e84a70a9	better handling of tombstones	2019-02-01 12:47:34 -08:00
zotlabs	f31749d4ec	change privacy hover message when $privacy_warning in effect	2019-01-31 16:28:14 -08:00
zotlabs	0f2e991c56	rename the sharing options and update the license for 2019	2019-01-31 15:54:37 -08:00
Mike Macgirvin	002d900514	Merge branch 'patch-20190110a' into 'dev' ... FIX: memory exhaustion on exceptionally large message queues & multiple... See merge request macgirvin/osada!12	2019-01-31 01:31:32 +01:00
zotlabs	ec6297c60b	federation issues with embedded posts	2019-01-29 21:48:45 -08:00
zotlabs	8f861659d2	post embed	2019-01-29 21:26:52 -08:00
zotlabs	9eb9e10712	cache embeds on storage	2019-01-29 15:18:35 -08:00
zotlabs	f5125b51f1	add ical link to activitystreams event objects	2019-01-28 14:58:18 -08:00
zotlabs	3c0d9522b1	issue with fix to reshares	2019-01-27 14:53:24 -08:00
zotlabs	9355ceb526	fn not found	2019-01-27 14:46:57 -08:00
zotlabs	f7f8416477	share fixes	2019-01-27 12:39:28 -08:00
zotlabs	1c3d26fe83	remove unused zot6 'request' verb support	2019-01-26 12:30:18 -08:00
zotlabs	a07ef38902	typo	2019-01-24 19:05:43 -08:00
zotlabs	c43173109e	minor fixes from upstream	2019-01-24 19:03:14 -08:00
zotlabs	0bee1bdb49	missing file	2019-01-23 17:55:39 -08:00
zotlabs	ab9f1ae33c	wordsmithing	2019-01-23 16:18:05 -08:00
zotlabs	045debd26f	issues with autoperms, rewrite owa, upstream fixes to main.js	2019-01-23 14:27:51 -08:00
zotlabs	a4f638124b	content filter app	2019-01-22 19:11:53 -08:00
zotlabs	df5e298628	remove backtrace on zlib/webfinger, no longer needed for troubleshooting	2019-01-21 21:19:41 -08:00
zotlabs	1d3540ac6c	refactor include/follow (Connect::connect()) and update strings	2019-01-21 17:31:24 -08:00
zotlabs	c40a502b0c	provide tracking for errant double json encoding on zot6 transmissions (infrequent)	2019-01-20 19:37:39 -08:00
zotlabs	35f1cee50b	more comment policy work	2019-01-20 15:52:44 -08:00
zotlabs	4350a64f8d	be more specific about hubloc_network	2019-01-20 14:59:43 -08:00
zotlabs	1bdd8b6c52	comment perm issue	2019-01-20 14:39:52 -08:00
zotlabs	289150a21a	updates	2019-01-18 13:04:05 -08:00
zotlabs	f81d2f08d1	cleanup	2019-01-17 15:12:58 -08:00
zotlabs	bf39206518	store item_level to avoid a lot of recursion during rendering	2019-01-14 14:47:05 -08:00
zotlabs	40eb338db5	move ActivityStreams::fetch to Activity::fetch as it now has structural platform dependencies and may require porting.	2019-01-13 21:22:45 -08:00
zotlabs	a611a1cecc	send signed fetches over AP, requeue (queue::update) AP messages on fail, set ajaxasync flag on updates, upstream fixes to mail import	2019-01-13 16:08:26 -08:00
M. Dent	366f7c3fe6	use db_getfunc().	2019-01-11 14:13:56 +01:00
DM42.Net (Matt Dent)	2003e0dbdc	Fix for difference between PGSQL and MYSQL	2019-01-10 15:23:22 -05:00
ZotSocial Admin	35a7fe1994	FIX: memory exhaustion on exceptionally large message queues & multiple Queue.php invocations duplicate work	2019-01-10 13:38:14 -05:00
zotlabs	d3121763f3	make base apps pluggable	2019-01-08 20:34:39 -08:00
zotlabs	66e0c61ebb	separate blacklisting availability for public streams and general communications	2019-01-05 14:47:21 -08:00
zotlabs	7d3c1bd947	wrong variable	2019-01-05 12:46:20 -08:00
zotlabs	64462c9d0d	enable activitypub for encoding collections	2019-01-05 12:42:41 -08:00
zotlabs	c3ab068607	comment policy work	2019-01-05 12:39:19 -08:00
zotlabs	c0e1a03996	crypto issue - undefined variable	2019-01-05 11:17:51 -08:00
zotlabs	921313f0c8	remaining work on slider conversion	2018-12-30 14:36:23 -08:00
zotlabs	4ba9257b9c	slider value updates	2018-12-29 15:40:07 -08:00
zotlabs	77f43d4c4e	fix db update	2018-12-29 14:44:30 -08:00
zotlabs	ff4b1331db	reset system apps	2018-12-29 14:40:10 -08:00
zotlabs	ad55860b00	slider work	2018-12-28 15:13:22 -08:00
zotlabs	a001507577	assorted issues	2018-12-26 15:33:01 -08:00
zotlabs	4dc31a5fc7	allow bypass for hyperdrive setting on announce activities	2018-12-18 23:39:31 -08:00
zotlabs	ad5381545a	affinity slider issues after approving connections	2018-12-17 01:59:17 -08:00
zotlabs	7e4fc5c438	completion of crypto cleanup	2018-12-16 20:37:43 -08:00
zotlabs	8ffbf543c4	upstream fixes	2018-12-15 14:03:20 -08:00
zotlabs	e47bc21034	crypto: switch to Keyutils - please review	2018-12-14 12:46:03 -08:00
zotlabs	b290a631d2	crypto - split off key conversion functions, review required	2018-12-13 17:53:09 -08:00
zotlabs	cb42507e1f	crypto: migration please review	2018-12-13 17:16:01 -08:00
gia vec	cb51317028	Update Activity.php forgot one more ':'	2018-12-13 14:58:41 -08:00
zotlabs	97d051337c	Begin rewrite of crypto library. As I reside in Australia, this is being re-written in stages to allow easy verification by non-Australian developers. Please review this work. It is currently not linked to running code.	2018-12-13 14:47:48 -08:00
zotlabs	ccb6d409fb	provide override	2018-12-13 14:35:14 -08:00
zotlabs	bbc90c4b4f	ebs	2018-12-13 14:14:01 -08:00
zotlabs	b9d1ccbbc3	issues with app ordering	2018-12-12 19:04:59 -08:00
zotlabs	1fa2d111ba	wrong varname	2018-12-12 16:26:30 -08:00
zotlabs	a66c72127a	missing arg in pconfig_get	2018-12-12 15:39:17 -08:00
zotlabs	42fa248f81	prefer zot6 hublocs and xchans when there's a choice.	2018-12-11 21:42:15 -08:00
zotlabs	334bec0f40	strip titles on response activities	2018-12-11 21:03:50 -08:00
zotlabs	c4b3ad8c76	try to gracefully handle multi-protocol xchans/hublocs with the same url	2018-12-11 20:30:47 -08:00
zotlabs	50ad168ad0	issues with language filtering	2018-12-11 15:57:15 -08:00
zotlabs	0a2eae6612	configurable hyperdrive	2018-12-10 23:53:03 -08:00
zotlabs	74d1b11961	use modulus differentiation between thread levels to aid quick comparisons	2018-12-10 21:01:57 -08:00
zotlabs	49f9d5076f	fix home ping results when large number of network posts is present	2018-12-09 14:15:35 -08:00
zotlabs	437b40b04c	code modernisation	2018-12-06 21:54:06 -08:00
zotlabs	bd424cd2dd	change the rules slightly for converting notes to articles. We got a lot of false positives	2018-12-05 15:27:07 -08:00
zotlabs	52e5cee217	dilithium crystals were 2nd quality	2018-12-04 21:51:56 -08:00
zotlabs	9166c0cc87	re-use of wrong query result	2018-12-04 19:57:28 -08:00
zotlabs	963d799144	not needed	2018-12-04 16:26:21 -08:00
zotlabs	c163ebcf8b	new dimensions in hyperspace	2018-12-04 16:20:54 -08:00
zotlabs	a516b82cef	update inbox location if it changes	2018-12-04 03:24:41 -08:00
zotlabs	643214917d	misc fixes, plus add cover photo and profile "about" to AP actor document	2018-12-03 21:45:35 -08:00
zotlabs	a47aae22d0	more work on zap missing parents	2018-12-02 21:51:45 -08:00
zotlabs	b3d36b0c7c	thread issues	2018-12-02 20:24:12 -08:00
zotlabs	580642a8a0	issues with conversation completion which included AP messages	2018-12-02 16:46:52 -08:00
zotlabs	7ebf204b53	change reply label	2018-12-02 15:52:20 -08:00
zotlabs	cb59d4a144	thread support	2018-12-02 14:39:58 -08:00
zotlabs	4cd565930c	allow notification filtering by name or addr	2018-11-30 19:01:10 -08:00
zotlabs	f4cfa8876f	prevent update 1223 from exhausting mysql data limits	2018-11-26 18:29:26 -08:00
zotlabs	ee4c181801	fix comment policy for zot6 delivery of AP messages	2018-11-26 16:16:07 -08:00
zotlabs	d67392ff26	remove post_wall permission from the Osada side since those messages will not federate over AP	2018-11-25 14:20:34 -08:00
zotlabs	2ee719abc0	actor type = Organization wasn't being recognised.	2018-11-23 12:18:19 -08:00
zotlabs	b722b87041	new activitypub forum implementation (compatible with mastodon)	2018-11-22 17:04:28 -08:00
zotlabs	00fb137164	more tag stuff	2018-11-21 21:05:08 -08:00
zotlabs	686585c703	consistency in iconfig names	2018-11-21 19:04:42 -08:00
zotlabs	a21d412409	typo	2018-11-21 18:27:19 -08:00
zotlabs	530a377982	more forum work	2018-11-21 18:24:45 -08:00
zotlabs	e253a25025	forum work	2018-11-21 17:46:08 -08:00
zotlabs	6dc45a9644	fix wildcard blacklist checking	2018-11-20 21:50:41 -08:00
zotlabs	7b23312af7	config rework fixes	2018-11-20 19:32:15 -08:00
zotlabs	67ebc86812	config updates	2018-11-20 19:15:15 -08:00
zotlabs	f10ed01fac	hardening	2018-11-20 18:55:33 -08:00
zotlabs	69ebb48efa	some actor records not updated after cache timeout	2018-11-19 20:50:58 -08:00
zotlabs	6f098fdc74	typo	2018-11-19 18:52:10 -08:00
zotlabs	7cc762dcea	add more schema validation to clone sync activities	2018-11-19 17:30:22 -08:00
zotlabs	8f6b1c1239	comment delivery issue	2018-11-18 21:53:09 -08:00
zotlabs	e86d864bab	datetime_convert wrong args	2018-11-15 21:12:59 -08:00
zotlabs	af6a52ffe3	misc cleanup from hubzilla	2018-11-15 20:52:08 -08:00
zotlabs	1f29a86580	update missing addr's on actor_store, send Page urls through linkinfo to make the content more interesting	2018-11-13 17:23:09 -08:00
zotlabs	c9c26fba1c	parsing issue with prismo	2018-11-12 19:38:21 -08:00
zotlabs	5604952809	mention issue	2018-11-11 19:16:22 -08:00
zotlabs	8fb97e9e16	php warning	2018-11-11 19:13:11 -08:00
zotlabs	30b5902496	regression	2018-11-11 18:51:05 -08:00
zotlabs	0e124bb0da	change directory default	2018-11-11 18:31:48 -08:00
zotlabs	a4088ec4bf	more repair of malformed xchan storage	2018-11-08 17:02:04 -08:00
zotlabs	bc688da078	incorrect ids on some Mastodon xchans	2018-11-08 15:00:33 -08:00
zotlabs	1bf150398e	implement update-person activity	2018-11-07 20:29:14 -08:00
zotlabs	fc63913421	Mastodon notification issues	2018-11-07 18:24:22 -08:00
zotlabs	b58c032b8f	osada issue #6 - enforce Mastodon advisory privacy on hyper-drive imported items	2018-11-07 15:31:11 -08:00
zotlabs	b590ad1b3f	minor warning	2018-11-05 18:47:21 -08:00
zotlabs	ced3fe7aa5	Merge branch 'dev' of https://framagit.org/macgirvin/osada into dev	2018-11-04 17:19:23 -08:00
zotlabs	cb9e81a1d3	route mismatch for comments between osada and zap	2018-11-04 17:18:12 -08:00
Mike Macgirvin	709da04938	Merge branch 'patch-20181103c' into 'dev' ... Fix spurrious error for sites without images See merge request macgirvin/osada!8	2018-11-04 08:51:41 +01:00
Mike Macgirvin	e40d3fcaf7	Merge branch 'patch-20181103b' into 'dev' ... Fix array_key_exists with non-array error See merge request macgirvin/osada!7	2018-11-04 08:50:44 +01:00
DM42.Net (Matt Dent)	8a2e9ec9e6	Fix spurrious error for sites without images	2018-11-03 12:11:17 -04:00
DM42.Net (Matt Dent)	4157a0b52f	Fix missing paren	2018-11-03 10:26:20 -04:00
DM42.Net (Matt Dent)	916a2e0d0e	Fix array_key_exists with non-array error	2018-11-03 10:20:18 -04:00
M.Dent	35aa253ff0	Fix not array, is hash	2018-11-03 10:08:09 -04:00
zotlabs	b20032a61d	compatibility fix for prismo 'Page' types and fix from upstream for scaled images	2018-11-01 16:53:45 -07:00
zotlabs	8c860d04ce	updates from upstream	2018-10-30 15:42:52 -07:00
zotlabs	d9170c6617	more photo object work	2018-10-28 21:01:58 -07:00
zotlabs	7e3c8e46e7	turn photos into proper AS objects (still need to fix the places where they were turned into Note for short-term compatibility)	2018-10-28 20:39:01 -07:00
zotlabs	516a375fff	fix embed photos from albums and phase1 of the forum count bug from hubzilla and the edit post breaking delivery chain bug also from hubzilla	2018-10-27 14:30:07 -07:00
zotlabs	5c58abd801	superblock leaking through enotify::format	2018-10-25 22:12:47 -07:00
zotlabs	df1000a8a0	add tag_deliver permission to discovered activitypub groups	2018-10-24 22:43:00 -07:00
zotlabs	d2cc723e11	separate pubsites page into separate projects	2018-10-23 17:49:08 -07:00
zotlabs	1898ca3216	strings	2018-10-23 15:36:48 -07:00
Mike Macgirvin	441b65c030	mv blueimp library to composer, remove duplicate copy in library	2018-10-23 11:00:33 +11:00
zotlabs	55a4fa44a2	secondary delivery issue	2018-10-21 18:05:32 -07:00
zotlabs	8993466023	wrong verb on announce notifications	2018-10-20 15:12:23 -07:00
zotlabs	6378cb8f27	miscellaneous fixes, unset project icon, onepoll feed failure	2018-10-20 02:03:31 -07:00
zotlabs	699cd0de85	remove singleton code on activitypub	2018-10-18 17:37:34 -07:00
zotlabs	dabd21008f	fix branding in email notifications	2018-10-17 21:11:29 -07:00
zotlabs	aeb282d9c1	share improvements	2018-10-17 16:08:43 -07:00
zotlabs	cd2c3f7127	share issue on zot6 side	2018-10-17 15:51:23 -07:00
zotlabs	6b1f3eeae6	still some mention url weirdness but this might get past pleroma's parser	2018-10-17 01:26:23 -07:00
zotlabs	89130e78b7	also block upstream swimmers to the source_xchan in a downstream flow	2018-10-16 22:33:45 -07:00
zotlabs	48363c2cab	event AP endpoint update	2018-10-16 20:42:44 -07:00
zotlabs	134dd8d653	setup fixes	2018-10-16 20:25:37 -07:00
zotlabs	8c74cfb6a9	better formatting of rsvp reactions	2018-10-16 20:07:45 -07:00
zotlabs	21301adfd3	owa issue	2018-10-16 19:32:17 -07:00
zotlabs	38b54f55d1	event formatting and rsvp parenting	2018-10-16 13:56:46 -07:00
zotlabs	5c456461cf	bug - regression	2018-10-15 19:41:17 -07:00
zotlabs	eda156a5bb	regression in socgraph	2018-10-15 19:29:32 -07:00
zotlabs	79ab759d58	php warnings	2018-10-15 18:52:55 -07:00
zotlabs	4ee5755bc6	peertube improvements, missing host in dreport	2018-10-15 18:27:03 -07:00
zotlabs	986f385bdd	wrong content for announce activities when the object originated on osada	2018-10-15 01:21:47 -07:00
zotlabs	8dd30c5f7a	php warning removing ap connnection	2018-10-14 22:42:55 -07:00
zotlabs	c82d1b03fa	missing quote	2018-10-14 19:02:15 -07:00
zotlabs	7fca42bec6	better response handling	2018-10-14 15:47:57 -07:00
zotlabs	23256b5b1a	update banner	2018-10-13 17:53:17 -07:00
zotlabs	8119fe2e5a	merge bbcode summary with actual summary	2018-10-13 00:37:22 -07:00
zotlabs	4af3f25c15	remove nav link override, turn announce activities into sourced items	2018-10-11 21:05:30 -07:00
zotlabs	63faaa1b55	improve check for media inclusion	2018-10-11 16:54:31 -07:00
zotlabs	d9bdd894af	missing content-length for sigs	2018-10-11 01:02:34 -07:00
zotlabs	4ad47bae64	typo	2018-10-10 21:46:33 -07:00
zotlabs	9238ec9f68	don't auto-insert mentions in Zap comments	2018-10-10 21:39:33 -07:00
zotlabs	9f5520325f	multiple photo issue	2018-10-10 21:36:55 -07:00
zotlabs	31fd804c6b	regression found in auto author mention	2018-10-10 21:27:15 -07:00
zotlabs	c998a084da	auto mention comment authors; up to 6 total. If more, select the first and last 3 and always exclude yourself.	2018-10-10 20:24:28 -07:00
zotlabs	84552ef9d5	better handling of tombstones, schema changes from upstream	2018-10-10 18:53:26 -07:00
zotlabs	c9bcde817a	the rest of the bits	2018-10-10 17:58:51 -07:00
zotlabs	c5a886ffea	missed a fix	2018-10-09 22:32:20 -07:00
zotlabs	3a8d916702	better signature handling	2018-10-09 21:08:57 -07:00
zotlabs	b66312e408	status editor hook	2018-10-08 21:27:35 -07:00
zotlabs	c2b8829f9d	hubzilla core issue #1278	2018-10-07 22:15:46 -07:00
zotlabs	1dc002c4fd	wrong mime type	2018-10-07 20:37:34 -07:00
zotlabs	87587c40d3	rework the banner code	2018-10-07 19:54:25 -07:00
zotlabs	4d76e4a99f	default icon	2018-10-07 19:44:27 -07:00
zotlabs	a5455fa049	add personal filter and fix api zot-auth	2018-10-07 15:51:52 -07:00
zotlabs	d39fd52f16	one more try altering content so it will get through Mastodon's content mangler	2018-10-04 21:40:16 -07:00
zotlabs	d64e67b18c	fix affinity settings, use export var on bbcode destined for ActivityPub recipients to strip out map and embed scripts	2018-10-04 21:16:20 -07:00
zotlabs	9424a7f56b	app updates from red/hubzilla	2018-10-04 20:29:41 -07:00
zotlabs	be7cb76651	group support	2018-10-04 18:40:57 -07:00
zotlabs	2f48679fef	fix import/export after project merger	2018-10-04 13:45:20 -07:00
zotlabs	02d0256449	fix masto images (again)	2018-10-04 02:19:08 -07:00
zotlabs	6a71ffe2c2	correct the servername	2018-10-03 19:31:47 -07:00
zotlabs	bd5d6158a1	zap/osada repo merger	2018-10-03 19:10:52 -07:00
M.Dent	404b7d48dc	Fix import_xchan function not found	2018-09-27 23:13:00 -04:00
zotlabs	cdee25ea1b	sql error	2018-09-25 23:50:35 -07:00
zotlabs	0460814158	channel signing issue	2018-09-25 20:41:06 -07:00
zotlabs	290b8b58ec	rename groups and group_members tables	2018-09-25 17:50:59 -07:00
zotlabs	6f6d54d378	cleanup	2018-09-25 17:50:12 -07:00
zotlabs	cd8150f20d	push version	2018-09-23 18:23:28 -07:00
zotlabs	f1ed64efe4	fixes	2018-09-23 17:03:10 -07:00
zotlabs	54bfc4a88d	delivery issues	2018-09-21 16:29:13 -07:00
zotlabs	382551e4b4	strip bbcode from event titles	2018-09-20 22:50:12 -07:00
zotlabs	6221d2b1bb	php warning	2018-09-20 17:17:41 -07:00
zotlabs	1a3d9ca91b	better handling of masto approve	2018-09-19 23:53:26 -07:00
zotlabs	d69b88e793	Merge branch 'zap' into dev	2018-09-19 22:50:47 -07:00
zotlabs	8b123f57ad	Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap	2018-09-19 22:47:25 -07:00
zotlabs	e76d2201bf	better handling of media objects	2018-09-19 22:47:03 -07:00
zotlabs	7d8cbb01bb	Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap	2018-09-19 22:01:11 -07:00
zotlabs	8e4f5007b4	button to add conversation mentions in comments	2018-09-19 22:00:29 -07:00
zotlabs	3b688d678e	typo	2018-09-19 21:42:54 -07:00
zotlabs	551314201c	Merge branch 'zap' into dev	2018-09-19 20:48:14 -07:00
zotlabs	202c96eb77	Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap	2018-09-19 20:48:00 -07:00
zotlabs	14ad70c587	thread author mentioning (begin)	2018-09-19 20:47:31 -07:00
Mike Macgirvin	529171de8f	Merge branch 'dev' of https://framagit.org/macgirvin/zap into dev	2018-09-20 12:36:29 +10:00
zotlabs	92b2d17297	Merge branch 'zap' into dev	2018-09-19 17:55:15 -07:00
zotlabs	b95f41571c	Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap	2018-09-19 17:54:07 -07:00
zotlabs	45ece3c6c5	item fix	2018-09-19 17:53:49 -07:00
zotlabs	e98ca4af20	fix item, setup	2018-09-19 17:52:21 -07:00
zotlabs	9725e55eb9	Merge branch 'dev'	2018-09-19 16:29:29 -07:00
zotlabs	0bc76e85e4	Merge branch 'zap' into dev	2018-09-19 16:26:36 -07:00
zotlabs	fd0de5fc12	Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap	2018-09-19 16:26:05 -07:00
zotlabs	c0f8940b60	indicate cached records	2018-09-19 16:25:05 -07:00
zotlabs	d3b28b718c	Merge branch 'red' into dev	2018-09-18 20:51:38 -07:00
zotlabs	0709d0f08e	Merge branch 'zap' into dev	2018-09-17 23:41:03 -07:00
zotlabs	ab3d3b029e	Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap	2018-09-17 23:40:45 -07:00
zotlabs	9f14cd4b3c	missing connect link if no xchan_addr	2018-09-17 23:40:17 -07:00
zotlabs	6667554916	missing connect link if no xchan_addr	2018-09-17 23:34:33 -07:00
zotlabs	f2d3fd0f1a	Merge branch 'zap' into dev	2018-09-17 22:53:51 -07:00
zotlabs	f6c5e9e610	Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap	2018-09-17 22:53:38 -07:00
zotlabs	b16e5716b7	Merge branch '1.0'	2018-09-17 22:53:19 -07:00
zotlabs	5c21236dc1	Merge branch 'dev' into 1.0	2018-09-17 22:53:04 -07:00
zotlabs	f2c99480f0	generate better photo and event activities	2018-09-17 22:51:27 -07:00
zotlabs	f0b6952585	generate full actor record on follow json	2018-09-17 22:50:06 -07:00
zotlabs	dfdf11d461	Merge branch 'dev'	2018-09-17 19:38:40 -07:00
zotlabs	cc5ef57843	fix listeners table create and expire federation had a syntax error	2018-09-17 18:40:49 -07:00
zotlabs	fdc89d1b89	pdo install check requires namespacing	2018-09-17 13:03:17 -07:00
zotlabs	390a570b51	Merge branch 'zap' into dev	2018-09-17 13:00:40 -07:00
zotlabs	926c63ee84	Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap	2018-09-17 13:00:02 -07:00
zotlabs	79af06d6e1	Merge branch 'dev'	2018-09-17 12:58:54 -07:00
zotlabs	fcc7358a44	Merge branch 'dev' into 1.0	2018-09-17 12:58:41 -07:00
zotlabs	01d38494d9	fix install check	2018-09-17 12:58:05 -07:00
Mario Vavti	1455fa6bc3	Merge branch 'dev' of https://framagit.org/hubzilla/core into dev	2018-09-17 11:36:25 +02:00
Mario Vavti	a9853e6033	seperate settings for mod network	2018-09-17 11:36:11 +02:00
Mario	3019d8341d	Merge branch 'app-list-hook' into 'dev' ... Add hook to allow addons to filter the list returned by app_list See merge request hubzilla/core!1276	2018-09-17 10:55:47 +02:00
Mario Vavti	dcacfc1124	Merge remote-tracking branch 'mike/master' into dev	2018-09-17 10:31:13 +02:00
Mario Vavti	2f6cb764a4	prepare submodule to interact with route	2018-09-17 10:30:47 +02:00
zotlabs	30154b0f0b	Merge branch 'zap' into dev	2018-09-16 22:07:35 -07:00
zotlabs	ea2db5d7aa	Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap	2018-09-16 22:07:18 -07:00
zotlabs	dad5039b09	Merge branch 'dev'	2018-09-16 22:04:54 -07:00
zotlabs	6ccbb9a14d	Merge branch 'dev' into 1.0	2018-09-16 22:04:44 -07:00
zotlabs	cf64349379	usort : use class function	2018-09-16 22:04:11 -07:00
zotlabs	0eb1752ed5	duplicate	2018-09-16 21:45:44 -07:00
zotlabs	f0266b4837	Merge branch 'zap' into dev	2018-09-16 21:43:20 -07:00
zotlabs	8d565a8305	Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap	2018-09-16 21:43:06 -07:00
zotlabs	943edb4c14	simplify AP discovery	2018-09-16 21:42:41 -07:00
zotlabs	e9f862b2d6	Merge branch 'dev'	2018-09-16 21:42:28 -07:00
zotlabs	488cf522ed	Merge branch 'dev' into 1.0	2018-09-16 21:42:16 -07:00
zotlabs	0aaaa882ad	simplify activitypub discovery	2018-09-16 21:41:24 -07:00
zotlabs	c3a74b3ece	setup and channel sync fixes from upstream	2018-09-16 20:01:53 -07:00
M.Dent	a0cf2b53e0	Add hook to allow addons to filter the list returned by app_list	2018-09-16 23:01:17 -04:00
zotlabs	593a5072d9	Some improvements to setup checks: image library and pdo support	2018-09-16 20:00:20 -07:00
zotlabs	27617efbfb	Merge branch 'dev'	2018-09-16 19:05:12 -07:00
zotlabs	a8f4091551	Merge branch 'zap' into dev	2018-09-16 18:42:07 -07:00
zotlabs	ee8cdafd92	Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap	2018-09-16 18:41:56 -07:00
zotlabs	f3d8730f42	resolve naming dispute over network app	2018-09-16 18:37:15 -07:00
zotlabs	4005a0217f	resolve naming dispute over network app	2018-09-16 18:37:02 -07:00
zotlabs	29f4230474	resolve naming dispute over network app	2018-09-16 18:35:43 -07:00
zotlabs	347e391e51	Merge branch 'dev' into 1.0	2018-09-16 17:07:35 -07:00
zotlabs	3c3f395d24	Merge branch 'zap' into dev	2018-09-16 17:06:34 -07:00
zotlabs	72f098e1c0	Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap	2018-09-16 17:05:54 -07:00
zotlabs	1856d39237	correct owner attribution	2018-09-16 17:05:39 -07:00
zotlabs	d476b46fcf	correct owner attribution	2018-09-16 17:04:47 -07:00
Mario Vavti	07cd1d1272	appification of the lang module	2018-09-16 09:30:07 +02:00
Mario Vavti	791ff25d52	appify poke	2018-09-15 11:09:16 +02:00
Mario Vavti	299eb469f8	appify mood	2018-09-15 11:00:41 +02:00
Mario Vavti	0f9a8a43e4	appify invite	2018-09-15 10:48:51 +02:00
Mario Vavti	7856f5882b	appify cdav stuff. WARNING: if you use caldav or carddav from a client or the webinterface you will need to enable those apps to make things work again	2018-09-15 10:10:43 +02:00
zotlabs	ca752cfb1f	Merge branch 'zap' into dev	2018-09-14 14:38:23 -07:00
zotlabs	d725f9d97f	Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap	2018-09-14 14:38:10 -07:00
zotlabs	d6a68b8f8c	Merge commit '6734fea'	2018-09-14 14:37:33 -07:00
zotlabs	6734feaa81	Merge commit '3bc079e' into 1.0	2018-09-14 14:37:07 -07:00
zotlabs	3bc079e69e	zap issue #3 cannot post to public forum using tag mentions	2018-09-14 14:33:39 -07:00
zotlabs	3bd1df52bf	Merge branch 'zap' into dev	2018-09-14 02:19:23 -07:00
zotlabs	097a0e5adc	Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap	2018-09-14 02:19:05 -07:00
zotlabs	2542617471	zot6 import authors in hyperdrive mode	2018-09-14 02:18:17 -07:00
zotlabs	8505ae4ab2	zot6 import authors in hyperdrive mode	2018-09-14 02:18:07 -07:00
zotlabs	273a9b12f0	zot6 import authors in hyperdrive mode	2018-09-14 02:16:42 -07:00
zotlabs	c16fa755a8	Merge branch 'zap' into dev	2018-09-13 22:40:23 -07:00
zotlabs	4b7770f28c	Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap	2018-09-13 22:40:11 -07:00
zotlabs	f2c7e7bb01	Merge branch 'dev'	2018-09-13 22:39:44 -07:00
zotlabs	048c5f65e2	old protocol string still showing	2018-09-13 22:39:05 -07:00
zotlabs	26e419e032	hardwire group widget = enabled	2018-09-13 21:25:37 -07:00
zotlabs	2b39a93e0f	Merge branch 'zap' into dev	2018-09-13 18:44:24 -07:00
zotlabs	980ccf0876	Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap	2018-09-13 18:44:05 -07:00
zotlabs	57d7c81c31	missing call to actor_store	2018-09-13 18:43:23 -07:00
zotlabs	767d1f9889	missing call to actor_store	2018-09-13 18:42:29 -07:00
zotlabs	5cee677014	Merge branch 'zap' into dev	2018-09-13 18:23:00 -07:00
zotlabs	71cc526f7d	Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap	2018-09-13 18:22:43 -07:00
zotlabs	9febf8643e	chanview not redirecting properly for z6	2018-09-13 18:20:59 -07:00
zotlabs	abeb19416e	chanview not redirecting properly for z6	2018-09-13 18:19:54 -07:00
Mario Vavti	869534fafa	remove network_tabs() which has been deprecated and replaced by activity_{order, filters} widgets	2018-09-13 11:53:59 +02:00
Mario Vavti	56f88f2e30	move chat from feature to apps	2018-09-13 11:32:43 +02:00
Mario Vavti	a1d5ce3716	remove profile_tabs() which has been deprecated and replaced by channel_apps()	2018-09-13 10:59:37 +02:00
zotlabs	4a8de535e2	Merge branch 'master' of https://framagit.org/macgirvin/zap	2018-09-12 22:29:29 -07:00
Mario Vavti	2651eae663	mpre feature to app transition	2018-09-12 11:08:53 +02:00
zotlabs	1d9c5eb821	Merge branch 'zap' into dev	2018-09-11 22:23:48 -07:00
zotlabs	3fdb9f3cfd	Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap	2018-09-11 22:23:32 -07:00
zotlabs	73ae895e5c	abook sync issue	2018-09-11 22:21:31 -07:00
zotlabs	fda9a36505	Merge branch 'zap' into dev	2018-09-11 17:41:22 -07:00
zotlabs	eb3a5349db	Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap	2018-09-11 17:37:54 -07:00
zotlabs	f9b344ac4d	runtime errors	2018-09-11 17:35:31 -07:00
zotlabs	66cd2dc7e4	cleanup	2018-09-11 16:58:26 -07:00
zotlabs	67ae00ae2f	it's alive	2018-09-11 03:36:31 -07:00
Mario Vavti	28e4977c33	include item.title in /network and /channel search	2018-09-11 11:16:58 +02:00
zotlabs	adc164b825	Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge	2018-09-10 22:11:26 -07:00
zotlabs	04a5ebf8c0	Merge branch 'zap' into dev	2018-09-10 18:39:15 -07:00
zotlabs	e45583c794	Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap	2018-09-10 18:37:51 -07:00
zotlabs	f2e8d9f032	more hyperdrive	2018-09-10 18:36:52 -07:00
Mario Vavti	c6abe87ec2	move cards from features to apps	2018-09-10 13:34:05 +02:00
zotlabs	c960c91a8d	wrong mimetype	2018-09-09 23:29:14 -07:00
zotlabs	44df4d785e	Merge branch 'zap' into dev	2018-09-09 23:23:42 -07:00
zotlabs	ddb50b8de4	Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap	2018-09-09 23:17:23 -07:00
zotlabs	44af74af3b	tweaks	2018-09-09 23:16:58 -07:00
zotlabs	c4dc8b9cca	hyperdrive stuff	2018-09-09 23:15:59 -07:00
zotlabs	b837f0b8fc	Merge branch 'red' into dev	2018-09-09 20:59:13 -07:00
zotlabs	abfb17ef33	hyperdrive work	2018-09-09 20:55:51 -07:00
zotlabs	be3b630474	important hyperdrive component	2018-09-09 20:53:20 -07:00
zotlabs	e1b0570690	assorted fixes	2018-09-09 18:28:13 -07:00
Mario Vavti	9607bb29fd	missing text	2018-09-07 14:58:16 +02:00
Mario Vavti	d29415a6e2	provide a noscript_content switch for mod channel and display	2018-09-07 14:23:16 +02:00
zotlabs	20520b2ecc	merge from downstream	2018-09-07 04:47:53 -07:00
zotlabs	39d295462e	merge from downstream	2018-09-07 04:46:57 -07:00
zotlabs	0a36bc3eab	like parents	2018-09-07 04:44:49 -07:00
Mario Vavti	54fa28441c	install bootstrap via composer	2018-09-07 11:26:02 +02:00
Mario Vavti	bb42ec2bfc	apps: change page title to available/installed, display install action label in button and use different icons for installable and updateable apps	2018-09-07 10:39:15 +02:00
zotlabs	5079b44d08	undeclared var	2018-09-06 22:52:48 -07:00
zotlabs	235c0a2865	signature changes	2018-09-06 21:55:30 -07:00
zotlabs	6f2284ba18	missing observer	2018-09-06 21:51:52 -07:00
zotlabs	667f8ed920	delivery optimisations	2018-09-06 21:24:56 -07:00
zotlabs	00eeb680d9	set a process timeout for fetching remote xchan photos	2018-09-06 18:33:27 -07:00
zotlabs	61165cbb37	merge	2018-09-06 17:50:45 -07:00
zotlabs	a1cf08ac36	Merge branch 'zap' into dev	2018-09-06 17:44:12 -07:00
zotlabs	4005c484c1	Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap	2018-09-06 17:42:01 -07:00
zotlabs	551e7b332a	move xchan_photo import to background	2018-09-06 17:37:09 -07:00
zotlabs	b77eac2ae8	move xchan_photo processing to background	2018-09-06 17:36:35 -07:00
zotlabs	acad5df5dc	typo	2018-09-06 17:01:16 -07:00
zotlabs	3ff96239f6	typo	2018-09-06 17:00:42 -07:00
zotlabs	91d629fb8e	typo	2018-09-06 16:59:19 -07:00
zotlabs	7b492d2bd3	federated emoji support	2018-09-06 16:40:13 -07:00
zotlabs	2640c49c0e	add federated forum role	2018-09-05 23:13:55 -07:00
zotlabs	b38625aef6	Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into dev	2018-09-05 21:23:49 -07:00
zotlabs	44ca674937	Merge branch 'red' into dev	2018-09-05 21:18:14 -07:00
zotlabs	efab473ee2	add comment_policy	2018-09-05 16:30:46 -07:00
Mario Vavti	ea381d9180	move str_replace inside if clause	2018-09-05 14:44:06 +02:00
Mario	a81a1bd5f1	Merge branch 'fix-authorcomment-fix' into 'dev' ... Corrected resubmit of fixes to Authors unable to comment on posts they authored… See merge request hubzilla/core!1269	2018-09-05 12:18:56 +02:00
Mario Vavti	5d1539df75	Merge branch 'dev' of https://framagit.org/hubzilla/core into dev	2018-09-05 12:17:50 +02:00
Mario Vavti	a821682c8c	instead of not displaying the cover-photo at all after first page load, load the page with the cover slided up. change pointer to n-resize if cover is not slid.	2018-09-05 12:17:32 +02:00
zotlabs	46c3a2f196	Merge branch 'zap'	2018-09-04 23:44:56 -07:00
zotlabs	cd429d343e	Merge branch 'master' of /home/macgirvin/zap.macgirvin.com into zap	2018-09-04 23:44:43 -07:00
zotlabs	ccf0df2602	set the default profile photo before fetching one, in case the process gets killed.	2018-09-04 23:42:06 -07:00
zotlabs	68634ec02e	Merge branch 'zap'	2018-09-04 19:07:06 -07:00
zotlabs	c42dd61301	Merge branch 'master' of /home/macgirvin/zap.macgirvin.com into zap	2018-09-04 19:06:49 -07:00
zotlabs	a4cfb0558a	set default profile photo is nothing was found	2018-09-04 19:06:19 -07:00
zotlabs	27a982249b	Merge branch 'zap'	2018-09-04 18:48:48 -07:00
zotlabs	286bd494f2	Merge branch 'master' of /home/macgirvin/zap.macgirvin.com into zap	2018-09-04 18:46:49 -07:00
zotlabs	bd1fa5c360	stream order widget	2018-09-04 18:44:02 -07:00
M.Dent	9446e0348e	Corrected resubmit of fixes to Authors unable to comment on posts they authored when owned by others.	2018-09-04 08:14:52 -04:00
zotlabs	0aa9c35d0c	announce improvements	2018-09-04 04:06:50 -07:00
zotlabs	fb068ac9f7	more tweaks	2018-09-03 21:30:39 -07:00
zotlabs	e2e4dd6f2c	more small fixes	2018-09-03 18:23:31 -07:00
zotlabs	6ef4abacb1	more fine tuning	2018-09-03 18:22:31 -07:00
Mario Vavti	41ccb61c2e	Revert "Fix: Authors unable to comment on posts they authored when under owned by others in certain circumstances." ... This reverts commit e2824f9259. Reverting because it breaks forum mentions.	2018-09-03 18:14:17 +02:00
zotlabs	675914c6a5	Merge branch 'zap'	2018-09-02 23:13:30 -07:00
zotlabs	b0b08ea9bd	Merge branch 'master' of /home/macgirvin/zap.macgirvin.com into zap	2018-09-02 23:13:15 -07:00
zotlabs	5e47e9d258	use activity url	2018-09-02 23:12:53 -07:00
zotlabs	10ac556bb4	Merge branch 'zap'	2018-09-02 22:59:59 -07:00
zotlabs	edb22f9244	Merge branch 'master' of /home/macgirvin/zap.macgirvin.com into zap	2018-09-02 22:59:36 -07:00
zotlabs	95c38bcf62	incorrect object reference	2018-09-02 22:59:08 -07:00
zotlabs	3a6df2b12f	sync likes and shares	2018-09-02 22:58:30 -07:00
zotlabs	19e06edec8	Merge branch 'zap'	2018-09-02 20:52:00 -07:00
zotlabs	705f1e98ce	Merge branch 'master' of /home/macgirvin/zap.macgirvin.com into zap	2018-09-02 20:51:46 -07:00
zotlabs	45135e7953	fix the retweet icon	2018-09-02 20:51:17 -07:00
zotlabs	cf2604d104	Merge branch 'zap'	2018-09-02 20:46:40 -07:00
zotlabs	6ff75a1bfe	Merge branch 'master' of /home/macgirvin/zap.macgirvin.com into zap	2018-09-02 20:46:24 -07:00
zotlabs	97cc4a2479	attach content missing	2018-09-02 20:45:53 -07:00