Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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) | ||||
| * | | Fixes shaarli/Shaarli#46: allow 'javascript:' links sharing | ArthurHoaro | 2015-02-20 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #151 from nodiscc/addnote-button | nodiscc | 2015-03-07 | 1 | -0/+1 |
|\ \ \ | | | | | | | | | tools dialog: add a 'Add Note' bookmarklet to immediatly open a note (text post) compose window | ||||
| * | | | tools dialog: add a 'Add Note' bookmarklet to immediatly open a note (text ↵ | nodiscc | 2015-03-07 | 1 | -0/+1 |
| | |/ | |/| | | | | | | | | | | | | | | | | post) compose window * Fixes https://github.com/shaarli/Shaarli/issues/142 * Fixes https://github.com/sebsauvage/Shaarli/issues/59 | ||||
* | | | Merge pull request #124 from virtualtam/static-analysis | nodiscc | 2015-03-07 | 3 | -1/+116 |
|\ \ \ | |/ / |/| | | Code quality: Makefile to run static code checkers | ||||
| * | | Code quality: Makefile to run static code checkers | VirtualTam | 2015-03-05 | 3 | -1/+116 |
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Relates to #71 Relates to #95 Additions: - Makefile for easy usage, - Composer file to declare dev & test dependencies. Features: - PHP Copy/Paste Detect: detect duplicate code; - PHP Code Sniffer: static analysis, syntax checking, - PHP Mess Detector: static analysis, syntax checking. Signed-off-by: VirtualTam <virtualtam@flibidi.org> | ||||
* | | fix broken URL for user.css | nodiscc | 2015-03-05 | 1 | -1/+1 |
| | | |||||
* | | fix broken CSS file URL introduced in 1f7f8ce067b278a4837364191513d04f7548cef9 | nodiscc | 2015-03-05 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #140 from nodiscc/master | nodiscc | 2015-03-05 | 4 | -127/+7 |
|\ \ | | | | | | | Various fixes | ||||
| * | | add bountysource.com badge | nodiscc | 2015-03-05 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | * Bountysource is the funding platform for open-source software. Users can improve the open-source projects they love by creating/collecting bounties and pledging to fundraisers. * https://github.com/bountysource/frontend/wiki/Frequently-Asked-Questions |