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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge pull request #362 from simonlnu/master	Simon	2012-06-25	4	-4/+4
\|\ \| \| \| \|	fix margin of .wall-item-body
\| *	fix margin of wall-item-body	Simon L'nu	2012-06-25	4	-4/+4
\|/ \| \| \|	Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
*	Merge pull request #361 from simonlnu/master	Simon	2012-06-25	4	-38/+14
\|\ \| \| \| \|	cleaned up the css a bit
\| *	fix delete thingy, and minor clean up	Simon L'nu	2012-06-25	4	-38/+14
\| \| \| \| \| \| \| \|	Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
* \|	Merge pull request #360 from fermionic/more-nested-lists	friendica	2012-06-25	2	-10/+13
\|\ \ \| \| \| \| \| \|	allow nested [ol] and [ul] lists too
\| * \|	allow nested [ol] and [ul] lists too	Zach Prezkuta	2012-06-25	2	-10/+13
\| \|/
* \|	Merge pull request #359 from fermionic/mustard-prevent-comment-doubles	friendica	2012-06-25	3	-11/+12
\|\ \ \| \| \| \| \| \|	fix check for parent of StatusNet API post
\| * \|	fix check for parent of StatusNet API post	Zach Prezkuta	2012-06-25	3	-11/+12
\| \|/
* \|	Merge pull request #358 from rdc/master	friendica	2012-06-25	1	-1/+1
\|\ \ \| \|/ \|/\|	Added App::get_cached_avatar_image usage for displaying "Last users" avatar thumbs in right sidebar
\| *	Added App::get_cached_avatar_image usage for displaying "Last users"	Zvi ben Yaakov (a.k.a rdc)	2012-06-25	1	-1/+1
\| \| \| \| \| \| \| \|	avatar thumbs in right sidebar
\| *	Merge git://github.com/friendica/friendica	Zvi ben Yaakov (a.k.a rdc)	2012-06-25	20	-179/+472
\| \|\ \| \|/ \|/\|
* \|	more service class functionality	friendica	2012-06-25	1	-0/+5
\| \|
* \|	service limits for photo uploads	friendica	2012-06-25	4	-1/+63
\| \|
* \|	implement "follow" service limits	friendica	2012-06-24	3	-2/+51
\| \|
* \|	add like/dislike to profiles	friendica	2012-06-24	7	-3/+75
\| \|
* \|	sidebar photo album list not visible to anybody if user['hidewall'] set	friendica	2012-06-24	3	-96/+115
\| \|
* \|	service class basics	friendica	2012-06-24	4	-8/+52
\| \|
* \|	Merge pull request #357 from fermionic/fix-relayable-signature-handle	fermionic	2012-06-23	1	-77/+20
\|\ \ \| \| \| \| \| \|	ok now I'm just making silly mistakes--take out premature function locki...
\| * \|	ok now I'm just making silly mistakes--take out premature function locking code	Zach Prezkuta	2012-06-23	1	-77/+20
\| \| \|
* \| \|	Merge https://github.com/friendica/friendica into pull	friendica	2012-06-23	2	-24/+90
\|\ \ \
\| * \| \|	Merge pull request #356 from fermionic/fix-relayable-signature-handle	fermionic	2012-06-23	1	-24/+84
\| \|\\| \| \| \| \| \| \| \| \| \|	use author handle instead of sender handle
\| \| * \|	use author handle instead of sender handle	Zach Prezkuta	2012-06-23	1	-24/+84
\| \| \| \|
\| * \| \|	Merge pull request #355 from ↵	fermionic	2012-06-23	1	-0/+6
\| \|\ \ \ \| \| \|/ / \| \|/\| \| \| \| \| \| \| \| \| \|	fermionic/missing-urls-after-strip_tags-in-bb2diaspora allow bare URLS to make it through to Diaspora
\| \| * \|	allow bare URLS to make it through to Diaspora	Zach Prezkuta	2012-06-23	1	-0/+6
\| \|/ /
* / /	sort out some "like" issues	friendica	2012-06-23	4	-78/+73
\|/ /
* \|	Merge pull request #354 from fermionic/always-terminate-bbcode-list-elements	fermionic	2012-06-23	1	-3/+41
\|\ \ \| \| \| \| \| \|	Fix Diaspora list formatting
\| * \|	small optimization	Zach Prezkuta	2012-06-23	1	-5/+3
\| \| \|
\| * \|	fix BB-to-Diaspora list formatting	Zach Prezkuta	2012-06-23	1	-3/+43
\|/ /
\| *	Merge git://github.com/friendica/friendica	Zvi ben Yaakov (a.k.a rdc)	2012-06-23	32	-217/+3247
\| \|\ \| \|/ \|/\|
* \|	Merge pull request #352 from fermionic/diaspora-display-scaled-down-image	Simon	2012-06-23	2	-4/+17
\|\ \ \| \| \| \| \| \|	allow linking to Diaspora's scaled-down images
\| * \|	allow linking to Diaspora's scaled-down images	Zach Prezkuta	2012-06-23	2	-4/+17
\| \| \|
* \| \|	Merge pull request #353 from simonlnu/master	Simon	2012-06-23	9	-43/+53
\|\ \ \ \| \|/ / \|/\| \|	jquery update; templates
\| * \|	update jquery to 1.7.2; fix some dispy templates to be more in sync with view/	Simon L'nu	2012-06-23	9	-43/+53
\|/ / \| \| \| \| \| \|	Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
* \|	this is going to take some more debug before it can be roller out	friendica	2012-06-23	1	-2/+2
\| \|
* \|	debugging	friendica	2012-06-23	1	-1/+2
\| \|
* \|	cokmment likes not propagating	friendica	2012-06-23	1	-2/+5
\| \|
* \|	make feeds work with comment likes/dislikes	friendica	2012-06-23	1	-1/+1
\| \|
* \|	typo	friendica	2012-06-23	1	-2/+4
\| \|
* \|	Merge https://github.com/friendica/friendica into pull	friendica	2012-06-23	11	-34/+2980
\|\ \
\| * \	Merge pull request #351 from annando/master	friendica	2012-06-23	11	-34/+2980
\| \|\ \ \| \| \| \| \| \| \| \|	Massive change in bbcode2markdown
\| \| * \	Merge remote branch 'upstream/master'	Michael Vogel	2012-06-23	40	-4763/+5539
\| \| \|\ \ \| \| \|/ / \| \|/\| \| \| \| \| \| \| \| \| \|	Conflicts: include/bb2diaspora.php
\| \| * \|	Diaspora: Messages are now looking better	Michael Vogel	2012-06-23	1	-2/+18
\| \| \| \|
\| \| * \|	Merge branch 'master' of github.com:annando/friendica	Michael	2012-06-18	11	-35/+2963
\| \| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: include/oembed.php
\| \| \| * \|	New option in the bbcode parser to disable oembed.	Michael Vogel	2012-06-18	2	-26/+35
\| \| \| \| \|
\| \| \| * \|	New function to convert bbcode to markdown.	Michael Vogel	2012-06-17	10	-19/+2939
\| \| \| \| \|
\| \| * \| \|	OEmbed: Don't output the width of images	Michael	2012-06-18	1	-1/+2
\| \| \| \| \|
* \| \| \| \|	like comments	friendica	2012-06-23	2	-3/+4
\| \| \| \| \|
* \| \| \| \|	liking comments backend	friendica	2012-06-23	4	-12/+20
\|/ / / /
* \| \| \|	cleanup mod/share	friendica	2012-06-23	1	-14/+11
\| \| \| \|
* \| \| \|	Merge pull request #350 from fermionic/improve-bb2diaspora-conversions	fermionic	2012-06-22	1	-20/+53
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Improve bb2diaspora conversions