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

	Commit message (Collapse)	Author	Age	Files	Lines
*	dispy, dispy, oh what a little lispy	Simon L'nu	2012-03-06	1	-19/+18
\| \| \| \|	Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
*	bugs #312, #313	friendica	2012-03-06	1	-1/+1
\|
*	styling fixes in dispy. fix typos in settings.tpl	Simon L'nu	2012-03-06	2	-38/+37
\| \| \| \|	Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
*	quattro: theme settings (a bit hackish)	Fabio Comuni	2012-03-06	2	-0/+57
\|
*	Merge remote-tracking branch 'origin/master'	tommy tomson	2012-03-06	8	-58/+66
\|\
\| *	Merge branch 'pull'	friendica	2012-03-05	1	-1/+2
\| \|\
\| \| *	changed bg color around comment box from white to match page background, ↵	Michael Johnston	2012-03-05	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \|	improved contrast on comment preview (darkzero)
\| * \|	some admin page fixes and cleanup	friendica	2012-03-05	3	-3/+10
\| \|/
\| *	Merge branch 'pull'	friendica	2012-03-05	1	-2/+2
\| \|\
\| \| *	forgot a small change in .field_help	Simon L'nu	2012-03-05	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
\| * \|	some testbubble stuff	friendica	2012-03-05	3	-31/+37
\| \|/
\| *	implement more of the changes requested	Simon L'nu	2012-03-05	1	-22/+16
\| \| \| \| \| \| \| \|	Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
* \|	fixes in diabook	tommy tomson	2012-03-06	6	-4/+16
\| \|
* \|	fixes	tommy tomson	2012-03-05	4	-5/+26
\|/
*	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>
*	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>
*	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>
*	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>
*	$name appearing on testbubble items	friendica	2012-03-05	1	-1/+1
\|
*	Merge branch 'pull'	friendica	2012-03-05	1	-14/+23
\|\
\| *	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>
* \| \|	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 '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	1	-1/+1
\|/ / \| \| \| \| \| \|	misplaced in editplain mode
* \|	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>
* \|	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>
* \|	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>
* \|	soften '.shiny' a bit to fit in with colour scheme. tweak wall boxes	Simon L'nu	2012-03-04	1	-5/+8
\| \| \| \| \| \| \| \|	Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
* \|	tweak wall items a bit (nasty-looking wall items...). jot-header tries to ↵	Simon L'nu	2012-03-04	2	-7/+37
\| \| \| \| \| \| \| \| \| \| \| \|	count chars and fails :P Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
* \|	Merge pull request #74 from tomtom84/master	tomtom84	2012-03-03	5	-15/+137
\|\\| \| \| \| \|	fixes in diabook theme
\| *	some fixes in diabook	tommy tomson	2012-03-04	5	-15/+137
\| \|
* \|	Merge pull request #73 from simonlnu/master	Simon	2012-03-03	19	-1767/+3934
\|\ \ \| \| \| \| \| \|	dispy! (and minor formatting)
\| * \|	these are more finessing on formatting again	Simon L'nu	2012-03-03	2	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
\| * \|	first commit for dispy New Edition	Simon L'nu	2012-03-03	16	-1752/+3924
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
\| * \|	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-03-03	2	-1/+8
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: Added docblox default configuration file. fixed apps css * master:
\| * \ \	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-03-03	15	-12/+19
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: fixed star/unstar fixed admin fixed editor * master:
\| * \ \ \	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-03-03	2	-14/+34
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: fix editor * master:
\| * \ \ \ \	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-03-03	18	-184/+402
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: fix text-editor in theme german strings as of 28th Feb from transilex small fix in style.css fix star/unstar fixes in wall_item.tpl and style.css in theme diabook fix in wall_item.tpl new icon link.png add diabook to default themes fixed broken tags and notifications in theme * master: