volse-hubzilla.git - Volse Hubzilla -- soft fork of main Hubzilla core for Volse

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge	zotlabs	2017-09-16	5	-21/+37
\|\
\| *	Moved add wiki page form to top of page list to address issue ↵	Andrew Manning	2017-09-16	1	-17/+17
\| \| \| \| \| \| \| \|	https://github.com/redmatrix/hubzilla/issues/719
\| *	Page title is what we need in order to delete pages, not the url	Andrew Manning	2017-09-16	1	-1/+1
\| \|
\| *	db update to add index to item.resource_id we query this in wikis a lot	Mario Vavti	2017-09-16	4	-3/+19
\| \|
* \|	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge	zotlabs	2017-09-16	12	-29/+240
\|\\|
\| *	do not show edit pencil if not allowed to edit	Mario Vavti	2017-09-16	1	-0/+4
\| \|
\| *	set update_title to false	Mario	2017-09-15	1	-0/+2
\| \|
\| *	version	Mario	2017-09-15	1	-1/+1
\| \|
\| *	implement wiki editing	Mario	2017-09-15	5	-40/+90
\| \|
\| *	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev	git-marijus	2017-09-15	9	-19/+111
\| \|\
\| \| *	typocheck	zotlabs	2017-09-14	1	-1/+1
\| \| \|
\| \| *	provide a hook for importing a channel photo at channel creation time	zotlabs	2017-09-14	2	-0/+42
\| \| \|
\| \| *	wiki: lock mimetype	zotlabs	2017-09-14	6	-9/+32
\| \| \|
\| \| *	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge	zotlabs	2017-09-14	2	-25/+26
\| \| \|\
\| \| * \|	bring back wiki download	zotlabs	2017-09-14	3	-9/+37
\| \| \| \|
\| * \| \|	some work on wiki acl	git-marijus	2017-09-15	3	-2/+65
\| \| \|/ \| \|/\|
* \| \|	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge	zotlabs	2017-09-14	11	-65/+131
\|\\| \|
\| * \|	wiki: do not suggest bbcode if mimetype is text/plain	Mario Vavti	2017-09-14	1	-0/+2
\| \| \|
\| * \|	use the hubzilla icons	Mario Vavti	2017-09-14	1	-2/+2
\| \| \|
\| * \|	hubzilla issue #858: Fix: Shortcut icon is not dysplayed when Admin or ↵	Sergey Lukin	2017-09-14	1	-23/+22
\| \|/ \| \| \| \| \| \|	Channel Manager panels are opened
\| *	add text/plain type to wiki	zotlabs	2017-09-13	3	-9/+19
\| \|
\| *	make wiki page mimetype default to wiki mimetype (this was the original ↵	zotlabs	2017-09-13	2	-2/+4
\| \| \| \| \| \| \| \|	intent but the wrong variable was used)
\| *	more zot6	zotlabs	2017-09-13	4	-6/+26
\| \|
\| *	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge	zotlabs	2017-09-13	2	-37/+41
\| \|\
\| * \|	Zot6: some things that need to be done ahead of time so we can turbocharge ↵	zotlabs	2017-09-13	4	-24/+57
\| \| \| \| \| \| \| \| \| \| \| \|	the delivery engine and split off site records from channel records.
* \| \|	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge	zotlabs	2017-09-13	16	-65/+113
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	Merge remote-tracking branch 'mike/master' into dev	Mario Vavti	2017-09-13	10	-23/+54
\| \|\\|
\| \| *	add option to mimetype selector so you can change the element name in case ↵	zotlabs	2017-09-12	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \|	you end up with two of these suckers on the same page
\| \| *	wiki mimetype selection. We can add text/plain as soon as we add code to ↵	zotlabs	2017-09-12	5	-12/+32
\| \| \| \| \| \| \| \| \| \| \| \|	purify and render it specifically.
\| \| *	wiki mimetype	zotlabs	2017-09-12	1	-1/+1
\| \| \|
\| \| *	wiki mimetype selection	zotlabs	2017-09-12	5	-9/+19
\| \| \|
\| \| *	drop salmon until we improve performance	zotlabs	2017-09-12	2	-2/+3
\| \| \|
\| * \|	rename activity notifications links - one more	Mario Vavti	2017-09-12	1	-1/+1
\| \| \|
\| * \|	rename activity notifications links	Mario Vavti	2017-09-12	1	-2/+2
\| \| \|
\| * \|	hubzilla issue #855: fix for some problems with displaying selected theme ↵	Sergey Lukin	2017-09-12	1	-34/+38
\| \|/ \| \| \| \| \| \|	after panel Settings->Display loading
\| *	typo in ldsigs	zotlabs	2017-09-11	2	-2/+14
\| \|
\| *	regex was still broken	zotlabs	2017-09-10	1	-1/+1
\| \|
\| *	fix regex	zotlabs	2017-09-10	1	-1/+1
\| \|
\| *	remove item_thread_top from simple_update query - we're already fetching ↵	zotlabs	2017-09-10	2	-2/+3
\| \| \| \| \| \| \| \|	distinct(parent) and this prevented comments from displaying after submission when remote-authed.
* \|	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge	zotlabs	2017-09-10	28	-41/+291
\|\\|
\| *	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev	Mario Vavti	2017-09-10	2	-9/+5
\| \|\
\| \| *	More content tab help removed in context help	Andrew Manning	2017-09-09	1	-3/+1
\| \| \|
\| \| *	Update help.html	Andrew Manning	2017-09-09	1	-6/+4
\| \| \|
\| * \|	Merge remote-tracking branch 'mike/master' into dev	Mario Vavti	2017-09-10	3	-26/+10
\| \|\ \
\| \| * \|	owa cleanup	zotlabs	2017-09-09	3	-26/+10
\| \| \| \|
\| * \| \|	Merge remote-tracking branch 'mike/master' into dev	Mario Vavti	2017-09-09	2	-10/+17
\| \|\\| \| \| \| \|/ \| \|/\|
\| \| *	owa: missed the set-observer stuff	zotlabs	2017-09-08	2	-10/+17
\| \| \|
\| * \|	Added context help for apps and appman in English	Andrew Manning	2017-09-09	4	-1/+16
\| \| \|
\| * \|	fix radius	Mario Vavti	2017-09-08	1	-1/+1
\| \| \|
\| * \|	Merge remote-tracking branch 'mike/master' into dev	Mario Vavti	2017-09-08	18	-19/+258
\| \|\\|