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-04-07	180	-231/+365
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: ignore removed plugins fix messed up config tables w/ duplicate entries small fixes for the German strings fix bad sql update revert config changes, we're getting duplicate keys new-contacts-introductions in contacts-drop-down and new-messages in messages-drop-down get each an additional indicator... profile-picture is now scaled right in firefox... fixed broken css on introductions-page in firefox... * master:
\| *	ignore removed plugins	friendica	2012-04-06	1	-2/+9
\| \|
\| *	Merge branch 'pull'	friendica	2012-04-06	176	-73/+154
\| \|\
\| \| *	Merge pull request #211 from tomtom84/master	tomtom84	2012-04-06	0	-0/+0
\| \| \|\ \| \| \| \| \| \| \| \|	small fix
\| \| \| *	Merge remote-tracking branch 'origin/master'	tommy tomson	2012-04-06	0	-0/+0
\| \| \| \|\ \| \| \| \|/ \| \| \|/\|
\| \| * \|	Merge pull request #210 from tomtom84/master	tomtom84	2012-04-06	174	-54/+135
\| \| \|\ \ \| \| \| \| \| \| \| \| \| \|	fixes in diabook-derivates
\| \| \| \| *	Merge remote-tracking branch 'origin/master'	tommy tomson	2012-04-06	4	-24/+29
\| \| \| \| \|\ \| \| \| \|_\|/ \| \| \|/\| \|
\| \| * \| \|	Merge branch 'master' of https://github.com/friendica/friendica	Tobias Diekershoff	2012-04-06	3	-156/+157
\| \| \|\ \ \
\| \| * \| \| \|	small fixes for the German strings	Tobias Diekershoff	2012-04-06	2	-19/+19
\| \| \| \| \| \|
\| \| \| \| \| *	Merge remote-tracking branch 'origin/master'	tommy tomson	2012-04-06	1	-151/+147
\| \| \| \| \|/\|
\| \| \| \| * \|	new-contacts-introductions in contacts-drop-down and new-messages in ↵	tommy tomson	2012-04-06	174	-54/+135
\| \| \| \|/ / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	messages-drop-down get each an additional indicator... profile-picture is now scaled right in firefox... fixed broken css on introductions-page in firefox...
\| * \| \| \|	fix messed up config tables w/ duplicate entries	friendica	2012-04-06	3	-6/+51
\| \| \|/ / \| \|/\| \|
\| * \| \|	fix bad sql update	friendica	2012-04-06	2	-5/+10
\| \| \|/ \| \|/\|
\| * \|	Merge branch 'pull'	friendica	2012-04-06	2	-1216/+1850
\| \|\\|
\| * \|	revert config changes, we're getting duplicate keys	friendica	2012-04-06	1	-151/+147
\| \| \|
* \| \|	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-04-06	1505	-1390/+2052
\|\ \ \ \| \| \|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: update to the German strings add network_tabs hook pass autoname(0) test rev update added index to config and pconfig table changed config.php to use REPLACE instead of INSERT, this removes one db hit. * master:
\| * \|	update to the German strings	Tobias Diekershoff	2012-04-06	2	-1216/+1850
\| \|/
\| *	Merge branch 'pull'	friendica	2012-04-05	1503	-158/+179
\| \|\
\| \| *	Merge branch 'master' of https://github.com/friendica/friendica	Alexander Kampmann	2012-04-05	1809	-6998/+48636
\| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: include/config.php update.php
\| \| * \|	added index to config and pconfig table	Alexander Kampmann	2012-04-05	4	-160/+178
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	changed config.php to use REPLACE instead of INSERT, this removes one db hit.
\| * \| \|	add network_tabs hook	friendica	2012-04-05	1	-2/+6
\| \| \| \|
\| * \| \|	pass autoname(0) test	friendica	2012-04-05	1	-0/+3
\| \| \| \|
\| * \| \|	rev update	friendica	2012-04-05	2	-14/+14
\| \| \|/ \| \|/\|
* / \|	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-04-06	0	-0/+0
\|/ / \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: make 'PHP "register_argc_argv"' easier to translate, may require fix for po2php * master:
* \|	make 'PHP "register_argc_argv"' easier to translate, may require fix for po2php	friendica	2012-04-05	2	-1/+3
\| \|
* \|	Merge pull request #207 from simonlnu/master	Simon	2012-04-04	2	-4/+24
\|\ \ \| \| \| \| \| \|	styled cat tags and input
\| * \|	finish styling category tags and category input	Simon L'nu	2012-04-05	2	-0/+20
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
\| * \|	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-04-05	2	-0/+12
\| \|\ \ \| \|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: also block outbound let's catch d* disabled at a higher level and not waste any resources on it. * master:
* \| \|	also block outbound	friendica	2012-04-04	1	-0/+5
\| \| \|
* \| \|	let's catch d* disabled at a higher level and not waste any resources on it.	friendica	2012-04-04	1	-0/+7
\| \| \|
\| * \|	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-04-04	0	-0/+0
\| \|\ \ \| \|/ / \|/\| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: * master:
* \| \|	Merge pull request #206 from simonlnu/master	Simon	2012-04-04	19	-131/+188
\|\ \ \ \| \| \| \| \| \| \| \|	update the template files
\| \| * \|	style categorytags	Simon L'nu	2012-04-04	2	-4/+4
\| \|/ / \| \| \| \| \| \| \| \| \|	Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
\| * \|	update the dispy* templates	Simon L'nu	2012-04-04	19	-131/+188
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
\| * \|	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-04-04	4	-4/+13
\| \|\ \ \| \|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: correct some filer dialog weirdness caused by introduction of categories move alert box away from nav links log disabled requests fix config storage of booleans * master:
* \| \|	Merge pull request #205 from unary/filerfix	friendica	2012-04-04	1	-1/+2
\|\ \ \ \| \| \| \| \| \| \| \|	correct some filer dialog weirdness caused by introduction of categories
\| * \| \|	correct some filer dialog weirdness caused by introduction of categories	Michael Johnston	2012-04-04	1	-1/+2
\|/ / /
* \| \|	move alert box away from nav links	friendica	2012-04-04	1	-1/+4
\| \| \|
* \| \|	log disabled requests	friendica	2012-04-04	1	-2/+6
\| \| \|
* \| \|	fix config storage of booleans	friendica	2012-04-04	1	-0/+1
\| \| \|
\| * \|	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-04-04	0	-0/+0
\|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: well that was a stupid mistake... string update bug: diaspora_enabled setting turns it on but doesn't fully turn it off. better handling of reshares containing embeds * master:
* \|	well that was a stupid mistake...	friendica	2012-04-04	1	-1/+1
\| \|
* \|	string update	friendica	2012-04-04	1	-733/+1023
\| \|
* \|	bug: diaspora_enabled setting turns it on but doesn't fully turn it off.	friendica	2012-04-04	2	-1/+10
\| \|
* \|	Merge branch 'pull'	friendica	2012-04-04	2	-20/+38
\|\ \
\| * \	Merge pull request #204 from simonlnu/master	Simon	2012-04-03	2	-20/+38
\| \|\ \ \| \| \| \| \| \| \| \|	many changes, all small
\| \| * \|	latest changes are the popup menu for notifs, fixes	Simon L'nu	2012-04-04	2	-20/+38
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
\| \| * \|	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-04-04	72	-3950/+404
\| \| \|\ \ \| \| \|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: display settings hooks re-opened bug #363 this is better include contact_widgets for categories_widget when doing updates remove loozah themes which fell too far behind to recover smal fix german translation for right_aside make right_aside translatable and provide german translation... and some css-fixes suppress duplicates in search make contact ssl_policy change a function since it is used in a few places more ssl policy fixes and prevent delivery to soapbox when using local delivery don't change ssl settings on local photos for remote contact * master:
\| \| * \|	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-04-02	2	-2/+33
\| \| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: bug #363 and a couple of other reported ssl link issues * master:
\| \| * \ \	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-04-02	35	-217/+378
\| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: diabook-themes: css-fixes diabook-themes: fixes in js diabook-themes: fixed pageheader diabook-themes: bugfixes / css-fixes make the "new calendar" (javascript interactive) the default remove zrl from query string catch a couple more Oo smilies add page_content_top hook * master: