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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-03-23	43	-127/+5589
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: (25 commits) diabook: theme.php remove code duplication last photos check for user "hidewall" remove unneeded regex move js code to close popup in main.js (missing stop event propagation in popup links) user settings: don't show emoticons fix in css right_aside small fix fix 1024resolution add right_aside to theme diabook ability to change tags in edited posts normalise comparison link on delegation page quattro(-green) styling the 'filed under: remove' text it's only item.filer ;-) non static filer text new lines removed removed some new lines to cut down number of changed files removed unneccessary stuff removed problem from previous commit tests for the template engine adding filer functionality to quattro(-green) missing tooltip for "file as" prevent re-registrations using a deleted username - not an issue with Friendica but could create a serious privacy issue with federated platforms add file_as-option to diabook-derivates ... * master:
\| *	Merge pull request #160 from fabrixxm/master	tomtom84	2012-03-23	5	-223/+86
\| \|\ \| \| \| \| \| \|	work on diabook theme and settings
\| \| *	diabook: theme.php	Fabio Comuni	2012-03-23	3	-221/+79
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	remove code duplication last photos check for user "hidewall" remove unneeded regex move js code to close popup in main.js (missing stop event propagation in popup links)
\| \| *	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
\| \|\\| \| \|
\| * \| \| \|	Merge branch 'master' of https://github.com/friendica/friendica	Tobias Diekershoff	2012-03-18	6	-23/+15
\| \|\ \ \ \
\| * \ \ \ \	Merge branch 'master' of https://github.com/friendica/friendica	Tobias Diekershoff	2012-03-17	3	-4/+4
\| \|\ \ \ \ \
\| * \ \ \ \ \	Merge branch 'master' of https://github.com/friendica/friendica	Tobias Diekershoff	2012-03-17	31	-321/+504
\| \|\ \ \ \ \ \
\| * \ \ \ \ \ \	Merge branch 'master' of https://github.com/friendica/friendica	Tobias Diekershoff	2012-03-16	51	-189/+619
\| \|\ \ \ \ \ \ \
\| * \ \ \ \ \ \ \	Merge branch 'master' of https://github.com/friendica/friendica	Tobias Diekershoff	2012-03-15	38	-284/+1398
\| \|\ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \	Merge branch 'master' of https://github.com/friendica/friendica	Tobias Diekershoff	2012-03-14	47	-338/+752
\| \|\ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \	Merge branch 'master' of https://github.com/friendica/friendica	Tobias Diekershoff	2012-03-13	29	-58/+379
\| \|\ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \	Merge branch 'master' of https://github.com/friendica/friendica	Tobias Diekershoff	2012-03-12	10	-156/+196
\| \|\ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \|	Revert "OpenID: display error msg if ID URL used to register an account does ↵	Tobias Diekershoff	2012-03-11	1	-9/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	not exist" This reverts commit 3c168503834651b56b9b5de61621e8fbe958c298.
\| * \| \| \| \| \| \| \| \| \| \| \|	OpenID: display error msg if ID URL used to register an account does not exist	Tobias Diekershoff	2012-03-11	1	-4/+9
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| \| \| \| \| \| \| *	Merge remote-tracking branch 'friendica/master'	Fabio Comuni	2012-03-19	4	-3/+15
\| \| \| \| \| \| \| \| \| \| \| \| \|\
* \| \| \| \| \| \| \| \| \| \| \| \| \	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-03-22	356	-10435/+21643
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|_\|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: support lowercase :-p smilie work around doubled linefeeds in tinymce3.5b2 add icons to aside diabook, fixes in css revert permissions relaxation on community add comix-plain smooth the comix comment box make autocomplete work with updated tinymce ika to ica private file in repository facepark is unsupported ATM remove stray template variable from old code add comix theme use password field for DB input added Vijay's theme from facepark.in added README to mcefixes to explain what is going on. update tinymce to 3.5b2 to fix issues with FF 11 and pasting into code blocks more friend suggestions * master: