Merge branch 'hotfix-1.12.0a14' into devel
Add a selection to insert file without embedding it.
Fix id typo of editor_file.
Add a checkbox to determine whether to insert the file or subpage.
Persist last insert type of insert link and insert file dialog with pref.
Auto focus the field corresponding to current radio selection for attach link/file dialog window.
Adjust the code order.
Merge branch 'improve-attach-ui' into devel
Merge branch 'hotfix-1.12.0a15' into devel
Output latest HTML5 format.
Fix: fix potential exploits for items whose title has special chars.
Use more comprehensive coding style.
Remove ugly linebreaks.
Fix: heights of iframes are not set correctly on load.
Merge branch 'fix-combine-view' into devel
Revert "Add a pref to define whether to export folder items. (default false since inadequate import sequence can mess up the result)"

This reverts commit e409b523dd91f56dc7f7d34494879e0f859bb862.
Add "Export folder items" to the trade manager.
Merge branch 'move-export-folder-option' into adjust-trade
Do not change item data on export.
Add an option to update data format to latest ScrapBook X version on import.