self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-11-29 22:48:10 +02:00
Code Issues Releases Activity

Merge branch 'master' into search_engine_fts_fix

Browse Source
This commit is contained in:
Laurent Cozic
2019-01-19 18:08:45 +00:00
parent 299008688d 4e3896c108
commit a8a7b7c07b
3 changed files with 33 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ReactNativeClient/ios/Joplin/Info.plist
View File

@@ -26,6 +26,8 @@
<true/>
<key>NSAppTransportSecurity</key>
<dict>
<key>NSAllowsArbitraryLoads</key>
<true/>
<key>NSExceptionDomains</key>
<dict>
<key>localhost</key>

3
ReactNativeClient/lib/MdToHtml.js
View File

@@ -512,6 +512,9 @@ class MdToHtml {
return this.renderImageHtml_(before, src, after, options);
});
// To disable meta tags that would refresh the page - eg "<meta http-equiv="refresh" content="5; url=/">"
// https://github.com/laurent22/joplin/issues/769
renderedBody = renderedBody.replace(/<meta\s/, '&lt;meta ');
// https://necolas.github.io/normalize.css/
const normalizeCss = `