Commit graph

716 commits

Author SHA1 Message Date
nodiscc
4ad88dd190 Merge pull request #60 from pikzen/master
Do not add a tag to the search if it's already being searched for.
 * Fixes https://github.com/shaarli/Shaarli/issues/50
 * Fixes https://github.com/sebsauvage/Shaarli/issues/140
2014-11-21 18:27:04 +01:00
Florian Eula
732e683bda Do not add a tag to the search if it's already being searched for 2014-11-21 18:19:37 +01:00
nodiscc
9362352e12 Merge pull request #59 from tst2005/master
uniform if syntax
2014-11-13 01:48:52 +01:00
Emilien Klein
f2b2ac8c79 Merge pull request #54 from nodiscc/tagcloud-urlencode
use urlencode in tagcloud links
2014-11-10 22:16:27 +01:00
nodiscc
0845fb1ab8 use urlencode in tagcloud links
* prevents unproper escaping of characters like '&'
 * fixes https://github.com/sebsauvage/Shaarli/issues/85
 * fixes https://github.com/shaarli/Shaarli/issues/48
2014-11-09 21:09:43 +01:00
nodiscc
dffa06ed61 Merge pull request #51 from nodiscc/optional-archiveorg
make archive.org integration optional (ARCHIVE_ORG option, defaults to false)
2014-11-08 18:40:27 +01:00
nodiscc
d2f517638c make archive.org integration optional (ARCHIVE_ORG option, defaults to false) 2014-11-08 18:21:19 +01:00
Emilien Klein
6fdbfe817a Merge pull request #42 from nodiscc/new-readme
Update README
2014-11-08 17:40:58 +01:00
Emilien Klein
903eb0f99c Merge pull request #39 from nodiscc/master
add warning about hostname/cookie storage problems during install
2014-11-08 17:34:01 +01:00
Emilien Klein
19920acc17 Merge pull request #43 from nodiscc/archiveorg-integration
Add Archive.org integration
2014-11-08 17:32:12 +01:00
Qwerty
b113dc8e6b Add Archive.org integration
* adds an "archive" link next to permalinks, linking to the last version of the page on archive.org
2014-11-05 14:35:52 +01:00
nodiscc
cffa853aae Update README:
* Add screenshots
 * Use Mediacrush as a CDN for images to reduce load on sebsauvage.net
 * Improve page layout/sections
 * Reorder list of features
 * Add links to wiki and bug tracker
 * Add proper download links for stable/dev channels
 * Improve copyright/license notice
2014-11-04 20:35:55 +01:00
nodiscc
01ec179148 index.html: add warning message about hostname/cookie storage problems
* Fixes https://github.com/sebsauvage/Shaarli/issues/196
 * Fixes https://github.com/sebsauvage/Shaarli/issues/97
2014-11-03 13:21:14 +01:00
Emilien Klein
36b226ca1b Merge pull request #37 from qwertygc/patch-2
Update shaarli_version.txt
2014-10-25 19:01:27 +02:00
Qwerty
2e9af8ab26 Update shaarli_version.txt
La version actuelle de shaarli est la 0.042.
2014-10-25 15:25:53 +02:00
Emilien Klein
39e41053ad Merge pull request #36 from nodiscc/https-thumbnails
thumbnails: force HTTPS for youtube, imgur, vimeo
2014-10-23 20:06:29 +02:00
Emilien Klein
a4355279cb Merge pull request #35 from nodiscc/optional-atom
Make ATOM toolbar button optional
2014-10-23 20:05:13 +02:00
nodiscc
1a663a0f2c thumbnails: force HTTPS for youtube, imgur, vimeo
* other services also provide thumbs over HTTPS, but the rewrite expression is more complex, so left out for now
2014-10-23 18:00:21 +02:00
nodiscc
1099d8fcad Make ATOM toolbar button optional
* ATOM button display is now configurable using the SHOW_ATOM variable in index.php or data/options.php (defaults to false)
 * Fixes https://github.com/shaarli/Shaarli/issues/24
