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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Fixed...merged with mainline THEN added beards.	Thomas	2012-03-06	1	-5/+36
\|
*	added beard smileys	Thomas	2012-03-06	3	-35/+8
\|
*	doc/Account-Basics.md	Thomas	2012-03-06	1	-1/+1
\|
*	doc/Account-Basics.md	Thomas	2012-03-06	1	-2/+1
\|
*	a	Thomas	2012-03-06	1	-2/+2
\|
*	doc/Remove-Account.md	Thomas	2012-03-06	1	-2/+13
\|
*	doc/Making-Friends.md	Thomas	2012-03-06	1	-1/+8
\|
*	doc/Bugs-and-Issues.md	Thomas	2012-03-06	1	-5/+6
\|
*	doc/Account-Basics.md	Thomas	2012-03-06	1	-6/+13
\|
*	Merge pull request #93 from fabrixxm/master	fabrixxm	2012-03-06	2	-0/+57
\|\ \| \| \| \|	quattro: theme settings
\| *	quattro: theme settings (a bit hackish)	Fabio Comuni	2012-03-06	2	-0/+57
\| \|
\| *	Merge remote-tracking branch 'friendica/master'	Fabio Comuni	2012-03-06	98	-2520/+7789
\| \|\
\| * \|	template proc: add variable filters	Fabio Comuni	2012-03-02	1	-5/+15
\| \| \|
* \| \|	remove "smilie" expansion for Diaspora logo	friendica	2012-03-06	1	-2/+2
\| \| \|
* \| \|	prevent duplicate likes	friendica	2012-03-06	1	-0/+25
\| \| \|
* \| \|	Merge branch 'pull'	friendica	2012-03-06	9	-9/+42
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	Merge pull request #92 from tomtom84/master	tomtom84	2012-03-05	9	-9/+42
\| \|\ \ \| \| \| \| \| \| \| \|	fixes in theme diabbook
\| \| * \|	add img	tommy tomson	2012-03-06	1	-0/+0
\| \| \| \|
\| \| * \|	Merge remote-tracking branch 'origin/master'	tommy tomson	2012-03-06	12	-477/+648
\| \| \|\ \ \| \| \|/ / \| \|/\| \|
\| \| * \|	fixes in diabook	tommy tomson	2012-03-06	6	-4/+16
\| \| \| \|
\| \| * \|	fixes	tommy tomson	2012-03-05	4	-5/+26
\| \| \| \|
* \| \| \|	finalise spam storage model, begin driver changes.	friendica	2012-03-05	1	-5/+29
\|/ / /
* \| \|	Merge branch 'pull'	friendica	2012-03-05	1	-1/+2
\|\ \ \
\| * \ \	Merge pull request #91 from unary/darkzero	Simon	2012-03-05	1	-1/+2
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \|	changed bg color around comment box from white to match page background,...
\| \| * \| \|	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	4	-6/+17
\| \| \| \|
* \| \| \|	string update	friendica	2012-03-05	1	-414/+568
\|/ / /
* \| \|	Merge branch 'pull'	friendica	2012-03-05	1	-2/+2
\|\ \ \
\| * \ \	Merge pull request #90 from simonlnu/master	Simon	2012-03-05	1	-2/+2
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \|	field_help tweak
\| \| * \ \	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-03-05	0	-0/+0
\| \| \|\ \ \ \| \| \|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: * master:
\| \| * \| \|	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
\| \| \| \| \|
* \| \| \| \|	Merge branch 'pull'	friendica	2012-03-05	1	-22/+16
\|\\| \| \| \|
\| * \| \| \|	Merge pull request #89 from simonlnu/master	Simon	2012-03-05	1	-22/+16
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \|	implement more changes
\| \| * \| \|	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>
\| \| * \| \|	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-03-05	0	-0/+0
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: revup * master:
* / / /	can_write_wall documentation	friendica	2012-03-05	1	-1/+6
\|/ / /
* \| \|	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: