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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'chriscase-master'	Friendika	2011-02-17	5	-72/+15
\|\ \| \| \| \| \| \| \| \|	Conflicts: mod/dfrn_notify.php
\| *	removed localized multipart email templates, now the multipart settings are ↵	Chris Case	2011-02-17	5	-68/+15
\| \| \| \| \| \| \| \|	configured directly in the code
* \|	no delimiter if empty	Friendika	2011-02-17	1	-1/+1
\| \|
* \|	ajax testing continues	Friendika	2011-02-17	2	-2/+2
\| \|
* \|	convert update script arg passing to js - remembering the browser prefetch ↵	Friendika	2011-02-17	3	-30/+19
\| \| \| \| \| \| \| \|	issues
* \|	issues found when testing all live network modes	Friendika	2011-02-16	1	-1/+1
\| \|
* \|	error return for update process when invalid group	Friendika	2011-02-16	1	-0/+4
\| \|
* \|	ajax live update for all network pages and subpages	Friendika	2011-02-16	1	-3/+13
\| \|
* \|	ajax reload fixes	Friendika	2011-02-16	7	-8/+26
\| \|
* \|	properly handle error returns in post w/ajax	Friendika	2011-02-16	2	-4/+13
\| \|
* \|	broken image + linkify site link in body	Friendika	2011-02-16	5	-8/+9
\| \|
* \|	sanitise all incoming url's - also stop them from getting mangled by simplepie	Friendika	2011-02-16	5	-18/+32
\| \|
* \|	Merge branch 'chriscase-master'	Friendika	2011-02-16	13	-166/+200
\|\\|
\| *	fixed encoding, i had been experimenting with different ones and forgot to ↵	Chris Case	2011-02-16	4	-8/+8
\| \| \| \| \| \| \| \|	change it back, now UTF-8
\| *	forgot to check this in earlier... splits up text and html into two ↵	Chris Case	2011-02-16	1	-4/+30
\| \| \| \| \| \| \| \|	different templates and base64 encodes them
\| *	changed message sending to use base64 encoding	Chris Case	2011-02-16	12	-162/+170
\| \|
* \|	small fixes	Friendika	2011-02-16	2	-3/+4
\| \|
* \|	set contact permissions on photos uploaded to private messages	Friendika	2011-02-16	1	-6/+36
\| \|
* \|	Merge branch 'fabrixxm-master'	Friendika	2011-02-16	1	-15/+24
\|\ \
\| * \|	Fix #8 \"recycle symbol getting mangled from status.net retweets\"	Fabio Comuni	2011-02-16	1	-15/+24
\| \| \|
* \| \|	provide permalink for posts, include permalinks in feeds and imported from feeds	Friendika	2011-02-16	13	-3/+35
\|/ /
* \|	Merge branch 'fabrixxm-master'	Friendika	2011-02-15	5	-16/+45
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: addon/statusnet/statusnet.php util/strings.php
\| * \|	Fixed parentheses in translable string in statusnet.php. Rebulid ↵	Fabio Comuni	2011-02-15	3	-21/+33
\| \| \| \| \| \| \| \| \| \| \| \|	util/strings.php. Update it/strings
\| * \|	Updated it language	Fabio Comuni	2011-02-15	2	-5/+29
\| \| \|
\| * \|	fin un util/strings	Fabio Comuni	2011-02-15	1	-1/+1
\| \| \|
\| * \|	Small tweaks to string_translator	Fabio Comuni	2011-02-15	1	-6/+6
\| \| \|
\| * \|	Merge remote-tracking branch 'friendika-master/master'	Fabio Comuni	2011-02-15	28	-137/+385
\| \|\ \
\| * \| \|	change \"html\" with \"bb code\" in tinyMce icons	Fabio Comuni	2011-02-15	1	-0/+0
\| \| \| \|
* \| \| \|	parens in english string	Friendika	2011-02-15	2	-16/+23
\| \|/ / \|/\| \|
* \| \|	Merge branch 'chriscase-master'	Friendika	2011-02-15	1	-34/+41
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	fixed error which was causing multiple line breaks, added comments to better ↵	Chris Case	2011-02-15	1	-34/+41
\| \| \| \| \| \| \| \| \| \| \| \|	document what is occuring, cleaned up code, removed unnecessary parameters from templating step
* \| \|	Merge branch 'tobiasd-master'	Friendika	2011-02-15	2	-14/+37
\|\ \ \
\| * \| \|	deleted the translated file of comment_item.tpl	Tobias Diekershoff	2011-02-15	1	-22/+0
\| \| \| \|
\| * \| \|	masked the / in the config strings to fix problems with the strings.php	Tobias Diekershoff	2011-02-15	1	-1/+1
\| \| \| \|
\| * \| \|	some translations into German	Tobias Diekershoff	2011-02-15	2	-13/+58
\| \| \| \|
* \| \| \|	add permalink field to item table	Friendika	2011-02-15	3	-2/+7
\| \| \| \|
* \| \| \|	bug #0000006, local sparkle links visible in "like" items when remote viewing	Friendika	2011-02-15	1	-1/+1
\|/ / /
* \| \|	bug #0000002, strip HTML from pasted text in prv messages	Friendika	2011-02-14	4	-20/+36
\| \| \|
* \| \|	wrong return url for ajax comments on display and photos pages	Friendika	2011-02-14	4	-3/+5
\|/ /
* \|	Merge remote branch 'upstream/master'	Chris Case	2011-02-14	8	-10/+40
\|\ \
\| * \	Merge branch 'chriscase-master'	Friendika	2011-02-14	5	-61/+220
\| \|\ \
\| * \ \	Merge branch 'ajaxcomms'	Friendika	2011-02-14	5	-5/+32
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: view/comment_item.tpl
\| \| * \| \|	ajax comments	Friendika	2011-02-14	1	-0/+3
\| \| \| \| \|
\| \| * \| \|	ajax comments	Friendika	2011-02-14	1	-12/+20
\| \| \| \| \|
\| \| * \| \|	more test ajax comments	Friendika	2011-02-12	2	-2/+15
\| \| \| \| \|
\| \| * \| \|	preliminary ajax comment setups	Friendika	2011-02-12	4	-3/+6
\| \| \| \| \|
\| * \| \| \|	try this again	Friendika	2011-02-14	1	-4/+4
\| \| \| \| \|
\| * \| \| \|	just in time for valentines day - heart smiley <3	Friendika	2011-02-13	2	-1/+2
\| \| \| \| \|
\| * \| \| \|	app not defined	Friendika	2011-02-13	1	-0/+2
\| \| \| \| \|
* \| \| \| \|	fixed a bbcode issue with rich text html messages, fixed some issues with ↵	Chris Case	2011-02-14	1	-2/+2
\| \|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \|	plain text.