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

	Commit message (Collapse)	Author	Age	Files	Lines
*	user settings: don't show emoticons	Fabio Comuni	2012-03-23	2	-2/+7
\|
*	Merge remote-tracking branch 'friendica/master'	Fabio Comuni	2012-03-23	14	-20/+5280
\|\
\| *	fix in css right_aside	tommy tomson	2012-03-23	5	-34/+4953
\| \|
\| *	small fix	tommy tomson	2012-03-23	1	-1/+1
\| \|
\| *	Merge pull request #159 from tomtom84/master	tomtom84	2012-03-22	2	-14/+15
\| \|\ \| \| \| \| \| \|	fixes in theme diabook
\| \| *	fix 1024resolution	tommy tomson	2012-03-23	2	-14/+15
\| \|/
\| *	Merge pull request #158 from tomtom84/master	friendica	2012-03-22	6	-11/+329
\| \|\ \| \| \| \| \| \|	add right_aside to theme diabook ... need author
\| \| *	add right_aside to theme diabook	tommy tomson	2012-03-23	6	-11/+329
\| \|/
\| *	ability to change tags in edited posts	friendica	2012-03-22	5	-14/+36
\| \|
* \|	Merge remote-tracking branch 'friendica/master'	Fabio Comuni	2012-03-22	394	-10588/+22262
\|\\|
\| *	Merge branch 'pull'	friendica	2012-03-22	4	-7/+52
\| \|\
\| \| *	Merge branch 'master' of https://github.com/friendica/friendica	Tobias Diekershoff	2012-03-22	3	-4/+246
\| \| \|\
\| \| * \|	quattro(-green) styling the 'filed under: remove' text	Tobias Diekershoff	2012-03-22	4	-7/+52
\| \| \| \|
\| * \| \|	normalise comparison link on delegation page	friendica	2012-03-22	1	-1/+1
\| \| \|/ \| \|/\|
\| * \|	Merge pull request #157 from campino/master	friendica	2012-03-22	3	-4/+246
\| \|\ \ \| \| \|/ \| \|/\|	Tests for the template engine
\| \| *	new lines removed	Alexander Kampmann	2012-03-22	2	-1/+2
\| \| \|
\| \| *	removed some new lines to cut down number of changed files	Alexander Kampmann	2012-03-22	3	-2/+1
\| \| \|
\| \| *	removed unneccessary stuff	Alexander Kampmann	2012-03-22	2	-23/+0
\| \| \|
\| \| *	Merge branch 'master' of git://github.com/friendica/friendica	Alexander Kampmann	2012-03-22	498	-11542/+24259
\| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: boot.php database.sql include/template_processor.php update.php
\| \| * \|	removed problem from previous commit	Alexander Kampmann	2012-03-22	1	-3/+0
\| \| \| \|
\| \| * \|	tests for the template engine	Alexander Kampmann	2012-03-22	2	-1/+225
\| \| \| \|
\| \| * \|	integrated profiler	Alexander Kampmann	2012-03-15	3	-41/+26
\| \| \| \|
\| \| * \|	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
\| \| \| \|
\| * \| \|	it's only item.filer ;-)	Tobias Diekershoff	2012-03-22	2	-2/+2
\| \| \| \|
\| * \| \|	Merge branch 'quattrofiler'	Tobias Diekershoff	2012-03-22	2	-0/+6
\| \|\ \ \
\| \| * \| \|	non static filer text	Tobias Diekershoff	2012-03-22	2	-2/+2
\| \| \| \| \|
\| \| * \| \|	adding filer functionality to quattro(-green)	Tobias Diekershoff	2012-03-22	2	-0/+6
\| \| \| \| \|
\| * \| \| \|	Merge branch 'master' of https://github.com/friendica/friendica	Tobias Diekershoff	2012-03-22	12	-8/+44
\| \|\ \ \ \ \| \| \|/ / / \| \|/\| \| / \| \| \| \|/ \| \| \|/\|
\| \| * \|	missing tooltip for "file as"	friendica	2012-03-22	6	-6/+6
\| \| \| \|
\| \| * \|	prevent re-registrations using a deleted username - not an issue with ↵	friendica	2012-03-22	6	-2/+38
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Friendica but could create a serious privacy issue with federated platforms
\| * \| \|	Merge branch 'master' of https://github.com/friendica/friendica	Tobias Diekershoff	2012-03-22	6	-0/+10
\| \|\\| \|
\| \| * \|	Merge pull request #156 from tomtom84/master	tomtom84	2012-03-21	6	-0/+10
\| \| \|\ \ \| \| \| \| \| \| \| \| \| \|	fixes in diabook-derivates
\| \| \| * \|	add file_as-option to diabook-derivates	tommy tomson	2012-03-22	6	-0/+10
\| \| \|/ /
\| * \| \|	Merge branch 'master' of https://github.com/friendica/friendica	Tobias Diekershoff	2012-03-22	389	-10614/+22032
\| \|\\| \|
\| \| * \|	support lowercase :-p smilie	friendica	2012-03-21	1	-0/+2
\| \| \| \|
\| \| * \|	Merge branch 'pull'	friendica	2012-03-21	14	-46/+65
\| \| \|\ \
\| \| \| * \	Merge pull request #155 from tomtom84/master	tomtom84	2012-03-21	14	-46/+65
\| \| \| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	fixes in diabook-derivates
\| \| \| \| * \|	add icons to aside diabook, fixes in css	tommy tomson	2012-03-22	14	-46/+65
\| \| \| \|/ /
\| \| * / /	work around doubled linefeeds in tinymce3.5b2	friendica	2012-03-21	1	-0/+10
\| \| \|/ /
\| \| * \|	revert permissions relaxation on community	friendica	2012-03-21	1	-2/+2
\| \| \| \|
\| \| * \|	add comix-plain	friendica	2012-03-21	7	-1/+415
\| \| \| \|
\| \| * \|	smooth the comix comment box	friendica	2012-03-21	2	-2/+36
\| \| \| \|
\| \| * \|	make autocomplete work with updated tinymce	friendica	2012-03-21	1	-10/+10
\| \| \| \|
\| \| * \|	ika to ica	friendica	2012-03-21	1	-1/+1
\| \| \| \|
\| \| * \|	private file in repository	friendica	2012-03-21	1	-0/+0
\| \| \| \|
\| \| * \|	facepark is unsupported ATM	friendica	2012-03-21	2	-0/+0
\| \| \| \|
\| \| * \|	Merge branch 'pull'	friendica	2012-03-20	25	-0/+3661
\| \| \|\ \
\| \| \| * \	Merge pull request #154 from tonybaldwin/master	friendica	2012-03-20	25	-0/+3661
\| \| \| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	added theme
\| \| \| \| * \	Merge remote branch 'upstream/master'	tony baldwin	2012-03-21	426	-11330/+19994
\| \| \| \| \|\ \