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

	Commit message (Collapse)	Author	Age	Files	Lines
*	added simple build-in profiling	Alexander Kampmann	2012-03-15	5	-2/+64
\|
*	another test for xmlify	Alexander Kampmann	2012-03-15	1	-1/+22
\|
*	Merge branch 'master' of git://github.com/friendica/friendica	Alexander Kampmann	2012-03-14	81	-708/+7818
\|\ \| \| \| \| \| \| \| \|	Conflicts: view/de/strings.php
\| *	add links to home, profile, photos, events, notes to aside in network-stream	tommy tomson	2012-03-14	6	-3/+189
\| \|
\| *	fix css	tommy tomson	2012-03-13	1	-1/+1
\| \|
\| *	Merge pull request #127 from tomtom84/master	tomtom84	2012-03-12	44	-1490/+2
\| \|\ \| \| \| \| \| \|	fixes in diabook-derivates
\| \| *	use fancybox instead of lightbox	tommy tomson	2012-03-13	44	-1490/+2
\| \| \|
\| * \|	Merge pull request #126 from tomtom84/master	tomtom84	2012-03-12	6	-4/+72
\| \|\\| \| \| \| \| \| \|	fixes in diabook-derivates
\| \| *	fixes	tommy tomson	2012-03-12	6	-4/+72
\| \| \|
\| * \|	Merge pull request #125 from tomtom84/master	tomtom84	2012-03-12	59	-45/+1667
\| \|\\| \| \| \| \| \| \|	fixes in diabook-derivates
\| \| *	add lightbox, fixex in css	tommy tomson	2012-03-12	59	-45/+1667
\| \| \|
\| * \|	Merge branch 'pull'	friendica	2012-03-12	1	-17/+18
\| \|\ \
\| \| * \|	fix dispy-dark photo album stuff	Simon L'nu	2012-03-11	1	-17/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
\| \| * \|	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-03-11	0	-0/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: * master:
\| * \| \|	more save to file backend	friendica	2012-03-11	1	-1/+55
\| \| \| \|
\| * \| \|	backend for "save to file" feature	friendica	2012-03-11	2	-7/+33
\| \|/ /
\| * \|	Merge pull request #124 from simonlnu/master	Simon	2012-03-11	7	-130/+147
\| \|\ \ \| \| \| \| \| \| \| \|	fix dispys' css and layout
\| \| * \|	fix dispys' css and layout	Simon L'nu	2012-03-11	7	-130/+147
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
\| \| * \|	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-03-11	3	-3/+3
\| \| \|\ \ \| \| \|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: community meta tag renamed from "ika" * master:
\| * \| \|	Merge branch 'pull'	friendica	2012-03-11	2	-7/+29
\| \|\ \ \
\| * \| \| \|	community meta tag renamed from "ika"	friendica	2012-03-11	3	-3/+3
\| \| \| \| \|
\| \| \| * \|	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-03-11	0	-0/+0
\| \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: * master:
\| \| * \|	Merge pull request #123 from simonlnu/master	Simon	2012-03-11	1	-1/+1
\| \| \|\ \ \| \| \| \| \| \| \| \| \| \|	screwed up on the font-size for screen last push
\| \| \| * \|	screwed up on the font-size for screen last push	Simon L'nu	2012-03-11	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
\| \| \| * \|	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-03-11	0	-0/+0
\| \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: * master:
\| \| * \|	Merge pull request #122 from simonlnu/master	Simon	2012-03-11	2	-1/+14
\| \| \|\ \ \| \| \| \| \| \| \| \| \| \|	add some '@media handheld' types for dispys
\| \| \| * \|	add some '@media handheld' types for dispys	Simon L'nu	2012-03-11	2	-1/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
\| \| * \| \|	Merge pull request #121 from simonlnu/master	Simon	2012-03-11	1	-5/+9
\| \| \|\\| \| \| \| \| \| \| \| \| \| \| \|	fix more stuff
\| \| \| * \|	fix more stuff	Simon L'nu	2012-03-11	1	-5/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
\| \| * \| \|	Merge pull request #120 from simonlnu/master	Simon	2012-03-11	1	-2/+7
\| \|/\| \| \| \| \| \|/ / \| \| \| \|	fix some stuff right away
\| \| * \|	fix some stuff right away	Simon L'nu	2012-03-11	1	-2/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
\| * \| \|	Merge pull request #119 from simonlnu/master	Simon	2012-03-10	33	-13/+6144
\| \|\\| \| \| \| \| \| \| \| \| \|	preliminary dispy-dark theme. WIP! did i say "WIP!"? yes, i did. WIP!
\| \| * \|	preliminary dispy-dark theme. WIP! did i say "WIP!"? yes, i did. WIP!	Simon L'nu	2012-03-11	33	-13/+6144
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
\| \| * \|	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-03-11	15	-494/+883
\| \| \|\ \ \| \| \|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: bug #328 default the text template var on conversations bug #327 - composed private message is lost if no recip specified. revup fixed login-fields, fixed. notofication.png, changed locations German translation * master:
\| * \| \|	bug #328	friendica	2012-03-10	1	-3/+3
\| \| \| \|
\| * \| \|	default the text template var on conversations	friendica	2012-03-10	1	-0/+1
\| \| \| \|
\| * \| \|	bug #327 - composed private message is lost if no recip specified.	friendica	2012-03-10	2	-6/+16
\| \| \| \|
\| * \| \|	Merge branch 'pull'	friendica	2012-03-10	11	-484/+862
\| \|\ \ \
\| \| * \ \	Merge pull request #118 from tomtom84/master	tomtom84	2012-03-10	9	-11/+52
\| \| \|\ \ \ \| \| \| \| \|/ \| \| \| \|/\|	fixes in diabook-derivates
\| \| \| * \|	fixed login-fields, fixed. notofication.png, changed locations	tommy tomson	2012-03-10	9	-11/+52
\| \| \| \| \|
\| \| * \| \|	German translation	Tobias Diekershoff	2012-03-10	2	-473/+810
\| \| \| \| \|
\| * \| \| \|	revup	friendica	2012-03-10	1	-1/+1
\| \|/ / /
\| \| \| *	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-03-10	8	-2/+13
\| \| \| \|\ \| \| \|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: spec directory allow user to set number of items to show on network page revup * master:
\| * \| \|	Merge branch 'pull'	friendica	2012-03-09	3	-1/+12
\| \|\ \ \
\| \| * \ \	Merge pull request #117 from unary/issue299	friendica	2012-03-09	3	-1/+12
\| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	allow user to set number of items to show on network page
\| \| \| * \| \|	allow user to set number of items to show on network page	Michael Johnston	2012-03-09	3	-1/+12
\| \| \|/ / /
\| * \| \| \|	spec directory	friendica	2012-03-09	4	-0/+0
\| \| \| \| \|
\| * \| \| \|	Merge branch 'pull'	friendica	2012-03-09	10	-86/+157
\| \|\\| \| \|
\| * \| \| \|	revup	friendica	2012-03-09	1	-1/+1
\| \| \| \| \|
\| \| \| \| *	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-03-09	0	-0/+0
\| \| \| \|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: add js to hide nav-menus, when clicked outside fixes in css recover contacts total count which got lost bug #324 - tinymce used for mail even if editplain being used. bug in check for private email comment to public conversation prevents authenticated visitor from seeing comments that should be allowed keep tony from talking to himself * master: