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

	Commit message (Collapse)	Author	Age	Files	Lines
*	bug #447 - make followed feeds private	friendica	2012-06-11	1	-3/+16
\|
*	Merge pull request #330 from fabrixxm/savenetworktab	friendica	2012-06-11	1	-29/+83
\|\ \| \| \| \|	network view: rembember last tab selected by user
\| *	network view: rembember last tab selected by user	fabrixxm	2012-06-11	1	-29/+83
\|/
*	rev update	friendica	2012-06-10	2	-9/+9
\|
*	Merge https://github.com/friendica/friendica into pull	friendica	2012-06-10	2	-7/+10
\|\
\| *	Merge pull request #329 from simonlnu/master	Simon	2012-06-09	2	-7/+10
\| \|\ \| \| \| \| \| \|	minor template update
\| \| *	minor template update	Simon L'nu	2012-06-09	2	-7/+10
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
\| \| *	Merge remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-06-08	37	-466/+937
\| \| \|\ \| \| \|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: (21 commits) more logging on pubsub callbacks provide ability to autofriend ostatus accounts ostatus hub subscription issues better events-reminder theming png support for embedded private photos rev update png support: update database.sql, fix some typos, fix tinymce image browser Add support for PNG images with alpha fix a random profile error message events: fix select events query select events that starts before display start date and/or ends after display end date. more logging on subscribe_to_hub admin page untranslated strings, remove empty list element for update A few corrections in German translations. rev update set minchars to 2 for PM lookups too set minchars to 2 for contacts search contacts search autocomplete add email probe logging, limit typo check to main addon files and skip additional support files rev update named anchors on display page ...
\| \| *	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-06-05	0	-0/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: DE: update for the strings quattro: added editor buttons to comments quattro: cleanup the less file * master:
* \| \|	rev update	friendica	2012-06-10	2	-146/+159
\|/ /
* \|	more logging on pubsub callbacks	friendica	2012-06-08	1	-4/+12
\| \|
* \|	provide ability to autofriend ostatus accounts	friendica	2012-06-07	1	-1/+15
\| \|
* \|	ostatus hub subscription issues	friendica	2012-06-07	3	-4/+13
\| \|
* \|	better events-reminder theming	friendica	2012-06-07	2	-4/+13
\| \|
* \|	png support for embedded private photos	friendica	2012-06-07	3	-4/+4
\| \|
* \|	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
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \