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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-03-05	0	-0/+0
\| \| \| \| \| \| \|	* remotes/upstream/master: revup * master:
*	Merge branch 'pull'	friendica	2012-03-05	5	-57/+67
\|\
\| *	Merge pull request #88 from simonlnu/master	Simon	2012-03-05	4	-37/+49
\| \|\ \| \| \| \| \| \|	multiple ui fixes
\| \| *	multiple fixes; the jot-header works as standalone, not sure what's up.	Simon L'nu	2012-03-05	4	-37/+49
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
\| \| *	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-03-05	0	-0/+0
\| \|/ \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: * master:
\| *	Merge pull request #87 from simonlnu/master	Simon	2012-03-05	2	-3/+4
\| \|\ \| \| \| \| \| \|	contact_block.tpl link fix and dispy page parts
\| \| *	tweak sizing of <section> and <aside> more; fix link in 'view contacts' in ↵	Simon L'nu	2012-03-05	2	-3/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	sidebar Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
\| \| *	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-03-05	0	-0/+0
\| \|/ \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: * master:
\| *	Merge pull request #86 from simonlnu/master	Simon	2012-03-05	2	-18/+14
\| \|\ \| \| \| \| \| \|	more dispy
\| \| *	still working on jot-header. amending <aside> and other elements	Simon L'nu	2012-03-05	2	-18/+14
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
\| \| *	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-03-05	0	-0/+0
\| \|/ \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: * master:
\| *	Merge pull request #85 from simonlnu/master	Simon	2012-03-05	1	-2/+3
\| \|\ \| \| \| \| \| \|	hopefully fix overflow issue now
\| \| *	hopefully fix the overflow issue everywhere this time	Simon L'nu	2012-03-05	1	-2/+3
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
\| \| *	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-03-05	0	-0/+0
\| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: $name appearing on testbubble items testbubble notifications * master:
* /	revup	friendica	2012-03-05	1	-1/+1
\|/
*	$name appearing on testbubble items	friendica	2012-03-05	1	-1/+1
\|
*	Merge branch 'pull'	friendica	2012-03-05	1	-14/+23
\|\
\| *	Merge pull request #84 from simonlnu/master	Simon	2012-03-04	1	-14/+23
\| \|\ \| \| \| \| \| \|	more ui bugs fixed \o/
\| \| *	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-03-05	3	-7/+7
\| \| \|\ \| \| \|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: like dislike button fixes in diabook * master:
\| \| *	yet more ui things, and bug fixing	Simon L'nu	2012-03-05	1	-14/+23
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
\| \| *	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-03-04	0	-0/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: wrap title and text for editplain in zero and TB themes correct owner info from misconfigured installs, duepuntozero title block misplaced in editplain mode improved contrast in acl selector, and preview (darkzero) * master:
* \| \|	testbubble notifications	friendica	2012-03-05	3	-6/+13
\|/ /
* \|	Merge pull request #83 from tomtom84/master	tomtom84	2012-03-04	3	-7/+7
\|\ \ \| \|/ \|/\|	fixes in diabook theme
\| *	like dislike button	tommy tomson	2012-03-05	2	-0/+0
\| \|
\| *	fixes in diabook	tommy tomson	2012-03-05	3	-21/+25
\| \|
* \|	Merge pull request #80 from unary/darkzero	Simon	2012-03-04	1	-0/+8
\|\ \ \| \| \| \| \| \|	improved contrast in acl selector, and preview (darkzero)
\| * \|	improved contrast in acl selector, and preview (darkzero)	Michael Johnston	2012-03-04	1	-0/+8
\| \| \|
* \| \|	Merge pull request #82 from simonlnu/master	Simon	2012-03-04	1	-6/+24
\|\ \ \ \| \| \| \| \| \| \| \|	say hello to dispy's younger brother
\| * \| \|	more ui thingies with dispy - we'll get you well dispy, we promise	Simon L'nu	2012-03-04	1	-6/+24
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
\| * \| \|	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-03-04	5	-24/+27
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: fixes in diabook unused replacement variable displays %1 in all html2bbcode 'code' blocks revup style.css fix * master:
\| * \| \| \|	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-03-04	0	-0/+0
\| \| \|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: * master:
* \| \| \|	Merge branch 'pull'	friendica	2012-03-04	3	-22/+25
\|\ \ \ \ \| \| \|/ / \| \|/\| \|
\| * \| \|	Merge pull request #81 from tomtom84/master	tomtom84	2012-03-04	3	-22/+25
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \|	fixes in diabook theme
\| \| * \| \|	fixes in diabook	tommy tomson	2012-03-05	3	-14/+18
\| \| \| \|/ \| \| \|/\|
\| \| * \|	style.css fix	tommy tomson	2012-03-04	1	-10/+9
\| \| \| \|
* \| \| \|	wrap title and text for editplain in zero and TB themes	friendica	2012-03-04	3	-5/+6
\| \| \| \|
* \| \| \|	correct owner info from misconfigured installs, duepuntozero title block ↵	friendica	2012-03-04	2	-1/+25
\|/ / / \| \| \| \| \| \| \| \| \|	misplaced in editplain mode
* \| \|	unused replacement variable displays %1 in all html2bbcode 'code' blocks	friendica	2012-03-04	1	-1/+1
\| \| \|
* \| \|	Merge branch 'pull'	friendica	2012-03-04	3	-44/+87
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	Merge pull request #79 from simonlnu/master	Simon	2012-03-04	1	-5/+6
\| \|\ \ \| \| \| \| \| \| \| \|	more UI fixes
\| \| * \|	removed extra padding/border on tread-wrapper (heh, tea read :P)	Simon L'nu	2012-03-04	1	-5/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
\| \| * \|	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-03-04	0	-0/+0
\| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: * master:
\| * \|	Merge pull request #78 from simonlnu/master	Simon	2012-03-04	2	-10/+49
\| \|\ \ \| \| \| \| \| \| \| \|	fix ui issue with toolbar and notification icons
\| \| * \|	fix up toolbar so the notifications line up better together	Simon L'nu	2012-03-04	2	-10/+49
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
\| \| * \|	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-03-04	0	-0/+0
\| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: * master:
\| * \|	Merge pull request #77 from simonlnu/master	Simon	2012-03-04	2	-29/+32
\| \|\ \ \| \| \| \| \| \| \| \|	CSS and JS tweaks
\| \| * \|	more tweakage. stylesheet and jot-header	Simon L'nu	2012-03-04	2	-29/+32
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
\| \| * \|	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-03-04	0	-0/+0
\| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: revup * master:
* / /	revup	friendica	2012-03-04	1	-1/+1
\|/ /
* \|	Merge branch 'pull'	friendica	2012-03-04	49	-1974/+4574
\|\ \