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

	Commit message (Collapse)	Author	Age	Files	Lines
*	move profile photos to new methods	redmatrix	2015-06-15	3	-50/+46
\|
*	fix attachment permissions when they also contain an image.	redmatrix	2015-06-15	3	-1/+18
\|
*	photo upload: pass in the contact_allow and resource_id via include/attach.php	redmatrix	2015-06-15	4	-5/+9
\|
*	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-06-15	6	-162/+191
\|\ \| \| \| \| \| \| \| \| \| \|	Conflicts: view/nl/messages.po view/nl/strings.php
\| *	Merge branch 'master' of https://github.com/redmatrix/redmatrix	Mario Vavti	2015-06-15	2	-6998/+7222
\| \|\
\| \| *	Update Dutch language strings	jeroenpraat	2015-06-15	2	-6998/+7222
\| \| \|
\| * \|	update spin.js	Mario Vavti	2015-06-15	2	-157/+184
\| \|/
\| *	do not allow/show acl button on photo edit if not owner	Mario Vavti	2015-06-15	3	-4/+6
\| \|
\| *	version update	redmatrix	2015-06-14	1	-1/+1
\| \|
* \|	DB changes for some channel flags	redmatrix	2015-06-15	19	-131/+87
\| \|
* \|	un-maintainable - let it go.	redmatrix	2015-06-14	17	-1760/+0
\| \|
* \|	sql errors after last major edit adventure	redmatrix	2015-06-14	2	-2/+2
\| \|
* \|	convert the abook fields	redmatrix	2015-06-14	34	-279/+241
\| \|
* \|	more file/photo merge work	redmatrix	2015-06-14	2	-17/+51
\| \|
* \|	first cut at merging files and photos, not yet well integrated but they are ↵	redmatrix	2015-06-14	3	-24/+35
\| \| \| \| \| \| \| \|	integrated
* \|	make new os_storage flag work	redmatrix	2015-06-14	2	-1/+5
\| \|
* \|	isolate the os_storage flag	redmatrix	2015-06-13	3	-23/+29
\| \|
* \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-06-13	3	-4/+12
\|\\| \| \| \| \| \| \| \| \|	Conflicts: util/messages.po
\| *	Merge https://github.com/redmatrix/redmatrix into pending_merge	redmatrix	2015-06-13	1	-1/+1
\| \|\
\| \| *	Merge pull request #348 from unary/nginxconfig	redmatrix	2015-06-13	1	-1/+1
\| \| \|\ \| \| \| \| \| \| \| \|	nginx config change from Thomas
\| \| \| *	nginx config change from Thomas	Michael Johnston	2015-06-13	1	-1/+1
\| \| \|/
\| * /	weekly string update	redmatrix	2015-06-13	2	-4401/+4582
\| \|/
* \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-06-11	1	-0/+4
\|\\|
\| *	don't provide a connect button on the sys channel profile sidebar	redmatrix	2015-06-11	1	-0/+4
\| \|
* \|	make cloud work again	redmatrix	2015-06-11	5	-6/+6
\| \|
* \|	start on the DAV/photos merger	redmatrix	2015-06-11	2	-12/+32
\| \|
* \|	more work on items	redmatrix	2015-06-11	13	-38/+164
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	and Merge branch 'master' of https://github.com/redmatrix/redmatrix Conflicts: include/items.php view/it/messages.po view/it/strings.php
\| *	Merge https://github.com/redmatrix/redmatrix into pending_merge	redmatrix	2015-06-11	7	-7225/+7179
\| \|\
\| \| *	Merge pull request #347 from tuscanhobbit/dev	Paolo T	2015-06-11	2	-7219/+7160
\| \| \|\ \| \| \| \| \| \| \| \|	updated italian strings
\| \| \| *	updated italian strings	Paolo Tacconi	2015-06-11	2	-7219/+7160
\| \| \| \|
\| \| * \|	set width for region_3 only if center page content is set	Mario Vavti	2015-06-11	3	-4/+15
\| \| \| \|
\| \| * \|	fix rendering of affinity slider	Mario Vavti	2015-06-11	2	-2/+4
\| \| \| \|
\| * \| \|	hubzilla compatibility function	redmatrix	2015-06-11	2	-1/+15
\| \|/ /
* \| \|	the hubzilla version of this function	redmatrix	2015-06-11	1	-0/+12
\| \| \|
* \| \|	diaspora disallowed by default	redmatrix	2015-06-10	3	-8/+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	2	-1/+7
\|\\| \|
\| * \|	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	2	-1/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	mod_home
* \| \| \|	more work on item table optimisation	redmatrix	2015-06-10	19	-82/+123
\| \| \| \|
* \| \| \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-06-10	7	-67/+45
\|\ \ \ \ \| \| \|/ / \| \|/\| \|
\| * \| \|	Merge pull request #346 from solstag/fixattachperms	redmatrix	2015-06-11	1	-21/+23
\| \|\ \ \ \| \| \|/ / \| \|/\| \|	correctly fix attachment permissions from private mentions
\| \| * \|	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
\| \| \|
\| * \|	assign right aside the same width as we have in left aside but hide it on ↵	Mario Vavti	2015-06-10	4	-11/+18
\| \| \| \| \| \| \| \| \| \| \| \|	small and xs screens. make aside width a variablee for easier handling.
\| * \|	really show login form if it is enabled	Mario Vavti	2015-06-10	1	-2/+2
\| \| \|
\| * \|	retire old Friendica RINO encryption functions	redmatrix	2015-06-09	1	-28/+0
\| \| \|
* \| \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-06-09	6	-2/+38
\|\\| \|
\| * \|	put mirror_frontpage setting into admin/site	redmatrix	2015-06-09	2	-0/+4
\| \| \|
\| * \|	toggle diaspora protocol on a per-channel level in addition to the existing ↵	redmatrix	2015-06-09	4	-2/+34
\| \| \| \| \| \| \| \| \| \| \| \|	per site setting. Default is enabled if the site setting is enabled.