harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
24,488 Commits 6 Branches 36 Tags
ca8d252ad75306e6d3cd066d5c593e94de1dfbdd
Commit Graph

24488 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
zotlabs 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. 2017-09-13 19:20:16 -07:00
Sergey Lukin d5bd5cda97 hubzilla issue #858: Fix: Shortcut icon is not dysplayed when Admin or Channel Manager panels are opened 2017-09-14 07:19:56 +10:00
Mario Vavti 29b0ed87d6 Merge remote-tracking branch 'mike/master' into dev 2017-09-13 10:30:08 +02:00
zotlabs 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 2017-09-12 23:25:19 -07:00
zotlabs 796228b7ad wiki mimetype selection. We can add text/plain as soon as we add code to purify and render it specifically. 2017-09-12 23:15:30 -07:00
zotlabs 7489a4442e wiki mimetype 2017-09-12 22:35:30 -07:00
zotlabs 5e99295bf6 wiki mimetype selection 2017-09-12 22:32:31 -07:00
zotlabs 4ff89a5862 drop salmon until we improve performance 2017-09-12 20:24:57 -07:00
Mario Vavti 87ca60b0b1 rename activity notifications links - one more 2017-09-12 21:38:36 +02:00
Mario Vavti 525d554a35 rename activity notifications links 2017-09-12 21:34:14 +02:00
Sergey Lukin 4c121aff30 hubzilla issue #855: fix for some problems with displaying selected theme after panel Settings->Display loading 2017-09-12 21:28:40 +02:00
git-marijus d77872de50 Merge pull request #856 from subrealist/displaying_selected_theme 
hubzilla issue #855: fix for some problems with displaying selected theme
 2017-09-12 21:17:59 +02:00
Sergey Lukin 91ed3b357d hubzilla issue #855: fix for some problems with displaying selected theme after panel Settings->Display loading 2017-09-13 04:00:59 +10:00
zotlabs d4e53bb86f typo in ldsigs 2017-09-11 18:56:17 -07:00
zotlabs 471449f539 regex was still broken 2017-09-10 22:59:26 -07:00
zotlabs 187fc9a51b fix regex 2017-09-10 17:40:40 -07:00
zotlabs 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. 2017-09-10 16:10:56 -07:00
zotlabs 20ae69ab7b Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge 2017-09-10 15:56:37 -07:00
Mario Vavti 67024c023a Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev 2017-09-10 09:50:52 +02:00
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 5877e28d72 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge 2017-09-06 19:59:07 -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