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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'fabrixxm-master'	Friendika	2011-02-05	5	-5/+23
\|\
\| *	Merge branch 'ph2pr' of https://github.com/fabrixxm/friendika into ↵	Friendika	2011-02-05	5	-5/+23
\| \|\ \| \| \| \| \| \| \| \| \|	fabrixxm-master
\| \| *	Add a link to user photos in Upload Profile Photo page	Fabio Comuni	2011-02-04	6	-5/+27
\| \| \|
* \| \|	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
\| \| \| \|
* \| \| \|	Upload profile photo page it title	Fabio Comuni	2011-02-04	1	-1/+5
\| \|_\|/ \|/\| \|
* \| \|	small fix to IT strings	fabrixxm	2011-02-04	1	-1/+1
\| \| \|
* \| \|	allow changing album name in photo edit page	Friendika	2011-02-03	6	-6/+15
\| \| \|
* \| \|	remove self	Friendika	2011-02-03	5	-4/+24
\| \| \|
* \| \|	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
\| \| \| \| \|
\| * \| \| \|	update jot-headers	fabrixxm	2011-02-01	3	-12/+36
\| \|/ / /
* / / /	append jotplugin tools to current toolbar row	Friendika	2011-02-02	6	-18/+23
\|/ / /
* \| \|	oembed contsant name, fix dfrnpubdeliver, add 'code' editor button	Friendika	2011-01-31	1	-1/+1
\| \| \|
* \| \|	let there be purple! ;-)	Friendika	2011-01-31	4	-0/+27
\| \| \|
* \| \|	email cc recipients (front end)	Friendika	2011-01-31	4	-4/+22
\| \| \|
* \| \|	force text paste in editor	Friendika	2011-01-31	1	-3/+11
\| \| \|
* \| \|	more ssl_policy cleanup, allow manual feed update per contact when hub is ↵	Friendika	2011-01-30	6	-8/+19
\| \| \| \| \| \| \| \| \| \| \| \|	whacked, log feed parse errors
* \| \|	removed java photo uploader from mainline. Photo uploaders are now plugins, ↵	Friendika	2011-01-27	4	-32/+16
\| \| \| \| \| \| \| \| \| \| \| \|	but a single item upload is available by default.
* \| \|	Merge branch 'omigeot-master'	Friendika	2011-01-27	4	-337/+336
\|\\| \|
\| * \|	Merge branch 'master' of https://github.com/omigeot/friendika into ↵	Friendika	2011-01-27	4	-337/+336
\| \|\\| \| \| \| \| \| \| \| \| \|	omigeot-master
\| \| *	More translation	olivierm	2011-01-27	1	-1/+1
\| \| \|
\| \| *	Done head.tpl	olivierm	2011-01-27	1	-1/+1
\| \| \|
\| \| *	French translation : Done strings.php, started template files.	olivierm	2011-01-27	2	-335/+334
\| \| \|
* \| \|	still not quite ready for the big photos rollover	Friendika	2011-01-27	1	-3/+32
\| \| \|
* \| \|	Revert "Revert "roll version - now in alpha 2.1""	Friendika	2011-01-27	1	-32/+3
\| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit e8a3166fa9caa1bdff90526886ae705bc44c4ac8.
* \| \|	Revert "roll version - now in alpha 2.1"	Friendika	2011-01-27	1	-3/+32
\| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit df4f77dadddc7bd756c3e4f72fa2fbe204cfff88.
* \| \|	roll version - now in alpha 2.1	Friendika	2011-01-27	1	-32/+3
\| \| \|
* \| \|	set update frequency to twice daily for 'feed' contacts, unable to set ↵	Friendika	2011-01-26	4	-9/+17
\| \| \| \| \| \| \| \| \| \| \| \|	update frequency on contact edit form.
* \| \|	search icons (?)	Friendika	2011-01-26	2	-1/+6
\| \| \|
* \| \|	Merge branch 'oembed' of https://github.com/fabrixxm/friendika into ↵	Friendika	2011-01-26	5	-7/+49
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	fabrixxm-oembed
\| * \| \|	remove fixed width from wall-item-content	Fabio Comuni	2011-01-26	1	-1/+1
\| \| \| \|
\| * \| \|	Add 'jot_tool' hook, plugins can add tool icons.	Fabio Comuni	2011-01-26	5	-2/+41
\| \| \| \|
\| * \| \|	Merge remote branch 'friendika-master/master'	Fabio Comuni	2011-01-25	2	-1/+7
\| \|\ \ \
\| * \| \| \|	fixed width on wall-item-wrapper	Fabio Comuni	2011-01-25	1	-0/+2
\| \| \| \| \|
\| * \| \| \|	Bigger subject in messages	fabrixxm	2011-01-24	1	-4/+5
\| \| \| \| \|
* \| \| \| \|	greenzero stripped to bare essentials, imported from duepuntozero	Friendika	2011-01-25	1	-1865/+7
\| \| \| \| \|
* \| \| \| \|	renamed theme - it was a bit too long	Friendika	2011-01-25	4	-0/+0
\| \| \| \| \|
* \| \| \| \|	Merge git://github.com/tobiasd/friendika	Tobias Diekershoff	2011-01-25	4	-0/+1887
\|\ \ \ \ \
\| * \| \| \| \|	a green variation of the duepuntozero theme	Tobias Diekershoff	2011-01-25	4	-0/+1887
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	for this variation of the theme the header image and the link colors were set to some tone of green that fit my current likings.
* \| \| \| \| \|	some more strings translated into German	Tobias Diekershoff	2011-01-25	1	-73/+73
\|/ / / / /
* \| \| \| \|	Merge branch 'master' of git://github.com/friendika/friendika	Tobias Diekershoff	2011-01-25	2	-1/+7
\|\ \ \ \ \ \| \| \|/ / / \| \|/\| \| \|
\| * \| \| \|	leave room for vertical scrollbar (when needed)	Friendika	2011-01-24	2	-9/+7
\| \| \| \| \|
\| * \| \| \|	allow a video and/or photo to fit with scrollbars	Friendika	2011-01-24	2	-2/+2
\| \| \| \| \|
\| * \| \| \|	restrict post height, we may back this out later and replace with [show all] ↵	Friendika	2011-01-24	2	-1/+9
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \|	toggles