aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #61 from pikzen/shaarli47nodiscc2014-11-211-0/+8
|\ | | | | | | | | Prevents ?do=addlink from generating a 404 if the user is not logged in Fixes https://github.com/sebsauvage/Shaarli/issues/141 Fixes https://github.com/shaarli/Shaarli/issues/47
| * Prevents ?do=addlink from generating a 404 if the user is not logged inFlorian Eula2014-11-211-0/+8
| | | | | | | | Fixes https://github.com/shaarli/Shaarli/issue/47
* | Merge pull request #60 from pikzen/masternodiscc2014-11-211-7/+25
|\| | | | | | | | | 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
| * Do not add a tag to the search if it's already being searched forFlorian Eula2014-11-211-7/+25
|/
* Merge pull request #59 from tst2005/masternodiscc2014-11-133-8/+8
|\ | | | | uniform if syntax
| * uniform if syntaxTsT2013-10-233-8/+8
| |
* | Merge pull request #54 from nodiscc/tagcloud-urlencodeEmilien Klein2014-11-101-1/+1
|\ \ | | | | | | use urlencode in tagcloud links
| * | use urlencode in tagcloud linksnodiscc2014-11-091-1/+1
|/ / | | | | | | | | | | * prevents unproper escaping of characters like '&' * fixes https://github.com/sebsauvage/Shaarli/issues/85 * fixes https://github.com/shaarli/Shaarli/issues/48
* | Merge pull request #51 from nodiscc/optional-archiveorgnodiscc2014-11-082-0/+3
|\ \ | | | | | | make archive.org integration optional (ARCHIVE_ORG option, defaults to false)
| * | make archive.org integration optional (ARCHIVE_ORG option, defaults to false)nodiscc2014-11-082-0/+3
|/ /
* | Merge pull request #42 from nodiscc/new-readmeEmilien Klein2014-11-081-42/+47
|\ \ | | | | | | Update README
| * | Update README:nodiscc2014-11-041-42/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
* | | Merge pull request #39 from nodiscc/masterEmilien Klein2014-11-081-1/+3
|\ \ \ | | | | | | | | add warning about hostname/cookie storage problems during install
| * | | index.html: add warning message about hostname/cookie storage problemsnodiscc2014-11-031-1/+3
| |/ / | | | | | | | | | | | | * Fixes https://github.com/sebsauvage/Shaarli/issues/196 * Fixes https://github.com/sebsauvage/Shaarli/issues/97
* | | Merge pull request #43 from nodiscc/archiveorg-integrationEmilien Klein2014-11-082-4/+6
|\ \ \ | |/ / |/| | Add Archive.org integration
| * | Add Archive.org integrationQwerty2014-11-052-4/+6
|/ / | | | | | | * adds an "archive" link next to permalinks, linking to the last version of the page on archive.org
* | Merge pull request #37 from qwertygc/patch-2Emilien Klein2014-10-251-1/+1
|\ \ | | | | | | Update shaarli_version.txt
| * | Update shaarli_version.txtQwerty2014-10-251-1/+1
|/ / | | | | La version actuelle de shaarli est la 0.042.
* | Merge pull request #36 from nodiscc/https-thumbnailsEmilien Klein2014-10-231-7/+7
|\ \ | | | | | | thumbnails: force HTTPS for youtube, imgur, vimeo
| * | thumbnails: force HTTPS for youtube, imgur, vimeonodiscc2014-10-231-7/+7
| | | | | | | | | | | | * other services also provide thumbs over HTTPS, but the rewrite expression is more complex, so left out for now
* | | Merge pull request #35 from nodiscc/optional-atomEmilien Klein2014-10-232-1/+4
|\ \ \ | |/ / |/| | Make ATOM toolbar button optional
| * | Make ATOM toolbar button optionalnodiscc2014-10-232-1/+4
|/ / | | | | | | | | * 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
* | Merge pull request #31 from nodiscc/version-checknodiscc2014-10-232-1/+2
|\ \ | | | | | | Version check: check against latest version on github
| * | update check: check against last version available on github.com/shaarli/Shaarlinodiscc2014-10-211-1/+1
| | | | | | | | | | | | * fixes https://github.com/shaarli/Shaarli/issues/5
| * | add current release version number in shaarli_version.txtnodiscc2014-10-211-0/+1
|/ / | | | | | | * release process: please update this file when releasing a new version on github
* | Merge pull request #30 from nodiscc/masternodiscc2014-10-211-1/+5
|\ \ | | | | | | add link: in case of empty URL (self-post), prepend "Note: " to the title
| * | add link: in case of empty URL (self-post), prepend "Note: " to the titlenodiscc2014-10-211-1/+5
|/ / | | | | | | | | * Thanks to qwertygc (https://github.com/shaarli/Shaarli/pull/23) * Fix small typo
* | Merge pull request #27 from virtualtam/masternodiscc2014-10-201-2/+2
|\ \ | | | | | | fix: add missing slash when defining RainTPL's temp dir
| * | fix: add missing slash when defining RainTPL's temp dirVirtualTam2014-10-191-2/+2
|/ / | | | | | | Signed-off-by: VirtualTam <virtualtam@flibidi.org>
* | gitignore: ignore raintpl generated php pagesnodiscc2014-09-101-1/+4
| |
* | 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
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-02 05:03:24 +0000