0d5968d8bf
[fix] missing thumburl
2014-07-16 09:33:27 +02:00
7dfc53c60f
[fix] missing thumburl
2014-07-16 09:14:12 +02:00
9d185b0900
[fix]
2014-07-15 15:32:15 +02:00
9c1201a048
[add] cache for external thumbshot
2014-07-15 15:28:35 +02:00
f457180534
Merge branch 'master' into myShaarli
2014-04-04 14:18:43 +02:00
f945bb9b05
Merge branch 'master' of git://github.com/sebsauvage/Shaarli
2014-04-04 14:17:19 +02:00
bb2103a4a2
[add] visual image for private link
2014-04-04 14:16:51 +02:00
48b68c8fa5
Merge pull request #166 from timovn/patch-1
...
Update shaarli.css
2014-02-14 16:52:22 +01:00
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
0396d42bba
Merge branch 'master' into myShaarli
2014-02-12 10:51:35 +01:00
020df22d1e
Merge branch 'master' of git://github.com/sebsauvage/Shaarli
2014-02-12 10:49:50 +01:00
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
921e7020c9
Merge via branch
2014-01-03 09:49:24 +01:00
f1a8ca9cc8
[fix] warning in search form when empty via field
2014-01-03 09:39:02 +01:00
4123658eae
[upd] change via message (@via to Origine ⇒)
...
[fix] via field for atom
[fix] warning when add new link
2013-12-19 09:53:12 +01:00
8e2b06fd78
[fix] warning when add new link
2013-12-19 09:37:57 +01:00
b55c95e172
Merge branch 'master' into myShaarli
2013-12-19 09:30:59 +01:00
5f9bf1b96e
Merge branch 'master' into via
2013-12-19 09:30:20 +01:00
a9821c6fcd
Merge branch 'master' of git://github.com/sebsauvage/Shaarli
2013-12-19 09:25:58 +01:00
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
067e66acfe
Corrected overlapping tags
2013-12-04 13:55:42 +01:00
ab0638edb0
Merge pull request #145 from Alkarex/patch-1
...
smallHash: simplified and improved performance
2013-11-29 13:01:08 -08:00
53da201749
XSS flaw correction
...
Closes issue https://github.com/sebsauvage/Shaarli/issues/134
2013-11-29 21:53:20 +01:00
7a8068a787
[upd] update input label via
2013-11-21 17:10:47 +01:00
06d803e78e
[upd] change via message (@via to Origine =>)
...
[fix] via field for atom
2013-11-21 16:50:48 +01:00
c002ca9c6b
smallHash: simplified and improved performance
...
Unchanged behaviour
2013-11-10 22:50:34 +01:00
e8633c6bbe
[fix] add url prefix for smallhash url for external thumbshot
2013-10-14 14:41:14 +02:00
f80a51a9bf
Merge branch 'master' of git://github.com/sebsauvage/Shaarli
2013-10-11 15:24:33 +02:00
3c49d5a29a
Merge branch 'master' of git://github.com/sebsauvage/Shaarli into via
2013-10-11 15:23:24 +02:00
040eb18ec8
Add source of link (via imput)
2013-10-11 15:18:37 +02:00
7b2186a63e
Corrected field focus in bookmarklet
...
Focus was not properly given to description field when it's empty.
2013-09-27 17:08:31 +02:00
55ade1a969
Fix bad merge
2013-09-27 10:02:20 +02:00
6cb22b63c5
Merge branch 'master' into myShaarli
...
Conflicts:
tpl/page.header.html
tpl/picwall.html
tpl/tagcloud.html
2013-09-27 09:53:07 +02:00
6f5933d23f
Sync with SebSauvage repo
2013-09-27 09:38:01 +02:00
2d20481e45
Update README.md
2013-09-26 15:17:43 +02:00
246e9b4e37
Removed jQuery from almost all pages
...
jQuery has been removed from all pages, except those who really require
it (like autocomplete in link edition).
Immediate gain: All pages weight 286 kb LESS ! \o/
Highlighting in search results has also been temporarly removed (and
will be re-implemented).
2013-09-25 21:27:50 +02:00
af77b2fd9a
New QR-Code generation code
...
* QR-Code generation now uses a client-side javascript library instead of an external service. This is better for user privacy.
* Library used is http://neocotic.com/qr.js/ (11 kb).
* jQuery is no longer used to display QR-Code (this is a first step in removing jQuery entirely).
* This library is loaded *only* if the QR-Code icon is clicked.
* If javascript is disabled, it will fallback to the external service.
* External service was changed from "invx.com" to "qrfree.kaywa.com" because invx has become bloated.
By loading the javascript library *only* if the icon is clicked, it will prevent the 11 kb lib to be loaded in every page.
2013-09-25 15:17:09 +02:00
26c9556894
Changed QR-Code CSS (selector and attributes)
2013-09-25 14:58:47 +02:00
83cff11de5
Added javascript QR-Code library
2013-09-25 14:57:27 +02:00
58a8f4cab4
Default example private link changed
...
Default example private link changed from pastebin to ZeroBin.
2013-09-25 10:41:31 +02:00
c677013b93
Added nb=all to get all links in RSS/ATOM feed.
2013-09-24 22:39:40 +02:00
1f9886dc51
Merge branch 'master' into myShaarli
...
Conflicts:
index.php
2013-09-24 13:55:49 +02:00
bd5d37d0ba
Merge branch 'master' of git://github.com/sebsauvage/Shaarli
2013-09-24 13:49:24 +02:00
eea58b3d5a
Merge pull request #87 from LionelMartin/3385af123f6b4dfc59aeaa69f180381307b64368
...
Added a json_encode implementation for PHP < 5.2 (free.fr)
2013-09-24 02:20:06 -07:00
3fac0a5257
Added tags+private in shaarli URL
...
Manually merged pull request https://github.com/sebsauvage/Shaarli/pull/99
2013-09-24 11:17:22 +02:00
85c0205876
Merge pull request #112 from BoboTiG/master
...
RSS/Atom: add a parameter to print only the N last links
2013-09-24 02:10:18 -07:00
0b88c6022d
Merge pull request #118 from Alkarex/patch-1
...
Corrected error message for lack of write access in ./data
2013-09-24 02:07:21 -07:00
371a6fc2d2
Merge pull request #119 from Alkarex/master
...
Smaller logo file
2013-09-24 02:06:41 -07:00
c4bbb01064
Merge pull request #125 from broncowdd/master
...
Added the possibility to put a description in the bookmarklet's URL
2013-09-24 02:03:26 -07:00
fdc3c114d1
Merge pull request #126 from Alkarex/Milliseconds
...
Import: add compatibility for milliseconds in NETSCAPE-Bookmark
2013-09-24 02:02:33 -07:00
Knah Tsaeb
Sébastien SAUVAGE
timo van neerden
Knah Tsaeb
Christophe HENRY
Alexandre Alapetite