aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'ArthurHoaro/default-links'nodiscc2015-06-262-13/+17
|\
| * Fixes unit tests: checking datastore filesize instead of hash.ArthurHoaro2015-06-241-7/+7
| * Change fresh install default linkArthurHoaro2015-06-241-6/+10
* | Merge remote-tracking branch 'virtualtam/linkdb/remove-globals'nodiscc2015-06-264-35/+40
|\ \
| * | LinkDB: do not access global variablesVirtualTam2015-06-244-35/+40
| |/
* | [doc] sync doc with latest wiki, build HTMLnodiscc2015-06-269-233/+443
* | [doc] update CONTRIBUTINGnodiscc2015-06-261-0/+1
* | duplicated id removednicolasm2015-06-261-1/+1
* | awesome.css restored. width bug fixed.nicolasm2015-06-262-0/+6
* | Merge pull request #249 from fbartels/patch-1nodiscc2015-06-261-1/+1
|\ \ | |/ |/|
| * Restore compatability with php 5.3Felix Bartels2015-06-261-1/+1
|/
* move escape() and sanitizeLink() to application/Utils.phpnodiscc2015-06-242-17/+27
* Merge remote-tracking branch 'ArthurHoaro/input-escape' into nextnodiscc2015-06-2412-97/+117
|\
| * Working on shaarli/Shaarli#224ArthurHoaro2015-06-2312-95/+113
* | LinkDB: add 'hidePublicLinks' parameter to the constructorVirtualTam2015-06-243-20/+59
* | 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
* | 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
|/
* 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
* | Merge remote-tracking branch 'ArthurHoaro/daily-date' into nextnodiscc2015-06-232-2/+2
|\ \
| * | Daily page: date format in templateArthurHoaro2015-06-192-2/+2
| |/
* | 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
|\ \
| * | 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
|\ \