aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--README.md9
-rw-r--r--inc/LICENSE120
-rw-r--r--index.php1
-rw-r--r--tpl/includes.html4
4 files changed, 7 insertions, 127 deletions
diff --git a/README.md b/README.md
index 0397621a..7f0b7d5f 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@ Shaarli, the personal, minimalist, super-fast, no-database delicious clone.
5You want to share the links you discover ? Shaarli is a minimalist delicious clone you can install on your own website. 5You want to share the links you discover ? Shaarli is a minimalist delicious clone you can install on your own website.
6It is designed to be personal (single-user), fast and handy. 6It is designed to be personal (single-user), fast and handy.
7 7
8[![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) 8[![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)
9 9
10## Features: 10## Features:
11 11
@@ -51,7 +51,7 @@ It is designed to be personal (single-user), fast and handy.
51 51
52## Installing 52## Installing
53 53
54Shaarli requires php 5.1 54Shaarli requires php 5.1. `php-gd` is optional and provides thumbnail resizing.
55 55
56 * Download the latest stable release from https://github.com/shaarli/Shaarli/releases 56 * Download the latest stable release from https://github.com/shaarli/Shaarli/releases
57 * Unpack the archive in a directory on your web server 57 * 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
63 63
64## Upgrading 64## Upgrading
65 65
66Delete all files and directories except the `data` directory, then unzip the new version of Shaarli. 66 * **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.
67You will not lose your links and you will not have to reconfigure it. 67 * **If you installed using `git clone`**: run `git pull` in your Shaarli directory.
68
69 68
70 69
71## About 70## About
diff --git a/inc/LICENSE b/inc/LICENSE
deleted file mode 100644
index 8711a29a..00000000
--- a/inc/LICENSE
+++ /dev/null
@@ -1,120 +0,0 @@
1JQuery 1.11.2
2===============================================================================
3Copyright jQuery Foundation and other contributors, https://jquery.org/
4
5This software consists of voluntary contributions made by many
6individuals. For exact contribution history, see the revision history
7available at https://github.com/jquery/jquery
8
9The following license applies to all parts of this software except as
10documented below:
11
12====
13
14Permission is hereby granted, free of charge, to any person obtaining
15a copy of this software and associated documentation files (the
16"Software"), to deal in the Software without restriction, including
17without limitation the rights to use, copy, modify, merge, publish,
18distribute, sublicense, and/or sell copies of the Software, and to
19permit persons to whom the Software is furnished to do so, subject to
20the following conditions:
21
22The above copyright notice and this permission notice shall be
23included in all copies or substantial portions of the Software.
24
25THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
26EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
27MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
28NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
29LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
30OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
31WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
32
33====
34
35All files located in the node_modules and external directories are
36externally maintained libraries used by this software which have their
37own licenses; we recommend you read them, as their terms may differ from
38the terms above.
39
40
41
42JQuery UI 1.11.2
43===============================================================================
44Copyright jQuery Foundation and other contributors, https://jquery.org/
45
46This software consists of voluntary contributions made by many
47individuals. For exact contribution history, see the revision history
48available at https://github.com/jquery/jquery-ui
49
50The following license applies to all parts of this software except as
51documented below:
52
53====
54
55Permission is hereby granted, free of charge, to any person obtaining
56a copy of this software and associated documentation files (the
57"Software"), to deal in the Software without restriction, including
58without limitation the rights to use, copy, modify, merge, publish,
59distribute, sublicense, and/or sell copies of the Software, and to
60permit persons to whom the Software is furnished to do so, subject to
61the following conditions:
62
63The above copyright notice and this permission notice shall be
64included in all copies or substantial portions of the Software.
65
66THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
67EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
68MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
69NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
70LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
71OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
72WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
73
74====
75
76Copyright and related rights for sample code are waived via CC0. Sample
77code is defined as all source code contained within the demos directory.
78
79CC0: http://creativecommons.org/publicdomain/zero/1.0/
80
81====
82
83All files located in the node_modules and external directories are
84externally maintained libraries used by this software which have their
85own licenses; we recommend you read them, as their terms may differ from
86the terms above.
87
88
89
90QR.js 1.1.3
91===============================================================================
92Copyright (C) 2014 Alasdair Mercer, http://neocotic.com
93
94This program is free software: you can redistribute it and/or modify
95it under the terms of the GNU General Public License as published by
96the Free Software Foundation, either version 3 of the License, or
97(at your option) any later version.
98
99This program is distributed in the hope that it will be useful,
100but WITHOUT ANY WARRANTY; without even the implied warranty of
101MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
102GNU General Public License for more details.
103
104You should have received a copy of the GNU General Public License
105along with this program. If not, see <http://www.gnu.org/licenses/>.
106
107
108
109
110JQuery Lazyload 1.9.3
111===============================================================================
112By Mika Tuupola (https://github.com/tuupola)
113
114All code licensed under the MIT License[1]. All images licensed under
115Creative Commons Attribution 3.0 Unported License[2]. In other words you are
116basically free to do whatever you want. Just don’t remove my name from the
117source.
118
119[1]: http://opensource.org/licenses/mit-license.php
120[2]: http://creativecommons.org/licenses/by/3.0/deed.en_US \ No newline at end of file
diff --git a/index.php b/index.php
index a8326a2b..cda918df 100644
--- a/index.php
+++ b/index.php
@@ -1560,6 +1560,7 @@ function renderPage()
1560 if (isset($_GET['source']) && $_GET['source']=='bookmarklet') { echo '<script>self.close();</script>'; exit; } 1560 if (isset($_GET['source']) && $_GET['source']=='bookmarklet') { echo '<script>self.close();</script>'; exit; }
1561 $returnurl = ( isset($_POST['returnurl']) ? $_POST['returnurl'] : '?' ); 1561 $returnurl = ( isset($_POST['returnurl']) ? $_POST['returnurl'] : '?' );
1562 $returnurl .= '#'.smallHash($linkdate); // Scroll to the link which has been edited. 1562 $returnurl .= '#'.smallHash($linkdate); // Scroll to the link which has been edited.
1563 if (strstr($returnurl, "do=addlink")) { $returnurl = '?'; } //if we come from ?do=addlink, set returnurl to homepage instead
1563 header('Location: '.$returnurl); // After saving the link, redirect to the page the user was on. 1564 header('Location: '.$returnurl); // After saving the link, redirect to the page the user was on.
1564 exit; 1565 exit;
1565 } 1566 }
diff --git a/tpl/includes.html b/tpl/includes.html
index 93cdfd5a..5e298fa1 100644
--- a/tpl/includes.html
+++ b/tpl/includes.html
@@ -6,5 +6,5 @@
6<link rel="alternate" type="application/atom+xml" href="{$feedurl}?do=atom{$searchcrits}#" title="ATOM Feed" /> 6<link rel="alternate" type="application/atom+xml" href="{$feedurl}?do=atom{$searchcrits}#" title="ATOM Feed" />
7<link href="images/favicon.ico#" rel="shortcut icon" type="image/x-icon" /> 7<link href="images/favicon.ico#" rel="shortcut icon" type="image/x-icon" />
8<link type="text/css" rel="stylesheet" href="../inc/reset.css" /> 8<link type="text/css" rel="stylesheet" href="../inc/reset.css" />
9<link type="text/css" rel="stylesheet" href="inc/shaarli.css?version={$version|urlencode}#" /> 9<link type="text/css" rel="stylesheet" href="inc/shaarli.css" />
10{if="is_file('inc/user.css')"}<link type="text/css" rel="stylesheet" href="inc/user.css?version={$version|urlencode}#" />{/if} 10{if="is_file('inc/user.css')"}<link type="text/css" rel="stylesheet" href="inc/user.css" />{/if}