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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge https://github.com/friendica/friendica into pull	friendica	2012-06-07	16	-81/+243
\|\
\| *	Merge pull request #328 from fabrixxm/master	friendica	2012-06-07	13	-77/+237
\| \|\ \| \| \| \| \| \|	PNG with alpha channel
\| \| *	png support: update database.sql, fix some typos, fix tinymce image browser	Fabio Comuni	2012-06-07	6	-19/+34
\| \| \|
\| \| *	Add support for PNG images with alpha	Fabio Comuni	2012-06-07	11	-71/+216
\| \| \|
\| * \|	Merge pull request #327 from fabrixxm/master	fabrixxm	2012-06-07	3	-4/+6
\| \|\\| \| \| \| \| \| \|	events: fix select events query
\| \| *	fix a random profile error message	fabrixxm	2012-06-07	2	-2/+4
\| \| \|
\| \| *	events: fix select events query	fabrixxm	2012-06-07	1	-2/+2
\| \|/ \| \| \| \| \| \| \| \|	select events that starts before display start date and/or ends after display end date.
* /	rev update	friendica	2012-06-07	2	-175/+179
\|/
*	more logging on subscribe_to_hub	friendica	2012-06-06	1	-1/+6
\|
*	Merge https://github.com/friendica/friendica into pull	friendica	2012-06-06	2	-54/+48
\|\
\| *	Merge pull request #326 from zzottel/master	zzottel	2012-06-06	2	-54/+48
\| \|\ \| \| \| \| \| \|	German translations
\| \| *	A few corrections in German translations.	zottel	2012-06-07	2	-54/+48
\| \| \|
\| \| *	Merge remote branch 'upstream/master'	zottel	2012-06-07	3	-123/+339
\| \| \|\ \| \| \|/ \| \|/\|
\| \| *	Merge remote branch 'upstream/master'	zottel	2012-06-06	13	-453/+508
\| \| \|\
\| \| * \	Merge remote branch 'upstream/master'	zottel	2012-06-05	30	-1287/+2256
\| \| \|\ \
\| \| * \ \	Merge remote branch 'upstream/master'	zottel	2012-06-03	22	-459/+607
\| \| \|\ \ \
\| \| * \ \ \	Merge remote branch 'upstream/master'	zottel	2012-06-02	6	-176/+186
\| \| \|\ \ \ \
\| \| * \ \ \ \	Merge remote branch 'upstream/master'	zottel	2012-06-01	5	-436/+502
\| \| \|\ \ \ \ \
\| \| * \ \ \ \ \	Merge remote branch 'upstream/master'	zottel	2012-05-31	11	-186/+214
\| \| \|\ \ \ \ \ \
\| \| * \ \ \ \ \ \	Merge remote branch 'upstream/master'	zottel	2012-05-30	47	-839/+995
\| \| \|\ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \	Merge remote branch 'upstream/master'	zottel	2012-05-25	23	-819/+1098
\| \| \|\ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \	Merge remote branch 'upstream/master'	zottel	2012-05-23	29	-761/+980
\| \| \|\ \ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \ \	Merge remote branch 'upstream/master'	zottel	2012-05-22	29	-444/+623
\| \| \|\ \ \ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \ \ \	Merge remote branch 'upstream/master'	zottel	2012-05-20	33	-682/+1171
\| \| \|\ \ \ \ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \ \ \ \	Merge remote branch 'upstream/master'	zottel	2012-05-17	37	-5312/+6391
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \ \ \ \ \	Merge remote branch 'upstream/master'	zottel	2012-05-15	4	-49/+63
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \ \ \ \ \ \	Merge remote branch 'upstream/master'	zottel	2012-05-14	53	-7106/+10559
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge remote branch 'upstream/master'	zottel	2012-05-11	14	-177/+628
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge remote branch 'upstream/master'	zottel	2012-05-10	23	-118/+123
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge remote branch 'upstream/master'	zottel	2012-05-09	14	-468/+621
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge remote branch 'upstream/master'	zottel	2012-05-08	15	-377/+626
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge remote branch 'upstream/master'	zottel	2012-05-07	40	-611/+6304
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge remote branch 'upstream/master'	zottel	2012-05-05	6	-787/+795
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge remote branch 'upstream/master'	zottel	2012-05-04	10	-686/+970
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge remote branch 'upstream/master'	zottel	2012-05-04	37	-2709/+4343
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge remote branch 'upstream/master'	zottel	2012-05-03	43	-493/+697
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge remote branch 'upstream/master'	zottel	2012-05-02	20	-249/+383
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge remote branch 'upstream/master'	zottel	2012-05-01	85	-2812/+3625
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge remote branch 'upstream/master'	zottel	2012-04-28	14	-363/+485
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge remote branch 'upstream/master'	zottel	2012-04-27	7	-62/+161
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge remote branch 'upstream/master'	zottel	2012-04-27	110	-8362/+11873
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge remote branch 'upstream/master'	zottel	2012-04-25	49	-499/+1194
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge remote branch 'upstream/master'	zottel	2012-04-24	263	-14482/+1144
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge remote branch 'upstream/master'	zottel	2012-04-23	412	-21572/+3945
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge remote branch 'upstream/master'	zottel	2012-04-20	636	-4024/+115549
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge remote branch 'upstream/master'	zottel	2012-04-16	31	-180/+524
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge remote branch 'upstream/master'	zottel	2012-04-15	349	-6710/+7509
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge remote branch 'upstream/master'	zottel	2012-04-09	2	-1/+11
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	admin page untranslated strings, remove empty list element for update	friendica	2012-06-06	2	-3/+8
\|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| /	rev update	friendica	2012-06-06	3	-123/+339
\| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|