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

	Commit message (Collapse)	Author	Age	Files	Lines
*	undefined function	redmatrix	2016-07-20	1	-1/+1
\|
*	delete test doc	redmatrix	2016-07-20	1	-37/+0
\|
*	Merge branch 'dev' into perms	redmatrix	2016-07-20	14	-197/+136
\|\
\| *	fix vevent multi-line formatting	redmatrix	2016-07-20	1	-1/+3
\| \|
\| *	sort out some of the authentication mess - with luck this may fix the DAV ↵	redmatrix	2016-07-20	13	-196/+133
\| \| \| \| \| \| \| \|	auth issue which I simply could not duplicate or find a reason for.
* \|	Merge branch 'dev' into perms	redmatrix	2016-07-20	4	-2/+10
\|\\|
\| *	Merge branch '1.10RC' into dev	Mario Vavti	2016-07-20	1	-1/+1
\| \|\
\| \| *	Merge branch '1.10RC' of https://github.com/redmatrix/hubzilla into 1.10RC	Mario Vavti	2016-07-20	2	-0/+7
\| \| \|\
\| \| \| *	Merge pull request #456 from anaqreon/1.10RC-updates	git-marijus	2016-07-20	2	-0/+7
\| \| \| \|\ \| \| \| \| \| \| \| \| \| \|	Wiki delete page confirmation and max image width
\| \| \| \| *	Wiki delete page confirmation and max image width	Andrew Manning	2016-07-20	2	-0/+7
\| \| \| \| \|
\| \| * \| \|	type m query in Acl.php should probably^Ceturn xchan_hash as hash and not as ↵	Mario Vavti	2016-07-20	1	-1/+1
\| \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \|	id. This fixes the issue that autocomplete for mail returns null for data.xid
\| * \| \|	Merge pull request #455 from anaqreon/wiki	git-marijus	2016-07-20	2	-0/+7
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \|	Wiki delete page confirmation and max image width
\| \| * \ \	Merge remote-tracking branch 'upstream/dev' into wiki	Andrew Manning	2016-07-20	70	-2515/+2531
\| \| \|\ \ \
\| \| * \| \| \|	Set max-width for embedded images	Andrew Manning	2016-07-09	1	-0/+4
\| \| \| \| \| \|
\| \| * \| \| \|	Merge remote-tracking branch 'upstream/dev' into wiki	Andrew Manning	2016-07-09	22	-1674/+1724
\| \| \|\ \ \ \
\| \| * \ \ \ \	Merge remote-tracking branch 'upstream/dev' into wiki	Andrew Manning	2016-07-01	15	-3589/+3645
\| \| \|\ \ \ \ \
\| \| * \| \| \| \| \|	JavaScript popup for page delete confirmation	Andrew Manning	2016-07-01	1	-0/+3
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch '1.10RC' into dev	Mario Vavti	2016-07-20	1	-2/+2
\| \|\ \ \ \ \ \ \ \| \| \|_\|_\|_\|/ / / \| \|/\| \| \| \| / / \| \| \| \|_\|_\|/ / \| \| \|/\| \| \| \|
\| \| * \| \| \| \|	fix /mail wsod issue reported by giac hellvecio	Mario Vavti	2016-07-20	1	-2/+2
\| \| \| \|_\|_\|/ \| \| \|/\| \| \|
\| \| * \| \| \|	Merge branch '1.10RC' of https://github.com/redmatrix/hubzilla into 1.10RC_merge	redmatrix	2016-07-18	1	-1/+1
\| \| \|\ \ \ \
\| \| * \| \| \| \|	runaway cron emails	redmatrix	2016-07-18	1	-10/+2
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	fix the forum detection in include/zot	redmatrix	2016-07-19	3	-7/+18
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	another couple of minor perms fixes	redmatrix	2016-07-19	2	-8/+10
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	permission fixes	redmatrix	2016-07-19	6	-25/+19
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	fixes to perms	redmatrix	2016-07-19	2	-4/+4
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	add test sequence	redmatrix	2016-07-19	1	-0/+37
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	translate more old perms calls	redmatrix	2016-07-19	4	-5/+5
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'dev' into perms	redmatrix	2016-07-19	2	-1/+2
\|\\| \| \| \| \| \|
\| * \| \| \| \| \|	doc correction	redmatrix	2016-07-19	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	issue #411	redmatrix	2016-07-19	1	-0/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	yet more grungy perms work.	redmatrix	2016-07-19	1	-37/+36
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'dev' into perms	redmatrix	2016-07-18	1	-10/+2
\|\\| \| \| \| \| \|
\| * \| \| \| \| \|	runaway cron emails	redmatrix	2016-07-18	1	-10/+2
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	missing bracket	redmatrix	2016-07-18	1	-1/+2
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	more perms work (a lot more)	redmatrix	2016-07-18	7	-70/+164
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	move legacy code inside the legacy check	redmatrix	2016-07-18	1	-2/+3
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	more perms work	redmatrix	2016-07-18	4	-0/+25
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'dev' into perms	redmatrix	2016-07-18	1	-1/+1
\|\\| \| \| \| \| \|
\| * \| \| \| \| \|	whitespace	Mario Vavti	2016-07-18	1	-2/+0
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	resolve merge conflict	Mario Vavti	2016-07-18	2	-1/+3
\| \|\ \ \ \ \ \ \| \| \| \|/ / / / \| \| \|/\| \| \| \|
\| \| * \| \| \| \|	do not transform hashes to tags in [code=xxx] or [code] blocks	Mario Vavti	2016-07-18	1	-1/+1
\| \| \|/ / / /
\| \| * \| \| \|	update changelog	redmatrix	2016-07-17	1	-0/+41
\| \| \| \| \| \|
\| \| * \| \| \|	jquery update issue prevents comments from reloading and resetting watch cursor	redmatrix	2016-07-17	1	-1/+1
\| \| \| \| \| \|
\| \| * \| \| \|	change std_version	redmatrix	2016-07-17	1	-1/+1
\| \| \| \| \| \|
* \| \| \| \| \|	more perms work	redmatrix	2016-07-18	2	-5/+103
\| \| \| \| \| \|
* \| \| \| \| \|	export/import channel permissions	redmatrix	2016-07-17	2	-9/+39
\| \| \| \| \| \|
* \| \| \| \| \|	clone channel perms	redmatrix	2016-07-17	2	-1/+71
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'dev' into perms	redmatrix	2016-07-17	43	-2405/+2401
\|\\| \| \| \| \|
\| * \| \| \| \|	roll version	redmatrix	2016-07-17	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	update changelog	redmatrix	2016-07-17	1	-0/+41
\| \| \| \| \| \|