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

	Commit message (Collapse)	Author	Age	Files	Lines
*	fixed admin	tommy tomson	2012-03-03	11	-2/+2
\| \| \| \|	fixed editor
*	fix editor	tommy tomson	2012-03-03	2	-14/+34
\|
*	fix text-editor in theme	tommy tomson	2012-03-03	10	-7/+204
\|
*	small fix in style.css	tommy tomson	2012-03-03	1	-1/+5
\|
*	fix star/unstar	tommy tomson	2012-03-03	2	-0/+0
\|
*	fixes in wall_item.tpl and style.css in theme diabook	tommy tomson	2012-03-03	3	-8/+12
\|
*	fix in wall_item.tpl	tommy tomson	2012-03-03	3	-10/+13
\| \| \| \|	new icon link.png
*	fixed broken tags and notifications in theme	tommy tomson	2012-03-03	3	-16/+26
\|
*	deleted readme.txt from folder diabook	tommy tomson	2012-03-02	1	-0/+0
\|
*	github finally working	tommy tomson	2012-03-02	1	-2/+0
\|
*	adjust3	tommy tomson	2012-03-02	1	-0/+1
\|
*	Merge remote-tracking branch 'tomtom84_friendica/master' into master-2	tommy tomson	2012-03-02	1	-0/+1
\|\
\| *	adjust	tommy tomson	2012-03-02	24	-0/+2332
\| \|
* \|	adjust2	tommy tomson	2012-03-02	23	-0/+2331
\|/
*	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
\| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Build documentation This looks good. It may take me some time to get up to speed - and I'm not sure I have all the utilities available via my hosting provider.
\| \| \| *	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
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	-build.xml, phing build file -@package tags at acl_selector.php and db_update.php -added documentation and some IDE files to .gitignore -automated tool to find files that corrupt the doc build process -removed ansi characters from SSH1.php, docBlox could not handle them
\| * \| \|	probe for very old (0.97 or 1.0) RSS feed with an incorrect or generic ↵	friendica	2012-03-01	2	-1/+6
\| \|/ / \| \| \| \| \| \| \| \| \|	content-type
* / /	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
\| \| \| \| \| \| \| \|	as duplex
* \|	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
\| \|\ \ \| \| \| \| \| \| \| \|	remove template filters support
\| \| * \|	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
\| \|\\| \| \| \| \| \| \|	Corrected syntax error
\| \| *	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
\|\ \ \| \| \| \| \| \|	RFC, request for comments: about the https for html5shiv
\| * \|	minor typographical fixes. need to do something about the http on https ↵	Simon L'nu	2012-02-27	2	-3/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	sites for html5shiv. changed to https on mine Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
\| * \|	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-02-27	0	-0/+0
\|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: (29 commits) spam db fix tag icon size typo in css tagging missing from wallwall and a couple of themes, star missing from dispy Mail: New options for actions after importing mails. relative link redirects Avoid some notices Bugfix is not always defined; but if defined, then always of type integer 1 Bugfix (missing $ character) and avoid some notices necessare fields not loaded from DB should probably be a->user['hidewall'] instead of profile['hidewall'] "Vier-Theme" Some more design stuff. some revision to the German strings German strings Wrong variable name show experimental and unsupported theme status on theme admin page jumping divs with no scrolling imrpove contrast on darkzero blockquotes darkzero-NS theme ... * master:
* \|	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
\|\ \ \| \| \| \| \| \|	massive changes in mail and design updates in "vier"
\| * \|	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
\| \|\ \