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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge remote branch 'upstream/master'	Michael Vogel	2012-06-23	10	-108/+219
\|\ \| \| \| \| \| \| \| \|	Conflicts: include/bb2diaspora.php
\| *	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
\| \|
\| *	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
\| \|
\| *	show last.fm source in username	friendica	2012-06-20	1	-0/+1
\| \|
\| *	follow last.fm scrobbles	friendica	2012-06-20	1	-1/+9
\| \|
\| *	create new signed text for relayables right when relaying them	Zach Prezkuta	2012-06-20	1	-52/+28
\| \|
\| *	undefined unmark_for_death	friendica	2012-06-20	1	-0/+1
\| \|
\| *	Merge https://github.com/friendica/friendica into pull	friendica	2012-06-20	1	-2/+9
\| \|\
\| \| *	Merge pull request #344 from ridcully/master	friendica	2012-06-20	1	-2/+9
\| \| \|\ \| \| \| \| \| \| \| \|	exclude_replies for twitter api
\| \| \| *	added exclude_replies option to api call statuses/user_timeline.	Sebastian Egbers	2012-06-19	1	-1/+4
\| \| \| \|
\| \| \| *	added exclude_replies option to api call statuses/home_timeline.	Sebastian Egbers	2012-06-19	1	-1/+5
\| \| \| \|
\| * \| \|	iframes were getting stripped at the rss/atom parser level. We can preserve ↵	friendica	2012-06-20	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	these because we will strip them in the purifier after checking for supported video sources
\| * \| \|	allow dfrn_deliver to undo a mark_for_death just in case the poller is ↵	friendica	2012-06-19	1	-0/+5
\| \|/ / \| \| \| \| \| \| \| \| \|	consistently getting killed.
\| * \|	plugin optimisation - don't loop through every single plugin callback for ↵	friendica	2012-06-19	1	-17/+18
\| \| \| \| \| \| \| \| \| \| \| \|	every hook call, only those registered for that hook
\| * \|	Added App::get_cached_avatar_image usage on conversation wall of Normal View	Zvi ben Yaakov (a.k.a rdc)	2012-06-19	1	-1/+1
\| \| \|
\| * \|	Now using App::get_cached_avatar_image for navigation bar	Zvi ben Yaakov (a.k.a rdc)	2012-06-19	1	-2/+2
\| \| \|
\| * \|	Beginning to use App::get_cached_avatar_image for loading profile images in ↵	Zvi ben Yaakov (a.k.a rdc)	2012-06-19	1	-1/+1
\| \|/ \| \| \| \| \| \|	conversations
\| *	exif_read_data may not be available and isn't a requirement - check and ↵	friendica	2012-06-18	1	-0/+3
\| \| \| \| \| \| \| \|	silently ignore exif orientation if it isn't there
\| *	fix some whitespace issues	Zach Prezkuta	2012-06-18	1	-13/+13
\| \|
\| *	rotate uploaded images if an EXIF rotation is present	Zach Prezkuta	2012-06-18	1	-1/+61
\| \|
\| *	public forum author using private posting, correct the comment permissions ↵	friendica	2012-06-18	1	-0/+6
\| \| \| \| \| \| \| \|	downstream.
\| *	Typo breaking tag notifications	Thomas Willingham	2012-06-18	1	-1/+1
\| \|
* \|	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
\| \|/ \|/\|
* \|	Added missing backticks to navigation bar query	Zvi ben Yaakov (a.k.a rdc)	2012-06-17	1	-1/+1
\| \|
* \|	Enabled Profile photo revisions to be displayed in navigation bar	Zvi ben Yaakov (a.k.a rdc)	2012-06-17	1	-2/+2
\|/
*	rev update	friendica	2012-06-16	1	-3/+3
\|
*	Merge remote branch 'upstream/master'	Hauke Zuehl	2012-06-16	2	-72/+109
\|\
\| *	Merge pull request #338 from ↵	fermionic	2012-06-16	1	-71/+108
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \|	fermionic/diaspora-dont-check-more-signatures-than-diaspora-does Diaspora dont check more signatures than diaspora does
\| \| *	more cleanup	Zach Prezkuta	2012-06-16	1	-15/+0
\| \| \|
\| \| *	some cleanup of obsolete code	Zach Prezkuta	2012-06-16	1	-31/+6
\| \| \|
\| \| *	still need the original author information for comments and likes	Zach Prezkuta	2012-06-16	1	-0/+24
\| \| \|
\| \| *	update signature checking for relayables	Zach Prezkuta	2012-06-16	1	-69/+122
\| \| \|
\| * \|	fix small typo for logging command in api.php	Zach Prezkuta	2012-06-16	1	-1/+1
\| \|/
* \|	Merge remote branch 'upstream/master'	Hauke Zuehl	2012-06-16	11	-84/+295
\|\\|
\| *	rev update	friendica	2012-06-16	1	-10/+0
\| \|
\| *	redundant log entry	friendica	2012-06-14	1	-1/+0
\| \|
\| *	also mark for death if there isn't any xml to be found	friendica	2012-06-14	1	-0/+3
\| \|
\| *	poll even if contact hasn't responded recently, so we can update the ↵	friendica	2012-06-14	2	-5/+3
\| \| \| \| \| \| \| \|	termination status
\| *	better handling of dead contacts	friendica	2012-06-14	2	-1/+8
\| \|
\| *	syntax on sql	friendica	2012-06-13	1	-1/+1
\| \|
\| *	remove php version restriction on archive widget	friendica	2012-06-13	1	-8/+4
\| \|
\| *	couple of little fixes to enotify positional params	friendica	2012-06-13	1	-2/+2
\| \|
\| *	fix to imported youtube videos, updating of contact profile photos, do not ↵	friendica	2012-06-13	4	-34/+105
\| \| \| \| \| \| \| \|	remove "dead" contacts but archive them.
\| *	Merge https://github.com/friendica/friendica into pull	friendica	2012-06-13	1	-1/+1
\| \|\