aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAgeFilesLines
...
* Merge pull request #109 from nodiscc/version-checknodiscc2015-02-146-19/+217
|\
| * Fix missing authors and licenses in COPYINGnodiscc2015-02-144-10/+204
| * Update README and Shaarli's footernodiscc2015-02-142-9/+13
|/
* Merge pull request #63 from pikzen/permaoptionsnodiscc2015-02-074-13/+27
|\
| * Feature: enable/disable permalinks for RSSFlorian Eula2015-02-074-13/+27
|/
* Merge pull request #107 from pikzen/fix-copyingnodiscc2015-01-271-12/+510
|\
| * Fixed license info, reverted qr.js to GPLFlorian Eula2015-01-271-12/+510
|/
* Merge pull request #98 from ArthurHoaro/portnodiscc2015-01-261-4/+4
|\
| * Fixes Port/server config problems - see: https://github.com/shaarli/Shaarli/i...ArthurHoaro2015-01-091-4/+4
* | Merge pull request #99 from pikzen/license-versionnodiscc2015-01-2617-82/+28580
|\ \
| * | Versioned JS files & centralized licensesfeula2015-01-2117-82/+28580
* | | Merge pull request #100 from virtualtam/daily-timestampnodiscc2015-01-263-0/+10
|\ \ \
| * | | daily: display link timestampsVirtualTam2015-01-153-0/+10
* | | | Merge pull request #103 from virtualtam/fix-w3cnodiscc2015-01-264-4/+5
|\ \ \ \ | |/ / / |/| | |
| * | | w3c: fix HTML syntax errorsVirtualTam2015-01-204-4/+5
|/ / /
* | | Merge pull request #93 from ArthurHoaro/scripttagnodiscc2015-01-114-24/+32
|\ \ \ | |_|/ |/| |
| * | * removed the language attribute on the script element since it is obsolete a...ArthurHoaro2015-01-094-24/+32
|/ /
* | Merge pull request #77 from ArthurHoaro/w3cnodiscc2015-01-0911-54/+68
|\ \
| * | W3C compliance (work on issue #64 - https://github.com/shaarli/Shaarli/issues...ArthurHoaro2015-01-0811-54/+68
|/ /
* | Merge pull request #90 from shaarli/issue-87nodiscc2015-01-051-3/+1
|\ \
| * | Redirect to home page after deleting a linkEmilien Klein2015-01-041-3/+1
|/ /
* | Merge pull request #85 from nodiscc/tagcloud-scalingnodiscc2014-12-292-2/+2
|\ \
| * | improve tag cloud font size scalingnodiscc2014-12-292-2/+2
* | | Merge pull request #82 from pikzen/fix-searchnodiscc2014-12-251-7/+11
|\ \ \
| * | | Made tag/title search unicode aware, fixes #75Florian Eula2014-12-221-7/+11
* | | | Merge pull request #83 from pikzen/loop-factornodiscc2014-12-252-40/+32
|\ \ \ \ | |_|/ / |/| | |
| * | | Refactored the daily column generation (only one loop)Florian Eula2014-12-252-40/+32
|/ / /
* | | 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