aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--.github/mailmap2
-rw-r--r--AUTHORS12
-rw-r--r--CHANGELOG.md32
-rw-r--r--README.md4
-rw-r--r--doc/md/Download-and-Installation.md8
5 files changed, 39 insertions, 19 deletions
diff --git a/.github/mailmap b/.github/mailmap
index bbdb7908..7633afcf 100644
--- a/.github/mailmap
+++ b/.github/mailmap
@@ -1,6 +1,8 @@
1ArthurHoaro <arthur@hoa.ro> 1ArthurHoaro <arthur@hoa.ro>
2Florian Eula <eula.florian@gmail.com> feula 2Florian Eula <eula.florian@gmail.com> feula
3Florian Eula <eula.florian@gmail.com> <mr.pikzen@gmail.com> 3Florian Eula <eula.florian@gmail.com> <mr.pikzen@gmail.com>
4Immánuel Fodor <immanuelfactor+github@gmail.com>
5kalvn <kalvnthereal@gmail.com> <kalvn@users.noreply.github.com>
4Nicolas Danelon <hi@nicolasmd.com.ar> nicolasm 6Nicolas Danelon <hi@nicolasmd.com.ar> nicolasm
5Nicolas Danelon <hi@nicolasmd.com.ar> <nda@3818.com.ar> 7Nicolas Danelon <hi@nicolasmd.com.ar> <nda@3818.com.ar>
6Nicolas Danelon <hi@nicolasmd.com.ar> <nicolasdanelon@gmail.com> 8Nicolas Danelon <hi@nicolasmd.com.ar> <nicolasdanelon@gmail.com>
diff --git a/AUTHORS b/AUTHORS
index 105561c1..6c4d9529 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,6 +1,6 @@
1 537 ArthurHoaro <arthur@hoa.ro> 1 574 ArthurHoaro <arthur@hoa.ro>
2 252 VirtualTam <virtualtam@flibidi.net> 2 277 VirtualTam <virtualtam@flibidi.net>
3 148 nodiscc <nodiscc@gmail.com> 3 169 nodiscc <nodiscc@gmail.com>
4 56 Sébastien Sauvage <sebsauvage@sebsauvage.net> 4 56 Sébastien Sauvage <sebsauvage@sebsauvage.net>
5 15 Florian Eula <eula.florian@gmail.com> 5 15 Florian Eula <eula.florian@gmail.com>
6 13 Emilien Klein <emilien@klein.st> 6 13 Emilien Klein <emilien@klein.st>
@@ -11,8 +11,9 @@
11 5 Lucas Cimon <lucas.cimon@gmail.com> 11 5 Lucas Cimon <lucas.cimon@gmail.com>
12 4 Alexandre Alapetite <alexandre@alapetite.fr> 12 4 Alexandre Alapetite <alexandre@alapetite.fr>
13 4 David Sferruzza <david.sferruzza@gmail.com> 13 4 David Sferruzza <david.sferruzza@gmail.com>
14 4 kalvn <kalvnthereal@gmail.com>
15 3 Immánuel Fodor <immanuelfactor+github@gmail.com>
14 3 Teromene <teromene@teromene.fr> 16 3 Teromene <teromene@teromene.fr>
15 3 kalvn <kalvnthereal@gmail.com>
16 2 Chris Kuethe <chris.kuethe@gmail.com> 17 2 Chris Kuethe <chris.kuethe@gmail.com>
17 2 Knah Tsaeb <Knah-Tsaeb@knah-tsaeb.org> 18 2 Knah Tsaeb <Knah-Tsaeb@knah-tsaeb.org>
18 2 Mathieu Chabanon <git@matchab.fr> 19 2 Mathieu Chabanon <git@matchab.fr>
@@ -27,6 +28,7 @@
27 1 BoboTiG <bobotig@gmail.com> 28 1 BoboTiG <bobotig@gmail.com>
28 1 Bronco <bronco@warriordudimanche.net> 29 1 Bronco <bronco@warriordudimanche.net>
29 1 D Low <daniellowtw@gmail.com> 30 1 D Low <daniellowtw@gmail.com>
31 1 Daniel Jakots <vigdis@chown.me>
30 1 Dimtion <zizou.xena@gmail.com> 32 1 Dimtion <zizou.xena@gmail.com>
31 1 Fanch <fanch-github@qth.fr> 33 1 Fanch <fanch-github@qth.fr>
32 1 Felix Bartels <felix@host-consultants.de> 34 1 Felix Bartels <felix@host-consultants.de>
@@ -41,6 +43,8 @@
41 1 Lionel Martin <renarddesmers@gmail.com> 43 1 Lionel Martin <renarddesmers@gmail.com>
42 1 Mark Gerarts <mark.gerarts@gmail.com> 44 1 Mark Gerarts <mark.gerarts@gmail.com>
43 1 Marsup <marsup@gmail.com> 45 1 Marsup <marsup@gmail.com>
46 1 Neros <contact@neros.fr>
44 1 Sbgodin <Sbgodin@users.noreply.github.com> 47 1 Sbgodin <Sbgodin@users.noreply.github.com>
45 1 TsT <tst2005@gmail.com> 48 1 TsT <tst2005@gmail.com>
46 1 dimtion <zizou.xena@gmail.com> 49 1 dimtion <zizou.xena@gmail.com>
50 1 durcheinandr <jochen@durcheinandr.de>
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 33feac20..b823ba70 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,13 @@ All notable changes to this project will be documented in this file.
4The format is based on [Keep a Changelog](http://keepachangelog.com/) 4The format is based on [Keep a Changelog](http://keepachangelog.com/)
5and this project adheres to [Semantic Versioning](http://semver.org/). 5and this project adheres to [Semantic Versioning](http://semver.org/).
6 6
7## [v0.9.3](https://github.com/shaarli/Shaarli/releases/tag/v0.9.3) - 2018-01-04
8**XSS vulnerability fixed. Please update.**
9
10## Security
11- Fix an XSS (cross-site-scripting) vulnerability in `index.php`
12
13
7## [v0.9.2](https://github.com/shaarli/Shaarli/releases/tag/v0.9.2) - 2017-10-07 14## [v0.9.2](https://github.com/shaarli/Shaarli/releases/tag/v0.9.2) - 2017-10-07
8 15
9**Major security issue fixed. Please update.** 16**Major security issue fixed. Please update.**
@@ -42,6 +49,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
42 49
43- Fixed reflected XSS vulnerability introduced in v0.9.1, discovered by @chb9 ([CVE-2017-15215](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-15215)). 50- Fixed reflected XSS vulnerability introduced in v0.9.1, discovered by @chb9 ([CVE-2017-15215](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-15215)).
44 51
52
45## [v0.9.1](https://github.com/shaarli/Shaarli/releases/tag/v0.9.1) - 2017-08-23 53## [v0.9.1](https://github.com/shaarli/Shaarli/releases/tag/v0.9.1) - 2017-08-23
46 54
47The documentation has been migrated to ReadTheDocs: 55The documentation has been migrated to ReadTheDocs:
@@ -115,7 +123,7 @@ Theming:
115 - Introduce a new theme 123 - Introduce a new theme
116 - Allow selecting themes/templates from the configuration page 124 - Allow selecting themes/templates from the configuration page
117 - New/Edit link form can be submitted using CTRL+Enter in the textarea 125 - New/Edit link form can be submitted using CTRL+Enter in the textarea
118 - Shaarli version is displayed in the footer when logged in 126 - Shaarli version is displayed in the footer when logged in
119- Add plugin placeholders to Atom/RSS feed templates 127- Add plugin placeholders to Atom/RSS feed templates
120- Add OpenSearch to feed templates 128- Add OpenSearch to feed templates
121- Add `campaign_` to the URL cleanup pattern list 129- Add `campaign_` to the URL cleanup pattern list
@@ -145,7 +153,7 @@ Theming:
145- Improved date time display depending on the locale 153- Improved date time display depending on the locale
146- Partial namespace support for Shaarli classes 154- Partial namespace support for Shaarli classes
147- Shaarli version is now only present in `shaarli_version.php` 155- Shaarli version is now only present in `shaarli_version.php`
148- Human readable maximum file size upload 156- Human readable maximum file size upload
149 157
150 158
151### Removed 159### Removed
@@ -171,6 +179,12 @@ Theming:
171- Markdown plugin: escape HTML entities by default 179- Markdown plugin: escape HTML entities by default
172 180
173 181
182## [v0.8.5](https://github.com/shaarli/Shaarli/releases/tag/v0.8.5) - 2018-01-04
183**XSS vulnerability fixed. Please update.**
184
185## Security
186- Fix an XSS (cross-site-scripting) vulnerability in `index.php`
187
174## [v0.8.4](https://github.com/shaarli/Shaarli/releases/tag/v0.8.4) - 2017-03-04 188## [v0.8.4](https://github.com/shaarli/Shaarli/releases/tag/v0.8.4) - 2017-03-04
175### Security 189### Security
176- Markdown plugin: escape HTML entities by default 190- Markdown plugin: escape HTML entities by default
@@ -186,7 +200,7 @@ Theming:
186 200
187## [v0.8.1](https://github.com/shaarli/Shaarli/releases/tag/v0.8.1) - 2016-12-12 201## [v0.8.1](https://github.com/shaarli/Shaarli/releases/tag/v0.8.1) - 2016-12-12
188 202
189> Note: this version will create an automatic backup of your database if anything goes wrong. 203> Note: this version will create an automatic backup of your database if anything goes wrong.
190 204
191### Added 205### Added
192- Add CHANGELOG.md to track the whole project's history 206- Add CHANGELOG.md to track the whole project's history
@@ -203,7 +217,7 @@ Theming:
203- Link ID complete refactoring: 217- Link ID complete refactoring:
204 - Links now have a numeric ID instead of dates 218 - Links now have a numeric ID instead of dates
205 - Short URLs are now created once and can't change over time (previous URL are kept) 219 - Short URLs are now created once and can't change over time (previous URL are kept)
206- Templates: 220- Templates:
207 - Changed placeholder behaviour for: `buttons_toolbar`, `fields_toolbar` and `action_plugin` 221 - Changed placeholder behaviour for: `buttons_toolbar`, `fields_toolbar` and `action_plugin`
208 - Cleanup `{loop}` declarations in templates 222 - Cleanup `{loop}` declarations in templates
209 - Tools: hide Firefox Social button when not in HTTPS 223 - Tools: hide Firefox Social button when not in HTTPS
@@ -221,7 +235,7 @@ Theming:
221- Plugins: 235- Plugins:
222 - Tools: only display parameter description when it exists 236 - Tools: only display parameter description when it exists
223 - archive.org: do not propose archival of private notes 237 - archive.org: do not propose archival of private notes
224 - Markdown: 238 - Markdown:
225 - render links properly in code blocks 239 - render links properly in code blocks
226 - bug regarding the `nomarkdown` tag 240 - bug regarding the `nomarkdown` tag
227 - W3C compliance 241 - W3C compliance
@@ -360,7 +374,7 @@ Please use our release archives, or follow the
360### Fixed 374### Fixed
361- Fix a bug where renaming a tag was causing a 404 375- Fix a bug where renaming a tag was causing a 404
362- Fix a bug allowing to search blank terms 376- Fix a bug allowing to search blank terms
363- Fix a bug preventing to remove a tag with special chars when searching 377- Fix a bug preventing to remove a tag with special chars when searching
364 378
365 379
366## [v0.6.2](https://github.com/shaarli/Shaarli/releases/tag/v0.6.2) - 2015-12-23 380## [v0.6.2](https://github.com/shaarli/Shaarli/releases/tag/v0.6.2) - 2015-12-23
@@ -666,7 +680,7 @@ Initial release on GitHub.
666- When you click the key to see only private links, it turns yellow 680- When you click the key to see only private links, it turns yellow
667 681
668### Changed 682### Changed
669- The "Daily" page now automatically skips empty days. 683- The "Daily" page now automatically skips empty days.
670 684
671### Fixed 685### Fixed
672- Corrected the tag encoding (there was a bug when selecting a second tag which contains accented characters) 686- Corrected the tag encoding (there was a bug when selecting a second tag which contains accented characters)
@@ -964,7 +978,7 @@ Initial release on GitHub.
964- Nicer timezone selection patch by killruana 978- Nicer timezone selection patch by killruana
965 979
966### Fixed 980### Fixed
967- New lines now appear correctly in the RSS feed descriptions. 981- New lines now appear correctly in the RSS feed descriptions.
968 982
969 983
970## [v0.0.17beta](http://sebsauvage.net/wiki/doku.php?id=php:shaarli:history) 984## [v0.0.17beta](http://sebsauvage.net/wiki/doku.php?id=php:shaarli:history)
@@ -1018,7 +1032,7 @@ Initial release on GitHub.
1018## [v0.0.14beta](http://sebsauvage.net/wiki/doku.php?id=php:shaarli:history) 1032## [v0.0.14beta](http://sebsauvage.net/wiki/doku.php?id=php:shaarli:history)
1019### Added 1033### Added
1020- You no longer need to disable `magic_quotes` on your host. 1034- You no longer need to disable `magic_quotes` on your host.
1021 Shaarli will cope with this option beeing activated. 1035 Shaarli will cope with this option beeing activated.
1022 1036
1023 1037
1024## [v0.0.13beta](http://sebsauvage.net/wiki/doku.php?id=php:shaarli:history) 1038## [v0.0.13beta](http://sebsauvage.net/wiki/doku.php?id=php:shaarli:history)
diff --git a/README.md b/README.md
index c1050027..e7e8ad4c 100644
--- a/README.md
+++ b/README.md
@@ -6,10 +6,10 @@ _Do you want to share the links you discover?_
6_Shaarli is a minimalist link sharing service that you can install on your own server._ 6_Shaarli is a minimalist link sharing service that you can install on your own server._
7_It is designed to be personal (single-user), fast and handy._ 7_It is designed to be personal (single-user), fast and handy._
8 8
9[![](https://img.shields.io/badge/stable-v0.8.4-blue.svg)](https://github.com/shaarli/Shaarli/releases/tag/v0.8.4) 9[![](https://img.shields.io/badge/stable-v0.8.5-blue.svg)](https://github.com/shaarli/Shaarli/releases/tag/v0.8.5)
10[![](https://img.shields.io/travis/shaarli/Shaarli/stable.svg?label=stable)](https://travis-ci.org/shaarli/Shaarli) 10[![](https://img.shields.io/travis/shaarli/Shaarli/stable.svg?label=stable)](https://travis-ci.org/shaarli/Shaarli)
11&bull; 11&bull;
12[![](https://img.shields.io/badge/latest-v0.9.2-blue.svg)](https://github.com/shaarli/Shaarli/releases/tag/v0.9.2) 12[![](https://img.shields.io/badge/latest-v0.9.3-blue.svg)](https://github.com/shaarli/Shaarli/releases/tag/v0.9.3)
13[![](https://img.shields.io/travis/shaarli/Shaarli/latest.svg?label=latest)](https://travis-ci.org/shaarli/Shaarli) 13[![](https://img.shields.io/travis/shaarli/Shaarli/latest.svg?label=latest)](https://travis-ci.org/shaarli/Shaarli)
14&bull; 14&bull;
15[![](https://img.shields.io/badge/master-v0.9.x-blue.svg)](https://github.com/shaarli/Shaarli) 15[![](https://img.shields.io/badge/master-v0.9.x-blue.svg)](https://github.com/shaarli/Shaarli)
diff --git a/doc/md/Download-and-Installation.md b/doc/md/Download-and-Installation.md
index bbbfc26d..0fdbd27d 100644
--- a/doc/md/Download-and-Installation.md
+++ b/doc/md/Download-and-Installation.md
@@ -25,11 +25,11 @@ Using one of the following methods:
25 25
26In most cases, you should download the latest Shaarli release from the [releases](https://github.com/shaarli/Shaarli/releases) page. **Download our *shaarli-full* archive** to include dependencies. 26In most cases, you should download the latest Shaarli release from the [releases](https://github.com/shaarli/Shaarli/releases) page. **Download our *shaarli-full* archive** to include dependencies.
27 27
28The current latest released version is `v0.9.1` 28The current latest released version is `v0.9.3`
29 29
30```bash 30```bash
31$ wget https://github.com/shaarli/Shaarli/releases/download/v0.9.1/shaarli-v0.9.1-full.zip 31$ wget https://github.com/shaarli/Shaarli/releases/download/v0.9.3/shaarli-v0.9.3-full.zip
32$ unzip shaarli-v0.9.1-full.zip 32$ unzip shaarli-v0.9.3-full.zip
33$ mv Shaarli /path/to/shaarli/ 33$ mv Shaarli /path/to/shaarli/
34``` 34```
35 35
@@ -96,7 +96,7 @@ Install [Composer](Unit-tests.md#install_composer) to manage Shaarli dependencie
96To get the latest changes from the `master` branch: 96To get the latest changes from the `master` branch:
97 97
98```bash 98```bash
99# clone the repository 99# clone the repository
100$ git clone https://github.com/shaarli/Shaarli.git -b master /path/to/shaarli/ 100$ git clone https://github.com/shaarli/Shaarli.git -b master /path/to/shaarli/
101# install/update third-party dependencies 101# install/update third-party dependencies
102$ cd /path/to/shaarli 102$ cd /path/to/shaarli