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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge pull request #349 from git-marijus/master	redmatrix	2015-06-17	2	-3/+15
\|\ \| \| \| \|	make photo upload work for remote channels with perms
\| *	fix deleting of album for remote channel	Mario Vavti	2015-06-16	1	-2/+2
\| \|
\| *	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
\|/
*	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
\|
*	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
\|/
*	don't provide a connect button on the sys channel profile sidebar	redmatrix	2015-06-11	1	-0/+4
\|
*	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
\|/ /
* \|	Merge https://github.com/redmatrix/redmatrix into pending_merge	redmatrix	2015-06-10	1	-21/+23
\|\ \
\| * \	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
* / /	put block_public back where it is needed, which is in mod_public and not ↵	redmatrix	2015-06-10	2	-1/+7
\|/ / \| \| \| \| \| \|	mod_home
* \|	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
\| \|
* \|	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.
* \|	s/broder/border/	redmatrix	2015-06-09	1	-1/+1
\| \|
* \|	add nomadic identities as webfinger aliases	redmatrix	2015-06-09	2	-2/+11
\| \|
* \|	provide a mechanism for loading the frontpage without redirecting.	redmatrix	2015-06-08	1	-0/+5
\| \|
* \|	Merge https://github.com/redmatrix/redmatrix into pending_merge	redmatrix	2015-06-08	1	-0/+12
\|\ \
\| * \|	css regression fixes	Mario Vavti	2015-06-08	1	-0/+12
\| \| \|
* \| \|	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	8	-18/+52
\|/ / \| \| \| \| \| \|	webpages to be viewed even if site is configured "block public".
* \|	magic auth issues on dreamhost	redmatrix	2015-06-07	2	-3/+6
\| \|
* \|	Merge branch 'frontpage'	redmatrix	2015-06-07	6	-234/+223
\|\ \
\| * \|	make sure these are included	redmatrix	2015-06-07	2	-0/+189
\| \| \|
\| * \|	more frontpage tweaks	redmatrix	2015-06-07	3	-4/+4
\| \| \|
\| * \|	reverse logic of homepage login setting	redmatrix	2015-06-07	3	-5/+9
\| \| \|
\| * \|	frontpage tweaks	redmatrix	2015-06-07	3	-5/+11
\| \| \|
\| * \|	frontpage changes	redmatrix	2015-06-07	2	-230/+20
\| \| \|
* \| \|	Merge https://github.com/redmatrix/redmatrix into pending_merge	redmatrix	2015-06-07	2	-7229/+7132
\|\ \ \
\| * \| \|	Upd NL	jeroenpraat	2015-06-07	2	-7229/+7132
\| \|/ /
* / /	version update	redmatrix	2015-06-07	1	-1/+1
\|/ /
* \|	missing comma	Mario Vavti	2015-06-06	1	-1/+1
\| \|
* \|	Added translatable strings to the Display Settings page and refreshed ↵	jeroenpraat	2015-06-06	3	-4618/+4478
\| \| \| \| \| \| \| \|	util/messages.po.
* \|	css fixes	Mario Vavti	2015-06-06	1	-17/+9
\| \|