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

	Commit message (Collapse)	Author	Age	Files	Lines
*	german choose existing pic for the avatar	Tobias Diekershoff	2011-02-06	1	-2/+2
\|
*	Merge branch 'master' of git://github.com/friendika/friendika	Tobias Diekershoff	2011-02-06	8	-43/+116
\|\
\| *	Merge branch 'fabrixxm-master'	Friendika	2011-02-05	7	-42/+115
\| \|\
\| \| *	Merge branch 'ph2pr' of https://github.com/fabrixxm/friendika into ↵	Friendika	2011-02-05	7	-42/+115
\| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \|	fabrixxm-master
\| \| \| *	Add a link to user photos in Upload Profile Photo page	Fabio Comuni	2011-02-04	7	-6/+28
\| \| \| \|
\| \| \| *	Allow to set a photo from albums as profile photo	Fabio Comuni	2011-02-04	2	-37/+92
\| \| \| \|
\| * \| \|	Merge branch 'omigeot-master'	Friendika	2011-02-05	1	-1/+1
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: view/fr/strings.php
\| \| * \ \	Merge branch 'master' of https://github.com/omigeot/friendika into ↵	Friendika	2011-02-05	1	-0/+1
\| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	omigeot-master
\| \| \| * \| \|	Fixed some typo (prevented Friendika to load with french locale)	olivierm	2011-02-05	1	-0/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'master' of git://github.com/friendika/friendika	Tobias Diekershoff	2011-02-05	8	-78/+130
\|\\| \| \| \| \|
\| * \| \| \| \|	found it - typo	Friendika	2011-02-04	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	more error checking on posts	Friendika	2011-02-04	2	-13/+23
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch 'fabrixxm-master'	Friendika	2011-02-04	2	-2/+6
\| \|\ \ \ \ \ \| \| \| \|_\|/ / \| \| \|/\| \| \|
\| \| * \| \| \|	Upload profile photo page it title	Fabio Comuni	2011-02-04	1	-1/+5
\| \| \| \|_\|/ \| \| \|/\| \|
\| \| * \| \|	Merge branch 'master' of https://github.com/friendika/friendika.git	Fabio Comuni	2011-02-04	2	-4/+23
\| \| \|\ \ \
\| \| * \| \| \|	small fix to IT strings	fabrixxm	2011-02-04	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	prevent runaway notifications when parent=0 due to race condition	Friendika	2011-02-04	3	-59/+78
\| \| \|/ / / \| \|/\| \| \|
\| * \| \| \|	Merge branch 'photos' of https://github.com/fabrixxm/friendika into ↵	Friendika	2011-02-03	2	-4/+23
\| \|\ \ \ \ \| \| \|/ / / \| \|/\| \| \| \| \| \| \| \|	fabrixxm-photos
\| \| * \| \|	remove an erroneously pasted line	fabrixxm	2011-02-03	1	-6/+1
\| \| \| \| \|
\| \| * \| \|	Fix tabs	Fabio Comuni	2011-02-03	1	-14/+14
\| \| \| \| \|
\| \| * \| \|	Show lock info on photos	Fabio Comuni	2011-02-03	1	-1/+9
\| \| \| \| \|
\| \| * \| \|	Extend lockview to show info on items, photos and events	Fabio Comuni	2011-02-03	1	-4/+20
\| \| \| \| \|
* \| \| \| \|	wording	Tobias Diekershoff	2011-02-04	1	-2/+2
\|/ / / /
* \| \| \|	warn folks that changing your domain name after making friends is not ↵	Friendika	2011-02-03	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	supported at this time.
* \| \| \|	found the issue - remove the extra tracing stuff	Friendika	2011-02-03	1	-7/+1
\| \| \| \|
* \| \| \|	allow parentless items from SN - add more tracing on notify failures	Friendika	2011-02-03	2	-8/+28
\| \| \| \|
* \| \| \|	allow changing album name in photo edit page	Friendika	2011-02-03	9	-13/+34
\| \| \| \|
* \| \| \|	don't parse garbage in phase2 of dfrn_deliver either	Friendika	2011-02-03	1	-0/+7
\| \| \| \|
* \| \| \|	remove self	Friendika	2011-02-03	7	-5/+79
\| \| \| \|
* \| \| \|	Merge branch 'tobiasd-master'	Friendika	2011-02-02	1	-1/+1
\|\ \ \ \
\| * \| \| \|	double $ in de/strings.php corrected	Tobias Diekershoff	2011-02-03	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Merge branch 'tobiasd-master'	Friendika	2011-02-02	1	-7/+55
\|\\| \| \| \|
\| * \| \| \|	updates to the German strings.php file	Tobias Diekershoff	2011-02-03	1	-7/+55
\| \| \| \| \|
* \| \| \| \|	Merge branch 'fabrixxm-master'	Friendika	2011-02-02	4	-12/+55
\|\ \ \ \ \
\| * \| \| \| \|	IT string update	fabrixxm	2011-02-03	1	-0/+19
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch 'friendika-master'	fabrixxm	2011-02-03	9	-30/+114
\| \|\\| \| \| \|
\| * \| \| \| \|	Merge branch 'friendika-master'	fabrixxm	2011-02-02	7	-37/+84
\| \|\ \ \ \ \
\| * \| \| \| \| \|	update jot-headers	fabrixxm	2011-02-01	3	-12/+36
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'friendika-master'	fabrixxm	2011-02-01	2	-18/+36
\| \|\ \ \ \ \ \
\| * \ \ \ \ \ \	Merge branch 'master' of github.com:fabrixxm/friendika	fabrixxm	2011-02-01	5	-69/+71
\| \|\ \ \ \ \ \ \ \| \| \| \|_\|_\|/ / / \| \| \|/\| \| \| \| \|
\| \| * \| \| \| \| \|	Merge remote branch 'friendika-master/master'	Fabio Comuni	2011-02-01	25	-126/+341
\| \| \|\ \ \ \ \ \
\| \| * \ \ \ \ \ \	Merge branch 'master' of github.com:fabrixxm/friendika	Fabio Comuni	2011-02-01	0	-0/+0
\| \| \|\ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \	Merge remote branch 'friendika-master/master'	Fabio Comuni	2011-01-31	29	-135/+321
\| \| \|\ \ \ \ \ \ \ \
\| * \| \ \ \ \ \ \ \ \	Merge branch 'friendika-master'	fabrixxm	2011-02-01	35	-89/+374
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|/ / / / / / / \| \|/\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Merge branch 'master' of github.com:fabrixxm/friendika	fabrixxm	2011-01-29	0	-0/+0
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \|/ / / / / / / / \| \| \|/\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	Merge remote branch 'friendika-master/master'	Fabio Comuni	2011-01-28	18	-452/+666
\| \| \|\ \ \ \ \ \ \ \ \
\| * \| \ \ \ \ \ \ \ \ \	Merge branch 'friendika-master'	fabrixxm	2011-01-29	16	-105/+219
\| \|\ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \	Merge branch 'friendika-master'	fabrixxm	2011-01-28	18	-452/+666
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|/ / / / / / / / / / \| \|/\| \| / / / / / / / / / \| \| \| \|/ / / / / / / / / \| \| \|/\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Merge branch 'friendika-master'	fabrixxm	2011-01-27	93	-36/+7067
\| \|\ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \	Merge branch 'friendika-master'	fabrixxm	2011-01-25	57	-11/+2930
\| \|\ \ \ \ \ \ \ \ \ \ \ \