Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Do not load links if they're hidden (also fix shaarli/Shaarli#202) | ArthurHoaro | 2015-06-09 | 1 | -20/+8 |
| | |||||
* | split annoyingpatterns list on multpile lines, add new patterns for removal: | nodiscc | 2015-06-03 | 1 | -1/+14 |
| | | | | | | | | * utm_content= * fb= * xtor= closes https://github.com/shaarli/Shaarli/issues/136 | ||||
* | Merge branch 'really-hide' of https://github.com/pikzen/Shaarli into next | nodiscc | 2015-05-22 | 1 | -2/+23 |
|\ | |||||
| * | Properly hide all links | feula | 2015-05-11 | 1 | -2/+23 |
| | | | | | | | | >searchtags | ||||
* | | Merge remote-tracking branch 'Marsup/firefox-social' into next | nodiscc | 2015-05-22 | 3 | -7/+39 |
|\ \ | |||||
| * | | Add Firefox Social API to the tools. Fixes #101. | Marsup | 2015-05-15 | 3 | -7/+39 |
| |/ | |||||
* / | Display date as today if no articles published | Jonathan Druart | 2015-05-11 | 1 | -3/+6 |
|/ | | | | | | | | | On "The Daily Shaarli" page (index.php?do=daily), the date is "Tuesday 30, November 1999" if no articles have been published/shared. This patch checks the parameter ($linkdate) before the mktime call to prevent and generate the "day 0" string. mktime(0,0,0,0,0,0) returns 943916400 (hum?) | ||||
* | doc: add demo to README | nodiscc | 2015-04-20 | 1 | -0/+6 |
| | | | | fixes https://github.com/shaarli/Shaarli/issues/198 | ||||
* | change wording and variable names for "Hide public links" feature | nodiscc | 2015-04-10 | 2 | -6/+6 |
| | |||||
* | Merge remote-tracking branch 'pikzen/disable-public' into next | nodiscc | 2015-04-10 | 2 | -0/+14 |
|\ | |||||
| * | Allow disabling all public links, fixes #188 | feula | 2015-04-09 | 2 | -0/+14 |
| | | |||||
* | | Merge remote-tracking branch 'ArthurHoaro/localecharset' into next | nodiscc | 2015-04-10 | 1 | -3/+4 |
|\ \ | |||||
| * | | #193 add UTF8 by default to autoLocale | ArthurHoaro | 2015-04-08 | 1 | -3/+4 |
| |/ | |||||
* | | Merge branch 'pandoc' into next | nodiscc | 2015-04-10 | 11 | -242/+1264 |
|\ \ | |||||
| * | | doc: remove old mdwiki index.html | nodiscc | 2015-04-05 | 1 | -212/+0 |
| | | | |||||
| * | | doc: point footer link to local html documentation | nodiscc | 2015-04-05 | 1 | -1/+1 |
| | | | |||||
| * | | doc: sync doc/github-markdown.css from wiki | nodiscc | 2015-04-05 | 1 | -0/+277 |
| | | | |||||
| * | | add local HTML documentation | nodiscc | 2015-04-05 | 6 | -0/+907 |
| | | | | | | | | | | | | generated with 'make htmldoc' | ||||
| * | | use pandoc to generate local HTML documentation | nodiscc | 2015-04-05 | 1 | -0/+6 |
| | | | | | | | | | | | | | | | fixes https://github.com/shaarli/Shaarli/issues/178 run 'make htmldoc' | ||||
| * | | doc: update documentation (sync from wiki) | nodiscc | 2015-04-05 | 1 | -8/+55 |
| | | | |||||
| * | | cleanup: makefile comments | nodiscc | 2015-04-05 | 1 | -21/+18 |
| |/ | |||||
* | | Merge commit '326ae54' into next | nodiscc | 2015-04-10 | 1 | -1/+0 |
|\ \ | |/ |/| | |||||
| * | Fix missing permalink title when logged in | dimtion | 2015-04-05 | 1 | -1/+0 |
| | | |||||
* | | Fixes autoLocale function by trying several way to find a correct one. | ArthurHoaro | 2015-04-05 | 1 | -4/+9 |
|/ | | | | Fix https://github.com/shaarli/Shaarli/issues/184 | ||||
* | Merge pull request #183 from pikzen/fix-absolute-urls | nodiscc | 2015-04-01 | 1 | -0/+6 |
|\ | | | | | Display notes as absolute URLs (for real) | ||||
| * | Display notes as absolute URLs | Florian Eula | 2015-04-01 | 1 | -0/+6 |
|/ | |||||
* | Fix bad merge commit | ArthurHoaro | 2015-04-01 | 1 | -23/+6 |
| | | | | | | | | Define date format in templates instead of index.php. Conflicts: index.php tpl/dailyrss.html | ||||
* | update doc | nodiscc | 2015-03-31 | 1 | -5/+23 |
| | |||||
* | Display notes as absolute urls | pikzen | 2015-03-31 | 2 | -18/+27 |
|\ | | | | | | | | | | | | | Fixes https://github.com/shaarli/Shaarli/issues/177 Merge commit '3ea318dad05954e2043d5bb2f8572b103d7c3930' into notes-absolute-url Conflicts: index.php | ||||
| * | Display notes as absolute urls. | feula | 2015-03-29 | 2 | -10/+17 |
| | | | | | | | | | | The deletion is related to Windows not handling quotes in filenames, see #179. It shouldn't delete the real file. Probably. Check it out. | ||||
* | | Fix php error in daily RSS | nodiscc | 2015-03-31 | 1 | -1/+1 |
| | | | | | | | | | | Use of undefined constant htmlspecialchars - assumed 'htmlspecialchars' in /var/www/links/tmp/dailyrss.* Thanks @alexisju in https://github.com/shaarli/Shaarli/commit/bec18701801cc140d760c261dd115fda1507a0dd | ||||
* | | Fixes autoLocale function by trying several way to find a correct one. | ArthurHoaro | 2015-03-31 | 1 | -4/+9 |
| | | |||||
* | | Define date format in templates instead of index.php. | ArthurHoaro | 2015-03-31 | 4 | -17/+7 |
|/ | |||||
* | bump version to 0.0.45betav0.0.45beta | nodiscc | 2015-03-16 | 2 | -3/+3 |
| | |||||
* | restore normal font size for the "Add link" input field | nodiscc | 2015-03-16 | 1 | -0/+1 |
| | | | | * Fixes second part of #172 | ||||
* | Revert to non-unicode characters for search buttons | nodiscc | 2015-03-16 | 1 | -2/+2 |
| | | | | * Fixes #172 | ||||
* | Merge branch 'picwall-direct-link' into nextv0.0.44beta | nodiscc | 2015-03-15 | 2 | -2/+1 |
|\ | |||||
| * | picwall: link directly to the target URL (not the permalink) | nodiscc | 2015-03-11 | 2 | -2/+1 |
| | | |||||
* | | bump version to 0.0.44beta | nodiscc | 2015-03-15 | 2 | -3/+3 |
| | | |||||
* | | Merge branch 'cleaner-searchfields' into next | nodiscc | 2015-03-15 | 1 | -2/+2 |
|\ \ | |||||
| * | | add placeholder text for search fields, change button text to magnifying ↵ | nodiscc | 2015-03-12 | 1 | -2/+2 |
| |/ | | | | | | | glass unicode symbol | ||||
* | | Merge remote-tracking branch 'ArthurHoaro/autocomplete' into next | nodiscc | 2015-03-15 | 13 | -27028/+562 |
|\ \ | |||||
| * | | Use awesomplete as autocomplete lib and remove jQuery - shaarli/Shaarli#148 | ArthurHoaro | 2015-03-12 | 13 | -27028/+562 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add awesomplete dependancy (source + min + CSS) * Remove jQuery and jQuery-UI dependancy * Few CSS ajustements * Use tags complete list as RainTPL var (and display it as HTML) * Remove "disable jQuery" feature * Remove tag list web service | ||||
* | | | Merge branch 'include-doc' into next | nodiscc | 2015-03-15 | 16 | -2/+1040 |
|\ \ \ | |||||
| * | | | Include documentation/wiki locally: | nodiscc | 2015-03-14 | 16 | -2/+1040 |
| | |/ | |/| | | | | | | | | | | | | | | | | * sync current wiki (https://github.com/shaarli/Shaarli/wiki) to the doc/ directory * fix missing logo in README * add link to local documentation in the page footer * add Makefile targets for doc generation by @virtualtam | ||||
* | | | theme: decrease border-radius to 3px everywhere | nodiscc | 2015-03-12 | 1 | -8/+8 |
| | | | |||||
* | | | update COPYING | nodiscc | 2015-03-12 | 1 | -0/+1 |
| | | | |||||
* | | | added menu div and cleaned up code | Miloš Jovanović | 2015-03-11 | 1 | -14/+29 |
| | | | |||||
* | | | Fix menu dynamic resize, padding, private icon pixelation | Miloš Jovanović | 2015-03-11 | 2 | -35/+58 |
|/ / | |||||
* | | Merge pull request #119 from ArthurHoaro/js-link | nodiscc | 2015-03-11 | 1 | -1/+1 |
|\ \ | | | | | | | allow 'javascript:' links sharing (bookmarklets) |