442 commits

Author	SHA1	Message	Date
redmatrix	6a56a509d3	Merge branch 'dev' into perms	2016-07-20 19:03:18 -07:00
redmatrix	3affb2e817	sort out some of the authentication mess - with luck this may fix the DAV auth issue which I simply could not duplicate or find a reason for.	2016-07-20 17:55:40 -07:00
redmatrix	df0cd4dbc7	Merge branch 'dev' into perms	2016-07-20 13:39:10 -07:00
Mario Vavti	d54ad98802	Merge branch '1.10RC' into dev	2016-07-20 22:01:58 +02:00
Mario Vavti	4da005e209	type m query in Acl.php should probably^Ceturn xchan_hash as hash and not as id. This fixes the issue that autocomplete for mail returns null for data.xid	2016-07-20 22:00:41 +02:00
Mario Vavti	8c2b93da72	Merge branch '1.10RC' into dev	2016-07-20 20:44:20 +02:00
Mario Vavti	ca82b45fe4	fix /mail wsod issue reported by giac hellvecio	2016-07-20 20:43:12 +02:00
redmatrix	a3e5307b93	fix the forum detection in include/zot	2016-07-19 22:57:23 -07:00
redmatrix	a961d5e6c8	permission fixes	2016-07-19 20:49:54 -07:00
redmatrix	237cca7a0d	fixes to perms	2016-07-19 19:33:48 -07:00
redmatrix	ea83032863	translate more old perms calls	2016-07-19 17:52:45 -07:00
redmatrix	6a4573b935	Merge branch 'dev' into perms	2016-07-19 17:05:59 -07:00
redmatrix	9421e42dad	doc correction	2016-07-19 17:04:38 -07:00
redmatrix	b63165b6e0	more perms work (a lot more)	2016-07-18 21:37:34 -07:00
redmatrix	b5b57523f1	more perms work	2016-07-18 16:45:43 -07:00
redmatrix	de4f9d68bd	Merge branch 'dev' into perms	2016-07-17 21:40:04 -07:00
redmatrix	279359c1bd	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge	2016-07-17 16:05:46 -07:00
redmatrix	dc9fa7cf64	include attach.php at the module level since 2d4b75428a87038 wasn't backported to dev and we're about to branch an RC	2016-07-17 16:04:00 -07:00
Mario Vavti	2b674d4cd9	hide fullscreen button in embedphotos modal album view	2016-07-17 12:54:10 +02:00
redmatrix	aac0fa2b5f	os_delete_prohibit	2016-07-16 01:02:41 -07:00
redmatrix	8e667866fd	add service class restrictions to access_tokens	2016-07-15 21:57:41 -07:00
redmatrix	01fe7d6620	remove expired access tokens	2016-07-15 17:34:44 -07:00
redmatrix	f3aff45042	provide examples for using access tokens in urls	2016-07-15 16:31:21 -07:00
redmatrix	dcb3c2c299	mod_home: if using an atoken login on the home page redirect to the channel page of the channel that owns the atoken.	2016-07-15 15:26:36 -07:00
redmatrix	da5ec98f98	make lockview work with throwaway identities	2016-07-15 02:07:27 -07:00
redmatrix	d54f5a3831	more cleanup of atoken UI	2016-07-15 01:43:09 -07:00
redmatrix	5e475acb85	cleanup and debug of atoken feature	2016-07-15 01:33:28 -07:00
redmatrix	f666d8a083	enforce non-empty name and token/password on access tokens until better checks are instituted.	2016-07-15 01:06:25 -07:00
redmatrix	7ee7f00bf3	Here's the basic UI for the Zot Access Tokens, requires some minor cleanup	2016-07-14 22:41:53 -07:00
redmatrix	397a23499d	make the xchan_hash for the access token location independent	2016-07-14 21:28:17 -07:00
redmatrix	f70f4a4e85	add zat to acl	2016-07-14 20:26:22 -07:00
redmatrix	f3eb9af046	more ZAT work	2016-07-14 19:43:47 -07:00
redmatrix	191cd21028	more perms work	2016-07-13 23:05:19 -07:00
redmatrix	b3a785711c	deprecate/remove json_decode_plus	2016-07-13 22:11:06 -07:00
redmatrix	0aa205044b	Merge branch 'dev' into perms	2016-07-13 20:19:11 -07:00
redmatrix	00afe56cad	let abconfig specify a family	2016-07-13 20:17:40 -07:00
redmatrix	1fd65c934d	lots more permission work	2016-07-13 19:53:28 -07:00
redmatrix	b72720f6b6	Merge branch 'dev' into perms	2016-07-13 18:24:45 -07:00
redmatrix	f60a0c5ce0	document mod_acl a bit better and try to remove some redundancies and consolidate the various options	2016-07-13 17:51:19 -07:00
redmatrix	18565600b2	missing namespace prefix \	2016-07-12 22:58:12 -07:00
redmatrix	f4e4e734de	more work on perms	2016-07-12 21:47:24 -07:00
redmatrix	6424bac47c	Merge branch 'dev' into perms	2016-07-12 20:50:27 -07:00
redmatrix	ed0e2b52d7	move permissiondescription class to zotlabs/lib	2016-07-11 21:46:16 -07:00
redmatrix	a01baab4f0	Merge branch 'dev' into perms	2016-07-11 17:45:10 -07:00
redmatrix	71b001fdb7	more perms work - notably the stuff in public_perms	2016-07-11 17:02:49 -07:00
redmatrix	fb36561a68	force non-null sess_data	2016-07-11 13:27:44 -07:00
redmatrix	67c60229ca	use the profile_uid here.	2016-07-11 13:20:12 -07:00
Mario Vavti	3d3584b36c	remove check for mcrypt	2016-07-10 13:42:04 +02:00
redmatrix	c9db8c6857	more permissions work	2016-07-09 21:08:02 -07:00
redmatrix	917a465ccd	more work on perms	2016-07-09 19:03:29 -07:00