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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge https://github.com/friendica/red into zpull	friendica	2014-03-03	1	-0/+3
\|\
\| *	Partially revert 895c9411d93	Thomas Willingham	2014-03-03	1	-0/+3
\| \| \| \| \| \| \| \| \| \|	Not entirely sure why the lines in question were removed, but this is required as a quick fix for broken notifications.
* \|	missing file	friendica	2014-03-03	2	-1/+9
\|/
*	some anomolies found when viewing connections in various cases.	friendica	2014-03-02	5	-8/+78
\|
*	disable the right_aside on choklet two-column layouts	friendica	2014-03-02	2	-0/+8
\|
*	add choklet to the comanche docs	friendica	2014-03-02	2	-3/+41
\|
*	add choklet template with several defined flavours, two and three column ↵	friendica	2014-03-02	10	-48/+248
\| \| \| \|	fluid layouts with optional side margins and a region for a blog-style header photo
*	first cut at choklet template	friendica	2014-03-02	3	-14/+105
\|
*	Merge pull request #350 from git-marijus/master	friendica	2014-03-03	5	-97/+118
\|\ \| \| \| \|	make navbar themable again
\| *	make navbar themable again	marijus	2014-03-02	5	-97/+118
\| \|
\| *	Merge branch 'master' of https://github.com/friendica/red	marijus	2014-03-02	12	-300/+473
\| \|\ \| \|/ \|/\|
* \|	allow templates to have multiple styles - this would be a bit like having a ↵	friendica	2014-03-02	4	-5/+16
\| \| \| \| \| \| \| \|	schema for a template file. At first you'll think this is insane and overly complicated, you'll just have to wait and see what I'm up to. Then it will start to make sense.
* \|	s/layout/template/g *.pdl	friendica	2014-03-01	2	-2/+2
\| \|
* \|	Merge https://github.com/friendica/red into zpull	friendica	2014-03-01	6	-293/+369
\|\ \
\| * \	Merge pull request #347 from solstag/master	friendica	2014-03-02	2	-288/+354
\| \|\ \ \| \| \| \| \| \| \| \|	Update pt-br translation.
\| \| * \|	Update pt-br translation.	Alexandre Hannud Abdo	2014-03-01	2	-288/+354
\| \| \| \|
\| * \| \|	Merge pull request #346 from git-marijus/master	friendica	2014-03-02	4	-5/+15
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \|	css fixes
* \| \| \| \|	change the docs for template tag	friendica	2014-03-01	2	-7/+7
\| \| \| \| \|
* \| \| \| \|	it's unfortunate that we use the term "layout" to refer both to a template ↵	friendica	2014-03-01	1	-0/+4
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \|	file and to Comanche .PDL files. I think we should probably refer to the template file as "template" just to avoid confusion. For the moment we'll provide both, since the 'layout' is already in the wild. But please use "template" going forward.
* \| / /	first draft of creating templates documentation	friendica	2014-03-01	3	-1/+93
\| \|/ / \|/\| \|
\| \| *	Merge branch 'master' of https://github.com/friendica/red	marijus	2014-03-01	1	-1/+2
\| \|/\| \| \|/ \|/\|
* \|	Merge https://github.com/friendica/red into zpull	friendica	2014-02-28	1	-1/+1
\|\ \
* \| \|	allow one to ignore pending connections	friendica	2014-02-28	1	-1/+2
\| \| \|
\| \| *	Revert "a little fix against bootstrap 3.1.1"	marijus	2014-02-28	2	-5/+0
\| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit e82c9eb176541b42c9ea00828d4d1a7f1231743b.
\| \| *	a little fix against bootstrap 3.1.1	marijus	2014-02-28	2	-0/+5
\| \| \|
\| \| *	add hover effect to usermenu caret	marijus	2014-02-28	4	-5/+15
\| \|/
\| *	Merge pull request #345 from zzottel/master	zzottel	2014-02-28	1	-1/+1
\|/\| \| \| \| \|	correct bbcode link in German docs
\| *	correct bbcode link in German docs	zottel	2014-02-28	1	-1/+1
\| \|
\| *	trying to get back to upstream state	zottel	2014-02-28	1	-0/+96
\| \|
\| *	Merge remote-tracking branch 'upstream/master'	zottel	2014-02-28	1	-0/+2
\| \|\
\| * \	Merge remote-tracking branch 'upstream/master'	zottel	2014-02-28	12	-159/+132
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: mod/help.php
\| * \| \|	change page title for bbcode help files	zottel	2014-02-27	1	-1/+1
\| \| \| \|
* \| \| \|	It's no longer simply "Red" and the jury is still out on whether or not it's ↵	friendica	2014-02-28	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	a "project". Most of the time it doesn't seem like one or act like one. It doesn't seem to be anything cohesive that you can put your finger on and everybody involved is mostly doing their own thing and marching to their own drummer. It is however the RedMatrix, whatever that means to you.
* \| \| \|	more doc	friendica	2014-02-28	9	-0/+671
\| \| \| \|
* \| \| \|	dang - you really have to bludgeon this thing to get youtube to use https	friendica	2014-02-28	1	-1/+10
\| \| \| \|
* \| \| \|	try to fix youtube mixed content warnings	friendica	2014-02-28	99	-878/+1352
\| \| \| \|
* \| \| \|	more to-to	friendica	2014-02-27	1	-0/+2
\| \|_\|/ \|/\| \|
* \| \|	more tasks	friendica	2014-02-27	1	-0/+2
\| \|/ \|/\|
* \|	over-ride code tags within pre blocks as bootstrap which puts a border ↵	friendica	2014-02-27	1	-0/+4
\| \| \| \| \| \| \| \|	around pre tags, which messes up markdown code blocks which have yet another border.
* \|	put schemas in Comanche (this requires theme support (!))	friendica	2014-02-27	6	-62/+81
\| \|
* \|	minor fixes to suggested chatrooms	friendica	2014-02-27	2	-4/+2
\| \|
* \|	chatroom suggestions	friendica	2014-02-27	3	-0/+48
\| \|
* \|	fix photos in private mail	friendica	2014-02-27	2	-2/+2
\| \|
* \|	Capitalise $a->page['title'] in doco pages.	Thomas Willingham	2014-02-27	1	-3/+3
\|/
*	Merge pull request #342 from zzottel/master	zzottel	2014-02-27	5	-0/+269
\|\ \| \| \| \|	German help
\| *	some new German files	zottel	2014-02-27	3	-59/+190
\| \|
\| *	convert existing German help files to BBCode	zottel	2014-02-27	3	-0/+138
\| \|
* \|	Merge pull request #343 from beardy-unixer/master	Thomas Willingham	2014-02-27	4	-15/+15
\|\ \ \| \|/ \|/\|	Doc update (just formatting and typos)
\| *	Can't type today	Thomas Willingham	2014-02-27	1	-1/+1
\| \|
\| *	Who reverted that?	Thomas Willingham	2014-02-27	1	-1/+1
\| \|