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

	Commit message (Collapse)	Author	Age	Files	Lines
*	fix photos after permissions_sql change	friendica	2012-03-06	1	-4/+76
\|
*	Merge branch 'pull'	friendica	2012-03-06	1	-2/+2
\|\
\| *	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-03-06	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: fix html reshares when editplain in use * master:
* \|	[privacy] rework latest fix	friendica	2012-03-06	1	-1/+3
\|/
*	Merge pull request #94 from beardy-unixer/master	Simon	2012-03-06	1	-1/+5
\|\ \| \| \| \|	Documentation changes
\| *	Fixed...merged with mainline THEN added beards.	Thomas	2012-03-06	1	-5/+36
\| \|
\| *	added beard smileys	Thomas	2012-03-06	1	-35/+8
\| \|
* \|	Merge pull request #99 from tomtom84/master	Simon	2012-03-06	1	-0/+3
\|\ \ \| \| \| \| \| \|	fixes in theme diabook
\| * \|	messages-menu translation, add scroll-to-top and theme-bug-report in theme	tommy tomson	2012-03-07	1	-0/+3
\| \|/
* /	bugs #312, #313	friendica	2012-03-06	1	-1/+1
\|/
*	remove "smilie" expansion for Diaspora logo	friendica	2012-03-06	1	-2/+2
\|
*	prevent duplicate likes	friendica	2012-03-06	1	-0/+25
\|
*	can_write_wall documentation	friendica	2012-03-05	1	-1/+6
\|
*	correct owner info from misconfigured installs, duepuntozero title block ↵	friendica	2012-03-04	1	-0/+24
\| \| \| \|	misplaced in editplain mode
*	unused replacement variable displays %1 in all html2bbcode 'code' blocks	friendica	2012-03-04	1	-1/+1
\|
*	template proc: fix variables regexp	Fabio Comuni	2012-03-03	1	-1/+10
\|
*	template proc: allow isolation of var name between [ and ]	Fabio Comuni	2012-03-02	1	-2/+4
\| \| \| \|	$var.name -> $[var.name]
*	template proc: remove unused function and commented out code	Fabio Comuni	2012-03-02	1	-44/+1
\|
*	template proc: first optimization	Fabio Comuni	2012-03-02	2	-10/+29
\|
*	expand multiple heart smilies e.g. <3333	friendica	2012-03-02	1	-0/+12
\|
*	Merge pull request #55 from fabrixxm/master	fabrixxm	2012-03-02	2	-95/+112
\|\ \| \| \| \|	Some minor and one majior mod in templates
\| *	Merge remote-tracking branch 'friendica/master' into randomerror	Fabio Comuni	2012-03-01	3	-27/+79
\| \|\
\| * \|	conversation: remove templating items in code and move it to template.	Fabio Comuni	2012-03-01	1	-94/+103
\| \| \|
\| * \|	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
* \| \|	Merge branch 'pull'	friendica	2012-03-01	1	-1/+6
\|\ \ \
\| * \ \	Merge remote-tracking branch 'upstream/master'	Alexander Kampmann	2012-03-01	20	-251/+914
\| \|\ \ \ \| \| \| \|/ \| \| \|/\|
\| * \| \|	Enabled automated doc building. Changes:	Alexander Kampmann	2012-03-01	1	-1/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	-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	1	-0/+5
\| \|/ / \|/\| \| \| \| \| \| \| \|	content-type
* \| \|	yet more work on notifications	friendica	2012-02-29	3	-29/+54
\| \| \|
* \| \|	notification enhancements	friendica	2012-02-29	1	-3/+30
\| \|/ \|/\|
* \|	call time pass by reference deprecated	friendica	2012-02-28	1	-1/+1
\| \|
* \|	From Tobias H - catch some irregularities caused by cut/paste code	friendica	2012-02-28	1	-1/+1
\| \|
* \|	Merge branch 'pull'	friendica	2012-02-27	1	-3/+5
\|\ \
\| * \|	revert 01a2791e3a to avoid random preg internal errors. fix contact_template	Fabio Comuni	2012-02-27	1	-3/+5
\| \| \|
* \| \|	cleanup notify subject lines	friendica	2012-02-27	1	-8/+17
\|/ /
* \|	add plugin hooks to enotify	friendica	2012-02-26	1	-42/+80
\| \|
* \|	tagging missing from wallwall and a couple of themes, star missing from dispy	friendica	2012-02-26	1	-2/+12
\| \|
* \|	Merge pull request #50 from annando/master	friendica	2012-02-26	9	-99/+573
\|\ \ \| \| \| \| \| \|	massive changes in mail and design updates in "vier"
\| * \|	Mail: New options for actions after importing mails.	Michael	2012-02-26	1	-10/+36
\| \| \|
\| * \|	Merge remote branch 'upstream/master'	Michael	2012-02-26	8	-64/+222
\| \|\ \
\| * \| \|	poller.php: Test for moving to archive, vier-style: notifications fixed	Michael	2012-02-25	1	-1/+11
\| \| \| \|
\| * \| \|	"vier": The contacts are now working again. Line break before closing ↵	Michael	2012-02-25	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	bbcodes removed.
\| * \| \|	Bug fixed where mails where nearly empty. HTML mails can now be received.	Michael	2012-02-25	1	-62/+78
\| \| \| \|
\| * \| \|	multipart messages complete, message-id conversion done.	Michael	2012-02-25	4	-20/+29
\| \| \| \|
\| * \| \|	Sending mail as multipart/alternative (html and plain text) (very basic by now)	Michael	2012-02-24	3	-27/+51
\| \| \| \|
\| * \| \|	Encoding for incoming mails. Fixed invalid message id (with side effect at ↵	Michael	2012-02-24	7	-23/+411
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	the moment). Sending mail as text mail. Encoding name when importing mail contact.
\| * \| \|	GIT problems ...	Michael	2012-02-23	1	-8/+1
\| \| \| \|
\| * \| \|	Merge remote branch 'upstream/master'	Michael	2012-02-23	13	-46/+205
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: include/bbcode.php
\| * \| \| \|	bbcode.php: A list or quote at the beginning wasn't detected	Michael	2012-02-23	1	-3/+3
\| \| \| \| \|
* \| \| \| \|	Merge pull request #49 from CatoTH/master	friendica	2012-02-26	6	-16/+17
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Bugfix for del_config