summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.md43
-rw-r--r--CONTRIBUTING.md4
-rw-r--r--config.mk2
-rw-r--r--options.c2
4 files changed, 47 insertions, 4 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 96cad92..c387650 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,13 +1,54 @@
nsxiv
-----
-**[git](https://github.com/nsxiv/nsxiv.git)**
+**[git](https://codeberg.org/nsxiv/nsxiv.git)**
Changes will only be documented on stable releases. If you're on git/master then
there may be more changes. Please use `git log` to view them.
- - -
+***SPECIAL NOTE***: Due to [this incident](https://codeberg.org/nsxiv/nsxiv-tmp/issues/1)
+we have moved development over to [codeberg](https://codeberg.org/nsxiv/nsxiv).
+A lot of the references below may now be 404 or you may notice some users
+talking to themselves.
+
+Any threads which survived the wipe have been migrated over to codeberg and can
+be reached via `https://codeberg.org/nsxiv/nsxiv/pulls/ID`.
+
+- - -
+
+**[v30](https://codeberg.org/nsxiv/nsxiv/archive/v30.tar.gz)**
+*(June 15, 2022)*
+
+* Changes:
+
+ * Development and main repository moved over to Codeberg.
+ See the special note above for more info.
+ * `autoreload_{inotify,nop}.c` merged into a single file, `autoreload.c`. (#263)
+ * Moved all configuration related macros to `config.mk`. (#264)
+ * `win-title` is now called only when there's change rather than being called
+ on each redraw. (#266)
+
+* Added:
+
+ * Added more mimetypes to the `.desktop` entry. (#260)
+ * Added `thumb-info` for customizing the statusbar in thumbnail-mode. (#265)
+ * Added comments for building on OpenBSD. (#264)
+
+* Fixes:
+
+ * "Too many open file" error due to not closing the win-title script. (#245)
+ * `-f` now directly starts in fullscreen mode rather than opening a normal
+ window and then going fullscreen. (#251)
+ * Broken slideshow on slow systems or fast animations. (#282)
+ * Memory leak when removing an image in thumbnail mode. (#247)
+ * Correctly setting `_NET_WM_PID`. (#251)
+ * Don't override statusbar if info script doesn't exist. (#271)
+ * Potential misbehavior regarding font. (#250)
+
+- - -
+
**[v29](https://github.com/nsxiv/nsxiv/archive/v29.tar.gz)**
*(March 03, 2022)*
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 7310227..82c4a75 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -55,6 +55,8 @@ Our workflow regarding pull requests is the following:
* Code related changes require two approvals, but documentation related
changes (e.g. typo) can be merged with just one.
+ * If a pull request has a single approval, no objections and has been open
+ for more than 7 days, then it may be force-merged.
* Always prefer squashing when merging. In the case a PR makes more than one
significant change, use the "don't squash" tag and rebase instead.
* When merging, make sure the commit message is cleaned up properly so that
@@ -65,7 +67,7 @@ For releases, the process is the following:
* Tag the release with a "vN" tag, where N is the version number. Also set
the commit message and tag description for the release commit to "Release
version N". Make sure to use an annotated tag.
- * Update `VERSION` macro in the `Makefile`.
+ * Update `VERSION` macro in `config.mk`.
* Update the changelog (`CHANGELOG.md`):
* Include link to the release tarball and add the release date.
* Document only the changes or fixes between releases. Don't document
diff --git a/config.mk b/config.mk
index 4bb84c6..10fd491 100644
--- a/config.mk
+++ b/config.mk
@@ -1,5 +1,5 @@
# nsxiv version
-VERSION = 29
+VERSION = 30
# PREFIX for install
PREFIX = /usr/local
diff --git a/options.c b/options.c
index 96cf092..8ae5c7e 100644
--- a/options.c
+++ b/options.c
@@ -164,7 +164,7 @@ void parse_options(int argc, char **argv)
_options.scalemode = s - scalemodes;
break;
case 'T':
- title_deprecation_notice(); /* TODO(v30): remove this option */
+ title_deprecation_notice(); /* TODO(v31): remove this option */
break;
case 't':
_options.thumb_mode = true;