From 25c1e52c0635909b539a842d8686b0c0202d25bb Mon Sep 17 00:00:00 2001 From: Making GitHub Delicious Date: Sat, 30 Jan 2016 16:01:53 -0700 Subject: [PATCH 1/5] add waffle.io badge --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 6de33a5..ecdab96 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,4 @@ +[![Stories in Ready](https://badge.waffle.io/Pewpews/happypanda.png?label=ready&title=Ready)](https://waffle.io/Pewpews/happypanda) Development is done in alpha branch For future plans, see [issues](https://github.com/Pewpews/happypanda/issues) From 554f77a0bfcec50565967149f4f394bff488badd Mon Sep 17 00:00:00 2001 From: PewPews Date: Sun, 31 Jan 2016 00:15:51 +0100 Subject: [PATCH 2/5] Added waffle badge; --- README.md | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index ecdab96..b9d628e 100644 --- a/README.md +++ b/README.md @@ -1,14 +1,15 @@ -[![Stories in Ready](https://badge.waffle.io/Pewpews/happypanda.png?label=ready&title=Ready)](https://waffle.io/Pewpews/happypanda) +I'm here if you have any questions! + +[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/Pewpews/happypanda?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) + Development is done in alpha branch +[![Stories in Ready](https://badge.waffle.io/Pewpews/happypanda.png?label=In%20Progress&title=Features%20In%20Progress)](https://waffle.io/Pewpews/happypanda) + For future plans, see [issues](https://github.com/Pewpews/happypanda/issues) For general documentation, check the [wiki](https://github.com/Pewpews/happypanda/wiki) -I'm here if you have any questions! - -[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/Pewpews/happypanda?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) - # Screenshots From b9ae923eb978aaaf77e31f3502e4d6e0371a215e Mon Sep 17 00:00:00 2001 From: PewPews Date: Sun, 31 Jan 2016 00:20:54 +0100 Subject: [PATCH 3/5] Added updating info; --- README.md | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index b9d628e..0241231 100644 --- a/README.md +++ b/README.md @@ -16,15 +16,6 @@ For general documentation, check the [wiki](https://github.com/Pewpews/happypand -# How to install and run -#### Windows -1. Download the archive from [releases](https://github.com/Pewpews/happypanda/releases) -2. Extract the archive in it's own folder -3. Find Happypanda.exe and double click on it! - -#### Mac and Linux -see [INSTALL.md](INSTALL.md) - # Features - Portable, self-contained in folder and cross-platform - Low memory footprint @@ -39,6 +30,19 @@ see [INSTALL.md](INSTALL.md) - Customizable by lots of settings - And lots more... +# How to install and run +#### Windows +1. Download the archive from [releases](https://github.com/Pewpews/happypanda/releases) +2. Extract the archive in it's own folder +3. Find Happypanda.exe and double click on it! + +#### Mac and Linux +see [INSTALL.md](INSTALL.md) + +# How to update +Overwrite your previous installation. +More info in the [wiki](https://github.com/Pewpews/happypanda/wiki) + # Dependencies - Qt5 (Install this first) >= 5.4 - PyQt5 From f68509e800b9d01d85fbab15debceb49696bc986 Mon Sep 17 00:00:00 2001 From: PewPews Date: Sun, 31 Jan 2016 12:51:23 +0100 Subject: [PATCH 4/5] Added before next release badge; --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 0241231..f05b24b 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,9 @@ I'm here if you have any questions! Development is done in alpha branch -[![Stories in Ready](https://badge.waffle.io/Pewpews/happypanda.png?label=In%20Progress&title=Features%20In%20Progress)](https://waffle.io/Pewpews/happypanda) +[![Stories in Progress](https://badge.waffle.io/Pewpews/happypanda.png?label=In%20Progress&title=Features%20In%20Progress)](https://waffle.io/Pewpews/happypanda) + +[![Stories in Before next release](https://badge.waffle.io/Pewpews/happypanda.png?label=Before%20next%20release&title=Before%20next%20release)](https://waffle.io/Pewpews/happypanda) For future plans, see [issues](https://github.com/Pewpews/happypanda/issues) From 8c34e66148719cc4392c02304e9b52664f1fb964 Mon Sep 17 00:00:00 2001 From: PewPews Date: Sun, 31 Jan 2016 17:52:58 +0100 Subject: [PATCH 5/5] Added pururin tag converter link; --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index f05b24b..affdc35 100644 --- a/README.md +++ b/README.md @@ -45,6 +45,9 @@ see [INSTALL.md](INSTALL.md) Overwrite your previous installation. More info in the [wiki](https://github.com/Pewpews/happypanda/wiki) +# Misc. +People wanting to import galleries from the Pururin database torrent should find [this](https://github.com/Exedge/Convertor) useful. + # Dependencies - Qt5 (Install this first) >= 5.4 - PyQt5