aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAgeFilesLines
...
* | | fix quoting error introduced in 712501812b6f927b048b9d7f767cb15a370b3c81nodiscc2014-12-161-1/+1
* | | Merge pull request #81 from nodiscc/prevent-disclosurenodiscc2014-12-161-2/+2
|\ \ \
| * | | prevent disclosing PHP version on PHP version check errornodiscc2014-12-161-1/+1
| * | | prevent disclosing full path when raising "Shaarli directory not writeable" e...nodiscc2014-12-161-1/+1
|/ / /
* | | Merge pull request #69 from nodiscc/masternodiscc2014-12-051-1/+1
|\ \ \ | |_|/ |/| |
| * | bookmarklet: add ✚ sign to make it more recognizable in toolbarsnodiscc2014-12-051-1/+1
|/ /
* | Merge pull request #68 from virtualtam/hardcoded-stylenodiscc2014-12-0514-48/+161
|\ \
| * | CSS: remove hardcoded style from templatesVirtualTam2014-12-0314-48/+161
* | | Merge pull request #67 from e2jk/issue-66nodiscc2014-12-031-2/+2
|\ \ \ | |/ / |/| |
| * | Fix issue #66 by adding space before "selected"Emilien Klein2014-12-021-2/+2
|/ /
* | Merge pull request #28 from virtualtam/unify-cssnodiscc2014-12-011-353/+798
|\ \ | |/ |/|
| * CSS: separate rules with a blank lineVirtualTam2014-12-011-2/+102
| * CSS: expand one-line declarationsVirtualTam2014-12-011-119/+480
| * CSS: unify coding style - spaces, brackets, keywordsVirtualTam2014-12-011-230/+223
| * CSS: replace tabs by spaces, remove trailing whitespaces and empty linesVirtualTam2014-12-011-215/+206
|/
* Merge pull request #62 from pikzen/linkurlnodiscc2014-11-212-32/+36
|\
| * Added a link to the visible URL in the link listFlorian Eula2014-11-212-32/+36
* | Merge pull request #61 from pikzen/shaarli47nodiscc2014-11-211-0/+8
|\ \
| * | Prevents ?do=addlink from generating a 404 if the user is not logged inFlorian Eula2014-11-211-0/+8
| |/
* | 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 forFlorian Eula2014-11-211-7/+25
|/
* Merge pull request #59 from tst2005/masternodiscc2014-11-133-8/+8
|\
| * uniform if syntaxTsT2013-10-233-8/+8
* | Merge pull request #54 from nodiscc/tagcloud-urlencodeEmilien Klein2014-11-101-1/+1
|\ \
| * | use urlencode in tagcloud linksnodiscc2014-11-091-1/+1
|/ /
* | Merge pull request #51 from nodiscc/optional-archiveorgnodiscc2014-11-082-0/+3
|\ \
| * | 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:nodiscc2014-11-041-42/+47
* | | Merge pull request #39 from nodiscc/masterEmilien Klein2014-11-081-1/+3
|\ \ \
| * | | index.html: add warning message about hostname/cookie storage problemsnodiscc2014-11-031-1/+3
| |/ /
* | | Merge pull request #43 from nodiscc/archiveorg-integrationEmilien Klein2014-11-082-4/+6
|\ \ \ | |/ / |/| |
| * | Add Archive.org integrationQwerty2014-11-052-4/+6
|/ /
* | Merge pull request #37 from qwertygc/patch-2Emilien Klein2014-10-251-1/+1
|\ \
| * | Update shaarli_version.txtQwerty2014-10-251-1/+1
|/ /
* | Merge pull request #36 from nodiscc/https-thumbnailsEmilien Klein2014-10-231-7/+7
|\ \
| * | thumbnails: force HTTPS for youtube, imgur, vimeonodiscc2014-10-231-7/+7
* | | Merge pull request #35 from nodiscc/optional-atomEmilien Klein2014-10-232-1/+4
|\ \ \ | |/ / |/| |
| * | Make ATOM toolbar button optionalnodiscc2014-10-232-1/+4
|/ /
* | Merge pull request #31 from nodiscc/version-checknodiscc2014-10-232-1/+2
|\ \
| * | update check: check against last version available on github.com/shaarli/Shaarlinodiscc2014-10-211-1/+1
| * | add current release version number in shaarli_version.txtnodiscc2014-10-211-0/+1
|/ /
* | Merge pull request #30 from nodiscc/masternodiscc2014-10-211-1/+5
|\ \
| * | add link: in case of empty URL (self-post), prepend "Note: " to the titlenodiscc2014-10-211-1/+5
|/ /
* | Merge pull request #27 from virtualtam/masternodiscc2014-10-201-2/+2
|\ \
| * | fix: add missing slash when defining RainTPL's temp dirVirtualTam2014-10-191-2/+2
|/ /
* | 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
* | Merge pull request #12 from nodiscc/iconslicensenodiscc2014-08-3015-3/+47
|\ \
| * | replace unlicensed icons/images, add proper creditsnodiscc2014-08-2815-3/+47
|/ /