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

	Commit message (Collapse)	Author	Age	Files	Lines
*	some more work on realms	friendica	2014-08-17	6	-15/+54
\|
*	Merge https://github.com/friendica/red into pending_merge	friendica	2014-08-17	8	-2472/+2923
\|\
\| *	Merge pull request #567 from tuscanhobbit/master	Paolo T	2014-08-17	2	-1208/+1416
\| \|\ \| \| \| \| \| \|	IT: strings updated
\| \| *	IT: strings updated	tuscanhobbit	2014-08-17	2	-1208/+1416
\| \| \|
\| * \|	Doco - attempt to explain pull requests in git for non developers.	Thomas Willingham	2014-08-17	1	-2/+27
\| \| \|
\| * \|	Merge pull request #565 from RedMatrixCanada/Branch	RedMatrix	2014-08-17	2	-1197/+1387
\| \|\ \ \| \| \| \| \| \| \| \|	French Transalations - UPDATED
\| \| * \|	French Transalations - UPDATED	RedMatrixCanada	2014-08-16	2	-1197/+1387
\| \| \| \|
\| * \| \|	Merge pull request #566 from tonnerkiller/master	RedMatrix	2014-08-17	3	-65/+93
\| \|\ \ \ \| \| \|/ / \| \|/\| \|	Posting by API and Wordpress plugin
\| \| * \|	Added "if(!function_exists('xpost_to_html2bbcode'))"	tonnerkiller	2014-08-16	1	-64/+68
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This function name is also used by post to friendica plugin Both functions seem to be identical. If you have both plugins installed you get an error because of the identical function name This will avoid the attempt to load the function a second time in case it was already loaded by the post to friendica plugin
\| \| * \|	api_posting.bb is a new doco file that explains posting to the redmatrix ↵	tonnerkiller	2014-08-16	2	-1/+25
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	from an external program by exampple of command line tool curl main.bb is an updated version of the doco main site with a link to api_posting.bb
* \| \| \|	add collections widget to connections page - and some more work on realms	friendica	2014-08-17	5	-2/+27
\|/ / /
* \| \|	Merge https://github.com/friendica/red into pending_merge	friendica	2014-08-16	3	-4/+7
\|\ \ \
\| * \ \	Merge pull request #564 from cvogeley/master	RedMatrix	2014-08-17	2	-3/+6
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \|	Add account deletion to the UI
\| \| * \| \|	Add account deletion to the UI	Christian Vogeley	2014-08-16	2	-3/+6
\| \| \| \| \|
\| * \| \| \|	Install doc - mcrypt is required, not optional. Even if it's intended	Thomas Willingham	2014-08-16	1	-1/+1
\| \| \|/ / \| \|/\| \| \| \| \| \| \| \| \| \|	to be optional, it isn't. WSoD abound without it.
* / \| \|	provide backend storage and declaration of directory realm	friendica	2014-08-16	7	-31/+35
\|/ / /
* \| \|	Merge https://github.com/friendica/red into pending_merge	friendica	2014-08-15	1	-1/+1
\|\ \ \
\| * \ \	Merge pull request #563 from zzottel/master	RedMatrix	2014-08-16	1	-1/+1
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \|	don't block "public" messages with authenticated scope
\| \| * \| \|	don't block "public" messages with authenticated scope	zottel	2014-08-15	1	-1/+1
\| \|/ / /
* / / /	bring back some friendica crypto stuff including all the key mangling and ↵	friendica	2014-08-15	2	-1/+173
\|/ / / \| \| \| \| \| \| \| \| \|	translation functions. Also add ability to completely supress email notifications for actitivies with private contents. We'll still pass private mail notifications because often the email notification is the only way infrequently used channels get alerted to these.
* \| \|	doc update	friendica	2014-08-15	11	-0/+2299
\| \| \|
* \| \|	doc update	friendica	2014-08-15	94	-4907/+5731
\| \| \|
* \| \|	Merge https://github.com/friendica/red into pending_merge	friendica	2014-08-15	3	-2/+4
\|\ \ \
\| * \| \|	Merge pull request #562 from cvogeley/master	RedMatrix	2014-08-15	2	-1/+3
\| \|\\| \| \| \| \| \| \| \| \| \|	Account deletion
\| \| * \|	Account deletion	Christian Vogeley	2014-08-15	2	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix multi user deletion, add confirmation message
\| * \| \|	.btn.xs > 0.75rem (let's keep that as the min. scalable font size)	jeroenpraat	2014-08-15	1	-1/+1
\| \| \| \|
\| * \| \|	.btn-xs 0.65 > 0.7rem	jeroenpraat	2014-08-15	1	-1/+1
\| \|/ /
* / /	pkcs1 to pkcs8 key conversion - this is a lot easier than parsing ASN.1 DER ↵	friendica	2014-08-14	2	-0/+29
\|/ / \| \| \| \| \| \|	formats and rebuilding the darn things like we used to do. Check for illegal hex encoded album names in mod/photo so we don't throw php errors. Don't know where they come from but we get a lot of them.
* \|	in HTML email notifications, angle brackets in posts were unescaped - ↵	friendica	2014-08-14	1	-1/+1
\| \| \| \| \| \| \| \|	including those in code blocks.
* \|	escape tags when using markdown. Strange things happen if you put HTML ↵	friendica	2014-08-14	1	-2/+2
\| \| \| \| \| \| \| \|	entities in the text.
* \|	api - foreach warnings	friendica	2014-08-14	1	-10/+15
\| \|
* \|	Merge https://github.com/friendica/red into pending_merge	friendica	2014-08-14	11	-6441/+6425
\|\ \
\| * \	Merge pull request #561 from cvogeley/master	RedMatrix	2014-08-15	5	-6/+99
\| \|\ \ \| \| \| \| \| \| \| \|	Some work on account deletion
\| \| * \|	Some work on account deletion	Christian Vogeley	2014-08-14	5	-6/+99
\| \| \| \|
\| * \| \|	Added some missing translation strings. Fixed to scalable for a few font sizes.	Jeroen	2014-08-14	4	-408/+477
\| \| \| \|
\| * \| \|	update nl	Jeroen	2014-08-14	2	-6027/+5849
\| \| \| \|
* \| \| \|	put an indicator (*) in the message subject line for notification emails ↵	friendica	2014-08-14	2	-1/+2
\|/ / / \| \| \| \| \| \| \| \| \|	when the message body has been suppressed
* \| \|	some work on extended profile fields	friendica	2014-08-13	3	-0/+74
\| \| \|
* \| \|	Merge https://github.com/friendica/red into pending_merge	friendica	2014-08-13	6	-4/+20
\|\ \ \
\| * \| \|	this is better cross-browser support	marijus	2014-08-13	1	-1/+3
\| \| \| \|
\| * \| \|	tweak .comment-edit-text-empty to correlate with the new default app font-size	marijus	2014-08-13	2	-2/+2
\| \| \| \|
\| * \| \|	provide an expert option to opt out from user zoom on mobile devices	marijus	2014-08-13	4	-2/+16
\| \| \| \|
* \| \| \|	support title and description (and dates which were done earlier) for ↵	friendica	2014-08-13	4	-3/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	friendica photo import
* \| \| \|	provide a way to preserve photo timestamps when importing (rather than ↵	friendica	2014-08-12	3	-4/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	uploading)
* \| \| \|	here's the file but I'm less than 5% of the way through porting it.	friendica	2014-08-12	1	-0/+2807
\|/ / /
* \| \|	zot logging to figure out why we occasionally don't have an address on ↵	friendica	2014-08-12	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \|	xchan_import - I suspect we don't have anything useful at all.
* \| \|	couple of frphoto fixes to work better with the dreamhost process reaper	friendica	2014-08-12	2	-1/+8
\| \| \|
* \| \|	Friendica photo import tool. This will bring in all your photos from the ↵	friendica	2014-08-12	6	-7/+171
\|/ / \| \| \| \| \| \|	chosen Friendica account and import them into Red. Note that profile photos will also be imported, but will not be scaled for profiles, nor will they be attached to any profiles. They will appear however in your Profile Photos album. Photos that had any access restrictions in Friendica will be made private to only you. Comments and likes, captions, and tags are not transferred, only the actual photos. You will only be able to do this once. If something goes wrong but any photos were imported, a pconfig called frphotos.complete will be set and you'll have to remove it to start over. If you should remove this to start over, we also check each photo and will not over-write a photo you already brought over.
* \|	change default invitation message	friendica	2014-08-11	4	-24/+64
\| \|
* \|	Merge https://github.com/friendica/red into pending_merge	friendica	2014-08-11	2	-6028/+5850
\|\ \