aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | | | | | | | | | | | generated with 'make htmldoc'
| * | use pandoc to generate local HTML documentationnodiscc2015-04-051-0/+6
| | | | | | | | | | | | | | | fixes https://github.com/shaarli/Shaarli/issues/178 run 'make htmldoc'
| * | 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
|/ | | | Fix https://github.com/shaarli/Shaarli/issues/184
* Merge pull request #183 from pikzen/fix-absolute-urlsnodiscc2015-04-011-0/+6
|\ | | | | Display notes as absolute URLs (for real)
| * Display notes as absolute URLsFlorian Eula2015-04-011-0/+6
|/
* Fix bad merge commitArthurHoaro2015-04-011-23/+6
| | | | | | | | Define date format in templates instead of index.php. Conflicts: index.php tpl/dailyrss.html
* update docnodiscc2015-03-311-5/+23
|
* Display notes as absolute urlspikzen2015-03-312-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.feula2015-03-292-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 RSSnodiscc2015-03-311-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.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
| | | | * Fixes second part of #172
* Revert to non-unicode characters for search buttonsnodiscc2015-03-161-2/+2
| | | | * Fixes #172
* 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 ↵nodiscc2015-03-121-2/+2
| |/ | | | | | | glass unicode symbol
* | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 nextnodiscc2015-03-1516-2/+1040
|\ \ \
| * | | Include documentation/wiki locally:nodiscc2015-03-1416-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 everywherenodiscc2015-03-121-8/+8
| | |
* | | update COPYINGnodiscc2015-03-121-0/+1
| | |
* | | added menu div and cleaned up codeMiloš Jovanović2015-03-111-14/+29
| | |
* | | Fix menu dynamic resize, padding, private icon pixelationMiloš Jovanović2015-03-112-35/+58
|/ /
* | Merge pull request #119 from ArthurHoaro/js-linknodiscc2015-03-111-1/+1
|\ \ | | | | | | allow 'javascript:' links sharing (bookmarklets)
| * | Fixes shaarli/Shaarli#46: allow 'javascript:' links sharingArthurHoaro2015-02-201-1/+1
| | |
* | | Merge pull request #151 from nodiscc/addnote-buttonnodiscc2015-03-071-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 ↵nodiscc2015-03-071-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-analysisnodiscc2015-03-073-1/+116
|\ \ \ | |/ / |/| | Code quality: Makefile to run static code checkers
| * | Code quality: Makefile to run static code checkersVirtualTam2015-03-053-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.cssnodiscc2015-03-051-1/+1
| |
* | fix broken CSS file URL introduced in 1f7f8ce067b278a4837364191513d04f7548cef9nodiscc2015-03-051-1/+1
| |
* | Merge pull request #140 from nodiscc/masternodiscc2015-03-054-127/+7
|\ \ | | | | | | Various fixes