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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'master' of git://github.com/friendica/friendica	Alexander Kampmann	2012-03-07	59	-661/+1213
\|\
\| *	Merge pull request #103 from tomtom84/master	tomtom84	2012-03-06	2	-3/+8
\| \|\ \| \| \| \| \| \|	fixes in theme diabook
\| \| *	fix in navbar	tommy tomson	2012-03-07	2	-3/+8
\| \| \|
\| * \|	fix photos after permissions_sql change	friendica	2012-03-06	3	-6/+78
\| \| \|
\| * \|	Merge branch 'pull'	friendica	2012-03-06	23	-2/+6
\| \|\ \
\| \| * \	Merge pull request #102 from beardy-unixer/master	Simon	2012-03-06	18	-0/+0
\| \| \|\ \ \| \| \| \| \| \| \| \| \| \|	Improved transparency smileys
\| \| \| * \	Merge remote-tracking branch 'upstream/master'	Thomas	2012-03-06	18	-222/+359
\| \| \| \|\ \ \| \| \| \|/ / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: images/smiley-beard.png
\| \| * \| \|	Merge pull request #101 from tomtom84/master	tomtom84	2012-03-06	1	-0/+4
\| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	fixes in theme diabook
\| \| \| * \| \|	fix in navbar	tommy tomson	2012-03-07	1	-0/+4
\| \| \| \| \|/ \| \| \| \|/\|
\| \| * \| \|	Merge pull request #100 from simonlnu/master	Simon	2012-03-06	5	-2/+2
\| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	fix up the beards so text.php has the right smiley- prefix for them. make one of them transparent and .png
\| \| \| * \ \	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-03-06	6	-7/+15
\| \| \| \|\ \ \ \| \| \| \|/ / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: fix html reshares when editplain in use * master:
\| \| \| * \| \|	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-03-06	13	-38/+70
\| \| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: search should be ok, but a little extra security won't hurt messages-menu translation, add scroll-to-top and theme-bug-report in theme Fixed...merged with mainline THEN added beards. added beard smileys doc/Account-Basics.md doc/Account-Basics.md a doc/Remove-Account.md doc/Making-Friends.md doc/Bugs-and-Issues.md doc/Account-Basics.md * master:
\| \| \| * \| \| \|	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-03-06	0	-0/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: string update [PRIVACY] privacy issue bug #314 * master:
\| \| \| \| \| \| *	improved smiley transparency	Thomas	2012-03-06	20	-2/+2
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	[privacy] rework latest fix	friendica	2012-03-06	2	-4/+3
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	remove stray debugging	friendica	2012-03-06	1	-2/+2
\| \|/ / / / /
\| * \| \| \| \|	Merge branch 'pull'	friendica	2012-03-06	12	-37/+69
\| \|\ \ \ \ \ \| \| \| \|/ / / \| \| \|/\| \| \|
\| \| * \| \| \|	Merge pull request #94 from beardy-unixer/master	Simon	2012-03-06	7	-16/+45
\| \| \|\ \ \ \ \| \| \| \| \|_\|/ \| \| \| \|/\| \|	Documentation changes
\| \| \| * \| \|	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 #99 from tomtom84/master	Simon	2012-03-06	5	-21/+24
\| \| \|\ \ \ \ \| \| \| \| \|_\|/ \| \| \| \|/\| \|	fixes in theme diabook
\| \| \| * \| \|	messages-menu translation, add scroll-to-top and theme-bug-report in theme	tommy tomson	2012-03-07	5	-21/+24
\| \| \| \| \| \|
\| * \| \| \| \|	fix html reshares when editplain in use	friendica	2012-03-06	1	-5/+13
\| \|/ / / /
\| * \| \| /	search should be ok, but a little extra security won't hurt	friendica	2012-03-06	1	-1/+1
\| \| \|_\|/ \| \|/\| \|
\| * \| \|	Merge branch 'pull'	friendica	2012-03-06	1	-19/+18
\| \|\ \ \
\| \| * \ \	Merge pull request #98 from simonlnu/master	Simon	2012-03-06	1	-19/+18
\| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	missed some fixes on last request
\| \| \| * \| \|	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>
\| \| \| * \| \|	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-03-06	0	-0/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: bugs #312, #313 revup * master:
\| * \| \| \| \|	string update	friendica	2012-03-06	1	-101/+224
\| \|/ / / /
\| * / / /	[PRIVACY] privacy issue bug #314	friendica	2012-03-06	1	-2/+5
\| \|/ / /
\| * \| \|	bugs #312, #313	friendica	2012-03-06	4	-37/+35
\| \| \| \|
\| * \| \|	Merge branch 'pull'	friendica	2012-03-06	4	-38/+94
\| \|\\| \|
\| \| * \|	Merge pull request #95 from simonlnu/master	Simon	2012-03-06	2	-38/+37
\| \| \|\ \ \| \| \| \|/ \| \| \|/\|	styling fixes in dispy; typos fixed in settings.tpl
\| \| \| *	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>
\| \| \| *	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-03-06	14	-16/+155
\| \| \| \|\ \| \| \| \|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: remove "smilie" expansion for Diaspora logo prevent duplicate likes quattro: theme settings (a bit hackish) add img fixes in diabook finalise spam storage model, begin driver changes. fixes template proc: add variable filters * master:
\| \| * \|	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
\| \| \| \| \| \|
\| \| \| \| \| *	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-03-05	0	-0/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: some admin page fixes and cleanup changed bg color around comment box from white to match page background, improved contrast on comment preview (darkzero) string update some testbubble stuff can_write_wall documentation * master:
\| * \| \| \| \|	revup	friendica	2012-03-06	1	-1/+1
\| \|/ / / /
\| * \| \| \|	remove "smilie" expansion for Diaspora logo	friendica	2012-03-06	1	-2/+2
\| \| \| \| \|
\| * \| \| \|	prevent duplicate likes	friendica	2012-03-06	1	-0/+25
\| \| \| \| \|