20121 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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	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
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	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
Mario Vavti	5aa0fe2bf0	use the hubzilla icons	2017-09-14 10:33:16 +02:00
Sergey Lukin	f43f38c054	hubzilla issue #858: Fix: Shortcut icon is not dysplayed when Admin or Channel Manager panels are opened	2017-09-14 10:01:39 +02:00
zotlabs	55aaabc2f1	add text/plain type to wiki	2017-09-13 22:37:18 -07:00
zotlabs	5be132f877	make wiki page mimetype default to wiki mimetype (this was the original intent but the wrong variable was used)	2017-09-13 21:36:59 -07:00
zotlabs	b5966041be	more zot6	2017-09-13 20:40:01 -07:00
zotlabs	62d6bada4c	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge	2017-09-13 19:26:33 -07:00
zotlabs	13788af908	Zot6: some things that need to be done ahead of time so we can turbocharge the delivery engine and split off site records from channel records.	2017-09-13 19:20:16 -07:00
Mario Vavti	29b0ed87d6	Merge remote-tracking branch 'mike/master' into dev	2017-09-13 10:30:08 +02:00
zotlabs	0e6d84e207	add option to mimetype selector so you can change the element name in case you end up with two of these suckers on the same page	2017-09-12 23:25:19 -07:00
zotlabs	796228b7ad	wiki mimetype selection. We can add text/plain as soon as we add code to purify and render it specifically.	2017-09-12 23:15:30 -07:00
zotlabs	7489a4442e	wiki mimetype	2017-09-12 22:35:30 -07:00
zotlabs	5e99295bf6	wiki mimetype selection	2017-09-12 22:32:31 -07:00
zotlabs	4ff89a5862	drop salmon until we improve performance	2017-09-12 20:24:57 -07:00
Mario Vavti	87ca60b0b1	rename activity notifications links - one more	2017-09-12 21:38:36 +02:00
Mario Vavti	525d554a35	rename activity notifications links	2017-09-12 21:34:14 +02:00
Sergey Lukin	4c121aff30	hubzilla issue #855: fix for some problems with displaying selected theme after panel Settings->Display loading	2017-09-12 21:28:40 +02:00
zotlabs	d4e53bb86f	typo in ldsigs	2017-09-11 18:56:17 -07:00
zotlabs	471449f539	regex was still broken	2017-09-10 22:59:26 -07:00
zotlabs	187fc9a51b	fix regex	2017-09-10 17:40:40 -07:00
zotlabs	abbf245d14	remove item_thread_top from simple_update query - we're already fetching distinct(parent) and this prevented comments from displaying after submission when remote-authed.	2017-09-10 16:10:56 -07:00
Mario Vavti	67024c023a	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev	2017-09-10 09:50:52 +02:00