2014-10-23 17:47:30 +02:00
nodiscc
57dbbe51a6 Merge pull request #31 from nodiscc/version-check
Version check: check against latest version on github
2014-10-23 17:41:06 +02:00
nodiscc
b11bc5b6f9 update check: check against last version available on github.com/shaarli/Shaarli
* fixes https://github.com/shaarli/Shaarli/issues/5
2014-10-21 18:11:16 +02:00
nodiscc
ccfc046c11 add current release version number in shaarli_version.txt
* release process: please update this file when releasing a new version on github
2014-10-21 18:11:16 +02:00
nodiscc
736feea58e Merge pull request #30 from nodiscc/master
add link: in case of empty URL (self-post), prepend "Note: " to the title
2014-10-21 18:09:33 +02:00
nodiscc
27646ca5b4 add link: in case of empty URL (self-post), prepend "Note: " to the title
* Thanks to qwertygc (https://github.com/shaarli/Shaarli/pull/23)
 * Fix small typo
2014-10-21 16:18:25 +02:00
nodiscc
c4a329ede2 Merge pull request #27 from virtualtam/master
fix: add missing slash when defining RainTPL's temp dir
2014-10-20 13:59:44 +02:00
VirtualTam
2f2aa06b95 fix: add missing slash when defining RainTPL's temp dir
Signed-off-by: VirtualTam <virtualtam@flibidi.org>
2014-10-19 00:57:41 +02:00
nodiscc
ea8f67eb49 gitignore: ignore raintpl generated php pages 2014-09-10 15:20:58 +02:00
nodiscc
bbc6e66ad4 update qr.min.js to 1.1.3 from https://github.com/neocotic/qr.js, update COPYING
* fixes https://github.com/shaarli/Shaarli/issues/7
2014-09-05 00:42:39 +02:00
nodiscc
50df2cde74 Merge pull request #12 from nodiscc/iconslicense
fix icons license and general copyright information
2014-08-30 21:12:29 +02:00
nodiscc
509b080847 replace unlicensed icons/images, add proper credits
* fugue icons (http://p.yusukekamiyamane.com/) CC-BY-SA license
  * ornimental bookend (https://openclipart.org/detail/19869/ornimental-bookend---left-by-j4p4n) Public domain license
  * Paper_texture_v5_by_bashcorpo_w1000.jpg source found at http://bashcorpo.deviantart.com/art/Grungy-paper-texture-v-5-22966998 under Public Domain license
  * linecons (https://www.iconfinder.com/iconsets/linecons-free-vector-icons-pack) CC-BY license
  * add credits to COPYING, (get list of committers with git shortlog -sne, and previous contributors from the author's website)
  * Fixes https://github.com/shaarli/Shaarli/issues/10
  * Fixes https://github.com/sebsauvage/Shaarli/issues/8
2014-08-28 00:09:48 +02:00
nodiscc
e0cbb07872 Merge pull request #19 from nodiscc/master
bookmarklet: use selected text as description when adding a new link
2014-08-19 21:52:36 +02:00
Sbgodin
abc98ab39d Merge pull request #20 from nodiscc/fix-typos
Fix grammar, punctuation, spelling, trailing whitepaces and newlines; Fix typo in css
2014-08-19 21:33:53 +02:00
nodiscc
ad6c27b7b8 Fix grammar, punctuation, spelling, trailing whitepaces and newlines; Fix typo in css
Based on respencer's work at https://github.com/respencer/Shaarli/
Closes https://github.com/sebsauvage/Shaarli/pull/103
2014-08-19 18:01:15 +02:00
nodiscc
1ec633a74f Merge pull request #11 from Sbgodin/rainVariables 2014-08-12 02:07:15 +02:00
nodiscc
a1795ddcf3 bookmarklet: use selected text as description when adding a new link
* Based on romnGit's work at https://github.com/sebsauvage/Shaarli/pull/104
 * Fixes https://github.com/shaarli/Shaarli/issues/18
 * Closes https://github.com/sebsauvage/Shaarli/pull/104
 * Fixes https://github.com/sebsauvage/Shaarli/issues/53
 * Fixes https://github.com/sebsauvage/Shaarli/issues/129
 * Fixes https://github.com/sebsauvage/Shaarli/issues/33
2014-08-11 00:13:29 +02:00
Christophe HENRY
3bb684f59f Removes htaccess file creation and adds them in the repository
I also removed the previously created placeholders, which after all, have no more utility.
2014-08-04 00:42:49 +02:00
Christophe HENRY
e7416aba2c Adds empty directories: cache, data, pagecache and tmp. Removes mkdirs.
They are still in .gitignore because their future content will still be ignored.
2014-08-04 00:41:55 +02:00
Christophe HENRY
c614a35db8 Removed redundant check on RAINTPL_TMP directory
The same test is already on line 93
2014-07-31 23:31:58 +02:00
Christophe HENRY
25f5c59db6 Adds configuration variables, TPL and TMP, for RainTPL
The path for templates and temporary files are now part of the configuration.

For a custom install, it's possible to put these writable directories elsewhere than in the read-only source code.
2014-07-31 23:31:58 +02:00
Christophe HENRY
e411f7f9d7 Adds the tip for the title link in the configuration page 2014-07-27 23:32:41 +02:00
Christophe HENRY
ebb2880dfc Adds a configuration variable "titleLink" which allows to customize the
link on the title.
2014-07-27 23:32:41 +02:00
Emilien Klein
4ade7393a3 Release version 0.0.42 beta 2014-07-27 22:57:30 +02:00
Sébastien SAUVAGE
48b68c8fa5 Merge pull request #166 from timovn/patch-1
Update shaarli.css
2014-02-14 16:52:22 +01:00
timo van neerden
012e76e78c Update shaarli.css
Added word-wrap: break-word; to body, so that that text is well wrapped, and do not permit horizontal scroll-bars (on mobile, with responsive design).
2014-02-14 16:38:05 +01:00
Sébastien SAUVAGE
15b98c3dc8 Merge pull request #155 from Sbgodin/staySignedInWithCookie
"Stay signed in" modification. This will help people with hosts which aggressively clean sessions on server side.
2014-02-09 18:43:52 +01:00
Christophe HENRY
ae00595b1c A real "Stay signed in": keep the connection
Instead of trusting the php session, it uses a cookie. The php session
sooner or later is distroyed if not used. It depends upon the server
settings. Using a cookie ensures that one really stays signed in.

Dev notes: I wanted to avoid merge conflicts, stay with the main
developper standards and keep the "index.php" in one file. That's why
the code may not be that nice. My own dev level my also explain.
2013-12-05 22:26:04 +01:00
Sébastien SAUVAGE
067e66acfe Corrected overlapping tags 2013-12-04 13:55:42 +01:00
Sébastien SAUVAGE
ab0638edb0 Merge pull request #145 from Alkarex/patch-1
smallHash: simplified and improved performance
2013-11-29 13:01:08 -08:00
Sebastien SAUVAGE
53da201749 XSS flaw correction
Closes issue https://github.com/sebsauvage/Shaarli/issues/134
2013-11-29 21:53:20 +01:00
Alexandre Alapetite
c002ca9c6b smallHash: simplified and improved performance
Unchanged behaviour
2013-11-10 22:50:34 +01:00