aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
* add travis-ci.org build status to READMEnodiscc2015-06-241-1/+1
|
* Add link to 'Running unit tests wiki page'nodiscc2015-06-231-0/+1
| | | Fixes https://github.com/shaarli/Shaarli/issues/234
* Merge remote-tracking branch 'nicolasdanelon/master' into nextnodiscc2015-06-232-7/+7
|\
| * cursor pointer for label (ux improvement)Nicolas Danelon2015-06-231-0/+1
| |
| * fix no javascriptNicolas Danelon2015-06-232-6/+0
| |
| * Update awesomplete.cssNicolas Danelon2015-06-231-1/+0
| |
| * filter input search responsive fixed (mobile)Nicolas Danelon2015-06-232-2/+8
| |
* | Page title if there is a single linkArthurHoaro2015-06-231-2/+4
|/ | | | Fixes #232
* add tabindex 1/2 to search and tags fieldsnodiscc2015-06-231-2/+3
|
* Merge remote-tracking branch 'origin/doc-contributing'nodiscc2015-06-231-0/+80
|\
| * Create CONTIBUTING.mdnodiscc2015-06-101-0/+80
| | | | | | Contributing guidelines, fixes https://github.com/shaarli/Shaarli/issues/154
* | Merge remote-tracking branch 'ArthurHoaro/daily-date' into nextnodiscc2015-06-232-2/+2
|\ \
| * | Daily page: date format in templateArthurHoaro2015-06-192-2/+2
| |/ | | | | | | | | | | | | | | It only concerns the date of the day in the main title. Fixes #182 Note that daily RSS feed is not generated through templates. Date are still hard formatted in that case.
* | Merge remote-tracking branch 'nicolasdanelon/master' into nextnodiscc2015-06-232-4/+30
|\ \
| * | fix login desktopnda2015-06-191-0/+10
| | |
| * | login enhance for mobilenda2015-06-192-4/+20
| |/
* | 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
|\ \ | | | | | | | | | | | | Conflicts: index.php
| * | LinkDB: move to a proper file, add test coverageVirtualTam2015-06-1112-257/+1231
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Relates to #71 LinkDB - move to application/LinkDB.php - code cleanup - indentation - whitespaces - formatting - comment cleanup - add missing documentation - unify formatting Test coverage for LinkDB - constructor - public / private access - link-related methods Shaarli utilities (LinkDB dependencies) - move startsWith() and endsWith() functions to application/Utils.php - add test coverage Dev utilities - Composer: add PHPUnit to dev dependencies - Makefile: - update lint targets - add test targets - generate coverage reports Signed-off-by: VirtualTam <virtualtam@flibidi.net>
* | 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
| |/ | | | | | | | | | | Relates to #71 Signed-off-by: VirtualTam <virtualtam@flibidi.net>
* / 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
| | | | | | | | * utm_content= * fb= * xtor= closes https://github.com/shaarli/Shaarli/issues/136
* Merge branch 'really-hide' of https://github.com/pikzen/Shaarli into nextnodiscc2015-05-221-2/+23
|\
| * Properly hide all linksfeula2015-05-111-2/+23
| | | | | | | | >searchtags
* | 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
|/ | | | | | | | | 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 READMEnodiscc2015-04-201-0/+6
| | | | fixes https://github.com/shaarli/Shaarli/issues/198
* 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