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

	Commit message (Expand)	Author	Age	Files	Lines
*	soften '.shiny' a bit to fit in with colour scheme. tweak wall boxes	Simon L'nu	2012-03-04	1	-5/+8
*	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-03-04	0	-0/+0
*	Merge pull request #75 from simonlnu/master	Simon	2012-03-04	2	-7/+37
\|\
\| *	tweak wall items a bit (nasty-looking wall items...). jot-header tries to cou...	Simon L'nu	2012-03-04	2	-7/+37
\| *	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-03-04	5	-15/+137
\| \|\ \| \|/ \|/\|
* \|	Merge pull request #74 from tomtom84/master	tomtom84	2012-03-03	5	-15/+137
\|\ \
\| * \|	some fixes in diabook	tommy tomson	2012-03-04	5	-15/+137
\| \| *	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-03-03	0	-0/+0
\| \|/ \|/\|
* \|	Merge pull request #73 from simonlnu/master	Simon	2012-03-03	19	-1767/+3934
\|\ \
\| * \|	these are more finessing on formatting again	Simon L'nu	2012-03-03	2	-3/+3
\| * \|	first commit for dispy New Edition	Simon L'nu	2012-03-03	16	-1752/+3924
\| * \|	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-03-03	3	-1/+21
\| \|\ \
\| * \ \	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-03-03	17	-12/+19
\| \|\ \ \
\| * \ \ \	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-03-03	2	-14/+34
\| \|\ \ \ \
\| * \ \ \ \	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-03-03	20	-186/+404
\| \|\ \ \ \ \
\| * \| \| \| \| \|	minor formatting issues	Simon L'nu	2012-03-02	1	-12/+7
\| * \| \| \| \| \|	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-03-02	0	-0/+0
* \| \| \| \| \| \|	Merge pull request #72 from tomtom84/master	tomtom84	2012-03-03	1	-1/+2
\|\ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|/ \| \|/\| \| \| \| \|
\| * \| \| \| \| \|	tag fix	tommy tomson	2012-03-04	1	-1/+2
* \| \| \| \| \| \|	Merge pull request #71 from tomtom84/master	tomtom84	2012-03-03	1	-2/+2
\|\\| \| \| \| \| \|
\| * \| \| \| \| \|	fix	tommy tomson	2012-03-03	1	-2/+2
* \| \| \| \| \| \|	Merge pull request #70 from tomtom84/master	tomtom84	2012-03-03	5	-6/+18
\|\\| \| \| \| \| \| \| \|_\|_\|_\|_\|/ \|/\| \| \| \| \|
\| * \| \| \| \|	navbar fix	tommy tomson	2012-03-03	5	-6/+18
* \| \| \| \| \|	Merge pull request #69 from abinoam/docblox	Abinoam P. Marques Jr.	2012-03-03	1	-0/+13
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Added docblox default configuration file.	Abinoam P. Marques Jr	2012-03-03	1	-0/+13
\|/ / / / / /
* \| \| \| \| /	Merge pull request #68 from tomtom84/master	tomtom84	2012-03-03	2	-1/+8
\|\\| \| \| \| \| \| \|_\|_\|_\|/ \|/\| \| \| \|
\| * \| \| \|	fixed apps css	tommy tomson	2012-03-03	2	-1/+8
* \| \| \| \|	Merge pull request #67 from tomtom84/master	tomtom84	2012-03-03	7	-10/+17
\|\\| \| \| \|
\| * \| \| \|	fixed star/unstar	tommy tomson	2012-03-03	7	-10/+17
* \| \| \| \|	Merge pull request #66 from tomtom84/master	tomtom84	2012-03-03	11	-2/+2
\|\\| \| \| \| \| \|_\|_\|/ \|/\| \| \|
\| * \| \|	fixed admin	tommy tomson	2012-03-03	11	-2/+2
* \| \| \|	Merge pull request #65 from tomtom84/master	tomtom84	2012-03-03	2	-14/+34
\|\\| \| \| \| \|_\|/ \|/\| \|
\| * \|	fix editor	tommy tomson	2012-03-03	2	-14/+34
* \| \|	Merge pull request #64 from tomtom84/master	tomtom84	2012-03-03	10	-7/+204
\|\\| \|
\| * \|	fix text-editor in theme	tommy tomson	2012-03-03	10	-7/+204
* \| \|	german strings as of 28th Feb from transilex	Tobias Diekershoff	2012-03-03	2	-142/+142
* \| \|	Merge pull request #63 from tomtom84/master	tomtom84	2012-03-02	3	-1/+5
\|\\| \|
\| * \|	small fix in style.css	tommy tomson	2012-03-03	1	-1/+5
\| * \|	fix star/unstar	tommy tomson	2012-03-03	2	-0/+0
* \| \|	Merge pull request #62 from tomtom84/master	friendica	2012-03-02	5	-34/+51
\|\\| \|
\| * \|	fixes in wall_item.tpl and style.css in theme diabook	tommy tomson	2012-03-03	3	-8/+12
\| * \|	fix in wall_item.tpl	tommy tomson	2012-03-03	3	-10/+13
\| * \|	fixed broken tags and notifications in theme	tommy tomson	2012-03-03	3	-16/+26
* \| \|	add diabook to default themes	friendica	2012-03-02	2	-2/+2
\| \|/ \|/\|
* \|	Merge pull request #61 from fabrixxm/master	Simon	2012-03-02	2	-2/+11
\|\ \
\| * \|	fix @mention autocomplete in comments	Fabio Comuni	2012-03-03	1	-1/+1
\| * \|	Merge remote-tracking branch 'friendica/master'	Fabio Comuni	2012-03-03	33	-127/+2470
\| \|\ \ \| \|/ / \|/\| \|
* \| \|	Merge pull request #60 from simonlnu/master	Simon	2012-03-02	6	-123/+135
\|\ \ \
\| * \| \|	apply changes to templates to testbubble	Simon L'nu	2012-03-02	6	-123/+135
\| * \| \|	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-03-02	0	-0/+0
\|/ / /