20121 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Mario Vavti	2f76d63835	Merge remote-tracking branch 'mike/master' into dev	2017-09-10 09:30:59 +02:00
Andrew Manning	754329097f	More content tab help removed in context help	2017-09-09 19:47:39 -04:00
Andrew Manning	c5950c0370	Update help.html	2017-09-09 19:45:42 -04:00
zotlabs	e2e7bee3cc	owa cleanup	2017-09-09 13:34:57 -07:00
Mario Vavti	edada2b786	Merge remote-tracking branch 'mike/master' into dev	2017-09-09 20:22:45 +02:00
Andrew Manning	ccc9cc8202	Added context help for apps and appman in English	2017-09-09 08:23:30 -04:00
zotlabs	84c86f01c8	owa: missed the set-observer stuff	2017-09-08 16:00:27 -07:00
Mario Vavti	9b542c5bcf	fix radius	2017-09-08 09:43:25 +02:00
Mario Vavti	108bb7649b	Merge remote-tracking branch 'mike/master' into dev	2017-09-08 09:22:36 +02:00
zotlabs	1104e2652f	improve the code block styling a wee bit	2017-09-07 21:29:32 -07:00
zotlabs	f2dc55244c	provide root discovery for owa	2017-09-07 20:42:03 -07:00
zotlabs	048a8c5f44	provide owa discovery	2017-09-07 19:04:35 -07:00
zotlabs	1fbb1e6c2a	initial testing success with owa	2017-09-07 18:52:18 -07:00
zotlabs	7e9162ef06	there's the problem	2017-09-07 18:19:49 -07:00
zotlabs	f09fe8da78	add logging	2017-09-07 18:14:04 -07:00
zotlabs	4d794103be	testing owa	2017-09-07 18:09:31 -07:00
zotlabs	61f339a874	owa - first commit	2017-09-07 17:56:02 -07:00
Mario Vavti	7b3aa92b5a	use $target_item[mid] to make item highlighting work with shortened mids	2017-09-07 23:35:36 +02:00
Mario Vavti	27e9b5618b	use thread parent hash only for like and dislike activity. in all other cases use item hash. this will catch more situations.	2017-09-07 23:20:40 +02:00
Mario Vavti	4d1f5c1752	do not double encode already encoded mids	2017-09-07 23:12:58 +02:00
zotlabs	23e774db8e	markdown code blocks not preserving line breaks, removed a bootstrap over-ride which fixes this, but also changed the style to pre-wrap to wrap the text rather than the default horizontal scroll	2017-09-07 13:19:13 -07:00
Mario Vavti	4190a40de8	typo	2017-09-07 11:35:24 +02:00
Mario Vavti	6143f49042	fix an issue where some encoded mids were not found in /display allthough they existed	2017-09-07 11:28:42 +02:00
Mario Vavti	607c414634	remove semicolon from update query - this is probably trivial	2017-09-07 10:14:34 +02:00
git-marijus	d65007b230	Merge pull request #852 from waitman/patch-1 ... fix bogus semicolon	2017-09-07 10:04:41 +02:00
zotlabs	41e0d5f664	use array_key_exists() instead of x() in this case as the latter fails on an array that's empty and we unconditionally need to encode the array even if empty	2017-09-06 20:07:53 -07:00
zotlabs	fa7a6203fb	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge	2017-09-06 19:59:33 -07:00
zotlabs	318643cf9a	mastodon wraps oembed in an iframe - which we immediately purify our of existence and what we really want to purify is the content. So strip away the iframe, fetch the content and purify that instead.	2017-09-06 19:55:32 -07:00
zotlabs	ab9b82e778	ignore diaspora_meta column on item import.	2017-09-06 16:44:10 -07:00
Waitman Gobble	fee65f0c69	fix bogus semicolon ... Line 655 should have comma instead of semicolon	2017-09-06 16:12:57 -05:00
Mario Vavti	643f515eaf	cards: remove double generic-content-wrapper and section title	2017-09-06 15:55:34 +02:00
Mario Vavti	0a7364d494	make cards likeable	2017-09-06 11:42:16 +02:00
zotlabs	2cce599fd7	check code rights on cloud files	2017-09-05 21:38:07 -07:00
zotlabs	7dc99cb4a4	typo	2017-09-05 18:56:25 -07:00
zotlabs	45eb61bcf0	provide sharing of cards	2017-09-05 18:32:37 -07:00
zotlabs	80400d7191	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge	2017-09-05 17:35:56 -07:00
zotlabs	6147f819ce	avoid a security patch and resultant compatibility issues; instead restrict the input characters we accept in token verification strings to hex digits. This will all be changing in the coming weeks/months anyway.	2017-09-05 17:12:31 -07:00
zotlabs	842a041a88	remove period from characters allowed in username, as this will mess up URL based content-type negotiation. It was previously disallowed but permitted a month or two ago after seeing Diaspora started allowing it. It's OK if they have it, but we can't; as many of our urls are based on username and theirs are primarily based on uid.	2017-09-05 16:38:55 -07:00
Mario Vavti	68a91ec3ea	32 characters are often not enough to distinguish gnu-social mids - use the entire mid. in /display if we are not dealing with posts (eg likes) provide the thr_parent mid as bParam_mid so we can still adress the right post in javascript	2017-09-05 23:18:02 +02:00
zotlabs	d58f965b9a	some more prep work for Zot VI - some of this will need to be undone or at least re-arranged later but we need to bootstrap a test environment.	2017-09-04 22:35:54 -07:00
zotlabs	83d0e48ebe	some preliminary work on Zot VI	2017-09-04 22:35:44 -07:00
zotlabs	ca58ef80ae	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge	2017-09-04 22:33:53 -07:00
zotlabs	05654e4980	card embed improved	2017-09-04 21:02:44 -07:00
Mario Vavti	c8000fca1f	Default Access Control List (ACL) -> Default Privacy Group and minor template fix	2017-09-04 20:48:26 +02:00
Mario Vavti	48547f5f9e	remove logging	2017-09-04 13:38:21 +02:00
Mario Vavti	b4f8136315	whitespace	2017-09-04 13:34:17 +02:00
Mario Vavti	06f1910ac0	fix the error reporting query in /display. we need item_deleted instead of item_flags and remove id = $item_hash from the query since we always provide the mid and never the id iirc	2017-09-04 13:28:49 +02:00
Mario Vavti	e4b0e31a28	remove hubzilla.nl from fallback directory servers	2017-09-04 10:14:27 +02:00
zotlabs	ba4f75ba19	also error if no security context	2017-09-03 23:58:52 -07:00
zotlabs	fc62f07a08	validate the security context	2017-09-03 23:50:18 -07:00