Commit Graph

  • 6734854776 typocheck zotlabs 2017-09-14 18:50:43 -07:00
  • 1c0ece8411 provide a hook for importing a channel photo at channel creation time zotlabs 2017-09-14 18:48:55 -07:00
  • cf120b2351 wiki: lock mimetype zotlabs 2017-09-14 17:14:50 -07:00
  • 6481722fd9 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge zotlabs 2017-09-14 15:02:36 -07:00
  • b1876ac14f Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge zotlabs 2017-09-14 15:02:18 -07:00
  • d7ec6865b4 bring back wiki download zotlabs 2017-09-14 04:06:09 -07:00
  • 46b6415f5f wiki: do not suggest bbcode if mimetype is text/plain Mario Vavti 2017-09-14 10:44:16 +02:00
  • 5aa0fe2bf0 use the hubzilla icons Mario Vavti 2017-09-14 10:33:16 +02:00
  • f43f38c054 hubzilla issue #858: Fix: Shortcut icon is not dysplayed when Admin or Channel Manager panels are opened Sergey Lukin 2017-09-14 07:19:56 +10:00
  • 235ba81f25 Merge pull request #859 from subrealist/short_icon_admin_fix git-marijus 2017-09-14 10:00:47 +02:00
  • 55aaabc2f1 add text/plain type to wiki zotlabs 2017-09-13 22:37:18 -07:00
  • 5be132f877 make wiki page mimetype default to wiki mimetype (this was the original intent but the wrong variable was used) zotlabs 2017-09-13 21:36:59 -07:00
  • b5966041be more zot6 zotlabs 2017-09-13 20:40:01 -07:00
  • 62d6bada4c Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge zotlabs 2017-09-13 19:26:33 -07:00
  • e8e61c83d5 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge zotlabs 2017-09-13 19:26:07 -07:00
  • 13788af908 Zot6: some things that need to be done ahead of time so we can turbocharge the delivery engine and split off site records from channel records. zotlabs 2017-09-13 19:20:16 -07:00
  • d5bd5cda97 hubzilla issue #858: Fix: Shortcut icon is not dysplayed when Admin or Channel Manager panels are opened Sergey Lukin 2017-09-14 07:19:56 +10:00
  • 29b0ed87d6 Merge remote-tracking branch 'mike/master' into dev Mario Vavti 2017-09-13 10:30:08 +02:00
  • 0e6d84e207 add option to mimetype selector so you can change the element name in case you end up with two of these suckers on the same page zotlabs 2017-09-12 23:25:19 -07:00
  • 796228b7ad wiki mimetype selection. We can add text/plain as soon as we add code to purify and render it specifically. zotlabs 2017-09-12 23:15:30 -07:00
  • 7489a4442e wiki mimetype zotlabs 2017-09-12 22:35:30 -07:00
  • 5e99295bf6 wiki mimetype selection zotlabs 2017-09-12 22:32:31 -07:00
  • 4ff89a5862 drop salmon until we improve performance zotlabs 2017-09-12 20:24:57 -07:00
  • 87ca60b0b1 rename activity notifications links - one more Mario Vavti 2017-09-12 21:38:36 +02:00
  • 525d554a35 rename activity notifications links Mario Vavti 2017-09-12 21:34:14 +02:00
  • 4c121aff30 hubzilla issue #855: fix for some problems with displaying selected theme after panel Settings->Display loading Sergey Lukin 2017-09-13 04:00:59 +10:00
  • d77872de50 Merge pull request #856 from subrealist/displaying_selected_theme git-marijus 2017-09-12 21:17:59 +02:00
  • 91ed3b357d hubzilla issue #855: fix for some problems with displaying selected theme after panel Settings->Display loading Sergey Lukin 2017-09-13 04:00:59 +10:00
  • d4e53bb86f typo in ldsigs zotlabs 2017-09-11 18:56:17 -07:00
  • 471449f539 regex was still broken zotlabs 2017-09-10 22:59:26 -07:00
  • 187fc9a51b fix regex zotlabs 2017-09-10 17:40:40 -07:00
  • abbf245d14 remove item_thread_top from simple_update query - we're already fetching distinct(parent) and this prevented comments from displaying after submission when remote-authed. zotlabs 2017-09-10 16:10:56 -07:00
  • 20ae69ab7b Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge zotlabs 2017-09-10 15:56:37 -07:00
  • 67024c023a Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev Mario Vavti 2017-09-10 09:50:52 +02:00
  • 2f76d63835 Merge remote-tracking branch 'mike/master' into dev Mario Vavti 2017-09-10 09:30:59 +02:00
  • 754329097f More content tab help removed in context help Andrew Manning 2017-09-09 19:47:39 -04:00
  • c5950c0370 Update help.html Andrew Manning 2017-09-09 19:45:42 -04:00
  • e2e7bee3cc owa cleanup zotlabs 2017-09-09 13:34:57 -07:00
  • edada2b786 Merge remote-tracking branch 'mike/master' into dev Mario Vavti 2017-09-09 20:22:45 +02:00
  • ccc9cc8202 Added context help for apps and appman in English Andrew Manning 2017-09-09 08:23:30 -04:00
  • 84c86f01c8 owa: missed the set-observer stuff zotlabs 2017-09-08 16:00:27 -07:00
  • 9b542c5bcf fix radius Mario Vavti 2017-09-08 09:43:25 +02:00
  • 108bb7649b Merge remote-tracking branch 'mike/master' into dev Mario Vavti 2017-09-08 09:22:36 +02:00
  • 1104e2652f improve the code block styling a wee bit zotlabs 2017-09-07 21:29:32 -07:00
  • f2dc55244c provide root discovery for owa zotlabs 2017-09-07 20:42:03 -07:00
  • 048a8c5f44 provide owa discovery zotlabs 2017-09-07 19:04:35 -07:00
  • 1fbb1e6c2a initial testing success with owa zotlabs 2017-09-07 18:52:18 -07:00
  • 7e9162ef06 there's the problem zotlabs 2017-09-07 18:19:49 -07:00
  • f09fe8da78 add logging zotlabs 2017-09-07 18:14:04 -07:00
  • 4d794103be testing owa zotlabs 2017-09-07 18:09:31 -07:00
  • 61f339a874 owa - first commit zotlabs 2017-09-07 17:56:02 -07:00
  • 7b3aa92b5a use $target_item[mid] to make item highlighting work with shortened mids Mario Vavti 2017-09-07 23:35:36 +02:00
  • 27e9b5618b use thread parent hash only for like and dislike activity. in all other cases use item hash. this will catch more situations. Mario Vavti 2017-09-07 23:20:40 +02:00
  • 4d1f5c1752 do not double encode already encoded mids Mario Vavti 2017-09-07 23:12:58 +02:00
  • 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 zotlabs 2017-09-07 13:19:13 -07:00
  • 4190a40de8 typo Mario Vavti 2017-09-07 11:35:24 +02:00
  • 6143f49042 fix an issue where some encoded mids were not found in /display allthough they existed Mario Vavti 2017-09-07 11:28:42 +02:00
  • 607c414634 remove semicolon from update query - this is probably trivial Mario Vavti 2017-09-07 10:14:34 +02:00
  • d65007b230 Merge pull request #852 from waitman/patch-1 git-marijus 2017-09-07 10:04:41 +02:00
  • 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 zotlabs 2017-09-06 20:07:53 -07:00
  • fa7a6203fb Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge zotlabs 2017-09-06 19:59:33 -07:00
  • 5877e28d72 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge zotlabs 2017-09-06 19:59:07 -07:00
  • 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. zotlabs 2017-09-06 19:55:32 -07:00
  • ab9b82e778 ignore diaspora_meta column on item import. zotlabs 2017-09-06 16:44:10 -07:00
  • fee65f0c69 fix bogus semicolon Waitman Gobble 2017-09-06 16:12:57 -05:00
  • 643f515eaf cards: remove double generic-content-wrapper and section title Mario Vavti 2017-09-06 15:55:34 +02:00
  • 1305584d77 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. zotlabs 2017-09-05 17:12:31 -07:00
  • 0a7364d494 make cards likeable Mario Vavti 2017-09-06 11:42:16 +02:00
  • 2cce599fd7 check code rights on cloud files zotlabs 2017-09-05 21:38:07 -07:00
  • 7dc99cb4a4 typo zotlabs 2017-09-05 18:56:25 -07:00
  • 45eb61bcf0 provide sharing of cards zotlabs 2017-09-05 18:32:37 -07:00
  • 80400d7191 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge zotlabs 2017-09-05 17:35:56 -07:00
  • 9ca7cc565b Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge zotlabs 2017-09-05 17:35:44 -07:00
  • 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. zotlabs 2017-09-05 17:12:31 -07:00
  • 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. zotlabs 2017-09-05 16:38:55 -07:00
  • 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 Mario Vavti 2017-09-05 23:18:02 +02:00
  • 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. zotlabs 2017-09-04 22:30:55 -07:00
  • 83d0e48ebe some preliminary work on Zot VI zotlabs 2017-09-04 21:49:44 -07:00
  • ca58ef80ae Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge zotlabs 2017-09-04 22:33:53 -07:00
  • 0956dcadd3 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. zotlabs 2017-09-04 22:30:55 -07:00
  • 304c393f38 some preliminary work on Zot VI zotlabs 2017-09-04 21:49:44 -07:00
  • 05654e4980 card embed improved zotlabs 2017-09-04 21:02:44 -07:00
  • c8000fca1f Default Access Control List (ACL) -> Default Privacy Group and minor template fix Mario Vavti 2017-09-04 20:48:26 +02:00
  • 48547f5f9e remove logging Mario Vavti 2017-09-04 13:38:21 +02:00
  • b4f8136315 whitespace Mario Vavti 2017-09-04 13:34:17 +02:00
  • 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 Mario Vavti 2017-09-04 13:28:49 +02:00
  • 03b31932d1 remove hubzilla.nl from fallback directory servers Mario Vavti 2017-09-04 10:14:27 +02:00
  • e4b0e31a28 remove hubzilla.nl from fallback directory servers Mario Vavti 2017-09-04 10:14:27 +02:00
  • ba4f75ba19 also error if no security context zotlabs 2017-09-03 23:58:52 -07:00
  • fc62f07a08 validate the security context zotlabs 2017-09-03 23:50:18 -07:00
  • 3d0a7f4fc5 paths in xchan_addr no longer means RSS specifically but could be activitypub zotlabs 2017-09-03 22:09:16 -07:00
  • 47ef41695a sign zot-info packets with httpsignatures zotlabs 2017-09-03 19:56:13 -07:00
  • 4adf2caaa6 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge zotlabs 2017-09-03 17:17:20 -07:00
  • db82d303e2 only validate headers that aren't "spoofable", which will be somewhat implementation dependent. zotlabs 2017-09-03 17:12:42 -07:00
  • 0fac35686b Merge remote-tracking branch 'mike/master' into dev Mario Vavti 2017-09-03 21:49:01 +02:00
  • 5ae2d15dc0 this fixes an issue where in /channel/membername?mid=some_mid updates did not work when static updates were enabled. since in the current situation we always get a top-level-post mid, item_thread_top = 0 in the query will never return a result. change it to item_thread_top = 1 Mario Vavti 2017-09-03 21:41:47 +02:00
  • dc18440c18 introduce item_normal_update(). the differnce to item_normal() is that we do not query for item_deleted = 0 and therefor can find deleted likes which allows us to update our unlikes on the fly if static page update is enabled Mario Vavti 2017-09-03 21:33:07 +02:00
  • 499b7de0d2 Reviewed. This is OK. Revert "may be exploitable in current form - awaiting review" zotlabs 2017-09-03 00:59:51 -07:00
  • 1a0cf2666a Merge remote-tracking branch 'mike/master' into dev Mario Vavti 2017-09-02 23:52:31 +02:00
  • 7bff60edac may be exploitable in current form - awaiting review zotlabs 2017-09-02 14:04:37 -07:00