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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'pull'	friendica	2012-03-15	7	-63/+305
\|\
\| *	html2bbcode: Disabled size conversion	Michael Vogel	2012-03-15	1	-9/+9
\| \|
\| *	Merge commit 'upstream/master'	Michael Vogel	2012-03-15	9	-44/+263
\| \|\
\| * \|	Mail: Subject are now with working "Re:"	Michael Vogel	2012-03-12	2	-43/+14
\| \| \|
\| * \|	Removing test exports	Michael Vogel	2012-03-11	2	-4/+4
\| \| \|
\| * \|	Merge commit 'upstream/master'	Michael Vogel	2012-03-11	1	-3/+3
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: view/theme/diabook/wall_item.tpl view/theme/diabook/wallwall_item.tpl
\| * \| \|	Item cache now is one day.	Michael Vogel	2012-03-11	1	-1/+1
\| \| \| \|
\| * \| \|	Cache: item cache now has an autodelete of old files. The pages plugin now ↵	Michael Vogel	2012-03-11	2	-1/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	sets a link via redirection. So posting works.
\| * \| \|	Caching improved.	Michael Vogel	2012-03-10	1	-13/+11
\| \| \| \|
\| * \| \|	Enabled Caching for items. Changed color of tags in diabook.	Michael Vogel	2012-03-10	1	-1/+16
\| \| \| \|
\| * \| \|	New config options if ostatus polling should use the priority in the contacts	Michael Vogel	2012-03-10	1	-1/+4
\| \| \| \|
\| * \| \|	Mail: Removing signatures, gpg, unnecessary line breaks	Michael Vogel	2012-03-10	3	-2/+240
\| \| \| \|
\| * \| \|	Merge commit 'upstream/master'	Michael Vogel	2012-03-09	11	-213/+421
\| \|\ \ \
\| * \| \| \|	html2bbcode: don't convert sizes and fonts.	Michael	2012-03-02	1	-3/+7
\| \| \| \| \|
* \| \| \| \|	track whether contact is a community page or not	friendica	2012-03-15	1	-0/+5
\| \|_\|_\|/ \|/\| \| \|
* \| \| \|	basic ssl_policy for important modules	friendica	2012-03-14	2	-20/+28
\| \| \| \|
* \| \| \|	ssl_policy stuff	friendica	2012-03-14	1	-0/+17
\| \| \| \|
* \| \| \|	more work on filer, comment level and file tag removal	friendica	2012-03-13	3	-20/+28
\| \| \| \|
* \| \| \|	file as widget and basic filing implementation for duepuntozero,slackr	friendica	2012-03-13	3	-1/+32
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	much more work needed - this is just for test/evaluation currently
* \| \| \|	Merge pull request #129 from CatoTH/master	friendica	2012-03-13	6	-9/+64
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	CSRF-Protection and minor changes
\| * \| \| \|	Some security against XSRF-attacks	Tobias Hößl	2012-03-12	1	-0/+46
\| \| \| \| \|
\| * \| \| \|	Merge branch 'master' of git://github.com/friendica/friendica	Tobias Hößl	2012-03-12	1	-0/+73
\| \|\ \ \ \
\| * \ \ \ \	Merge branch 'master' of git://github.com/friendica/friendica	Tobias Hößl	2012-03-11	1	-3/+3
\| \|\ \ \ \ \ \| \| \| \|_\|_\|/ \| \| \|/\| \| \|
\| * \| \| \| \|	Merge branch 'master' of git://github.com/friendica/friendica	Tobias Hößl	2012-03-09	11	-206/+405
\| \|\ \ \ \ \ \| \| \| \|_\|_\|/ \| \| \|/\| \| \|
\| * \| \| \| \|	Mostly some checks in order to avoid Notices; 1 real bugfix in /mod/network.php	Tobias Hößl	2012-02-28	3	-5/+11
\| \| \| \| \| \|
\| * \| \| \| \|	Merge remote branch 'upstream/master'	Tobias Hößl	2012-02-28	14	-167/+719
\| \|\ \ \ \ \
\| * \| \| \| \| \|	wasn't actually changed before	Tobias Hößl	2012-02-28	1	-2/+2
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Avoid a notice	Tobias Hößl	2012-02-28	1	-0/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Avoid a Notice	Tobias Hößl	2012-02-27	1	-1/+3
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Avoid a Notice	Tobias Hößl	2012-02-27	1	-1/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	initial tag display for categories and save-to-file - suitable for testing ↵	friendica	2012-03-13	1	-0/+27
\| \|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	but needs cleanup, links to delete term, and theming.
* \| \| \| \| \|	more save to file backend	friendica	2012-03-11	1	-1/+55
\| \| \| \| \| \|
* \| \| \| \| \|	backend for "save to file" feature	friendica	2012-03-11	1	-0/+19
\| \|_\|_\|/ / \|/\| \| \| \|
* \| \| \| \|	bug #328	friendica	2012-03-10	1	-3/+3
\| \|_\|/ / \|/\| \| \|
* \| \| \|	bug in check for private email comment to public conversation prevents ↵	friendica	2012-03-09	2	-23/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	authenticated visitor from seeing comments that should be allowed
* \| \| \|	keep tony from talking to himself	friendica	2012-03-08	1	-1/+1
\| \| \| \|
* \| \| \|	still getting parent relays on remote systems	friendica	2012-03-07	2	-3/+3
\| \| \| \|
* \| \| \|	revup	friendica	2012-03-07	1	-1/+1
\| \| \| \|
* \| \| \|	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
\| \| \| \|