mirror of
https://github.com/sissbruecker/linkding.git
synced 2026-03-10 11:53:12 +08:00
Compare commits
5 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
83ccf5279f | ||
|
|
3bab7db023 | ||
|
|
b6b7d3f662 | ||
|
|
9c51487d3b | ||
|
|
c61e8ee2cd |
11
CHANGELOG.md
11
CHANGELOG.md
@@ -1,5 +1,16 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
|
## v1.3.0 (14/02/2021)
|
||||||
|
- [**closed**] Novice help. [#71](https://github.com/sissbruecker/linkding/issues/71)
|
||||||
|
- [**closed**] Option to create bookmarks public [#70](https://github.com/sissbruecker/linkding/issues/70)
|
||||||
|
- [**enhancement**] Show URL if title is not available [#64](https://github.com/sissbruecker/linkding/issues/64)
|
||||||
|
- [**bug**] minor ui nitpicks [#62](https://github.com/sissbruecker/linkding/issues/62)
|
||||||
|
- [**enhancement**] add an archive function [#46](https://github.com/sissbruecker/linkding/issues/46)
|
||||||
|
- [**closed**] remove non fqdn check and alert [#36](https://github.com/sissbruecker/linkding/issues/36)
|
||||||
|
- [**closed**] Add Lotus Notes links [#22](https://github.com/sissbruecker/linkding/issues/22)
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
## v1.2.1 (12/01/2021)
|
## v1.2.1 (12/01/2021)
|
||||||
- [**bug**] Bug: Two equal tags with different capitalisation lead to 500 server errors [#65](https://github.com/sissbruecker/linkding/issues/65)
|
- [**bug**] Bug: Two equal tags with different capitalisation lead to 500 server errors [#65](https://github.com/sissbruecker/linkding/issues/65)
|
||||||
- [**closed**] Enhancement: category and pagination [#11](https://github.com/sissbruecker/linkding/issues/11)
|
- [**closed**] Enhancement: category and pagination [#11](https://github.com/sissbruecker/linkding/issues/11)
|
||||||
|
|||||||
@@ -56,6 +56,13 @@ ul.bookmark-list {
|
|||||||
color: darken($gray-color, 10%);
|
color: darken($gray-color, 10%);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.actions .btn-link.bm-remove-confirm {
|
||||||
|
color: $error-color;
|
||||||
|
&:hover {
|
||||||
|
text-decoration: underline;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.bookmark-pagination {
|
.bookmark-pagination {
|
||||||
|
|||||||
@@ -32,8 +32,7 @@
|
|||||||
class="btn btn-link btn-sm">Archive</a>
|
class="btn btn-link btn-sm">Archive</a>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
<a href="{% url 'bookmarks:remove' bookmark.id %}?return_url={{ return_url }}"
|
<a href="{% url 'bookmarks:remove' bookmark.id %}?return_url={{ return_url }}"
|
||||||
class="btn btn-link btn-sm"
|
class="btn btn-link btn-sm bm-remove">Remove</a>
|
||||||
onclick="return confirm('Do you really want to delete this bookmark?')">Remove</a>
|
|
||||||
</div>
|
</div>
|
||||||
</li>
|
</li>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
@@ -42,3 +41,38 @@
|
|||||||
<div class="bookmark-pagination">
|
<div class="bookmark-pagination">
|
||||||
{% pagination bookmarks %}
|
{% pagination bookmarks %}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
{# Enhance delete links to show inline confirmation #}
|
||||||
|
<script type="application/javascript">
|
||||||
|
window.addEventListener("load", function () {
|
||||||
|
const linkEls = document.querySelectorAll('.bookmark-list a.bm-remove');
|
||||||
|
|
||||||
|
function showConfirmation(linkEl) {
|
||||||
|
const cancelEl = document.createElement('span');
|
||||||
|
cancelEl.innerText = 'Cancel';
|
||||||
|
cancelEl.className = 'btn btn-link btn-sm bm-remove-confirm mr-1';
|
||||||
|
cancelEl.addEventListener('click', function() {
|
||||||
|
container.remove();
|
||||||
|
linkEl.style = '';
|
||||||
|
});
|
||||||
|
|
||||||
|
const confirmEl = document.createElement('a');
|
||||||
|
confirmEl.innerText = 'Confirm';
|
||||||
|
confirmEl.className = 'btn btn-link btn-delete btn-sm bm-remove-confirm';
|
||||||
|
confirmEl.href = linkEl.href;
|
||||||
|
|
||||||
|
const container = document.createElement('span');
|
||||||
|
container.appendChild(cancelEl);
|
||||||
|
container.appendChild(confirmEl);
|
||||||
|
linkEl.parentElement.appendChild(container);
|
||||||
|
linkEl.style = 'display: none';
|
||||||
|
}
|
||||||
|
|
||||||
|
linkEls.forEach(function (linkEl) {
|
||||||
|
linkEl.addEventListener('click', function (e) {
|
||||||
|
e.preventDefault();
|
||||||
|
showConfirmation(linkEl);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
||||||
|
</script>
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "linkding",
|
"name": "linkding",
|
||||||
"version": "1.3.0",
|
"version": "1.3.1",
|
||||||
"description": "",
|
"description": "",
|
||||||
"main": "index.js",
|
"main": "index.js",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
1.3.0
|
1.3.1
|
||||||
Reference in New Issue
Block a user