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'	zottel	2012-03-30	39	-139/+391
\|\
\| *	Merge branch 'master' of https://github.com/friendica/friendica	Tobias Diekershoff	2012-03-30	4	-5/+5
\| \|\
\| \| *	zrl into people searches	friendica	2012-03-29	4	-5/+5
\| \| \|
\| * \|	quattro-greey: apply theming to private mail	Tobias Diekershoff	2012-03-30	2	-29/+128
\| \|/
\| *	another silly mistake	friendica	2012-03-29	2	-5/+5
\| \|
\| *	silly mistake	friendica	2012-03-29	1	-2/+3
\| \|
\| *	zrl on mentions	friendica	2012-03-29	1	-0/+6
\| \|
\| *	use zrl to get home again	friendica	2012-03-29	7	-17/+54
\| \|
\| *	Merge branch 'pull'	friendica	2012-03-29	6	-58/+44
\| \|\
\| \| *	Merge pull request #186 from simonlnu/master	Simon	2012-03-29	6	-58/+44
\| \| \|\ \| \| \| \| \| \| \| \|	tweaking stuff in dispys. i thought i fixed the login screens, but they're b0rked right now.
\| \| \| *	tweaking stuff in dispys. i thought i fixed the login screens, but they're ↵	Simon L'nu	2012-03-29	6	-58/+44
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	b0rked right now. Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
\| \| \| *	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-03-29	2	-4/+3
\| \| \| \|\ \| \| \| \|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: typo in function name * master:
\| \| \| *	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-03-29	31	-135/+657
\| \| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: theme file_as combobox for 2.0 css fixes in diabook-derivates quattro: style pm pages message: remove tabs, move new message link to aside, all message with gmail-style quattro: tpl for "file as" * master:
\| \| \| * \|	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-03-29	0	-0/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: some reported warnings cleaned up network permission ids wrong var for notify total fix notification total improved rw notifications bug #349 - email notls setting add a searchbox to "find friends" for global search bugfix in diabook title not updated when editing post New parameter in html2plain for plain text exports. More compatibility in API API: added max_id API: Now threading seems to work API: Seesmic is now working. Optimizing text export. Quotes with author are now having an "open/close" link New bbcode element: "spoiler". Mail: Top post quotes are now embraced in "spoiler" elements * master:
\| * \| \| \|	provide a way to specify an admin account for siteinfo if more than one have ↵	friendica	2012-03-29	1	-1/+5
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \|	admin email address
\| * \| /	typo in function name	friendica	2012-03-29	2	-4/+3
\| \| \|/ \| \|/\|
\| * \|	theme file_as combobox for 2.0	friendica	2012-03-29	2	-1/+8
\| \| \|
\| * \|	css fixes in diabook-derivates	tommy tomson	2012-03-29	16	-23/+136
\| \| \|
* \| \|	Merge remote branch 'upstream/master'	zottel	2012-03-29	87	-435/+2071
\|\\| \|
\| * \|	Merge pull request #185 from fabrixxm/master	fabrixxm	2012-03-28	13	-111/+513
\| \|\ \ \| \| \|/ \| \|/\|	Updated private message pages
\| \| *	quattro: style pm pages	Fabio Comuni	2012-03-28	8	-64/+405
\| \| \|
\| \| *	message: remove tabs, move new message link to aside, all message with ↵	Fabio Comuni	2012-03-28	4	-47/+96
\| \| \| \| \| \| \| \| \| \| \| \|	gmail-style
\| \| *	Merge remote-tracking branch 'friendica/master'	Fabio Comuni	2012-03-28	22	-130/+316
\| \| \|\
\| \| * \|	quattro: tpl for "file as"	Fabio Comuni	2012-03-28	1	-0/+12
\| \| \| \|
\| * \| \|	some reported warnings cleaned up	friendica	2012-03-28	3	-8/+11
\| \| \| \|
\| * \| \|	Merge branch 'pull'	friendica	2012-03-28	10	-78/+317
\| \|\ \ \
\| \| * \ \	Merge pull request #184 from annando/master	friendica	2012-03-28	10	-78/+317
\| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Enhancing the API - Preparations for a better facebook export
\| \| \| * \ \	Merge commit 'upstream/master'	Michael Vogel	2012-03-28	598	-11992/+36509
\| \| \| \|\ \ \ \| \| \| \| \| \|/ \| \| \| \| \|/\|
\| \| \| * \| \|	New parameter in html2plain for plain text exports. More compatibility in API	Michael Vogel	2012-03-21	2	-17/+83
\| \| \| \| \| \|
\| \| \| * \| \|	API: added max_id	Michael Vogel	2012-03-18	1	-2/+6
\| \| \| \| \| \|
\| \| \| * \| \|	API: Now threading seems to work	Michael Vogel	2012-03-18	1	-4/+12
\| \| \| \| \| \|
\| \| \| * \| \|	API: Seesmic is now working. Optimizing text export.	Michael Vogel	2012-03-18	4	-59/+164
\| \| \| \| \| \|
\| \| \| * \| \|	Quotes with author are now having an "open/close" link	Michael Vogel	2012-03-17	2	-3/+25
\| \| \| \| \| \|
\| \| \| * \| \|	New bbcode element: "spoiler". Mail: Top post quotes are now embraced in ↵	Michael Vogel	2012-03-17	6	-5/+39
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	"spoiler" elements
\| * \| \| \| \|	network permission ids	friendica	2012-03-28	1	-1/+23
\| \| \| \| \| \|
\| * \| \| \| \|	wrong var for notify total	friendica	2012-03-28	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	fix notification total	friendica	2012-03-28	1	-2/+3
\| \| \| \| \| \|
\| * \| \| \| \|	improved rw notifications	friendica	2012-03-28	2	-2/+28
\| \|/ / / /
\| * \| \| \|	Merge branch 'pull'	friendica	2012-03-28	12	-22/+108
\| \|\ \ \ \
\| \| * \| \| \|	add a searchbox to "find friends" for global search	tommy tomson	2012-03-28	8	-9/+70
\| \| \| \| \| \|
\| \| * \| \| \|	bugfix in diabook	tommy tomson	2012-03-28	5	-13/+38
\| \| \| \|/ / \| \| \|/\| \|
\| * / \| \|	bug #349 - email notls setting	friendica	2012-03-28	2	-2/+2
\| \|/ / /
\| * \| \|	Merge branch 'pull'	friendica	2012-03-28	4	-11/+14
\| \|\ \ \
\| \| * \ \	Merge pull request #183 from simonlnu/master	Simon	2012-03-28	2	-12/+4
\| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	final pull req for now. really fixed.
\| \| \| * \ \	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-03-28	2	-1/+10
\| \| \| \|\ \ \ \| \| \| \|/ / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: viewsrc: return only body if page is requested via ajax * master:
\| \| * \| \| \|	Merge pull request #182 from fabrixxm/master	fabrixxm	2012-03-28	2	-1/+10
\| \| \|\ \ \ \ \| \| \| \| \|_\|/ \| \| \| \|/\| \|	viewsrc returns only text if page is requested via ajax
\| \| \| * \| \|	viewsrc: return only body if page is requested via ajax	Fabio Comuni	2012-03-28	2	-1/+10
\| \| \| \| \| \|
\| \| * \| \| \|	Merge pull request #181 from simonlnu/master	Simon	2012-03-28	2	-2/+4
\| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	how the default.php gets read just changed from under me. not pleasant.
\| \| \| \| \| * \|	really fix it this time...	Simon L'nu	2012-03-28	2	-12/+4
\| \| \| \| \|/ / \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
\| \| \| * \| \|	WITH is going on?	Simon L'nu	2012-03-28	2	-2/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Simon L'nu <simon.lnu@gmail.com>