Skip to content

Commit

Permalink
Merge branch 'release/0.6.0' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
ilyvion committed Mar 8, 2019
2 parents 1ce748f + fd3fcdf commit b0977fb
Show file tree
Hide file tree
Showing 7 changed files with 56 additions and 2 deletions.
5 changes: 5 additions & 0 deletions assets/js/modules/angular/directives/qcSettingsDirective.js
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,11 @@ export class SettingsController {
close() {
($('#settingsDialog'): any).modal('hide');
}

showChangeLog() {
this.close();
($('#changeLogDialog'): any).modal('show');
}
}
SettingsController.$inject = [
'$scope', '$log', 'comicService'
Expand Down
4 changes: 4 additions & 0 deletions assets/sass/_common.scss
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,10 @@ a {
padding-right: 10px;
}

.p-r-20px {
padding-right: 20px;
}

.m-t-3px {
margin-top: 3px;
}
Expand Down
15 changes: 15 additions & 0 deletions assets/sass/directives/_change-log.scss
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,18 @@
}
}
}

.change-log-entry {
padding-left: 2em;
border-left: 1px dashed #8E979F;

p.developer-message {
border-left: 5px solid #8E979F;
padding: 20px;
background-color: #697683;

a {
color: #8E979F;
}
}
}
29 changes: 29 additions & 0 deletions assets/templates/changeLog.html
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,35 @@ <h4>NextVersion <small>NextDate</small></h4>
</ul>
-->

<h4>0.6.0 <small>March 7, 2019</small></h4>
<div class="change-log-entry">
<p class="developer-message">
This release, like the previous one, has been mostly about code quality and features for editors and me,
the developer. I'm hoping that I can now start putting in more features for the end-user as we move
towards version 0.7. If you have ideas for new features, or you have any problems with the extension
as it is, don't hesitate to
<a href="https://github.com/Questionable-Content-Extensions/client/issues">tell us about them</a>!
While I have quite a lot of ideas left to implement, I'd also love to implement ideas that aren't just
my own.
</p>
<h5>New features</h5>
<ul>
<li>If a comic takes too long to load, show a loading indicator. What's considered "too long" is configurable in the settings dialog</li>
<li>You can now open this change log at any time from the settings dialog, not just when a new version is out</li>
</ul>
<h5>Changes/fixes</h5>
<ul>
<li>Random comic navigation now respects exclusion settings</li>
</ul>
<h5>Editor features</h5>
<ul>
<li>Add support for the new item image system and for image uploading. This allows uploading images directly in the browser (was previously a tedious server-only job), and also allows for multiple images per item</li>
<li>Add edit log view. The server keeps track of all changes editors make, this view lets you see that log</li>
<li>Add flags for indicating whether a comic is lacking certain features, such as marking a comic as not having characters. Currently only used by the "comic missing X" feature so it doesn't indicate a comic having an error where missing X isn't erroneous</li>
<li>Ensure there are updating/loading indicators when changes are made, so it's clear that something's happening and that you don't accidentally do multiple potentially conflicting things</li>
</ul>
</div>

<h4>0.5.3 <small>March 1, 2019</small></h4>
<ul>
<li>Switch to using the new API server (only minor improvements client side for this version, but lays the groundwork for quicker and better improvements going forward)</li>
Expand Down
1 change: 1 addition & 0 deletions assets/templates/settings.html
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@ <h3 class="panel-title">Advanced settings</h3>
</div>
</div>
<div class="modal-footer">
<a class="qc p-r-20px" ng-click="svm.showChangeLog()">See change log</a>
<button class="btn btn-primary" type="button" ng-click="svm.close()">Close</button>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "questionable-content-spa",
"version": "0.5.3",
"version": "0.6.0",
"description": "Questionable Content Single-Page Application with Extra Features",
"main": "app.js",
"scripts": {
Expand Down

0 comments on commit b0977fb

Please sign in to comment.