Commit 9ee1f4b4 authored by Dennis Nienhüser's avatar Dennis Nienhüser
Browse files

Update for latest stable release

parent 20d4dc53
......@@ -154,7 +154,7 @@
<div class="clearfix visual"></div>
<h2>Version History</h2>
<table class="table table-hover table-condensed" style="width:40%;">
<tr>
......@@ -166,6 +166,8 @@
<td>04/16</td>
<td>08/16</td>
<td>12/16</td>
<td>04/17</td>
<td>08/17</td>
</tr>
<tr>
<th>Desktop</th>
......@@ -173,9 +175,11 @@
<td><span class="label label-default">1.11</span></td>
<td><span class="label label-default">1.12</span></td>
<td><span class="label label-default">1.13</span></td>
<td><span class="label label-success">1.14</span></td>
<td><span class="label label-info">2.0</span></td>
<td><span class="label label-info">2.1</span></td>
<td><span class="label label-default">1.14</span></td>
<td><span class="label label-default">2.0</span></td>
<td><span class="label label-default">2.1</span></td>
<td><span class="label label-success">2.2</span></td>
<td><span class="label label-info">2.3</span></td>
</tr>
<tr>
<th>Library</th>
......@@ -183,9 +187,11 @@
<td><span class="label label-default">0.21</span></td>
<td><span class="label label-default">0.22</span></td>
<td><span class="label label-default">0.23</span></td>
<td><span class="label label-success">0.24</span></td>
<td><span class="label label-info">0.25</span></td>
<td><span class="label label-info">0.26</span></td>
<td><span class="label label-default">0.24</span></td>
<td><span class="label label-default">0.25</span></td>
<td><span class="label label-default">0.26</span></td>
<td><span class="label label-success">0.27</span></td>
<td><span class="label label-info">0.27</span></td>
</tr>
<tr>
<th>KDE Applications</th>
......@@ -193,9 +199,11 @@
<td><span class="label label-default">15.04</span></td>
<td><span class="label label-default">15.08</span></td>
<td><span class="label label-default">15.12</span></td>
<td><span class="label label-success">16.04</span></td>
<td><span class="label label-info">16.08</span></td>
<td><span class="label label-info">16.12</span></td>
<td><span class="label label-default">16.04</span></td>
<td><span class="label label-default">16.08</span></td>
<td><span class="label label-default">16.12</span></td>
<td><span class="label label-success">17.04</span></td>
<td><span class="label label-info">17.08</span></td>
</tr>
</table>
......@@ -277,7 +285,7 @@
<span class="label label-default">old stable</span>
<span class="label label-success">stable</span>
<span class="label label-info">development</span>
<span class="label label-info">development</span>
</div> <!-- /container -->
......
......@@ -8,7 +8,7 @@
<div class="alert alert-info" style="margin: 5px 0; margin-bottom: 0px;">
<strong>Latest News</strong>
<ul>
<li>GSoC 2017 is coming up – Find <a href="https://community.kde.org/GSoC/2017/Ideas#Marble">your project</a> until March 20th!</li>
<li><a href="install.php">Marble 2.2 has been released</a> as part of <a href="https://www.kde.org/announcements/announce-applications-17.04.0.php">KDE Applications 17.04</a>!</li>
<li>A beautiful OpenStreetMap: Install <a href="https://play.google.com/store/apps/details?id=org.kde.marble.maps">Marble Maps</a> on your Android devices.</li>
</ul>
</div>
......
......@@ -15,7 +15,7 @@
</div>
<div class="col-md-8">
<div class="row">
Marble packages are available for all major Linux distributions. Please use the package manager of your distribution for installation.
Marble packages are released together with many other <a href="https://www.kde.org/applications/education/">KDE Applications</a> and packaged in all major Linux distributions. Please use the package manager of your distribution for installation.
<div class="clearfix visual"></div>
<div class="col-md-4">
Debian: <tt><a href="http://packages.debian.org/en/stable/marble">marble</a></tt>
......@@ -98,8 +98,8 @@ The original globe can be visited in the Germanisches Nationalmuseum (GNM) in Nu
<div class="col-md-8">
<p>Use this installer for Microsoft Windows. Download an installer for your architecture and execute it. The installer guides you through the installation process.</p>
<p>
<a href="https://files.kde.org/marble/downloads/windows/Marble-setup_1.14.1_x86.exe" class="btn btn-primary nav-btn">Marble 1.14.1 (Windows 32-bit)</a>
<a href="https://files.kde.org/marble/downloads/windows/Marble-setup_1.14.1_x64.exe" class="btn btn-primary nav-btn">Marble 1.14.1 (Windows 64-bit)</a>
<a href="https://files.kde.org/marble/downloads/windows/Marble-setup_2.2.0_x86.exe" class="btn btn-primary nav-btn">Marble 2.2.0 (Windows 32-bit)</a>
<a href="https://files.kde.org/marble/downloads/windows/Marble-setup_2.2.0_x64.exe" class="btn btn-primary nav-btn">Marble 2.2.0 (Windows 64-bit)</a>
</p>
<p><a href="http://windows.microsoft.com/en-us/windows7/find-out-32-or-64-bit" target="_blank">Is my PC running the 32-bit or 64-bit version of Windows?</a></p>
<p class="text-warning">Requires Windows Vista or newer. Please build Marble yourself to run on ancient Windows versions like Windows XP.</p>
......
......@@ -35,15 +35,15 @@ function adjustRun() {
<label class="btn btn-default btn-sm active" onClick='store("repo", "git://anongit.kde.org/marble"); adjustClone()'><input type="radio">anonymous</input></label>
<label class="btn btn-default btn-sm" onClick='store("repo", "git@git.kde.org:marble"); adjustClone()'><input type="radio">KDE developer</input></label>
</div> access and choose the initial branch to be <div class="btn-group" data-toggle="buttons">
<label class="btn btn-default btn-sm active" onClick='store("branch", "-b Applications/16.12 "); adjustClone()'><input type="radio">stable</input></label>
<label class="btn btn-default btn-sm active" onClick='store("branch", "-b Applications/17.04 "); adjustClone()'><input type="radio">stable</input></label>
<label class="btn btn-default btn-sm" onClick='store("branch", ""); adjustClone()'><input type="radio">development</input></label>
</div>. <button type="button" class="btn btn-info btn-sm pull-right" data-toggle="collapse" data-target="#demo" style="margin-left:50px;">
Help me choose the right branch...
</button>
<input type="hidden" id="repo" value="git://anongit.kde.org/marble" />
<input type="hidden" id="branch" value="-b Applications/16.12 " />
<pre style="margin-top:10px;" id="clone">git clone -b Applications/16.12 git://anongit.kde.org/marble ~/marble/sources</pre>
<input type="hidden" id="branch" value="-b Applications/17.04 " />
<pre style="margin-top:10px;" id="clone">git clone -b Applications/17.04 git://anongit.kde.org/marble ~/marble/sources</pre>
<p>You can clone the sources to any directory on your system. If you have no preferences, choose <tt>~/marble/sources</tt> as that is the directory we will use below.</p>
......@@ -64,7 +64,7 @@ function adjustRun() {
<p>Marble follows the common KDE release schedule. New features are developed in and merged to the master branch until the soft (hard) feature freeze. Afterwards a stabilizing period in master follows during which no new features and similar changes are committed to master. At the time of the first release candidate <tt>RC1</tt> a new <tt>Applications/year.month</tt> branch is created from the current master branch. Afterwards the master branch is open for development again. The <tt>Applications/year.month</tt> are stable branches that never receive new features.</p>
<img src="img/dev/release-branches.png" />
<p>Don't worry too much about branches though! Thanks to git switching between branches is as easy as running e.g. <code>git checkout -b Applications/16.12 origin/Applications/16.12</code> and requires no Internet connection. No need to clone the repository again if you got the inital branch wrong above, just switch to it later.</p>
<p>Don't worry too much about branches though! Thanks to git switching between branches is as easy as running e.g. <code>git checkout -b Applications/17.04 origin/Applications/17.04</code> and requires no Internet connection. No need to clone the repository again if you got the inital branch wrong above, just switch to it later.</p>
</div>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment