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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'master' of git://github.com/friendica/friendica	Tobias Hößl	2012-04-22	748	-2940/+62981
\|\
\| *	DE strings update	Tobias Diekershoff	2012-04-22	8	-542/+789
\| \|
\| *	diabook-themes: comment-bbcode-bugfix	tommy tomson	2012-04-22	2	-9/+9
\| \|
\| *	Merge pull request #256 from simonlnu/master	Simon	2012-04-21	2	-22/+30
\| \|\ \| \| \| \| \| \|	fix tinymce theming
\| \| *	fix tinymce theming	Simon L'nu	2012-04-22	2	-22/+30
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
\| \| *	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-04-22	384	-56031/+194
\| \| \|\ \| \| \|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: rev update diabook-themes: deleted obsolete diabook-folder & minor bug-fixes * master:
\| * \|	Merge https://github.com/friendica/friendica into pull	friendica	2012-04-21	382	-55989/+76
\| \|\ \
\| \| * \|	diabook-themes: deleted obsolete diabook-folder & minor bug-fixes	tommy tomson	2012-04-22	382	-55989/+76
\| \| \| \|
\| * \| \|	rev update	friendica	2012-04-21	2	-42/+118
\| \|/ /
\| \| *	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-04-21	0	-0/+0
\| \|/ \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: rev update * master:
\| *	rev update	friendica	2012-04-21	2	-416/+560
\| \|
\| *	Merge pull request #255 from simonlnu/master	Simon	2012-04-20	2	-0/+4
\| \|\ \| \| \| \| \| \|	fix checkboxes and radio buttons for some browsers
\| \| *	fix checkbox/radio buttons for some browsers	Simon L'nu	2012-04-20	2	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
\| \| *	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-04-20	0	-0/+0
\| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: diabook-themes: add diabook-dark diabook-themes: add diabook-green and some minor css/bug-fixes rev update escape email template var names. fix bug n385. * master:
\| *	diabook-themes: add diabook-dark	tommy tomson	2012-04-21	117	-1/+18810
\| \|
\| *	diabook-themes: add diabook-green and some minor css/bug-fixes	tommy tomson	2012-04-20	121	-30/+19091
\| \|
\| *	rev update	friendica	2012-04-20	2	-7/+7
\| \|
\| *	Merge pull request #254 from simonlnu/master	Simon	2012-04-20	21	-21/+1803
\| \|\ \| \| \| \| \| \|	add some knobs to comment boxes
\| \| *	fix the buttons. don't hide the buttons once shown	Simon L'nu	2012-04-20	4	-14/+2
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
\| \| *	optimise imgs; add some comment editing knobs	Simon L'nu	2012-04-20	21	-21/+1815
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
\| \| *	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-04-20	10	-39/+118
\| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: XSRF protection and PHPdoc for mod/admin.php XSRF protection and PHPdoc for mod/admin.php * master:
\| \| * \	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-04-20	471	-28/+75613
\| \| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: diabook-themes: theme-settings: add "colour scheme"-option, add diabook-pink and some bug/css-fixes * master:
\| \| * \| \|	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-04-19	0	-0/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: * master:
\| * \| \| \|	Merge pull request #253 from fabrixxm/master	fabrixxm	2012-04-20	8	-50/+50
\| \|\ \ \ \ \| \| \|_\|_\|/ \| \|/\| \| \|	fix bug n385
\| \| * \| \|	escape email template var names. fix bug n385.	Fabio Comuni	2012-04-20	8	-50/+50
\| \| \| \|/ \| \| \|/\|
\| * \| \|	Merge remote-tracking branch 'CatoTH/master' into req245	Fabio Comuni	2012-04-20	10	-39/+118
\| \|\ \ \ \| \| \|/ / \| \|/\| \|
\| * \| \|	Merge pull request #252 from tomtom84/master	tomtom84	2012-04-19	471	-28/+75613
\| \|\ \ \ \| \| \|_\|/ \| \|/\| \|	diabook-themes: theme-settings: add "colour scheme"-option, add diabook-pink and some bug/css-fixes
\| \| * \|	diabook-themes: theme-settings: add "colour scheme"-option, add diabook-pink ↵	tommy tomson	2012-04-20	471	-28/+75613
\| \|/ / \| \| \| \| \| \| \| \| \|	and some bug/css-fixes
\| * \|	Merge pull request #251 from simonlnu/master	Simon	2012-04-19	2	-4/+2
\| \|\ \ \| \| \| \| \| \| \| \|	fix .item-select
\| \| * \	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-04-19	0	-0/+0
\| \| \|\ \ \| \| \|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: * master:
\| * \| \|	Merge pull request #250 from simonlnu/master	Simon	2012-04-19	4	-4/+5
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \|	tweak drop-down and add in filebrowser
\| \| \| * \|	fix .item-select	Simon L'nu	2012-04-19	2	-4/+2
\| \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
\| \| * \|	tweak drop-down and add in filebrowser	Simon L'nu	2012-04-19	4	-4/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
\| \| * \|	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-04-19	6	-27/+237
\| \| \|\ \ \| \| \|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: Hadn't merged fixed typo from upstream. EO translation fixes filebrowser: fix style, show 10 recent photos if not in an album filebrowser: more style, load min and max scale photos tinymce: add inlinepopups plugin tinymce: add filebrowser for photos and attached files * master:
\| * \| \|	Merge pull request #248 from fabrixxm/tmcefilebrowser	fabrixxm	2012-04-19	4	-2/+212
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \|	TinyMCE file browser
\| \| * \| \|	filebrowser: fix style, show 10 recent photos if not in an album	Fabio Comuni	2012-04-18	2	-2/+9
\| \| \| \| \|
\| \| * \| \|	filebrowser: more style, load min and max scale photos	Fabio Comuni	2012-04-18	2	-46/+57
\| \| \| \| \|
\| \| * \| \|	tinymce: add inlinepopups plugin	Fabio Comuni	2012-04-18	2	-2/+2
\| \| \| \| \|
\| \| * \| \|	tinymce: add filebrowser for photos and attached files	Fabio Comuni	2012-04-18	4	-0/+192
\| \| \| \| \|
\| * \| \| \|	Merge pull request #249 from mschmitt/master	fabrixxm	2012-04-18	2	-25/+25
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	EO translation fixes
\| \| * \| \| \|	Hadn't merged fixed typo from upstream.	Martin Schmitt	2012-04-19	2	-2/+2
\| \| \| \| \| \|
\| \| * \| \| \|	EO translation fixes	Martin Schmitt	2012-04-19	2	-27/+27
\| \|/ / / /
\| \| \| * /	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-04-18	0	-0/+0
\| \| \|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: * master:
\| * \| \|	Merge pull request #247 from simonlnu/master	Simon	2012-04-18	14	-14/+14
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \|	fix silly abandonded typo. shouldn't affect translations
\| \| * \| \|	only affect immediate li children	Simon L'nu	2012-04-18	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
\| \| * \| \|	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-04-18	0	-0/+0
\| \| \|\ \ \ \| \| \|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: * master:
\| * \| \| \|	Merge pull request #246 from simonlnu/master	Simon	2012-04-18	4	-76/+105
\| \|\ \ \ \ \| \| \|_\|/ / \| \|/\| \| \|	fix alignment issues with toolbar
\| \| \| * \|	fix silly abandonded typo. shouldn't affect translations	Simon L'nu	2012-04-18	12	-12/+12
\| \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
\| \| * \|	fix alignment issues with toolbar	Simon L'nu	2012-04-18	4	-76/+105
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
\| \| * \|	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-04-18	32	-88/+8975
\| \| \|\ \ \| \| \|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: diabook-themes: some css/bug-fixes messages.po/strings.php at 100% Esperanto Typo * master: