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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge https://github.com/redmatrix/redmatrix into pending_merge	redmatrix	2015-08-11	1	-1/+11
\|\
\| *	Merge pull request #383 from solstag/commentpermgood	redmatrix	2015-08-12	1	-1/+11
\| \|\ \| \| \| \| \| \|	Require comment perms only for own posts, allow senders to deliver co…
\| \| *	Require comment perms only for own posts, allow senders to deliver comments ↵	Alexandre Hannud Abdo	2015-08-10	1	-1/+11
\| \|/ \| \| \| \| \| \|	using stream perms.
* \|	Merge https://github.com/redmatrix/redmatrix into pending_merge	redmatrix	2015-08-10	2	-12/+17
\|\\|
\| *	Update Dutch strings	jeroenpraat	2015-08-09	2	-12/+17
\| \|
* \|	convert abook_flags from hubzilla during cloning	redmatrix	2015-08-10	2	-5/+31
\|/
*	ensure diaspora_signature is converted to json before we store it.	redmatrix	2015-08-08	3	-11/+18
\|
*	closing tags	redmatrix	2015-08-06	2	-3/+3
\|
*	Merge https://github.com/redmatrix/redmatrix into pending_merge	redmatrix	2015-08-05	2	-1465/+1379
\|\
\| *	Update Dutch strings	jeroenpraat	2015-08-05	2	-1465/+1379
\| \|
* \|	connection filter fixes	redmatrix	2015-08-05	2	-7/+10
\|/
*	unobscure item before applying connection filter	redmatrix	2015-08-04	2	-1/+4
\|
*	Merge https://github.com/redmatrix/redmatrix into pending_merge	redmatrix	2015-08-03	2	-1354/+1266
\|\
\| *	Merge pull request #382 from tuscanhobbit/master	Paolo T	2015-08-03	2	-1354/+1266
\| \|\ \| \| \| \| \| \|	Italian translation
\| \| *	Italian translation	Paolo Tacconi	2015-08-03	2	-1354/+1266
\| \| \|
* \| \|	these were some really difficult bugs to find	redmatrix	2015-08-03	3	-4/+3
\|/ /
* \|	revision update	redmatrix	2015-08-02	1	-1/+1
\| \|
* \|	consistency of event form	redmatrix	2015-07-31	4	-213/+198
\| \|
* \|	event parse cleanup	redmatrix	2015-07-30	1	-2/+8
\| \|
* \|	escape $ in events	redmatrix	2015-07-30	2	-3/+16
\| \|
* \|	dummy update	redmatrix	2015-07-30	3	-3/+8
\| \|
* \|	minor cleanup	redmatrix	2015-07-29	1	-14/+1
\| \|
* \|	Merge branch 'vobject'	redmatrix	2015-07-29	1	-23/+83
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: include/event.php
\| * \|	convert ics import to sabre/vobject	redmatrix	2015-07-29	1	-29/+42
\| \| \|
\| * \|	initial work on using sabre as a vcalendar parser	redmatrix	2015-07-28	1	-1/+50
\| \| \|
* \| \|	add connection filter to non-zot posts	redmatrix	2015-07-29	2	-0/+8
\| \| \|
* \| \|	PRIVACY: imported events	redmatrix	2015-07-29	2	-1/+2
\|/ /
* \|	make superblock block a channel if it's an owner as well as the current ↵	redmatrix	2015-07-28	3	-3/+3
\| \| \| \| \| \| \| \|	author; add @hostname to event hashes to make their use in vcalendar more RFC compliant
* \|	align buttons on event calendar	redmatrix	2015-07-27	1	-6/+5
\| \|
* \|	logic issue in connection filter	redmatrix	2015-07-27	2	-5/+4
\| \|
* \|	crude but more or less functional event import from thunderbird ics files	redmatrix	2015-07-26	3	-8/+54
\| \|
* \|	backend code for importing events from "simple" ics calendar files.	redmatrix	2015-07-26	1	-0/+65
\| \|
* \|	Merge https://github.com/redmatrix/redmatrix into pending_merge	redmatrix	2015-07-26	4	-3171/+3325
\|\ \
\| * \|	comment out some popover infos - we provide enough visual feedback now	Mario Vavti	2015-07-26	1	-15/+15
\| \| \|
\| * \|	Provide connection status if status is "a-normal"	Mario Vavti	2015-07-26	2	-0/+13
\| \| \|
\| * \|	Merge pull request #378 from solstag/ptbrupdate	git-marijus	2015-07-25	2	-3156/+3297
\| \|\ \ \| \| \| \| \| \| \| \|	update pt-br strings
\| \| * \|	update pt-br strings	Alexandre Hannud Abdo	2015-07-24	2	-3156/+3297
\| \|/ /
* / /	revision and string update	redmatrix	2015-07-26	2	-30/+34
\|/ /
* \|	event privacy issue	redmatrix	2015-07-23	1	-2/+1
\| \|
* \|	Merge https://github.com/redmatrix/redmatrix into pending_merge	redmatrix	2015-07-23	1	-1/+1
\|\ \
\| * \	Merge pull request #377 from zzottel/master	redmatrix	2015-07-22	1	-1/+1
\| \|\ \ \| \| \| \| \| \| \| \|	make content filter by language work for excludes
\| \| * \|	make content filter by language work for excludes	zottel	2015-07-22	1	-1/+1
\| \|/ /
* / /	patch to allow theme based widgets	redmatrix	2015-07-23	5	-4/+8
\|/ /
* \|	ics calendar export - commas need to be escaped	redmatrix	2015-07-21	2	-2/+2
\| \|
* \|	provide content-disposition for exported ics file	redmatrix	2015-07-20	1	-0/+1
\| \|
* \|	Merge https://github.com/redmatrix/redmatrix into pending_merge	redmatrix	2015-07-20	18	-11/+16
\|\ \
\| * \|	Fixes regarding the new default profile photo size. The default profile ↵	Mario Vavti	2015-07-20	17	-9/+9
\| \| \| \| \| \| \| \| \| \| \| \|	photos are just renamed. People which provided the originals are invited to reproduce them in the new 300 by 300 px format.
\| * \|	show icons instead of disabled checkboxes	Mario Vavti	2015-07-20	1	-2/+7
\| \| \|
* \| \|	there is no stricmp() in php, use strcasecmp() - also only detect language ↵	redmatrix	2015-07-20	1	-3/+6
\| \| \| \| \| \| \| \| \| \| \| \|	if we plan to use it.
* \| \|	indicate where progress has been made	redmatrix	2015-07-20	2	-16/+20
\|/ /