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

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| * \| \|	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	2	-1/+2
\| \|\ \ \ \| \| \| \|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: include/items.php util/messages.po view/nl/messages.po view/nl/strings.php
\| \| * \|	Update Dutch strings	jeroenpraat	2015-08-09	2	-12/+17
\| \| \|/
\| \| *	ensure diaspora_signature is converted to json before we store it.	redmatrix	2015-08-08	3	-11/+18
\| \| \|
\| * \|	forum widget	redmatrix	2015-08-11	2	-4/+5
\| \| \|
\| * \|	untested forum widget	redmatrix	2015-08-11	1	-1/+39
\| \| \|
\| * \|	bring back colour to abook_self in acl	redmatrix	2015-08-11	2	-7/+7
\| \| \|
\| * \|	private mail isues	redmatrix	2015-08-09	2	-6/+8
\| \| \|
\| * \|	convert diaspora_signature to json for storage	redmatrix	2015-08-08	1	-0/+3
\| \| \|
\| * \|	update	redmatrix	2015-08-07	2	-20/+5
\| \| \|
\| * \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix0.8	redmatrix	2015-08-06	2	-3/+3
\| \|\\|
\| \| *	closing tags	redmatrix	2015-08-06	2	-3/+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	6	-24/+90
\| \| \| \| \| \| \| \| \| \| \| \|	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.
* \| \|	Merge remote-tracking branch 'upstream/master'	Haakon Meland Eriksen	2015-08-06	13	-117/+114
\|\\| \|
\| * \|	prohibit some photo album edit operations until we figure out how to sync ↵	redmatrix	2015-08-05	1	-20/+31
\| \| \| \| \| \| \| \| \| \| \| \|	them with dav
\| * \|	don't throw errors or do the wrong thing if photos have no album (placed on ↵	redmatrix	2015-08-05	2	-9/+14
\| \| \| \| \| \| \| \| \| \| \| \|	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	2	-7/+10
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: view/nl/messages.po view/nl/strings.php
\| \| *	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
\| \| \|/
\| * \|	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	2	-1/+4
\| \|\\|
\| \| *	unobscure item before applying connection filter	redmatrix	2015-08-04	2	-1/+4
\| \| \|
\| * \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-08-03	3	-3/+4
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: view/it/messages.po view/it/strings.php
\| \| *	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
\| \| \|/ /
\| * \| \|	more work separating Diaspora from core	redmatrix	2015-08-03	6	-70/+14
\| \| \| \|
* \| \| \|	Hubzilla addons added	Haakon Meland Eriksen	2015-08-03	1	-0/+5
\| \| \| \|
* \| \| \|	Merge remote-tracking branch 'upstream/master'	Haakon Meland Eriksen	2015-08-03	19	-3273/+209
\|\\| \| \|
\| * \| \|	diaspora_meta getting double json encoded	redmatrix	2015-08-02	1	-1/+1
\| \| \| \|
\| * \| \|	begin moving diaspora to plugin	redmatrix	2015-08-02	4	-3166/+8
\| \| \| \|
\| * \| \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-08-02	1	-1/+1
\| \|\\| \|
\| \| * \|	revision update	redmatrix	2015-08-02	1	-1/+1
\| \| \| \|
\| * \| \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-07-31	5	-6/+25
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: util/messages.po
\| \| * \|	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
\| \| \| \|
\| * \| \|	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
\| \| \| \|