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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge branch 'pull'	friendica	2012-03-02	25	-633/+731
\|\
\| *	Merge pull request #55 from fabrixxm/master	fabrixxm	2012-03-02	25	-633/+731
\| \|\
\| \| *	Merge remote-tracking branch 'friendica/master' into randomerror	Fabio Comuni	2012-03-01	8	-35/+115
\| \| \|\
\| \| * \|	conversation: remove templating items in code and move it to template.	Fabio Comuni	2012-03-01	15	-551/+584
\| \| * \|	template proc: avoid a notice and allow template name to include to be passed...	Fabio Comuni	2012-03-01	1	-1/+9
\| \| * \|	show relation in contact_template	Fabio Comuni	2012-03-01	1	-0/+1
\| \| * \|	admin: fix small string	Fabio Comuni	2012-03-01	1	-2/+5
\| \| * \|	Merge remote-tracking branch 'friendica/master' into randomerror	Fabio Comuni	2012-02-29	95	-2292/+4726
\| \| \|\ \
\| \| * \| \|	fix visualization in groupeditor	Fabio Comuni	2012-02-23	1	-2/+2
\| \| * \| \|	less html in mod/group.php, template for group members editor, quattro theme ...	Fabio Comuni	2012-02-23	7	-79/+132
* \| \| \| \|	item table update for file feature	friendica	2012-03-02	3	-3/+10
\|/ / / /
* \| \| \|	Merge pull request #56 from tomtom84/master	friendica	2012-03-01	1	-0/+0
\|\ \ \ \
\| * \ \ \	Merge remote-tracking branch 'upstream/master'	tommy tomson	2012-03-02	8	-4/+211
\| \|\ \ \ \ \| \|/ / / / \|/\| \| \| \|
* \| \| \| \|	Merge branch 'pull'	friendica	2012-03-01	6	-3/+205
\|\ \ \ \ \
\| * \ \ \ \	Merge pull request #54 from campino/master	friendica	2012-03-01	6	-3/+205
\| \|\ \ \ \ \ \| \| \|_\|_\|_\|/ \| \|/\| \| \| \|
\| \| * \| \| \|	Merge remote-tracking branch 'upstream/master'	Alexander Kampmann	2012-03-01	84	-1362/+2846
\| \| \|\ \ \ \ \| \| \|/ / / / \| \|/\| \| \| \|
\| \| * \| \| \|	Enabled automated doc building. Changes:	Alexander Kampmann	2012-03-01	6	-3/+205
* \| \| \| \| \|	probe for very old (0.97 or 1.0) RSS feed with an incorrect or generic conten...	friendica	2012-03-01	2	-1/+6
\|/ / / / /
\| \| * / /	diabook commit	tommy tomson	2012-03-02	1	-0/+0
\| \|/ / / \|/\| \| \|
* \| \| \|	yet more work on notifications	friendica	2012-02-29	3	-29/+54
* \| \| \|	notification enhancements	friendica	2012-02-29	5	-7/+43
* \| \| \|	better handling of multiple notifications for same item, and old notifications	friendica	2012-02-29	3	-5/+24
\| \|_\|/ \|/\| \|
* \| \|	Update LICENSE	friendica	2012-02-29	1	-1/+1
* \| \|	Update README	friendica	2012-02-29	1	-0/+4
* \| \|	cleaned up mess created when both people request friendship and one approves ...	friendica	2012-02-28	1	-1/+11
* \| \|	call time pass by reference deprecated	friendica	2012-02-28	1	-1/+1
* \| \|	Merge branch 'pull'	friendica	2012-02-28	1	-1/+2
\|\ \ \
\| * \| \|	fix url and network display	fabrixxm	2012-02-28	1	-1/+2
* \| \| \|	From Tobias H - catch some irregularities caused by cut/paste code	friendica	2012-02-28	4	-7/+7
\|/ / /
* \| \|	update globaldir when page-type changes, add spam date field	friendica	2012-02-27	5	-55/+13
* \| \|	clicking contact on contacts page broken link	friendica	2012-02-27	1	-0/+1
* \| \|	Merge branch 'pull'	friendica	2012-02-27	4	-10/+12
\|\ \ \
\| * \ \	Merge pull request #53 from fabrixxm/master	fabrixxm	2012-02-27	3	-7/+9
\| \|\ \ \
\| \| * \| \|	revert 01a2791e3a to avoid random preg internal errors. fix contact_template	Fabio Comuni	2012-02-27	3	-7/+9
\| \|/ / /
\| * \| \|	Merge pull request #52 from campino/master	Simon	2012-02-27	1	-3/+3
\| \|\\| \|
\| \| * \|	fixed syntax errors	Alexander Kampmann	2012-02-27	1	-3/+3
* \| \| \|	cleanup notify subject lines	friendica	2012-02-27	2	-9/+18
\|/ / /
* \| \|	add plugin hooks to enotify	friendica	2012-02-26	4	-45/+83
* \| \|	Merge pull request #51 from simonlnu/master	Simon	2012-02-26	2	-3/+2
\|\ \ \
\| * \| \|	minor typographical fixes. need to do something about the http on https sites...	Simon L'nu	2012-02-27	2	-3/+2
\| * \| \|	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-02-27	0	-0/+0
\|/ / /
* \| \|	spam db	friendica	2012-02-26	3	-2/+29
* \| \|	fix tag icon size	friendica	2012-02-26	1	-0/+0
* \| \|	typo in css	friendica	2012-02-26	1	-1/+1
* \| \|	tagging missing from wallwall and a couple of themes, star missing from dispy	friendica	2012-02-26	13	-2/+37
* \| \|	Merge pull request #50 from annando/master	friendica	2012-02-26	21	-474/+1238
\|\ \ \
\| * \| \|	Mail: New options for actions after importing mails.	Michael	2012-02-26	7	-41/+84
\| * \| \|	Merge remote branch 'upstream/master'	Michael	2012-02-26	48	-1659/+3227
\| \|\ \ \
\| * \| \| \|	"Vier-Theme" Some more design stuff.	Michael	2012-02-26	4	-336/+315
\| * \| \| \|	poller.php: Test for moving to archive, vier-style: notifications fixed	Michael	2012-02-25	2	-4/+33