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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge remote-tracking branch 'upstream/master'	Haakon Meland Eriksen	2015-12-01	11	-6759/+6830
\|\
\| *	version	redmatrix	2015-11-30	1	-1/+1
\| \|
\| *	Merge pull request #201 from wave72/master	Wave	2015-11-30	2	-6634/+6637
\| \|\ \| \| \| \| \| \|	Updated Italian strings
\| \| *	Updated Italian strings	Paolo Tacconi	2015-11-30	2	-6634/+6637
\| \| \|
\| \| *	Merge pull request #3 from redmatrix/master	Wave	2015-11-25	525	-14424/+116761
\| \| \|\ \| \| \| \| \| \| \| \|	Update branch
\| * \| \|	generalise the site black\|white allow lists, also add a channel black\|white ↵	redmatrix	2015-11-29	4	-26/+63
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	list for future use
\| * \| \|	report correct directory mode for standalone directories in siteinfo	redmatrix	2015-11-29	1	-1/+1
\| \| \| \|
\| * \| \|	create get_site_info() function so we can have a siteinfo.json module ↵	redmatrix	2015-11-29	3	-97/+115
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	instead of or actually in addition to siteinfo/json
\| * \| \|	issue #189	redmatrix	2015-11-29	2	-1/+7
\| \| \| \|
\| * \| \|	don't try to pull public content from dead sites	redmatrix	2015-11-29	1	-1/+4
\| \| \| \|
\| * \| \|	log whatever is showing up in the delivery hash array since it seems that ↵	redmatrix	2015-11-29	2	-1/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	one site has something unusual there and it is throwing errors.
* \| \| \|	Merge remote-tracking branch 'upstream/master'	Haakon Meland Eriksen	2015-11-29	7	-30/+51
\|\\| \| \|
\| * \| \|	Merge https://github.com/redmatrix/hubzilla into pending_merge	redmatrix	2015-11-28	7	-30/+51
\| \|\ \ \
\| \| * \| \|	reflect in form if we are editing or creating	Mario Vavti	2015-11-28	1	-7/+7
\| \| \| \| \|
\| \| * \| \|	css fixes	Mario Vavti	2015-11-28	5	-22/+43
\| \| \| \| \|
\| * \| \| \|	version	redmatrix	2015-11-28	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Resolving merge conflict	Haakon Meland Eriksen	2015-11-29	9	-302/+49
\| \| \| \| \|
* \| \| \| \|	My version of jot.tpl	Haakon Meland Eriksen	2015-11-28	1	-49/+58
\| \| \| \| \|
* \| \| \| \|	Merge remote-tracking branch 'upstream/master'	Haakon Meland Eriksen	2015-11-28	27	-4462/+4962
\|\ \ \ \ \ \| \| \|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: include/datetime.php include/text.php mod/events.php version.inc view/css/mod_events.css view/theme/redbasic/css/style.css view/tpl/event_head.tpl view/tpl/events-js.tpl view/tpl/jot.tpl
\| * \| \| \|	fix tpl if clause	Mario Vavti	2015-11-28	1	-1/+1
\| \|/ / /
\| * \| \|	Merge https://github.com/redmatrix/hubzilla into pending_merge	redmatrix	2015-11-27	13	-107/+128
\| \|\ \ \
\| \| * \| \|	Reverted.	ken restivo	2015-11-27	1	-6/+0
\| \| \| \| \|
\| \| * \| \|	Re-reading zottel's excellent docs, 70 seems the recommended default. Changed.	ken restivo	2015-11-27	1	-1/+1
\| \| \| \| \|
\| \| * \| \|	More sane defaults, to avoid problems. Addresses #188	ken restivo	2015-11-27	1	-0/+1
\| \| \| \| \|
\| \| * \| \|	Safe defaults to prevent #188	ken restivo	2015-11-27	1	-0/+6
\| \| \| \| \|
\| \| * \| \|	add templates	Mario Vavti	2015-11-27	2	-0/+23
\| \| \| \| \|
\| \| * \| \|	move events tools to aside widget	Mario Vavti	2015-11-27	5	-25/+34
\| \| \| \| \|
\| \| * \| \|	css fixes	Mario Vavti	2015-11-27	3	-71/+23
\| \| \| \| \|
\| \| * \| \|	Merge branch 'master' of https://github.com/redmatrix/hubzilla	Mario Vavti	2015-11-27	1	-0/+41
\| \| \|\ \ \
\| \| \| * \ \	Merge pull request #193 from zzottel/master	git-marijus	2015-11-27	1	-0/+41
\| \| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	added info about Apache settings to avoid Apache running wild
\| \| \| \| * \| \|	added info about Apache settings to avoid Apache running wild	zottel	2015-11-27	1	-0/+41
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	fixes #194 - New directory server is selected on every directory page reload	Mario Vavti	2015-11-27	1	-1/+1
\| \| \|/ / / /
\| \| * \| \| \|	unset does not work in webkit browsers	Mario Vavti	2015-11-27	1	-1/+1
\| \| \| \| \| \|
\| \| * \| \| \|	only show edit icon for your own events and minoe cleanup	Mario Vavti	2015-11-27	1	-18/+3
\| \| \| \| \| \|
\| \| * \| \| \|	add spinner to events	Mario Vavti	2015-11-27	3	-1/+11
\| \| \|/ / /
\| * / / /	document dreport expiration setting	redmatrix	2015-11-27	3	-4449/+4454
\| \|/ / /
\| * \| \|	don't show item_delayed_publish items in tag clouds	redmatrix	2015-11-26	2	-4/+3
\| \| \| \|
\| * \| \|	lost calendar icon	Mario Vavti	2015-11-26	1	-1/+1
\| \| \| \|
\| * \| \|	various css fixes	Mario Vavti	2015-11-26	5	-10/+18
\| \| \| \|
\| * \| \|	beautify event item code	Mario Vavti	2015-11-26	3	-45/+53
\| \| \| \|
\| * \| \|	default timepicker to 15 min steps. abbr -> span	Mario Vavti	2015-11-26	2	-4/+4
\| \| \| \|
\| * \| \|	Merge branch 'master' of https://github.com/redmatrix/hubzilla	Mario Vavti	2015-11-26	1	-1/+1
\| \|\ \ \
\| \| * \ \	Merge https://github.com/redmatrix/hubzilla into pending_merge	redmatrix	2015-11-26	10	-13/+105
\| \| \|\ \ \
\| \| * \| \| \|	version	redmatrix	2015-11-26	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	improve event rendering	Mario Vavti	2015-11-26	1	-6/+8
\| \| \|/ / / \| \|/\| \| \|
\| * \| \| \|	add location	Mario Vavti	2015-11-26	1	-4/+6
\| \| \| \| \|
\| * \| \| \|	fix event rendering	Mario Vavti	2015-11-26	1	-10/+11
\| \| \| \| \|
\| * \| \| \|	we also need nofinish in the object. css fices	Mario Vavti	2015-11-26	3	-2/+6
\| \| \| \| \|
\| * \| \| \|	css fixes	Mario Vavti	2015-11-26	2	-1/+2
\| \| \| \| \|
\| * \| \| \|	also catch the other object	Mario Vavti	2015-11-26	1	-0/+5
\| \| \| \| \|