Merge lp:~midori/midori/release0.5.7 into lp:midori

Proposed by Cris Dywan
Status: Merged
Approved by: Paweł Forysiuk
Approved revision: 6540
Merged at revision: 6540
Proposed branch: lp:~midori/midori/release0.5.7
Merge into: lp:midori
Diff against target: 137 lines (+52/-9)
5 files modified
CMakeLists.txt (+1/-1)
ChangeLog (+25/-0)
HACKING (+1/-1)
data/faq.html (+24/-6)
win32/makedist/midori.nsi (+1/-1)
To merge this branch: bzr merge lp:~midori/midori/release0.5.7
Reviewer Review Type Date Requested Status
Paweł Forysiuk Approve
Review via email: mp+201832@code.launchpad.net

Commit message

Bump version to 0.5.7

To post a comment you must log in.
Revision history for this message
Paweł Forysiuk (tuxator) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2013-11-28 17:46:14 +0000
3+++ CMakeLists.txt 2014-01-15 19:16:13 +0000
4@@ -11,7 +11,7 @@
5 add_definitions("-DPACKAGE_NAME=\"${CMAKE_PROJECT_NAME}\"")
6 add_definitions("-DPACKAGE_BUGREPORT=\"https://bugs.launchpad.net/midori\"")
7
8-set(VERSION 0.5.6)
9+set(VERSION 0.5.7)
10 add_definitions("-DMIDORI_VERSION_SUFFIX=\"${VERSION}\"")
11
12 string(REPLACE "." ";" VERSION_LIST ${VERSION})
13
14=== modified file 'ChangeLog'
15--- ChangeLog 2013-11-20 00:13:00 +0000
16+++ ChangeLog 2014-01-15 19:16:13 +0000
17@@ -1,5 +1,30 @@
18 This file is licensed under the terms of the expat license, see the file EXPAT.
19
20+v0.5.7:
21+ Modify actions and internal items in browser without changing settings
22+ Delay tab loading after Midori crashed
23+ Uncomment failing assertions about view_source in tab test
24+ Fallback to about:home if startup is anything but blank
25+ Don't try to create formhistory database if config_dir is NULL
26+ Handle url arguments for blank sessions
27+ Execute commands given at start time
28+ Introduce high-level prepare/ DatabaseStatement API
29+ Drop unused GraniteClutter-based animation support
30+ Drop uncommented contractor support
31+ Drop deprecated StaticNotebook used in KatzePreferences
32+ Introduce notebook class converging separate implementations
33+ Work around symbol relocation issue old version of gcc present on Ubuntu LTS
34+ NULL-check treeview in midori_search_action_get_editor
35+ Adjust CMakeList .ico check to not skip nojs icons
36+ Enable sidepanel in private mode
37+ Move Preferences menu entry above About
38+ Set minimum value of 0 on spin button for maximum cache size
39+ Give NextForward its own label for toolbar editor
40+ Correctly disable favicon database in app and private mode
41+ Change preferences to refer to proxy address as a "URI" (not "hostname")
42+ Add close tabs to right feature
43+ Allow printing without confirmation dialog on kiosk setups
44+
45 v0.5.6:
46 instead of creating devpet status icon on extension load, create it only to show new messages
47 Open speed dial or homepage according to preference
48
49=== modified file 'HACKING'
50--- HACKING 2013-11-20 00:13:00 +0000
51+++ HACKING 2014-01-15 19:16:13 +0000
52@@ -22,7 +22,7 @@
53 * https://www.bountysource.com/#trackers/130181-midori Add a bounty for a feature or bug you'd like to support
54 * https://translations.launchpad.net/midori/trunk/+pots/trunk Translate to your own language
55 * https://github.com/eustasy/midori-browser.org/issues Report website bugs
56- * Write tutorial your own extension - granted that's code, too, but maybe a little easier than hacking the core.
57+ * Write http://wiki.xfce.org/midori/tutorial your own extension - granted that's code, too, but maybe a little easier than hacking the core.
58 ====== Build the code ======
59
60 mkdir _build
61
62=== modified file 'data/faq.html'
63--- data/faq.html 2013-11-19 23:41:59 +0000
64+++ data/faq.html 2014-01-15 19:16:13 +0000
65@@ -5,20 +5,20 @@
66 <title>midori:faq</title>
67 <meta name="generator" content="DokuWiki"/>
68 <meta name="robots" content="index,follow"/>
69-<meta name="date" content="2013-10-18T05:46:11+0200"/>
70+<meta name="date" content="2013-12-20T22:56:39+0100"/>
71 <meta name="keywords" content="midori,faq"/>
72 <link rel="search" type="application/opensearchdescription+xml" href="/lib/exe/opensearch.php" title="Xfce Wiki"/>
73 <link rel="start" href="/"/>
74 <link rel="contents" href="/midori/faq?do=index" title="Sitemap"/>
75-<link rel="alternate" type="application/rss+xml" title="Recent Changes" href="/feed.php"/>
76-<link rel="alternate" type="application/rss+xml" title="Current Namespace" href="/feed.php?mode=list&amp;ns=midori"/>
77+<link rel="alternate" type="application/rss+xml" title="Recent changes" href="/feed.php"/>
78+<link rel="alternate" type="application/rss+xml" title="Current namespace" href="/feed.php?mode=list&amp;ns=midori"/>
79 <link rel="alternate" type="text/html" title="Plain HTML" href="/_export/xhtml/midori/faq"/>
80 <link rel="alternate" type="text/plain" title="Wiki Markup" href="/_export/raw/midori/faq"/>
81 <link rel="canonical" href="http://wiki.xfce.org/midori/faq"/>
82 <link rel="stylesheet" href="faq.css" />
83 <script type="text/javascript">/*<![CDATA[*/var NS='midori';var JSINFO = {"id":"midori:faq","namespace":"midori"};
84 /*!]]>*/</script>
85-<script type="text/javascript" charset="utf-8" src="/lib/exe/js.php?tseed=1371413028"></script>
86+<script type="text/javascript" charset="utf-8" src="/lib/exe/js.php?tseed=34912f2e1a4daa1bfa9afb3096df0197"></script>
87 </head>
88 <body>
89 <div class="dokuwiki export">
90@@ -1132,7 +1132,25 @@
91 <span class="br0">&#125;</span></pre>
92
93 </div>
94-<!-- EDIT20 SECTION "User styles" [24518-26759] -->
95+
96+<h4 id="tweaking_fonts_via_css">Tweaking fonts via CSS</h4>
97+<div class="level4">
98+
99+<p>
100+If changing system-wide font settings isn&#039;t bringing the desired results or rendering should be tweaked only for websites <abbr title="Cascading Style Sheets">CSS</abbr> can be an alternative. Add the following to <strong>~/.local/share/midori/styles</strong>, then restart Midori and make sure that it is enabled Tools → Userstyles.
101+</p>
102+
103+<p>
104+Customize as needed:
105+</p>
106+<pre class="code css"><span class="sy0">*</span> <span class="br0">&#123;</span>
107+ font-smooth<span class="sy0">:</span><span class="kw2">always</span><span class="sy0">;</span>
108+ -webkit-font-smoothing<span class="sy0">:</span> antialiased<span class="sy0">;</span>
109+ text-rendering<span class="sy0">:</span> optimizeLegibility
110+<span class="br0">&#125;</span></pre>
111+
112+</div>
113+<!-- EDIT20 SECTION "User styles" [24518-27222] -->
114 <h2 class="sectionedit21" id="understanding_webkit_version_numbers">Understanding WebKit Version Numbers</h2>
115 <div class="level2">
116
117@@ -1170,6 +1188,6 @@
118 </p>
119
120 </div>
121-<!-- EDIT21 SECTION "Understanding WebKit Version Numbers" [26760-] --></div>
122+<!-- EDIT21 SECTION "Understanding WebKit Version Numbers" [27223-] --></div>
123 </body>
124 </html>
125
126=== modified file 'win32/makedist/midori.nsi'
127--- win32/makedist/midori.nsi 2014-01-15 00:42:08 +0000
128+++ win32/makedist/midori.nsi 2014-01-15 19:16:13 +0000
129@@ -21,7 +21,7 @@
130 ; helper defines ;
131 ;;;;;;;;;;;;;;;;;;;
132 !define PRODUCT_NAME "Midori"
133-!define PRODUCT_VERSION "0.5.6"
134+!define PRODUCT_VERSION "0.5.7"
135 !define PRODUCT_BUILD "0"
136 !define PRODUCT_VERSION_ID "${PRODUCT_VERSION}.${PRODUCT_BUILD}"
137 !define PRODUCT_PUBLISHER "Christian Dywan"

Subscribers

People subscribed via source and target branches

to all changes: