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
\|\ \| \| \| \| \| \| \| \| \| \|	Conflicts: doc/history.md mod/import.php
\| *	Require comment perms only for own posts, allow senders to deliver comments ↵	Alexandre Hannud Abdo	2015-08-10	1	-1/+11
\| \| \| \| \| \| \| \|	using stream perms.
* \|	more consistent output on forum widget	redmatrix	2015-08-11	1	-5/+27
\| \|
* \|	remove the forum limit	redmatrix	2015-08-11	1	-1/+1
\| \|
* \|	arghh	redmatrix	2015-08-11	1	-1/+1
\| \|
* \|	typo	redmatrix	2015-08-11	1	-1/+1
\| \|
* \|	wrong cid	redmatrix	2015-08-11	1	-2/+3
\| \|
* \|	don't show '0' results, like notifications	redmatrix	2015-08-11	1	-1/+1
\| \|
* \|	order by name	redmatrix	2015-08-11	1	-1/+1
\| \|
* \|	make sure we only get forums attached to the channel	redmatrix	2015-08-11	1	-8/+2
\| \|
* \|	set font-weight back to normal on forums widget	redmatrix	2015-08-11	1	-1/+1
\| \|
* \|	Merge https://github.com/redmatrix/redmatrix into pending_merge	redmatrix	2015-08-11	1	-0/+1
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: include/items.php util/messages.po view/nl/messages.po view/nl/strings.php
\| *	ensure diaspora_signature is converted to json before we store it.	redmatrix	2015-08-08	1	-0/+3
\| \|
* \|	forum widget	redmatrix	2015-08-11	1	-4/+4
\| \|
* \|	untested forum widget	redmatrix	2015-08-11	1	-1/+39
\| \|
* \|	private mail isues	redmatrix	2015-08-09	2	-6/+8
\| \|
* \|	convert diaspora_signature to json for storage	redmatrix	2015-08-08	1	-0/+3
\| \|
* \|	more file permissions inheritance work	redmatrix	2015-08-06	1	-4/+11
\| \|
* \|	photo permission inheritance. We want to use the folder permissions unless ↵	redmatrix	2015-08-06	5	-24/+73
\| \| \| \| \| \| \| \|	specific permissions have been set to over-ride them. If nothing is set, use the channel default. We may have to mess with his further in the case of somebody trying to create a public photo directory when their normal permissions are set to private. Kind of a chicken/egg problem because the folder permissions will be empty.
* \|	don't throw errors or do the wrong thing if photos have no album (placed on ↵	redmatrix	2015-08-05	1	-1/+1
\| \| \| \| \| \| \| \|	your dav rootdir)
* \|	photo album is decided in dav or attach modules now - don't set it in ↵	redmatrix	2015-08-05	1	-8/+8
\| \| \| \| \| \| \| \|	photos_upload
* \|	uploaded photo from dav (file put, not dav create) not showing in photo album	redmatrix	2015-08-05	1	-1/+1
\| \|
* \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-08-05	1	-6/+9
\|\\| \| \| \| \| \| \| \| \| \| \|	Conflicts: view/nl/messages.po view/nl/strings.php
\| *	connection filter fixes	redmatrix	2015-08-05	1	-6/+9
\| \|
* \|	personal oembed black/white list	redmatrix	2015-08-04	2	-0/+30
\| \|
* \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-08-04	1	-0/+3
\|\\|
\| *	unobscure item before applying connection filter	redmatrix	2015-08-04	1	-0/+3
\| \|
* \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-08-03	2	-2/+3
\|\\| \| \| \| \| \| \| \| \| \| \|	Conflicts: view/it/messages.po view/it/strings.php
\| *	these were some really difficult bugs to find	redmatrix	2015-08-03	2	-3/+2
\| \|
* \|	more work separating Diaspora from core	redmatrix	2015-08-03	2	-19/+13
\| \|
* \|	diaspora_meta getting double json encoded	redmatrix	2015-08-02	1	-1/+1
\| \|
* \|	begin moving diaspora to plugin	redmatrix	2015-08-02	2	-3039/+8
\| \|
* \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-07-31	2	-3/+22
\|\\| \| \| \| \| \| \| \| \|	Conflicts: util/messages.po
\| *	event parse cleanup	redmatrix	2015-07-30	1	-2/+8
\| \|
\| *	escape $ in events	redmatrix	2015-07-30	2	-3/+16
\| \|
* \|	undefined function	redmatrix	2015-07-30	1	-0/+1
\| \|
* \|	minor - add all the newly supported table columns	redmatrix	2015-07-30	1	-2/+2
\| \|
* \|	incorrect photo permissions when uploaded via /cloud; issue #21	redmatrix	2015-07-30	1	-0/+11
\| \|
* \|	make /cloud work again after all the shuffling this morning	redmatrix	2015-07-30	3	-9/+14
\| \|
* \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-07-30	7	-87/+125
\|\\| \| \| \| \| \| \| \| \| \| \|	several dav fixes Conflicts: include/items.php
\| *	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	1	-0/+1
\| \|/
\| *	make superblock block a channel if it's an owner as well as the current ↵	redmatrix	2015-07-28	2	-2/+2
\| \| \| \| \| \| \| \|	author; add @hostname to event hashes to make their use in vcalendar more RFC compliant
* \|	incorrect function name	redmatrix	2015-07-29	2	-2/+2
\| \|
* \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-07-27	2	-5/+88
\|\\| \| \| \| \| \| \| \| \|	Conflicts: util/messages.po
\| *	logic issue in connection filter	redmatrix	2015-07-27	1	-4/+3
\| \|