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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-06-21	1	-4/+20
\|\ \| \| \| \| \| \| \| \| \| \|	Conflicts: include/items.php util/messages.po
\| *	import: Improve the descriptive text for this feature	redmatrix	2015-06-21	1	-2/+2
\| \|
\| *	some diaspora import issues uncovered during dry-run tests	redmatrix	2015-06-21	1	-6/+6
\| \|
\| *	automatically gunzip Diaspora export files if we're on a *nix system	redmatrix	2015-06-19	1	-0/+9
\| \|
\| *	very early attempt diaspora import from diaspora export file. Currently the ↵	redmatrix	2015-06-19	1	-1/+8
\| \| \| \| \| \| \| \|	json export has to be gunzipped prior to uploading and we're net yet adding connections (which should come soon) and we can't import items until they add guids to the export file - so consider it a work in progress. This first attempt should create a channel and get your profile details setup providing there isn't a nickname conflict on the server. That will also be handled later.
* \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-06-18	2	-1/+3
\|\\|
\| *	set return url from apps page	redmatrix	2015-06-18	2	-1/+3
\| \|
* \|	more photos work	redmatrix	2015-06-17	2	-4/+13
\| \|
* \|	lots of work on merging photo and file albums/folders	redmatrix	2015-06-17	2	-5/+9
\| \|
* \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-06-16	2	-1/+24
\|\\| \| \| \| \| \| \| \| \| \| \|	Conflicts: mod/photos.php mod/siteinfo.php
\| *	Merge pull request #349 from git-marijus/master	redmatrix	2015-06-17	1	-1/+13
\| \|\ \| \| \| \| \| \|	make photo upload work for remote channels with perms
\| \| *	make photo upload work for remote channels with perms	Mario Vavti	2015-06-16	1	-1/+13
\| \| \|
\| * \|	Small fix in siteinfo	jeroenpraat	2015-06-16	1	-1/+1
\| \|/
* \|	remove file/attachments when their associated photos are removed	redmatrix	2015-06-16	1	-0/+7
\| \|
* \|	move profile photos to new methods	redmatrix	2015-06-15	2	-49/+39
\| \|
* \|	fix attachment permissions when they also contain an image.	redmatrix	2015-06-15	2	-1/+16
\| \|
* \|	photo upload: pass in the contact_allow and resource_id via include/attach.php	redmatrix	2015-06-15	1	-1/+1
\| \|
* \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-06-15	1	-3/+3
\|\\| \| \| \| \| \| \| \| \| \| \|	Conflicts: view/nl/messages.po view/nl/strings.php
\| *	do not allow/show acl button on photo edit if not owner	Mario Vavti	2015-06-15	1	-3/+3
\| \|
* \|	DB changes for some channel flags	redmatrix	2015-06-15	7	-33/+17
\| \|
* \|	sql errors after last major edit adventure	redmatrix	2015-06-14	2	-2/+2
\| \|
* \|	convert the abook fields	redmatrix	2015-06-14	16	-132/+98
\| \|
* \|	first cut at merging files and photos, not yet well integrated but they are ↵	redmatrix	2015-06-14	1	-19/+25
\| \| \| \| \| \| \| \|	integrated
* \|	make new os_storage flag work	redmatrix	2015-06-14	2	-1/+5
\| \|
* \|	more work on items	redmatrix	2015-06-11	3	-8/+50
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	and Merge branch 'master' of https://github.com/redmatrix/redmatrix Conflicts: include/items.php view/it/messages.po view/it/strings.php
* \|	diaspora disallowed by default	redmatrix	2015-06-10	1	-2/+0
\| \|
* \|	start to partition the dav	redmatrix	2015-06-10	2	-30/+5
\| \|
* \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-06-10	1	-0/+6
\|\\|
\| *	Merge https://github.com/redmatrix/redmatrix into pending_merge	redmatrix	2015-06-10	1	-21/+23
\| \|\
\| * \|	put block_public back where it is needed, which is in mod_public and not ↵	redmatrix	2015-06-10	1	-0/+6
\| \| \| \| \| \| \| \| \| \| \| \|	mod_home
* \| \|	more work on item table optimisation	redmatrix	2015-06-10	13	-45/+55
\| \| \|
* \| \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-06-10	2	-28/+27
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	correctly fix attachment permissions from private mentions	Alexandre Hannud Abdo	2015-06-10	1	-21/+23
\| \|/ \| \| \| \| \| \|	by postponing code that removes the attachment tag from the body
\| *	show login without checking for block_public, local or remote channel	Mario Vavti	2015-06-10	1	-6/+3
\| \|
\| *	really show login form if it is enabled	Mario Vavti	2015-06-10	1	-2/+2
\| \|
* \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-06-09	2	-2/+8
\|\\|
\| *	put mirror_frontpage setting into admin/site	redmatrix	2015-06-09	1	-0/+3
\| \|
\| *	toggle diaspora protocol on a per-channel level in addition to the existing ↵	redmatrix	2015-06-09	1	-2/+5
\| \| \| \| \| \| \| \|	per site setting. Default is enabled if the site setting is enabled.
\| *	s/broder/border/	redmatrix	2015-06-09	1	-1/+1
\| \|
* \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-06-09	8	-239/+251
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: install/schema_mysql.sql mod/home.php mod/page.php view/nl/messages.po view/nl/strings.php
\| *	add nomadic identities as webfinger aliases	redmatrix	2015-06-09	1	-1/+10
\| \|
\| *	provide a mechanism for loading the frontpage without redirecting.	redmatrix	2015-06-08	1	-0/+5
\| \|
\| *	remove debugging	redmatrix	2015-06-08	1	-3/+0
\| \|
\| *	add site_dead flag to prevent delivery to dead sites. Allow sys channel ↵	redmatrix	2015-06-08	2	-6/+16
\| \| \| \| \| \| \| \|	webpages to be viewed even if site is configured "block public".
\| *	magic auth issues on dreamhost	redmatrix	2015-06-07	2	-3/+6
\| \|
\| *	make sure these are included	redmatrix	2015-06-07	2	-0/+189
\| \|
\| *	more frontpage tweaks	redmatrix	2015-06-07	2	-3/+3
\| \|
\| *	reverse logic of homepage login setting	redmatrix	2015-06-07	2	-4/+8
\| \|
\| *	frontpage tweaks	redmatrix	2015-06-07	2	-5/+10
\| \|
\| *	frontpage changes	redmatrix	2015-06-07	1	-229/+19
\| \|