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

	Commit message (Collapse)	Author	Age	Files	Lines
*	prepare for using a master theme_init()	friendica	2012-04-08	1	-0/+7
\|
*	provide theme_init() functions	friendica	2012-04-08	9	-0/+20
\|
*	rev updates	friendica	2012-04-08	2	-3/+3
\|
*	Merge pull request #214 from annando/master	friendica	2012-04-08	12	-22/+272
\|\ \| \| \| \|	API, Locking, some changes to "vier"
\| *	Merge commit 'upstream/master'	Michael Vogel	2012-04-08	15	-30/+43
\| \|\ \| \|/ \|/\|
* \|	Merge pull request #213 from simonlnu/master	Simon	2012-04-07	7	-30/+35
\|\ \ \| \| \| \| \| \|	minor dispy* fixes
\| * \|	minor dispy* fixes	Simon L'nu	2012-04-07	7	-30/+35
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
\| * \|	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-04-07	44	-153/+1476
\| \|\ \ \| \|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: diabook-themes: small fix changelog 1.014 : image-rezise via jquery-plugin in stream comments under uploaded pictues add Diabook's version-number in head-section ignore utf8 offset error for unit tests had arg order backwards try assertContains tag tests cont. fix autonamenegativelength test some work on tests * master:
* \| \|	diabook-themes: small fix	tommy tomson	2012-04-07	8	-0/+8
\| \| \|
\| * \|	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:
\| * \ \	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:
\| * \| \| \|	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:
\| \| \| \| *	API: API is now enhanced. mentions, repeat and destroy now works.	Michael Vogel	2012-04-08	1	-9/+142
\| \| \| \| \|
\| \| \| \| *	"vier": Some design stuff	Michael Vogel	2012-04-07	1	-0/+1
\| \| \| \| \|
\| \| \| \| *	Merge commit 'upstream/master'	Michael Vogel	2012-04-07	1393	-1443/+3554
\| \| \| \| \|\ \| \|_\|_\|_\|/ \|/\| \| \| \|
* \| \| \| \|	Merge pull request #212 from tomtom84/master	tomtom84	2012-04-07	37	-79/+1373
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	fixes in diabook-themes
\| * \| \| \| \|	changelog 1.014 :	tommy tomson	2012-04-07	37	-79/+1373
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	image-rezise via jquery-plugin in stream comments under uploaded pictues add Diabook's version-number in head-section css-fixes: tabs youtube-iframe title-bar in jot-wrapper blockquote & .oembed
* \| \| \| \|	ignore utf8 offset error for unit tests	friendica	2012-04-07	1	-1/+3
\| \| \| \| \|
* \| \| \| \|	had arg order backwards	friendica	2012-04-07	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	try assertContains	friendica	2012-04-07	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	tag tests cont.	friendica	2012-04-07	2	-5/+15
\| \| \| \| \|
* \| \| \| \|	fix autonamenegativelength test	friendica	2012-04-07	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	some work on tests	friendica	2012-04-07	7	-68/+77
\| \|_\|/ / \|/\| \| \|
* \| \| \|	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
\|\\| \| \|
\| * \| \|	update to the German strings	Tobias Diekershoff	2012-04-06	2	-1216/+1850
\| \| \| \|
* \| \| \|	revert config changes, we're getting duplicate keys	friendica	2012-04-06	1	-151/+147
\|/ / /
* \| \|	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
\| \|/ / \|/\| \|
\| \| *	"vier": Bookmarks now look better.	Michael Vogel	2012-04-07	2	-0/+10
\| \| \|
\| \| *	Merge commit 'upstream/master'	Michael Vogel	2012-04-06	102	-4851/+1753
\| \| \|\ \| \|_\|/ \|/\| \|
* \| \|	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: