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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Small fix to deploy	Haakon Meland Eriksen	2015-10-01	1	-1/+1
\|
*	Changed deploy script - removed hot_deploy and changed poller to every 10 ↵	Haakon Meland Eriksen	2015-10-01	1	-7/+7
\| \| \| \|	minutes rather than 5 minutes.
*	Updated Norwegian strings for Hubzilla	Haakon Meland Eriksen	2015-10-01	1	-1502/+1560
\|
*	Updated Norwegian string for Hubzilla	Haakon Meland Eriksen	2015-10-01	1	-6214/+6500
\|
*	Merge remote-tracking branch 'upstream/master'	Haakon Meland Eriksen	2015-10-01	13	-21033/+22308
\|\
\| *	Merge pull request #65 from tuscanhobbit/master	Wave	2015-10-01	2	-17/+17
\| \|\ \| \| \| \| \| \|	More updates on Italian translation from transifex
\| \| *	More updates on Italian translation from transifex	Paolo Tacconi	2015-10-01	2	-17/+17
\| \| \|
\| * \|	Merge pull request #64 from tuscanhobbit/master	Wave	2015-10-01	2	-7589/+7886
\| \|\\| \| \| \| \| \| \|	First Hubzilla Italian localization
\| \| *	First Hubzilla Italian localization	Paolo Tacconi	2015-10-01	2	-7589/+7886
\| \| \|
\| * \|	this is an even better fix for issue #61	redmatrix	2015-09-30	1	-8/+4
\| \| \|
\| * \|	issue #61 - provide un-useable icons as placeholders for location setting ↵	redmatrix	2015-09-30	1	-1/+5
\| \| \| \| \| \| \| \| \| \| \| \|	options on deleted hublocs
\| * \|	issue #63 - missing table fields in db query	redmatrix	2015-09-30	1	-2/+2
\| \| \|
\| * \|	update the opensearch template	redmatrix	2015-09-30	1	-4/+4
\| \| \|
\| * \|	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
\| \| \|\ \ \| \| \|/ / \| \|/\| \|
\| \| * \|	Merge remote-tracking branch 'upstream/master'	zottel	2015-09-29	67	-3014/+137292
\| \| \|\ \
\| \| * \ \	Merge remote-tracking branch 'upstream/master'	zottel	2015-09-25	15	-0/+0
\| \| \|\ \ \
\| \| * \ \ \	Merge remote-tracking branch 'upstream/master'	zottel	2015-09-25	23	-160/+425
\| \| \|\ \ \ \
\| \| * \ \ \ \	Merge remote-tracking branch 'upstream/master'	zottel	2015-09-24	9	-9/+33
\| \| \|\ \ \ \ \
\| \| * \ \ \ \ \	Merge remote-tracking branch 'upstream/master'	zottel	2015-09-23	26	-194/+464
\| \| \|\ \ \ \ \ \
\| \| * \ \ \ \ \ \	Merge remote-tracking branch 'upstream/master'	zottel	2015-09-19	25	-25/+144
\| \| \|\ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \	Merge remote-tracking branch 'upstream/master'	zottel	2015-09-18	20	-361/+392
\| \| \|\ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \	Merge remote-tracking branch 'upstream/master'	zottel	2015-09-17	11	-66/+61
\| \| \|\ \ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \ \	Merge remote-tracking branch 'upstream/master'	zottel	2015-09-16	33	-247/+314
\| \| \|\ \ \ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \ \ \	Merge remote-tracking branch 'upstream/master'	zottel	2015-09-14	22	-110/+203
\| \| \|\ \ \ \ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \ \ \ \	Merge remote-tracking branch 'upstream/master'	zottel	2015-09-11	20	-580/+593
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \ \ \ \ \	Merge remote-tracking branch 'upstream/master'	zottel	2015-09-10	14	-25/+69
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \ \ \ \ \ \	Merge remote-tracking branch 'upstream/master'	zottel	2015-09-09	17	-61/+361
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge remote-tracking branch 'upstream/master'	zottel	2015-09-08	10	-107/+276
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge remote-tracking branch 'upstream/master'	zottel	2015-09-07	3	-9/+12
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge remote-tracking branch 'upstream/master'	zottel	2015-09-07	14	-45/+69
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge remote-tracking branch 'upstream/master'	zottel	2015-09-04	11	-25/+174
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge remote-tracking branch 'upstream/master'	zottel	2015-09-03	16	-225/+546
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: include/zot.php
\| \| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	really fix post filtering	zottel	2015-09-02	1	-3/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge remote-tracking branch 'upstream/master'	Haakon Meland Eriksen	2015-09-30	84	-3019/+137693
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \