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-04-04	70	-3913/+376
\|\
\| *	Merge pull request #204 from simonlnu/master	Simon	2012-04-03	2	-20/+38
\| \|\ \| \| \| \| \| \|	many changes, all small
\| \| *	latest changes are the popup menu for notifs, fixes	Simon L'nu	2012-04-04	2	-20/+38
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
\| \| *	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-04-04	72	-3950/+404
\| \| \|\ \| \| \|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: display settings hooks re-opened bug #363 this is better include contact_widgets for categories_widget when doing updates remove loozah themes which fell too far behind to recover smal fix german translation for right_aside make right_aside translatable and provide german translation... and some css-fixes suppress duplicates in search make contact ssl_policy change a function since it is used in a few places more ssl policy fixes and prevent delivery to soapbox when using local delivery don't change ssl settings on local photos for remote contact * master:
\| * \|	display settings hooks	friendica	2012-04-03	1	-1/+4
\| \| \|
\| * \|	re-opened bug #363	friendica	2012-04-03	1	-0/+10
\| \| \|
\| * \|	this is better	friendica	2012-04-03	1	-3/+2
\| \| \|
\| * \|	Merge branch 'pull'	friendica	2012-04-03	24	-120/+313
\| \|\ \
\| \| * \|	smal fix	tommy tomson	2012-04-03	1	-1/+1
\| \| \| \|
\| \| * \|	Merge pull request #202 from tomtom84/master	tomtom84	2012-04-03	1	-0/+8
\| \| \|\ \ \| \| \| \| \| \| \| \| \| \|	german translation for right_aside
\| \| \| * \|	german translation for right_aside	tommy tomson	2012-04-03	1	-0/+8
\| \| \| \| \|
\| \| * \| \|	Merge pull request #201 from tomtom84/master	tomtom84	2012-04-03	23	-119/+304
\| \| \|\\| \| \| \| \| \| \| \| \| \| \| \|	fixes in diabook-themes
\| \| \| * \|	make right_aside translatable and provide german translation...	tommy tomson	2012-04-03	23	-119/+304
\| \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \|	and some css-fixes
\| * \| \|	include contact_widgets for categories_widget when doing updates	friendica	2012-04-03	1	-0/+2
\| \| \| \|
\| * \| \|	remove loozah themes which fell too far behind to recover	friendica	2012-04-03	40	-3763/+1
\| \|/ /
\| * \|	suppress duplicates in search	friendica	2012-04-03	1	-7/+7
\| \| \|
\| \| *	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-04-02	2	-2/+33
\| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: bug #363 and a couple of other reported ssl link issues * master:
\| \| * \	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-04-02	35	-217/+378
\| \| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: diabook-themes: css-fixes diabook-themes: fixes in js diabook-themes: fixed pageheader diabook-themes: bugfixes / css-fixes make the "new calendar" (javascript interactive) the default remove zrl from query string catch a couple more Oo smilies add page_content_top hook * master:
\| \| * \ \	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-04-01	34	-35/+340
\| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: add title to D* posts allow users to set categories on their posts Modified peopleyouknow to handle sites without Facebook better diabook-themes: add link to global dir in "find friends" at right_aside modified: mod/newmember.php New user quick start. check for style.php existence before inclusion Moved Diaspora notes away from top, per user request * master:
\| \| * \| \| \|	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-04-01	0	-0/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: slight improvement in handling of plaintext feeds css-fixes add new messages-layout in diabook fix the display of community-plugin in diabook-themes that didn't quite work out document tinymce fixes/workarounds various bugfixes and css-fixes qcomment overflow try slightly better detection of html in feeds send unverified private mail using zrl * master:
* \| \| \| \| \|	Merge remote branch 'upstream/master'	zottel	2012-04-03	41	-276/+471
\|\\| \| \| \| \|
\| * \| \| \| \|	make contact ssl_policy change a function since it is used in a few places	friendica	2012-04-02	4	-129/+52
\| \| \| \| \| \|
\| * \| \| \| \|	more ssl policy fixes and prevent delivery to soapbox when using local delivery	friendica	2012-04-02	3	-5/+100
\| \| \| \| \| \|
\| * \| \| \| \|	don't change ssl settings on local photos for remote contact	friendica	2012-04-02	1	-9/+0
\| \| \|_\|_\|/ \| \|/\| \| \|
\| * \| \| \|	bug #363 and a couple of other reported ssl link issues	friendica	2012-04-02	2	-2/+33
\| \| \|_\|/ \| \|/\| \|
\| * \| \|	diabook-themes: css-fixes	tommy tomson	2012-04-02	24	-20/+125
\| \| \| \|
\| * \| \|	diabook-themes: fixes in js	tommy tomson	2012-04-02	4	-112/+115
\| \| \| \|
\| * \| \|	diabook-themes: fixed pageheader	tommy tomson	2012-04-02	17	-68/+98
\| \| \| \|
\| * \| \|	diabook-themes: bugfixes / css-fixes	tommy tomson	2012-04-02	17	-17/+30
\| \| \| \|
\| * \| \|	make the "new calendar" (javascript interactive) the default	friendica	2012-04-02	1	-4/+4
\| \| \| \|
\| * \| \|	remove zrl from query string	friendica	2012-04-02	2	-0/+4
\| \| \| \|
* \| \| \|	Merge remote branch 'upstream/master'	zottel	2012-04-02	115	-313/+12740
\|\\| \| \|
\| * \| \|	catch a couple more Oo smilies	friendica	2012-04-01	1	-0/+4
\| \| \| \|
\| * \| \|	add page_content_top hook	friendica	2012-04-01	1	-0/+2
\| \| \|/ \| \|/\|
\| * \|	add title to D* posts	friendica	2012-04-01	1	-1/+5
\| \| \|
\| * \|	Merge pull request #200 from unary/categories	friendica	2012-04-01	11	-18/+226
\| \|\ \ \| \| \| \| \| \| \| \|	allow users to set categories on their posts
\| \| * \|	allow users to set categories on their posts	Michael Johnston	2012-04-01	11	-18/+226
\| \|/ /
\| * \|	Merge pull request #199 from ↵	friendica	2012-04-01	1	-2/+4
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	beardy-unixer/1457d6e90f36a6a7bb07df3579b6e5c0475b121d Better peopleyouknow for sites without Facebook
\| \| * \|	Modified peopleyouknow to handle sites without Facebook better	Thomas Willingham	2012-04-02	1	-2/+4
\| \| \| \|
\| * \| \|	Merge pull request #198 from beardy-unixer/master	friendica	2012-04-01	9	-3/+85
\| \|\\| \| \| \| \| \| \| \| \| \|	New User Quick Start
\| \| * \|	Merge remote-tracking branch 'upstream/master'	Thomas Willingham	2012-04-02	278	-1440/+32270
\| \| \|\ \ \| \| \|/ / \| \|/\| \|
\| * \| \|	diabook-themes: add link to global dir in "find friends" at right_aside	tommy tomson	2012-04-02	12	-12/+20
\| \| \| \|
\| * \| \|	check for style.php existence before inclusion	friendica	2012-04-01	1	-1/+2
\| \| \|/ \| \|/\|
\| * \|	Merge branch 'pull'	friendica	2012-04-01	37	-236/+1125
\| \|\ \
\| \| * \|	css-fixes	tommy tomson	2012-04-02	7	-12/+13
\| \| \| \|
\| \| * \|	Merge pull request #197 from tomtom84/master	tomtom84	2012-04-01	25	-8/+683
\| \| \|\ \ \| \| \| \| \| \| \| \| \| \|	fixes in diabook-derivates
\| \| \| * \|	add new messages-layout in diabook	tommy tomson	2012-04-01	25	-8/+683
\| \| \|/ /
\| \| * \|	Merge pull request #196 from tomtom84/master	tomtom84	2012-04-01	16	-222/+435
\| \| \|\ \ \| \| \| \| \| \| \| \| \| \|	fixes in diabook-derivates
\| \| \| * \|	fix the display of community-plugin in diabook-themes	tommy tomson	2012-04-01	16	-222/+435
\| \| \|/ /
\| * / /	slight improvement in handling of plaintext feeds	friendica	2012-04-01	2	-3/+10
\| \|/ /