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

	Commit message (Collapse)	Author	Age	Files	Lines
*	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
\| \| \|
\| * \|	first iteration on the event item	Mario Vavti	2015-11-26	9	-5/+84
\| \|/
\| *	document that you probably shouldn't set a primary directory server in ↵	redmatrix	2015-11-25	1	-1/+1
\| \| \| \| \| \| \| \|	somebody else's realm.
\| *	issue #185	redmatrix	2015-11-25	6	-10/+12
\| \|
\| *	Merge https://github.com/redmatrix/hubzilla into pending_merge	redmatrix	2015-11-25	6	-68/+64
\| \|\
\| \| *	some basic event styling	Mario Vavti	2015-11-25	5	-61/+36
\| \| \|
\| \| *	add a if clause for the case we do not have a finish date	Mario Vavti	2015-11-25	1	-6/+7
\| \| \|
\| \| *	note to self: do not make things more complicated than they need to be.	Mario Vavti	2015-11-25	1	-2/+3
\| \| \|
\| \| *	events: make sure default finish date is one hour after start date and shift ↵	Mario Vavti	2015-11-25	2	-7/+26
\| \| \| \| \| \| \| \| \| \| \| \|	the finishdate if startdate is shifted
\| * \|	removed block style on dropdown contact name and details, added ↵	redmatrix	2015-11-25	3	-4/+5
\| \|/ \| \| \| \| \| \|	dropdown-menu-img-sm on nav search dropdown; as many dropdowns were unuseable
\| *	fix event form initial values	redmatrix	2015-11-24	1	-6/+14
\| \|
\| *	add (blank?) label param to other instances of datetimesel	redmatrix	2015-11-24	3	-4/+6
\| \|
\| *	Merge branch 'master' of https://github.com/redmatrix/hubzilla	Mario Vavti	2015-11-24	2	-1946/+1997
\| \|\
\| \| *	Merge pull request #187 from wave72/master	Wave	2015-11-24	2	-1946/+1997
\| \| \|\ \| \| \| \| \| \| \| \|	Updated Italian strings
\| \| \| *	Updated Italian strings	Paolo Tacconi	2015-11-24	2	-1946/+1997
\| \| \| \|
\| * \| \|	efent form template fixes	Mario Vavti	2015-11-24	3	-54/+28
\| \|/ /
\| * \|	open form on dbl-click	Mario Vavti	2015-11-24	1	-1/+4
\| \| \|
\| * \|	fix event droping	Mario Vavti	2015-11-24	1	-1/+1
\| \| \|