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

	Commit message (Expand)	Author	Age	Files	Lines
...
\| \| * \| \| \| \| \|	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-04-02	35	-217/+378
\| \| \|\ \ \ \ \ \ \| \| \| \| \|_\|_\|_\|/ \| \| \| \|/\| \| \| \|
\| \| * \| \| \| \| \|	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-04-01	34	-35/+340
\| \| \|\ \ \ \ \ \
\| \| * \| \| \| \| \| \|	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-04-01	0	-0/+0
* \| \| \| \| \| \| \| \|	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	Michael Johnston	2012-04-01	11	-18/+226
\| \|/ / / / /
\| * \| \| \| \|	Merge pull request #199 from beardy-unixer/1457d6e90f36a6a7bb07df3579b6e5c047...	friendica	2012-04-01	1	-2/+4
\| \|\ \ \ \ \
\| \| * \| \| \| \|	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
\| \|\\| \| \| \| \|
\| \| * \| \| \| \|	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
\| \| \|\ \ \ \ \
\| \| \| * \| \| \| \|	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
\| \| \|\ \ \ \ \
\| \| \| * \| \| \| \|	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
\| \|/ / / / /
\| * \| \| \| /	that didn't quite work out	friendica	2012-04-01	1	-2/+2
\| \| \|_\|_\|/ \| \|/\| \| \|
\| * \| \| \|	Merge branch 'pull'	friendica	2012-04-01	11	-46/+69
\| \|\ \ \ \
\| \| * \ \ \	Merge pull request #195 from tomtom84/master	tomtom84	2012-04-01	11	-46/+69
\| \| \|\ \ \ \
\| \| \| * \| \| \|	various bugfixes and css-fixes	tommy tomson	2012-04-01	11	-46/+69
\| \| \|/ / / /
\| * / / / /	document tinymce fixes/workarounds	friendica	2012-04-01	1	-1/+5
\| \|/ / / /
\| * \| \| \|	qcomment overflow	friendica	2012-04-01	1	-0/+8
\| * \| \| \|	try slightly better detection of html in feeds	friendica	2012-04-01	1	-3/+4
\| * \| \| \|	Merge branch 'pull'	friendica	2012-04-01	6	-12/+32
\| \|\ \ \ \
\| \| * \ \ \	Merge pull request #194 from simonlnu/master	Simon	2012-04-01	5	-11/+31
\| \| \|\ \ \ \
\| \| \| * \| \| \|	latest fixes for dispys. tweaking/repairing	Simon L'nu	2012-04-01	5	-11/+31
\| \| \| * \| \| \|	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-04-01	2	-9/+6
\| \| \| \|\ \ \ \ \| \| \| \|/ / / / \| \| \|/\| \| \| \|
\| \| * \| \| \| \|	line 86: s/Friendika/Friendica/	Simon	2012-04-01	1	-1/+1
\| \| \| * \| \| \|	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-03-31	45	-94/+10852
\| \| \| \|\ \ \ \
\| \| \| * \| \| \| \|	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-03-31	0	-0/+0
\| * \| \| \| \| \| \|	send unverified private mail using zrl	friendica	2012-04-01	10	-6/+387
\| \|/ / / / / /
\| * \| / / / /	fix "between yourself and You" in mail list	friendica	2012-03-31	1	-8/+5
\| \| \|/ / / / \| \|/\| \| \| \|
\| * \| \| \| \|	more error handling	friendica	2012-03-31	2	-1/+4