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

	Commit message (Expand)	Author	Age	Files	Lines
*	diabook-themes: small icon fix	tommy tomson	2012-04-09	14	-0/+0
*	Merge pull request #217 from tomtom84/master	tomtom84	2012-04-09	8	-0/+0
\|\
\| *	diabook-nav-icons with gradient	tommy tomson	2012-04-09	8	-0/+0
\|/
*	Merge branch 'pull'	friendica	2012-04-09	2	-64/+64
\|\
\| *	Merge pull request #216 from zzottel/master	tomtom84	2012-04-09	2	-64/+64
\| \|\
\| \| *	Some new German translations	zottel	2012-04-09	2	-64/+64
\| \| *	Merge remote branch 'upstream/master'	zottel	2012-04-09	26	-333/+498
\| \| \|\
\| \| * \	Merge remote branch 'upstream/master'	zottel	2012-04-08	22	-25/+302
\| \| \|\ \
\| \| * \ \	Merge remote branch 'upstream/master'	zottel	2012-04-08	1418	-2297/+4820
\| \| \|\ \ \
\| \| * \ \ \	Merge remote branch 'upstream/master'	zottel	2012-04-04	70	-3913/+376
\| \| \|\ \ \ \
\| \| * \ \ \ \	Merge remote branch 'upstream/master'	zottel	2012-04-03	41	-276/+471
\| \| \|\ \ \ \ \
\| \| * \ \ \ \ \	Merge remote branch 'upstream/master'	zottel	2012-04-02	115	-313/+12740
\| \| \|\ \ \ \ \ \
\| \| * \ \ \ \ \ \	Merge remote branch 'upstream/master'	zottel	2012-03-31	197	-1141/+19714
\| \| \|\ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \	Merge remote branch 'upstream/master'	zottel	2012-03-30	39	-139/+391
\| \| \|\ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \	Merge remote branch 'upstream/master'	zottel	2012-03-29	87	-435/+2071
\| \| \|\ \ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \ \	Merge remote branch 'upstream/master'	zottel	2012-03-27	166	-1297/+7813
\| \| \|\ \ \ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \ \ \	Merge remote branch 'upstream/master'	zottel	2012-03-24	5	-223/+86
\| \| \|\ \ \ \ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \ \ \ \	Merge remote branch 'upstream/master'	zottel	2012-03-23	5	-34/+4953
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \ \ \ \ \	Merge remote branch 'upstream/master'	zottel	2012-03-23	12	-34/+375
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \ \ \ \ \ \	Merge remote branch 'upstream/master'	zottel	2012-03-22	22	-20/+349
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge remote branch 'upstream/master'	zottel	2012-03-22	36	-65/+552
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge remote branch 'upstream/master'	zottel	2012-03-21	346	-10409/+21300
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge remote branch 'upstream/master'	zottel	2012-03-20	5	-102/+81
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge remote branch 'upstream/master'	zottel	2012-03-19	2	-1/+17
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge remote branch 'upstream/master'	zottel	2012-03-19	24	-66/+113
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge remote branch 'upstream/master'	zottel	2012-03-18	8	-22/+21
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge remote branch 'upstream/master'	zottel	2012-03-17	3	-7/+9
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge remote branch 'upstream/master'	zottel	2012-03-17	28	-306/+488
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge remote branch 'upstream/master'	zottel	2012-03-16	44	-170/+547
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge remote branch 'upstream/master'	zottel	2012-03-15	31	-274/+1206
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge remote branch 'upstream/master'	zottel	2012-03-15	10	-21/+74
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge remote branch 'upstream/master'	zottel	2012-03-14	8	-8/+190
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	use local_user for tag completion if available. See bug #368	friendica	2012-04-09	1	-1/+1
\|/ / / / / / / / / / / / / / / / / / / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	more sane defaults datetime_convert	friendica	2012-04-08	1	-3/+6
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix empty string timezone	friendica	2012-04-08	1	-0/+7
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	send zrl after dfrn_request homecoming for manual entries	friendica	2012-04-08	1	-1/+1
\| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'pull'	friendica	2012-04-08	21	-45/+179
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge pull request #215 from tomtom84/master	tomtom84	2012-04-08	21	-45/+179
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fixed z-index of youtube-vids	tommy tomson	2012-04-09	21	-45/+179
\| \|/ / / / / / / / / / / / / / / / / / / / / / / / / /
* / / / / / / / / / / / / / / / / / / / / / / / / / /	fix to wall_upload photos default permissions to use cid rather than uid.	friendica	2012-04-08	5	-288/+319
\|/ / / / / / / / / / / / / / / / / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	prepare for using a master theme_init()	friendica	2012-04-08	1	-0/+7
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	provide theme_init() functions	friendica	2012-04-08	9	-0/+20
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	rev updates	friendica	2012-04-08	2	-3/+3
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #214 from annando/master	friendica	2012-04-08	12	-22/+272
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge commit 'upstream/master'	Michael Vogel	2012-04-08	15	-30/+43
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / / / / / / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #213 from simonlnu/master	Simon	2012-04-07	7	-30/+35
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	minor dispy* fixes	Simon L'nu	2012-04-07	7	-30/+35
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-04-07	44	-153/+1476
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / / / / / / / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	diabook-themes: small fix	tommy tomson	2012-04-07	8	-0/+8
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-04-07	180	-231/+365
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \