17555 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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	d6d94d9427	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge	2016-07-15 15:31:50 -07:00
redmatrix	acb78205c8	login isn't always your email.	2016-07-15 15:30:52 -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
Mario Vavti	9048f8cffe	bump minor version because of jquery update	2016-07-15 14:53:15 +02:00
Mario Vavti	4a2fb8336e	round up height	2016-07-15 14:23:10 +02:00
Mario Vavti	34a16e0ab9	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev	2016-07-15 13:21:07 +02:00
Mario Vavti	c2779b6f33	add jquery migrate for version 3	2016-07-15 13:20:55 +02:00
Mario Vavti	2e32b5f467	upgrade to jquery-3.1 and minor fixes	2016-07-15 13:20:00 +02: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	d660bde324	missing brace	2016-07-14 20:53:38 -07:00
redmatrix	94bd53c0f1	schema updates for zot access tokens	2016-07-14 20:51:15 -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
Andrew Manning	0edf248cd1	Merge remote-tracking branch 'upstream/dev' into website-import	2016-07-14 22:25:30 -04:00
Andrew Manning	514ffb74aa	Refactored the scan and import functions to reduce redundant code and simplify logic. Import of pages, layouts, and blocks works.	2016-07-14 22:24:23 -04:00
redmatrix	e6c8614801	first cut at zot access tokens	2016-07-14 19:24:15 -07:00
redmatrix	05a9f2f0f5	markdown is whitespace sensitive	2016-07-14 17:46:21 -07:00
redmatrix	115ef3249c	who are we	2016-07-14 17:45:09 -07:00
zottel	a2461d9816	Merge remote-tracking branch 'upstream/dev' into dev	2016-07-14 20:49:26 +02: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	503b420292	rework perm_is_allowed	2016-07-13 20:23:20 -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
Andrew Manning	960e9edff5	Blocks, pages, and layouts import from zip file. Layouts are not applied to pages until imported twice though.	2016-07-13 21:46:59 -04: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
Andrew Manning	ba903e21ed	Updated import_blocks for database calls	2016-07-13 06:17:12 -04:00
Andrew Manning	75b943b98a	Merge remote-tracking branch 'upstream/dev' into website-import	2016-07-13 05:50:31 -04: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	bdd7d24ac1	update_remote_id - updated to work with iconfig	2016-07-12 19:08:36 -07:00
Andrew Manning	5131759823	Merge remote-tracking branch 'upstream/dev' into website-import	2016-07-12 21:43:05 -04:00
Andrew Manning	1e4ef81244	Import blocks from zip file, but needs updates as detailed in https://gitlab.com/zot/hubsites/merge_requests/2	2016-07-12 21:41:37 -04:00
redmatrix	0fa807e7ad	don't try to send sync packets to dead sites.	2016-07-12 18:38:39 -07:00
redmatrix	b6987b4287	the abconfig defaults weren't changed in the schema files when they were changed in the code	2016-07-12 13:15:20 -07:00
redmatrix	ed0e2b52d7	move permissiondescription class to zotlabs/lib	2016-07-11 21:46:16 -07:00
redmatrix	168d35747d	use the get_hostname function rather than parse the url	2016-07-11 18:59:54 -07:00
redmatrix	a01baab4f0	Merge branch 'dev' into perms	2016-07-11 17:45:10 -07:00
redmatrix	17c3e12eab	document the new change_channel hook	2016-07-11 17:43:10 -07:00
redmatrix	71b001fdb7	more perms work - notably the stuff in public_perms	2016-07-11 17:02:49 -07:00