17216 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Andrew Manning	e0d9d30bcf	Merge remote-tracking branch 'upstream/dev' into wiki	2016-07-20 05:39:08 -04:00
redmatrix	9421e42dad	doc correction	2016-07-19 17:04:38 -07:00
redmatrix	f4b658d7b1	issue #411	2016-07-19 05:13:18 -07:00
redmatrix	269b3cef72	runaway cron emails	2016-07-18 22:33:26 -07:00
Mario Vavti	3beb94dc52	whitespace	2016-07-18 13:52:26 +02:00
Mario Vavti	4371e6ad97	resolve merge conflict	2016-07-18 13:50:32 +02:00
Mario Vavti	f44ca74e99	do not transform hashes to tags in [code=xxx] or [code] blocks	2016-07-18 13:48:09 +02:00
redmatrix	571b8cc85b	roll version	2016-07-17 19:57:19 -07:00
redmatrix	883fc5d753	update changelog	2016-07-17 19:56:32 -07:00
redmatrix	25b2a6e0cf	update changelog	2016-07-17 19:54:59 -07:00
redmatrix	4febdc3bcd	jquery update issue prevents comments from reloading and resetting watch cursor	2016-07-17 18:33:45 -07:00
redmatrix	c3617f5d1e	jquery update issue prevents comments from reloading and resetting watch cursor	2016-07-17 18:32:38 -07:00
redmatrix	fc78ba7c2f	change std_version	2016-07-17 16:38:21 -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	5d0ddb3123	booboo	2016-07-17 02:49:41 -07:00
Mario Vavti	f39d20ac97	some work on guest access token ui	2016-07-17 11:29:37 +02:00
Mario Vavti	f396b1bf73	check for variables after schema files have been added	2016-07-16 16:18:36 +02:00
Mario Vavti	e237dfc660	check for variables in schemes	2016-07-16 12:32:22 +02:00
Mario Vavti	641029ab18	hide/show mixup	2016-07-16 10:56:46 +02:00
Mario Vavti	065ef29de2	only use visibility for tabs	2016-07-16 10:52:06 +02:00
redmatrix	aac0fa2b5f	os_delete_prohibit	2016-07-16 01:02:41 -07:00
redmatrix	17edec8e4a	add new service class restriction to the doco	2016-07-15 21:59: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	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
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
redmatrix	00afe56cad	let abconfig specify a family	2016-07-13 20:17:40 -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