From 473f37a2eea01af869f87c843217d216994346e3 Mon Sep 17 00:00:00 2001 From: nodiscc Date: Wed, 4 Mar 2015 19:08:02 +0100 Subject: update README: add note about php-gd and git-based upgrade --- README.md | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'README.md') diff --git a/README.md b/README.md index 0397621a..d1aa03d4 100644 --- a/README.md +++ b/README.md @@ -51,7 +51,7 @@ It is designed to be personal (single-user), fast and handy. ## Installing -Shaarli requires php 5.1 +Shaarli requires php 5.1. `php-gd` is optional and provides thumbnail resizing. * Download the latest stable release from https://github.com/shaarli/Shaarli/releases * Unpack the archive in a directory on your web server @@ -63,9 +63,8 @@ _To get the development version, download https://github.com/shaarli/Shaarli/arc ## Upgrading -Delete all files and directories except the `data` directory, then unzip the new version of Shaarli. -You will not lose your links and you will not have to reconfigure it. - + * **If you installed from the zip:** Delete all files and directories except the `data` directory, then unzip the new version of Shaarli. You will not lose your links and you will not have to reconfigure it. + * **If you installed using `git clone`**: run `git pull` in your Shaarli directory. ## About -- cgit v1.2.3 From 9811b3efbca58bf464752e401d278fe677089a9c Mon Sep 17 00:00:00 2001 From: nodiscc Date: Wed, 4 Mar 2015 22:46:57 +0100 Subject: add bountysource.com badge * Bountysource is the funding platform for open-source software. Users can improve the open-source projects they love by creating/collecting bounties and pledging to fundraisers. * https://github.com/bountysource/frontend/wiki/Frequently-Asked-Questions --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'README.md') diff --git a/README.md b/README.md index d1aa03d4..7f0b7d5f 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ Shaarli, the personal, minimalist, super-fast, no-database delicious clone. You want to share the links you discover ? Shaarli is a minimalist delicious clone you can install on your own website. It is designed to be personal (single-user), fast and handy. -[![Join the chat at https://gitter.im/shaarli/Shaarli](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/shaarli/Shaarli?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) +[![Join the chat at https://gitter.im/shaarli/Shaarli](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/shaarli/Shaarli) [![Bountysource](https://www.bountysource.com/badge/team?team_id=19583&style=bounties_received)](https://www.bountysource.com/teams/shaarli/issues) ## Features: -- cgit v1.2.3