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

	Commit message (Collapse)	Author	Age	Files	Lines
*	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
\|/
*	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 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
\| * \| \|	cleanup lists and more comment signature stuff	Zach Prezkuta	2012-06-22	1	-2/+13
\| \| \| \|
\| * \| \|	expand support for BB code-to-Diaspora conversion	Zach Prezkuta	2012-06-22	1	-20/+42
\|/ / /
* \| \|	Merge https://github.com/friendica/friendica into pull	friendica	2012-06-22	3	-3/+4
\|\ \ \
\| * \ \	Merge pull request #349 from simonlnu/master	Simon	2012-06-22	3	-3/+4
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \|	minor template tweaks
\| \| * \| \|	minor tweaks to some tpl files	Simon L'nu	2012-06-22	3	-3/+4
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
* / / /	share RSS items	friendica	2012-06-22	3	-5/+5
\|/ / /
* \| \|	Merge https://github.com/friendica/friendica into pull	friendica	2012-06-22	1	-10/+17
\|\ \ \
\| * \ \	Merge pull request #348 from max-weller/master	friendica	2012-06-21	1	-10/+17
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \|	List statuses by conversation_id
\| \| * \| \|	Added ORDER BY clause for conversation view	Max Weller	2012-06-21	1	-1/+1
\| \| \| \| \|
\| \| * \| \|	Added statuses/show parameter ?conversation=true	Max Weller	2012-06-21	1	-10/+17
\| \|/ / /
* / / /	unterminated sql string	friendica	2012-06-22	3	-68/+76
\|/ / /
* \| \|	show last.fm source in username	friendica	2012-06-20	1	-0/+1
\| \| \|
* \| \|	follow last.fm scrobbles	friendica	2012-06-20	1	-1/+9
\| \| \|
* \| \|	Merge https://github.com/friendica/friendica into pull	friendica	2012-06-20	5	-65/+56
\|\ \ \
\| * \ \	Merge pull request #346 from fermionic/add-rotate-ccw-option	friendica	2012-06-20	2	-11/+18
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \|	allow rotation to be either CW or CCW
\| \| * \| \|	allow rotation either CW or CCW	Zach Prezkuta	2012-06-20	2	-11/+18
\| \| \| \| \|
\| * \| \| \|	Merge pull request #347 from fermionic/diaspora-more-signature-refinements	fermionic	2012-06-20	1	-52/+28
\| \|\ \ \ \ \| \| \|/ / / \| \|/\| \| \|	create new signed text for relayables right when relaying them
\| \| * \| \|	create new signed text for relayables right when relaying them	Zach Prezkuta	2012-06-20	1	-52/+28
\| \|/ / /
\| * \| \|	Darkzero-NS fix weeks old BBIcon error	Thomas Willingham	2012-06-21	1	-2/+2
\| \| \| \|
\| * \| \|	Darkzero/NS - make the archives font the same colour as the other widgets.	Thomas Willingham	2012-06-21	2	-0/+8
\| \| \| \|
* \| \| \|	try and eliminate the openssl warnings for forums trying to talk back to fans	friendica	2012-06-20	1	-1/+1
\|/ / /
* \| \|	undefined unmark_for_death	friendica	2012-06-20	1	-0/+1
\| \| \|
* \| \|	sort out contact search oddities	friendica	2012-06-20	1	-4/+3
\| \| \|
* \| \|	missing paren	friendica	2012-06-20	1	-1/+1
\| \| \|