Commit Graph

88 Commits

Author SHA1 Message Date
Knah Tsaeb dd91b924c6 Merge branch 'master' of git:// into via 2014-04-04 14:30:00 +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
Knah Tsaeb 289ce8f457 Merge branch 'master' into via 2014-02-12 10:50:46 +01:00
Knah Tsaeb 020df22d1e Merge branch 'master' of git:// 2014-02-12 10:49:50 +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
Knah Tsaeb f1a8ca9cc8 [fix] warning in search form when empty via field 2014-01-03 09:39:02 +01:00
Knah Tsaeb 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
Knah Tsaeb 5f9bf1b96e Merge branch 'master' into via 2013-12-19 09:30:20 +01:00
Knah Tsaeb a9821c6fcd Merge branch 'master' of git:// 2013-12-19 09:25:58 +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
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
Knah Tsaeb f80a51a9bf Merge branch 'master' of git:// 2013-10-11 15:24:33 +02:00
Knah Tsaeb 3c49d5a29a Merge branch 'master' of git:// into via 2013-10-11 15:23:24 +02:00
Knah Tsaeb 040eb18ec8 Add source of link (via imput) 2013-10-11 15:18:37 +02:00
Sebastien SAUVAGE 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
Knah Tsaeb 6f5933d23f Sync with SebSauvage repo 2013-09-27 09:38:01 +02:00
Sébastien SAUVAGE 2d20481e45 Update 2013-09-26 15:17:43 +02:00
Sebastien SAUVAGE 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
Sébastien SAUVAGE 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 (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 "" to "" 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
Sébastien SAUVAGE 26c9556894 Changed QR-Code CSS (selector and attributes) 2013-09-25 14:58:47 +02:00
Sébastien SAUVAGE 83cff11de5 Added javascript QR-Code library 2013-09-25 14:57:27 +02:00
Sébastien SAUVAGE 58a8f4cab4 Default example private link changed
Default example private link changed from pastebin to ZeroBin.
2013-09-25 10:41:31 +02:00
Sebastien SAUVAGE c677013b93 Added nb=all to get all links in RSS/ATOM feed. 2013-09-24 22:39:40 +02:00
Knah Tsaeb bd5d37d0ba Merge branch 'master' of git:// 2013-09-24 13:49:24 +02:00
Sébastien SAUVAGE eea58b3d5a Merge pull request #87 from LionelMartin/3385af123f6b4dfc59aeaa69f180381307b64368
Added a json_encode implementation for PHP < 5.2 (
2013-09-24 02:20:06 -07:00
Sébastien SAUVAGE 3fac0a5257 Added tags+private in shaarli URL
Manually merged pull request
2013-09-24 11:17:22 +02:00
Sébastien SAUVAGE 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
Sébastien SAUVAGE 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
Sébastien SAUVAGE 371a6fc2d2 Merge pull request #119 from Alkarex/master
Smaller logo file
2013-09-24 02:06:41 -07:00
Sébastien SAUVAGE 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
Sébastien SAUVAGE fdc3c114d1 Merge pull request #126 from Alkarex/Milliseconds
Import: add compatibility for milliseconds in NETSCAPE-Bookmark
2013-09-24 02:02:33 -07:00
Sébastien SAUVAGE 5d48d5d06e Merge pull request #122 from lehollandaisvolant/master
Ajout d’un UA lors de la récupération d’une page externe
2013-09-24 02:01:13 -07:00
Alexandre Alapetite fc93ae1d1a Import NETSCAPE-Bookmark compatible milliseconds
NETSCAPE-Bookmark sometimes contains dates as milliseconds instead of
For instance, this is the case of the files gererated for Google +1s by
Google Takeout.
This patch make these files compatible.
2013-09-21 18:15:41 +02:00
Bronco 3057373a25 Added the possibility to put a description in the bookmarklet's URL 2013-09-16 10:32:02 +02:00
lehollandaisvolant 03545ef691 Ajout d’un UA lors de la récupération d’une page externe (certains site veulent un UA) 2013-09-03 15:55:13 +02:00
Alexandre Alapetite f0075b1743 Smaller logo file
Better PNG compression of logo file, as produced by Page Speed.
2013-08-23 17:37:59 +02:00
Alexandre Alapetite ff63b7d111 Corrected error message for lack of write access in ./data 2013-08-23 17:02:15 +02:00
Knah Tsaeb 256545b392 Merge branch 'master' of git:// 2013-08-07 10:09:53 +02:00
Sebastien SAUVAGE 002ef0e5c8 Better encoding handling in title parsing
Thanks to a patch from Le Hollandais Volant.
2013-08-03 22:10:04 +02:00
Sebastien SAUVAGE f6a6ca0aec SERVER_NAME changed to HTTP_HOST
SERVER_NAME changed to HTTP_HOST because SERVER_NAME can cause problems
on some misconfigured hosts. HTTP_HOST is usually more reliable with
those servers. (cf.
This should cause less problem on most hosts.
2013-08-03 22:00:09 +02:00
BoboTiG fbd9e52716 RSS/Atom: add a parameter to print only the N last links 2013-07-26 08:57:19 +02:00
Lionel Martin 3385af123f Added json_encode implementation for php<5.2 2013-05-20 19:00:28 +02:00
Knah Tsaeb 9550bfe181 Move inline CSS style to shaarli.css 2013-03-29 15:37:44 +01:00
Knah Tsaeb dc420191df Move inline CSS style to shaarli.css 2013-03-29 15:21:32 +01:00
Sébastien SAUVAGE 99954e1290 Merge pull request #43 from dsferruzza/highlight-search-results
Highlight search results
2013-03-11 02:11:47 -07:00
Sébastien SAUVAGE 87e3d65023 Merge pull request #42 from matchab/master
Timezone par défaut
2013-03-11 01:59:48 -07:00