aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAgeFilesLines
* re-add readDb() missing from previous mergenodiscc2015-06-231-0/+7
* Merge remote-tracking branch 'virtualtam/test/link-db' into nextnodiscc2015-06-2312-264/+1231
|\
| * LinkDB: move to a proper file, add test coverageVirtualTam2015-06-1112-257/+1231
* | Merge remote-tracking branch 'ArthurHoaro/search-tag-awesomplete' into nextnodiscc2015-06-233-3/+23
|\ \
| * | Add awesomplete to tag search shaarli/Shaarli#49ArthurHoaro2015-06-093-3/+23
| |/
* | Merge remote-tracking branch 'virtualtam/travis' into nextnodiscc2015-06-231-0/+10
|\ \
| * | Add Travis CI configVirtualTam2015-06-051-0/+10
| |/
* / Do not load links if they're hidden (also fix shaarli/Shaarli#202)ArthurHoaro2015-06-091-20/+8
|/
* split annoyingpatterns list on multpile lines, add new patterns for removal:nodiscc2015-06-031-1/+14
* Merge branch 'really-hide' of https://github.com/pikzen/Shaarli into nextnodiscc2015-05-221-2/+23
|\
| * Properly hide all linksfeula2015-05-111-2/+23
* | Merge remote-tracking branch 'Marsup/firefox-social' into nextnodiscc2015-05-223-7/+39
|\ \
| * | Add Firefox Social API to the tools. Fixes #101.Marsup2015-05-153-7/+39
| |/
* / Display date as today if no articles publishedJonathan Druart2015-05-111-3/+6
|/
* doc: add demo to READMEnodiscc2015-04-201-0/+6
* change wording and variable names for "Hide public links" featurenodiscc2015-04-102-6/+6
* Merge remote-tracking branch 'pikzen/disable-public' into nextnodiscc2015-04-102-0/+14
|\
| * Allow disabling all public links, fixes #188feula2015-04-092-0/+14
* | Merge remote-tracking branch 'ArthurHoaro/localecharset' into nextnodiscc2015-04-101-3/+4
|\ \
| * | #193 add UTF8 by default to autoLocaleArthurHoaro2015-04-081-3/+4
| |/
* | Merge branch 'pandoc' into nextnodiscc2015-04-1011-242/+1264
|\ \
| * | doc: remove old mdwiki index.htmlnodiscc2015-04-051-212/+0
| * | doc: point footer link to local html documentationnodiscc2015-04-051-1/+1
| * | doc: sync doc/github-markdown.css from wikinodiscc2015-04-051-0/+277
| * | add local HTML documentationnodiscc2015-04-056-0/+907
| * | use pandoc to generate local HTML documentationnodiscc2015-04-051-0/+6
| * | doc: update documentation (sync from wiki)nodiscc2015-04-051-8/+55
| * | cleanup: makefile commentsnodiscc2015-04-051-21/+18
| |/
* | Merge commit '326ae54' into nextnodiscc2015-04-101-1/+0
|\ \ | |/ |/|
| * Fix missing permalink title when logged indimtion2015-04-051-1/+0
* | Fixes autoLocale function by trying several way to find a correct one.ArthurHoaro2015-04-051-4/+9
|/
* Merge pull request #183 from pikzen/fix-absolute-urlsnodiscc2015-04-011-0/+6
|\
| * Display notes as absolute URLsFlorian Eula2015-04-011-0/+6
|/
* Fix bad merge commitArthurHoaro2015-04-011-23/+6
* update docnodiscc2015-03-311-5/+23
* Display notes as absolute urlspikzen2015-03-312-18/+27
|\
| * Display notes as absolute urls.feula2015-03-292-10/+17
* | Fix php error in daily RSSnodiscc2015-03-311-1/+1
* | Fixes autoLocale function by trying several way to find a correct one.ArthurHoaro2015-03-311-4/+9
* | Define date format in templates instead of index.php.ArthurHoaro2015-03-314-17/+7
|/
* bump version to 0.0.45betav0.0.45betanodiscc2015-03-162-3/+3
* restore normal font size for the "Add link" input fieldnodiscc2015-03-161-0/+1
* Revert to non-unicode characters for search buttonsnodiscc2015-03-161-2/+2
* Merge branch 'picwall-direct-link' into nextv0.0.44betanodiscc2015-03-152-2/+1
|\
| * picwall: link directly to the target URL (not the permalink)nodiscc2015-03-112-2/+1
* | bump version to 0.0.44betanodiscc2015-03-152-3/+3
* | Merge branch 'cleaner-searchfields' into nextnodiscc2015-03-151-2/+2
|\ \
| * | add placeholder text for search fields, change button text to magnifying glas...nodiscc2015-03-121-2/+2
| |/
* | Merge remote-tracking branch 'ArthurHoaro/autocomplete' into nextnodiscc2015-03-1513-27028/+562
|\ \
| * | Use awesomplete as autocomplete lib and remove jQuery - shaarli/Shaarli#148ArthurHoaro2015-03-1213-27028/+562