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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge remote branch 'upstream/master'	zottel	2012-04-08	22	-25/+302
\|\
\| *	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
\| \|\
\| \| *	Merge commit 'upstream/master'	Michael Vogel	2012-04-08	15	-30/+43
\| \| \|\ \| \| \|/ \| \|/\|
\| \| *	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
\| \| \|\
\| \| * \|	"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
\| \| \|\ \
\| \| * \| \|	API: template for test function added	Michael Vogel	2012-04-02	1	-0/+1
\| \| * \| \|	Merge commit 'upstream/master'	Michael Vogel	2012-04-02	86	-488/+1850
\| \| \|\ \ \
\| \| * \| \| \|	The "vier"-theme is now working again. But there is still work needed	Michael Vogel	2012-04-02	5	-10/+66
\| \| * \| \| \|	New script that checks if a script is running	Michael Vogel	2012-04-01	1	-0/+32
\| \| * \| \| \|	poller: An optional lockfile is used to check if the poller is already running	Michael Vogel	2012-04-01	2	-1/+14
\| \| * \| \| \|	Merge commit 'upstream/master'	Michael Vogel	2012-04-01	277	-1573/+32158
\| \| \|\ \ \ \
\| \| * \| \| \| \|	Several improvements	Michael Vogel	2012-03-31	2	-2/+6
* \| \| \| \| \| \|	Merge remote branch 'upstream/master'	zottel	2012-04-08	1418	-2297/+4820
\|\\| \| \| \| \| \|
\| * \| \| \| \| \|	Merge pull request #213 from simonlnu/master	Simon	2012-04-07	7	-30/+35
\| \|\ \ \ \ \ \
\| \| * \| \| \| \| \|	minor dispy* fixes	Simon L'nu	2012-04-07	7	-30/+35
\| \| * \| \| \| \| \|	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-04-07	44	-153/+1476
\| \| \|\ \ \ \ \ \ \| \| \|/ / / / / / \| \|/\| \| \| \| \| \|
\| * \| \| \| \| \| \|	diabook-themes: small fix	tommy tomson	2012-04-07	8	-0/+8
\| \| \|_\|_\|_\|_\|/ \| \|/\| \| \| \| \|
\| * \| \| \| \| \|	Merge pull request #212 from tomtom84/master	tomtom84	2012-04-07	37	-79/+1373
\| \|\ \ \ \ \ \
\| \| * \| \| \| \| \|	changelog 1.014 :	tommy tomson	2012-04-07	37	-79/+1373
\| \|/ / / / / /
\| * \| \| \| \| \|	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
\| \| * \| \| \| \|	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-04-07	180	-231/+365
\| \| \|\ \ \ \ \ \| \| \|/ / / / / \| \|/\| \| \| \| \|
\| * \| \| \| \| \|	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
\| \| \|\ \ \ \ \ \
\| \| \| * \ \ \ \ \	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
\| \| \|\ \ \ \ \ \ \
\| \| \| \| * \ \ \ \ \	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 messages...	tommy tomson	2012-04-06	174	-54/+135
\| \| \| \|/ / / / / / / \| \| \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	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
\| \| \| \|\ \ \ \ \ \| \| \| \|/ / / / / \| \| \|/\| \| \| \| \|
\| \| * \| \| \| \| \|	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
\| \| \|\ \ \ \ \ \ \| \| \| \| \|_\|_\|_\|/ \| \| \| \|/\| \| \| \|