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

	Commit message (Collapse)	Author	Age	Files	Lines
*	rip out fpostit	Simon L'nu	2012-04-17	12	-328/+0
\| \| \| \|	Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
*	finally fix the ui in the settings. it was fugly.... other bug fixes too	Simon L'nu	2012-04-17	3	-1463/+1572
\| \| \| \|	Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
*	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-04-16	0	-0/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: (22 commits) diabook-themes: bugfix (sry, necessary) diabook-themes: small bug/css-fixes ---> ver. 1.019 diabook-themes: bug-fixes diabook-themes: minor bugfixes turn on comment edit propagate edited comments edited comments weren't being relayed rev update diabook-themes: css-fixes open contact edit in same window where did this "lang" string come from and why? function name typo track requested profile error msg DBA: Reverting back to original source DBA: Nothing really done .. DBA: Deactivation of the mysqli-class for testing purposes. API: Improved the timeline. Several (disabled) tests with caching of photos. html2plain: changed behaviour for the "hr" element. API: Tweetdeck is now working API: Added Public Timeline ... * master:
*	diabook-themes: bugfix (sry, necessary)	tommy tomson	2012-04-16	12	-12/+52
\|
*	diabook-themes: small bug/css-fixes ---> ver. 1.019	tommy tomson	2012-04-16	26	-21/+419
\|
*	diabook-themes: bug-fixes	tommy tomson	2012-04-16	12	-48/+68
\|
*	diabook-themes: minor bugfixes	tommy tomson	2012-04-16	12	-25/+59
\|
*	turn on comment edit	friendica	2012-04-16	1	-4/+4
\|
*	propagate edited comments	friendica	2012-04-16	1	-2/+6
\|
*	edited comments weren't being relayed	friendica	2012-04-16	1	-0/+24
\|
*	rev update	friendica	2012-04-15	2	-73/+78
\|
*	Merge pull request #238 from annando/master	friendica	2012-04-15	7	-67/+259
\|\ \| \| \| \|	API: Support of the statusnet application
\| *	DBA: Reverting back to original source	Michael Vogel	2012-04-14	1	-3/+1
\| \|
\| *	DBA: Nothing really done ..	Michael Vogel	2012-04-14	1	-71/+0
\| \|
\| *	Merge commit 'upstream/master'	Michael Vogel	2012-04-14	98	-911/+2464
\| \|\
\| * \	Merge commit 'upstream/master'	Michael Vogel	2012-04-13	88	-12005/+2087
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: include/dba.php
\| * \| \|	DBA: Deactivation of the mysqli-class for testing purposes.	Michael Vogel	2012-04-13	1	-30/+31
\| \| \| \|
\| * \| \|	Merge commit 'upstream/master'	Michael Vogel	2012-04-11	133	-1946/+2921
\| \|\ \ \
\| * \| \| \|	API: Improved the timeline. Several (disabled) tests with caching of photos.	Michael Vogel	2012-04-11	4	-8/+42
\| \| \| \| \|
\| * \| \| \|	html2plain: changed behaviour for the "hr" element.	Michael Vogel	2012-04-09	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	API: Tweetdeck is now working	Michael Vogel	2012-04-09	2	-54/+51
\| \| \| \| \|
\| * \| \| \|	API: Added Public Timeline	Michael Vogel	2012-04-08	1	-5/+85
\| \| \| \| \|
\| * \| \| \|	API: Now mentions could work as well - only my client doesn't really work	Michael Vogel	2012-04-08	1	-61/+72
\| \| \| \| \|
\| * \| \| \|	API: Basic support of the identica client added.	Michael Vogel	2012-04-08	1	-0/+72
\| \| \| \| \|
* \| \| \| \|	diabook-themes: css-fixes	tommy tomson	2012-04-15	17	-24/+88
\| \| \| \| \|
* \| \| \| \|	open contact edit in same window	friendica	2012-04-15	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	where did this "lang" string come from and why?	friendica	2012-04-15	1	-0/+10
\| \| \| \| \|
* \| \| \| \|	Merge https://github.com/friendica/friendica into pull	friendica	2012-04-15	153	-112/+8559
\|\ \ \ \ \
\| * \ \ \ \	Merge pull request #237 from simonlnu/master	Simon	2012-04-15	15	-82/+159
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	REALLY fix fpostit this time
\| \| * \| \| \| \|	REALLY fix fpostit this time	Simon L'nu	2012-04-15	15	-82/+159
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
\| \| * \| \| \| \|	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-04-15	0	-0/+0
\| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: * master:
\| * \| \| \| \|	Merge pull request #236 from simonlnu/master	Simon	2012-04-14	6	-8/+8
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix fpostJS, add and fix some other stuff
\| \| * \| \| \| \|	fix fpostJS, add and fix some other stuff	Simon L'nu	2012-04-15	6	-8/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
\| \| * \| \| \| \|	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-04-15	0	-0/+0
\| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: diabook-themes: added js for auto-growing comment-textareas diabook: theme-settings: add a wide-option Another bunch of executable permission removal Removed execution permission: lintian warning in Debian packaging * master:
\| * \| \| \| \|	diabook-themes: added js for auto-growing comment-textareas	tommy tomson	2012-04-15	12	-4/+238
\| \| \| \| \| \|
\| * \| \| \| \|	diabook: theme-settings: add a wide-option	tommy tomson	2012-04-15	43	-11/+8147
\| \| \| \| \| \|
\| * \| \| \| \|	Merge pull request #234 from copyninja/master	friendica	2012-04-14	153	-0/+0
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Executable permisson removal on files which are not elf/script
\| \| * \| \| \| \|	Another bunch of executable permission removal	Vasudev Kamath	2012-04-14	121	-0/+0
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Removed execution permission: lintian warning in Debian packaging	Vasudev Kamath	2012-04-14	32	-0/+0
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge pull request #235 from simonlnu/master	Simon	2012-04-14	6	-7/+7
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	string fix: typo. slow down scroll to top in dispys
\| \| * \| \| \| \| \|	string fix: typo. slow down scroll to top in dispys	Simon L'nu	2012-04-14	6	-7/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
\| \| * \| \| \| \| \|	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-04-14	7	-8/+24
\| \| \|\ \ \ \ \ \ \| \| \|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: bogus empty list element in dfrn_request page when emailnet not enabled zrl on random profile zrl hook bug #372 - category feeds pass zrl's to/through global directory * master:
\| \| * \| \| \| \| \|	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-04-14	0	-0/+0
\| \| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: one more additional marital status selectors * master:
* \| \| \| \| \| \|	function name typo	friendica	2012-04-15	1	-1/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	track requested profile error msg	friendica	2012-04-14	3	-17/+62
\|/ / / / / /
* \| \| \| \| \|	bogus empty list element in dfrn_request page when emailnet not enabled	friendica	2012-04-14	2	-2/+2
\| \| \| \| \| \|
* \| \| \| \| \|	zrl on random profile	friendica	2012-04-14	1	-1/+1
\| \| \| \| \| \|
* \| \| \| \| \|	zrl hook	friendica	2012-04-14	1	-2/+6
\| \| \| \| \| \|
* \| \| \| \| \|	bug #372 - category feeds	friendica	2012-04-14	1	-0/+10
\| \|_\|_\|_\|/ \|/\| \| \| \|
* \| \| \| \|	pass zrl's to/through global directory	friendica	2012-04-14	2	-3/+5
\|/ / / /