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

	Commit message (Collapse)	Author	Age	Files	Lines
*	make guest access tokens work with PERMS_NETWORK, PERMS_SITE, PERMS_PENDING, ↵	redmatrix	2016-07-31	2	-0/+37
\| \| \| \|	and PERMS_CONTACTS; or everything but PERMS_SPECIFIC. PERMS_SITE could be contentious, but we're currently denying them as they are a guest and don't actually have a channel on this site. We can't easily make PERMS_SPECIFIC work without providing an abook entry for the guest since we would need to set specific permissions for the guest login, but unfortunately this could be the most desirable setting to use in many cases. There is also an update of hmessages.po in this commit.
*	Merge remote-tracking branch 'upstream/dev' into website-import	Andrew Manning	2016-07-31	1	-1/+1
\|\
\| *	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge	redmatrix	2016-07-30	2	-16/+18
\| \|\
\| * \|	issue #466, sql typo	redmatrix	2016-07-28	1	-1/+1
\| \| \|
* \| \|	Improved UI. Removed logger statements.	Andrew Manning	2016-07-31	2	-8/+5
\| \| \|
* \| \|	Merge remote-tracking branch 'upstream/dev' into website-import	Andrew Manning	2016-07-30	7	-77/+91
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	translate mime types to icons, update some icons, move file preview (upload ↵	Mario Vavti	2016-07-28	2	-16/+18
\| \|/ \| \| \| \| \| \|	progress) below table header
\| *	missing s	redmatrix	2016-07-26	1	-1/+1
\| \|
\| *	issue #460 - remove reference to $a which was passed by value since it ↵	redmatrix	2016-07-26	1	-53/+53
\| \| \| \| \| \| \| \|	doesn't exist. Ultimately $a needs to be removed completely but that's a bit messier.
\| *	issue #460	redmatrix	2016-07-25	1	-1/+3
\| \|
\| *	string update and some minor comment edits	redmatrix	2016-07-24	1	-0/+1
\| \|
\| *	fix birthday addtocal	redmatrix	2016-07-21	1	-3/+3
\| \|
\| *	zat URL auth updated to match changes to the atoken_login interface	redmatrix	2016-07-21	2	-3/+12
\| \|
* \|	Merge remote-tracking branch 'upstream/dev' into website-import	Andrew Manning	2016-07-21	21	-566/+913
\|\\|
\| *	fail oembed if it is attempted and less than 80% of the original content is ↵	redmatrix	2016-07-21	1	-0/+11
\| \| \| \| \| \| \| \|	left after html filtering. For the original poster, this will fall back to linkinfo results. If the embed gets through their site but is filtered downstream (with more than 20% of the content removed), it will result in just a link.
\| *	typo	redmatrix	2016-07-21	1	-1/+1
\| \|
\| *	issue #453 and a bug noted from the logfiles related to the schema change ↵	redmatrix	2016-07-20	1	-1/+1
\| \| \| \| \| \| \| \|	last month
\| *	Merge branch 'dev' into perms	redmatrix	2016-07-20	6	-85/+105
\| \|\
\| \| *	fix vevent multi-line formatting	redmatrix	2016-07-20	1	-1/+3
\| \| \|
\| \| *	sort out some of the authentication mess - with luck this may fix the DAV ↵	redmatrix	2016-07-20	5	-84/+102
\| \| \| \| \| \| \| \| \| \| \| \|	auth issue which I simply could not duplicate or find a reason for.
\| * \|	fix the forum detection in include/zot	redmatrix	2016-07-19	2	-5/+16
\| \| \|
\| * \|	another couple of minor perms fixes	redmatrix	2016-07-19	2	-8/+10
\| \| \|
\| * \|	permission fixes	redmatrix	2016-07-19	2	-7/+7
\| \| \|
\| * \|	fixes to perms	redmatrix	2016-07-19	1	-3/+3
\| \| \|
\| * \|	translate more old perms calls	redmatrix	2016-07-19	2	-2/+2
\| \| \|
\| * \|	Merge branch 'dev' into perms	redmatrix	2016-07-19	1	-0/+1
\| \|\\|
\| * \|	yet more grungy perms work.	redmatrix	2016-07-19	1	-37/+36
\| \| \|
\| * \|	missing bracket	redmatrix	2016-07-18	1	-1/+2
\| \| \|
\| * \|	more perms work (a lot more)	redmatrix	2016-07-18	3	-40/+83
\| \| \|
\| * \|	move legacy code inside the legacy check	redmatrix	2016-07-18	1	-2/+3
\| \| \|
\| * \|	more perms work	redmatrix	2016-07-18	3	-0/+16
\| \| \|
\| * \|	Merge branch 'dev' into perms	redmatrix	2016-07-18	1	-1/+1
\| \|\ \
\| * \| \|	more perms work	redmatrix	2016-07-18	2	-5/+103
\| \| \| \|
\| * \| \|	export/import channel permissions	redmatrix	2016-07-17	2	-9/+39
\| \| \| \|
\| * \| \|	clone channel perms	redmatrix	2016-07-17	2	-1/+71
\| \| \| \|
\| * \| \|	Merge branch 'dev' into perms	redmatrix	2016-07-17	6	-26/+190
\| \|\ \ \
\| * \| \| \|	more perms work	redmatrix	2016-07-13	3	-25/+34
\| \| \| \| \|
\| * \| \| \|	deprecate/remove json_decode_plus	redmatrix	2016-07-13	4	-29/+21
\| \| \| \| \|
\| * \| \| \|	rework perm_is_allowed	redmatrix	2016-07-13	1	-4/+8
\| \| \| \| \|
\| * \| \| \|	Merge branch 'dev' into perms	redmatrix	2016-07-13	1	-3/+2
\| \|\ \ \ \
\| * \| \| \| \|	lots more permission work	redmatrix	2016-07-13	1	-2/+7
\| \| \| \| \| \|
\| * \| \| \| \|	more work on perms	redmatrix	2016-07-12	2	-18/+34
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch 'dev' into perms	redmatrix	2016-07-12	5	-193/+13
\| \|\ \ \ \ \
\| * \ \ \ \ \	Merge branch 'dev' into perms	redmatrix	2016-07-11	3	-21/+38
\| \|\ \ \ \ \ \
\| * \| \| \| \| \| \|	more perms work - notably the stuff in public_perms	redmatrix	2016-07-11	1	-55/+17
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	perms work	redmatrix	2016-07-10	1	-37/+13
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	change default so we don't have to check for array existence later	redmatrix	2016-07-09	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	more permissions work	redmatrix	2016-07-09	2	-2/+4
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	more work on perms	redmatrix	2016-07-09	2	-7/+9
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'dev' into perms	redmatrix	2016-07-05	4	-338/+16
\| \|\ \ \ \ \ \ \