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

	Commit message (Collapse)	Author	Age	Files	Lines
*	add delivery reports to mail (not backported to redmatrix)	redmatrix	2015-09-30	4	-7/+65
\|
*	Merge https://github.com/redmatrix/redmatrix into pending_merge	redmatrix	2015-09-30	4	-5978/+6384
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: include/zot.php view/de/messages.po view/de/strings.php
\| *	document the issue with cloned delivery to self vs normal delivery to self	redmatrix	2015-09-30	1	-2/+13
\| \|
\| *	Merge https://github.com/redmatrix/redmatrix into pending_merge	redmatrix	2015-09-30	2	-1863/+1872
\| \|\
\| \| *	Merge pull request #394 from zzottel/master	zzottel	2015-09-30	2	-1863/+1872
\| \| \|\ \| \| \| \| \| \| \| \|	update German strings
\| \| \| *	update German strings	zottel	2015-09-30	2	-1863/+1872
\| \| \|/
\| * /	undo self-deliver check	redmatrix	2015-09-30	2	-6/+7
\| \|/
* \|	undo self deliver check	redmatrix	2015-09-30	1	-5/+6
\| \|
* \|	Merge pull request #62 from zzottel/master	zzottel	2015-09-30	2	-7447/+7960
\|\ \ \| \| \| \| \| \|	update German strings
\| * \|	update German strings	zottel	2015-09-30	2	-7447/+7960
\| \| \|
\| * \|	Merge remote-tracking branch 'upstream/master'	zottel	2015-09-30	7	-7484/+7880
\| \|\ \ \| \|/ / \|/\| \|
* \| \|	another error from the db logs	redmatrix	2015-09-29	1	-1/+1
\| \| \|
* \| \|	wrong table column names	redmatrix	2015-09-29	2	-2/+2
\| \| \|
* \| \|	queue cleanup, and report issues	redmatrix	2015-09-29	2	-5/+32
\| \| \|
* \| \|	more work on the notifier	redmatrix	2015-09-29	2	-2/+18
\| \| \|
* \| \|	improve the sys channel location repair to check key issues and re-installs ↵	redmatrix	2015-09-29	1	-2/+10
\| \| \| \| \| \| \| \| \| \| \| \|	and/or site moves
* \| \|	Merge https://github.com/redmatrix/hubzilla into pending_merge	redmatrix	2015-09-29	3	-7475/+7765
\|\ \ \
\| * \| \|	Hooray! Dutch language complete again.	jeroenpraat	2015-09-29	2	-7475/+7759
\| \| \| \|
* \| \| \|	check and repair sys channel locations (hublocs) in zot-finger if they are ↵	redmatrix	2015-09-29	1	-0/+61
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	messed up
\| \| * \|	Merge remote-tracking branch 'upstream/master'	zottel	2015-09-29	67	-3014/+137292
\| \| \|\ \ \| \| \|/ / \| \|/\| \|
\| * \| \|	fix typo in 0b1cd826b05b6ec9637e373735967a2555eeb1d4	Mario Vavti	2015-09-29	1	-1/+1
\| \| \| \|
\| * \| \|	do not store a recalled mail if we can not find the original mid	Mario Vavti	2015-09-29	1	-0/+6
\|/ / /
* \| \|	remove debugging	redmatrix	2015-09-28	1	-4/+1
\| \| \|
* \| \|	add one more level of parentheses to ensure operator precedence is correctly ↵	redmatrix	2015-09-28	2	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \|	evaluated
* \| \|	check public scopes against visitor in item_permissions_sql()	redmatrix	2015-09-28	2	-3/+38
\| \| \|
* \| \|	resolve conflicts	redmatrix	2015-09-28	2	-10/+0
\| \| \|
* \| \|	Merge https://github.com/redmatrix/redmatrix into pending_merge	redmatrix	2015-09-28	3	-1/+11
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	process_delivery: ignore self	redmatrix	2015-09-28	4	-3/+13
\| \| \|
* \| \|	ignore self delivery in process_delivery	redmatrix	2015-09-28	1	-7/+5
\| \| \|
* \| \|	Merge branch 'deadsite'	redmatrix	2015-09-28	16	-29/+99
\|\ \ \
\| * \| \|	typo	redmatrix	2015-09-28	1	-2/+2
\| \| \| \|
\| * \| \|	create site records for all queued sites and check for death	redmatrix	2015-09-28	9	-21/+68
\| \| \| \|
\| * \| \|	add site_type to queries, first few - several more to go.	redmatrix	2015-09-28	3	-5/+9
\| \| \| \|
\| * \| \|	schema support for additional site types	redmatrix	2015-09-28	4	-3/+22
\| \| \| \|
* \| \| \|	a clear is needed after floating	Mario Vavti	2015-09-28	1	-1/+1
\| \| \| \|
* \| \| \|	private mail: bring additional inbox/outbox views and ajaxify single message ↵	Mario Vavti	2015-09-28	7	-32/+39
\|/ / / \| \| \| \| \| \| \| \| \|	drop
* \| \|	Merge https://github.com/redmatrix/redmatrix into pending_merge	redmatrix	2015-09-27	1	-4/+6
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: include/zot.php
\| * \|	well there's one problem...	redmatrix	2015-09-27	1	-4/+4
\| \| \|
* \| \|	Merge https://github.com/redmatrix/redmatrix into pending_merge	redmatrix	2015-09-27	5	-2795/+2335
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: include/zot.php util/messages.po
\| * \|	Merge https://github.com/redmatrix/redmatrix into pending_merge	redmatrix	2015-09-27	2	-31/+31
\| \|\ \
\| \| * \|	Another Spanish update	jeroenpraat	2015-09-25	2	-31/+31
\| \| \| \|
\| * \| \|	add some safety checks on the sending side of sync	redmatrix	2015-09-27	3	-30/+44
\| \|/ /
* \| \|	move string files to hmessages.po and hstrings.php for hubzilla to avoid ↵	redmatrix	2015-09-26	33	-15/+134666
\| \| \| \| \| \| \| \| \| \| \| \|	endless merge conflicts.
* \| \|	Merge https://github.com/redmatrix/hubzilla into pending_merge	redmatrix	2015-09-26	5	-79/+33
\|\ \ \
\| * \ \	Merge branch 'master' of https://github.com/redmatrix/hubzilla	Mario Vavti	2015-09-25	15	-0/+0
\| \|\ \ \
\| * \| \| \|	private mail: some work on conversations view	Mario Vavti	2015-09-25	5	-79/+33
\| \| \| \| \|
* \| \| \| \|	import_xchan_photo: check the return headers to ensure it's an image ↵	redmatrix	2015-09-26	2	-46/+64
\| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \|	content-type of some form as imagick chucks a wobbly if you try to initialise an image with an html error page.
\| \| \| *	Merge remote-tracking branch 'upstream/master'	zottel	2015-09-25	15	-0/+0
\| \| \| \|\ \| \|_\|_\|/ \|/\| \| \|
* \| \| \|	As a result of the logo vote: replaced favicon, remade alternative hubzilla ↵	jeroenpraat	2015-09-25	15	-0/+0
\|/ / / \| \| \| \| \| \| \| \| \|	avatar and uploaded 6 logo variants. Originals courtesy of Iko.
\| \| *	Merge remote-tracking branch 'upstream/master'	zottel	2015-09-25	23	-160/+425
\| \| \|\ \| \|_\|/ \|/\| \|