20348 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
zotlabs	00fe4e747f	use frozen jsonld contexts	2017-09-19 21:40:38 -07:00
zotlabs	b0cdec0c35	perform caching of jsonld schemas	2017-09-19 19:15:15 -07:00
zotlabs	373af6d4f4	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge	2017-09-19 17:41:13 -07:00
zotlabs	4ae503bef7	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge	2017-09-19 17:40:52 -07:00
zotlabs	72a19a14af	turn common friends into a widget	2017-09-19 17:35:57 -07:00
Mario Vavti	a7d0c45606	Revert "remove some redundant references to sticky_kit" ... This reverts commit dbc0cc8c92.	2017-09-19 23:17:17 +02:00
Mario Vavti	dbc0cc8c92	remove some redundant references to sticky_kit	2017-09-19 23:13:18 +02:00
Mario	a1be6f11ed	version	2017-09-19 22:43:52 +02:00
Mario	143e389695	jquery-3.2.1	2017-09-19 22:43:17 +02:00
Mario	962a3f7945	fix some issues with sticky-kit	2017-09-19 22:40:05 +02:00
zotlabs	bced63e823	call the follow_accept hook when desired	2017-09-19 13:25:34 -07:00
zotlabs	51e40add66	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge	2017-09-19 13:09:19 -07:00
Mario	4500faf463	fix various wikipage widget issues (sort pages by name, respect locked mime type setting, move create tool back to the bottom)	2017-09-19 18:59:06 +02:00
Mario Vavti	66fb0fdcd7	fix permission_{accept, reject} hooks not being called	2017-09-19 11:12:52 +02:00
Mario Vavti	105e7626fc	Merge remote-tracking branch 'mike/master' into dev	2017-09-19 10:26:06 +02:00
zotlabs	c6bcea0f82	pubcrawl: make a good faith effort to handle multi-media content	2017-09-18 21:55:45 -07:00
zotlabs	4fbebe7b2d	create new hooks for permissions_accept and permissions_reject	2017-09-18 20:38:09 -07:00
zotlabs	e812836a60	provide rel=alternate link if no reshare content in post	2017-09-18 17:46:34 -07:00
Mario	c3b3f41a21	changelog	2017-09-18 16:38:56 +02:00
Mario Vavti	9914e171b1	anonymous comments are not implemented for photos.	2017-09-18 16:15:42 +02:00
Waitman Gobble	b3c805d7d0	prevent 'my_address' being set with bogus info ... After a user has authenticated, it is possible to set my_address in $_SESSION to 'anything' using zid= parameter in URL - if user is authenticated then zid is never set. This change kills the authenticated switch if a person sends a new zid through for processing, which will trigger remote authentication.	2017-09-18 06:02:14 -05:00
Waitman Gobble	d31c91c9d3	add remote login to login.tpl ... Add Remote login option to login.tpl, this exists in nav login.	2017-09-18 05:57:18 -05:00
Waitman Gobble	bf252d2388	add remote login to login form ... This exists in nav login but not login.tpl	2017-09-18 05:54:38 -05:00
zotlabs	5c379b4d35	acl issue with some ActivityPub completions	2017-09-17 23:55:18 -07:00
zotlabs	4d3b0577c9	acl issue with some ActivityPub completions	2017-09-17 23:54:40 -07:00
zotlabs	d37e6b9271	more tag stuff	2017-09-17 23:54:29 -07:00
zotlabs	654139933f	tagging changes	2017-09-17 23:28:58 -07:00
zotlabs	1d9e0f17a6	more mastodon testing	2017-09-17 18:40:32 -07:00
zotlabs	9120a82ab4	wiki: update acl on child pages when wiki perms change	2017-09-16 16:52:25 -07:00
zotlabs	ca24bfdc46	wiki sync - we weren't getting the child pages	2017-09-16 16:42:01 -07:00
zotlabs	aaa83ae5d2	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge	2017-09-16 16:32:26 -07:00
zotlabs	8123a62302	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge	2017-09-16 16:32:11 -07:00
zotlabs	e84281b620	wiki download: only include the latest page revision	2017-09-16 15:48:48 -07:00
Andrew Manning	6239a27288	Moved add wiki page form to top of page list to address issue https://github.com/redmatrix/hubzilla/issues/719	2017-09-16 14:27:40 -04:00
Andrew Manning	0b272264ea	Page title is what we need in order to delete pages, not the url	2017-09-16 14:00:55 -04:00
Mario Vavti	d5ffa5508d	db update to add index to item.resource_id we query this in wikis a lot	2017-09-16 10:11:59 +02:00
zotlabs	991db80646	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge	2017-09-16 01:06:44 -07:00
Mario Vavti	cb3fb0049f	do not show edit pencil if not allowed to edit	2017-09-16 09:55:29 +02:00
Mario	eef1fcbb07	set update_title to false	2017-09-15 22:28:27 +02:00
Mario	186dd9dee0	version	2017-09-15 22:21:40 +02:00
Mario	373651c3db	implement wiki editing	2017-09-15 22:17:18 +02:00
git-marijus	663802e699	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev	2017-09-15 16:30:14 +02:00
git-marijus	4c5722c766	some work on wiki acl	2017-09-15 16:27:30 +02:00
zotlabs	6734854776	typocheck	2017-09-14 18:50:43 -07:00
zotlabs	1c0ece8411	provide a hook for importing a channel photo at channel creation time	2017-09-14 18:48:55 -07:00
zotlabs	cf120b2351	wiki: lock mimetype	2017-09-14 17:14:50 -07:00
zotlabs	6481722fd9	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge	2017-09-14 15:02:36 -07:00
zotlabs	b1876ac14f	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge	2017-09-14 15:02:18 -07:00
zotlabs	d7ec6865b4	bring back wiki download	2017-09-14 04:06:09 -07:00
Mario Vavti	46b6415f5f	wiki: do not suggest bbcode if mimetype is text/plain	2017-09-14 10:44:16 +02:00