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-03-02	36	-640/+952
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: item table update for file feature probe for very old (0.97 or 1.0) RSS feed with an incorrect or generic content-type diabook commit conversation: remove templating items in code and move it to template. Enabled automated doc building. Changes: -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 template proc: avoid a notice and allow template name to include to be passed with a variable value show relation in contact_template admin: fix small string fix visualization in groupeditor less html in mod/group.php, template for group members editor, quattro theme for group edit. * master:
\| *	Merge branch 'pull'	friendica	2012-03-02	25	-633/+731
\| \|\
\| \| *	Merge pull request #55 from fabrixxm/master	fabrixxm	2012-03-02	25	-633/+731
\| \| \|\ \| \| \| \| \| \| \| \|	Some minor and one majior mod in templates
\| \| \| *	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 ↵	Fabio Comuni	2012-03-01	1	-1/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	passed with a variable value
\| \| \| * \|	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
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	for group edit.
\| * \| \| \| \|	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
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	diabook theme
\| \| * \ \ \	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
\| \| \|/ / / \| \|/\| \| \|
* \| \| \| \|	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-02-29	8	-35/+115
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: yet more work on notifications notification enhancements better handling of multiple notifications for same item, and old notifications * master:
\| * \| \| \|	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
\| \| \|_\|/ \| \|/\| \|
* \| \| \|	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-02-29	8	-10/+24
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: Update LICENSE Update README cleaned up mess created when both people request friendship and one approves as duplex call time pass by reference deprecated From Tobias H - catch some irregularities caused by cut/paste code * master:
\| * \| \|	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
\| \|\ \ \
\| * \| \| \|	From Tobias H - catch some irregularities caused by cut/paste code	friendica	2012-02-28	4	-7/+7
\| \| \| \| \|
* \| \| \| \|	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-02-28	1	-1/+2
\|\ \ \ \ \ \| \| \|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: fix url and network display * master:
\| * \| \| \|	fix url and network display	fabrixxm	2012-02-28	1	-1/+2
\| \|/ / /
* \| \| \|	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-02-28	6	-55/+14
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: update globaldir when page-type changes, add spam date field clicking contact on contacts page broken link * master:
\| * \| \|	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 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-02-27	2	-9/+18
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: cleanup notify subject lines * master:
\| * \| \|	Merge branch 'pull'	friendica	2012-02-27	4	-10/+12
\| \|\ \ \
\| * \| \| \|	cleanup notify subject lines	friendica	2012-02-27	2	-9/+18
\| \| \| \| \|
* \| \| \| \|	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-02-27	3	-7/+9
\|\ \ \ \ \ \| \| \|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: revert 01a2791e3a to avoid random preg internal errors. fix contact_template * master:
\| * \| \| \|	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 branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-02-27	0	-0/+0
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: fixed syntax errors add plugin hooks to enotify * master:
* \| \| \|	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
\| \| \|
* \| \|	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
\| \| \|