aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
* update qr.min.js to 1.1.3 from https://github.com/neocotic/qr.js, update COPYINGnodiscc2014-09-052-11/+25
| | | | * fixes https://github.com/shaarli/Shaarli/issues/7
* Merge pull request #12 from nodiscc/iconslicensenodiscc2014-08-3015-3/+47
|\ | | | | fix icons license and general copyright information
| * replace unlicensed icons/images, add proper creditsnodiscc2014-08-2815-3/+47
|/ | | | | | | | | | * 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
* Merge pull request #19 from nodiscc/masternodiscc2014-08-192-4/+4
|\ | | | | bookmarklet: use selected text as description when adding a new link
| * bookmarklet: use selected text as description when adding a new linknodiscc2014-08-112-4/+4
| | | | | | | | | | | | | | | | | | * 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
* | Merge pull request #20 from nodiscc/fix-typosSbgodin2014-08-195-137/+137
|\ \ | | | | | | Fix grammar, punctuation, spelling, trailing whitepaces and newlines; Fix typo in css
| * | Fix grammar, punctuation, spelling, trailing whitepaces and newlines; Fix ↵nodiscc2014-08-195-137/+137
| |/ | | | | | | | | | | | | typo in css Based on respencer's work at https://github.com/respencer/Shaarli/ Closes https://github.com/sebsauvage/Shaarli/pull/103
* | Merge pull request #11 from Sbgodin/rainVariablesnodiscc2014-08-125-14/+12
|\ \ | |/ |/|
| * Removes htaccess file creation and adds them in the repositoryChristophe HENRY2014-08-049-7/+8
| | | | | | | | I also removed the previously created placeholders, which after all, have no more utility.
| * Adds empty directories: cache, data, pagecache and tmp. Removes mkdirs.Christophe HENRY2014-08-045-4/+0
| | | | | | | | They are still in .gitignore because their future content will still be ignored.
| * Removed redundant check on RAINTPL_TMP directoryChristophe HENRY2014-07-311-1/+0
| | | | | | | | The same test is already on line 93
| * Adds configuration variables, TPL and TMP, for RainTPLChristophe HENRY2014-07-311-4/+6
|/ | | | | | 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.
* Adds the tip for the title link in the configuration pageChristophe HENRY2014-07-271-1/+1
|
* Adds a configuration variable "titleLink" which allows to customize theChristophe HENRY2014-07-273-2/+7
| | | | link on the title.
* Release version 0.0.42 betav0.0.42betaEmilien Klein2014-07-271-2/+2
|
* Merge pull request #166 from timovn/patch-1Sébastien SAUVAGE2014-02-141-1/+1
|\ | | | | Update shaarli.css
| * Update shaarli.csstimo van neerden2014-02-141-1/+1
|/ | | 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).
* Merge pull request #155 from Sbgodin/staySignedInWithCookieSébastien SAUVAGE2014-02-091-5/+21
|\ | | | | "Stay signed in" modification. This will help people with hosts which aggressively clean sessions on server side.
| * A real "Stay signed in": keep the connectionChristophe HENRY2013-12-051-5/+21
|/ | | | | | | | | | 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.
* Corrected overlapping tagsSébastien SAUVAGE2013-12-041-1/+1
|
* Merge pull request #145 from Alkarex/patch-1Sébastien SAUVAGE2013-11-291-5/+2
|\ | | | | smallHash: simplified and improved performance
| * smallHash: simplified and improved performanceAlexandre Alapetite2013-11-101-5/+2
| | | | | | Unchanged behaviour
* | XSS flaw correctionSebastien SAUVAGE2013-11-291-5/+5
|/ | | | Closes issue https://github.com/sebsauvage/Shaarli/issues/134
* Corrected field focus in bookmarkletSebastien SAUVAGE2013-09-271-1/+1
| | | | Focus was not properly given to description field when it's empty.
* Update README.mdSébastien SAUVAGE2013-09-261-10/+10
|
* Removed jQuery from almost all pagesSebastien SAUVAGE2013-09-257-134/+25
| | | | | | | | 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).
* New QR-Code generation codeSébastien SAUVAGE2013-09-251-20/+60
| | | | | | | | | | * 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.
* Changed QR-Code CSS (selector and attributes)Sébastien SAUVAGE2013-09-251-2/+3
|
* Added javascript QR-Code librarySébastien SAUVAGE2013-09-251-0/+9
|
* Default example private link changedSébastien SAUVAGE2013-09-251-1/+1
| | | Default example private link changed from pastebin to ZeroBin.
* Added nb=all to get all links in RSS/ATOM feed.Sebastien SAUVAGE2013-09-241-2/+10
|
* Merge pull request #87 from ↵Sébastien SAUVAGE2013-09-241-1/+36
|\ | | | | | | | | LionelMartin/3385af123f6b4dfc59aeaa69f180381307b64368 Added a json_encode implementation for PHP < 5.2 (free.fr)
| * Added json_encode implementation for php<5.2Lionel Martin2013-05-201-2/+37
| |
* | Added tags+private in shaarli URLSébastien SAUVAGE2013-09-241-2/+3
| | | | | | Manually merged pull request https://github.com/sebsauvage/Shaarli/pull/99
* | Merge pull request #112 from BoboTiG/masterSébastien SAUVAGE2013-09-241-4/+6
|\ \ | | | | | | RSS/Atom: add a parameter to print only the N last links
| * | RSS/Atom: add a parameter to print only the N last linksBoboTiG2013-07-261-5/+7
| |/
* | Merge pull request #118 from Alkarex/patch-1Sébastien SAUVAGE2013-09-241-1/+1
|\ \ | | | | | | Corrected error message for lack of write access in ./data
| * | Corrected error message for lack of write access in ./dataAlexandre Alapetite2013-08-231-2/+2
| | |
* | | Merge pull request #119 from Alkarex/masterSébastien SAUVAGE2013-09-241-0/+0
|\ \ \ | | | | | | | | Smaller logo file
| * | | Smaller logo fileAlexandre Alapetite2013-08-231-0/+0
| |/ / | | | | | | | | | Better PNG compression of logo file, as produced by Page Speed.
* | | Merge pull request #125 from broncowdd/masterSébastien SAUVAGE2013-09-241-1/+2
|\ \ \ | | | | | | | | Added the possibility to put a description in the bookmarklet's URL
| * | | Added the possibility to put a description in the bookmarklet's URLBronco2013-09-161-2/+3
| |/ /
* | | Merge pull request #126 from Alkarex/MillisecondsSébastien SAUVAGE2013-09-241-1/+5
|\ \ \ | | | | | | | | Import: add compatibility for milliseconds in NETSCAPE-Bookmark
| * | | Import NETSCAPE-Bookmark compatible millisecondsAlexandre Alapetite2013-09-211-1/+5
| |/ / | | | | | | | | | | | | | | | | | | | | | NETSCAPE-Bookmark sometimes contains dates as milliseconds instead of seconds. For instance, this is the case of the files gererated for Google +1s by Google Takeout. This patch make these files compatible.
* | | Merge pull request #122 from lehollandaisvolant/masterSébastien SAUVAGE2013-09-241-2/+2
|\ \ \ | |/ / |/| | Ajout d’un UA lors de la récupération d’une page externe
| * | Ajout d’un UA lors de la récupération d’une page externe (certains ↵lehollandaisvolant2013-09-031-2/+2
|/ / | | | | | | site veulent un UA)
* | Better encoding handling in title parsingSebastien SAUVAGE2013-08-031-2/+23
| | | | | | | | Thanks to a patch from Le Hollandais Volant.
* | SERVER_NAME changed to HTTP_HOSTSebastien SAUVAGE2013-08-031-7/+7
|/ | | | | | | | 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. http://stackoverflow.com/questions/2297403/http-host-vs-server-name). This should cause less problem on most hosts.
* Merge pull request #43 from dsferruzza/highlight-search-resultsSébastien SAUVAGE2013-03-113-0/+120
|\ | | | | Highlight search results
| * Avoid highlighting paging stuffDavid Sferruzza2013-03-101-1/+1
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 22:29:23 +0000