aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAgeFilesLines
* 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
* | Merge branch 'include-doc' into nextnodiscc2015-03-1516-2/+1040
|\ \
| * | Include documentation/wiki locally:nodiscc2015-03-1416-2/+1040
* | | 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
|\ \
| * | 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 po...nodiscc2015-03-071-0/+1
| | |/ | |/|
* | | Merge pull request #124 from virtualtam/static-analysisnodiscc2015-03-073-1/+116
|\ \ \ | |/ / |/| |
| * | Code quality: Makefile to run static code checkersVirtualTam2015-03-053-1/+116
|/ /
* | 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
|\ \
| * | add bountysource.com badgenodiscc2015-03-051-1/+1
| * | Redirect to homepage after adding a link via "Add Link" dialognodiscc2015-03-051-0/+1
| * | update README: add note about php-gd and git-based upgradenodiscc2015-03-051-4/+3
| * | remove duplicate license information, fixes https://github.com/shaarli/Shaarl...nodiscc2015-03-051-120/+0
| * | cleanup: remove version number from CSS linksnodiscc2015-03-051-2/+2
|/ /
* | Merge pull request #141 from nodiscc/cleanurl-filtersnodiscc2015-03-051-4/+7
|\ \
| * | Improve URL cleaning:nodiscc2015-03-051-1/+1
| * | Improve annoying URL parameters cleaning:nodiscc2015-03-051-2/+3
| * | cleanup: refactor annoying URL patterns in a single loopnodiscc2015-03-041-9/+6
| * | Add some filters to clean URLsAlexis J2015-03-041-0/+5
* | | Merge pull request #132 from ArthurHoaro/picwallnodiscc2015-03-049-280/+256
|\ \ \ | |/ / |/| |
| * | Lazy load images with the light lib bLazy.js instead of jQuery:ArthurHoaro2015-03-019-280/+256
|/ /
* | Merge pull request #123 from nodiscc/dont-disclose-versionEmilien Klein2015-02-253-3/+3
|\ \
| * | Prevent visitors from reading shaarli versionnodiscc2015-02-253-3/+3
|/ /
* | Merge pull request #120 from ArthurHoaro/optionalupdateEmilien Klein2015-02-213-11/+22
|\ \ | |/ |/|
| * shaarli/Shaarli#34: Make update check optionalArthurHoaro2015-02-203-11/+22
|/
* bump version to 0.0.43betav0.0.43betanodiscc2015-02-202-3/+3
* Merge pull request #86 from pikzen/fix-cookiesnodiscc2015-02-191-22/+57
|\
| * Only verify login state at the beginning of the request.Florian Eula2015-02-181-22/+57
* | Added Gitter badge (Fixes #116)Emilien Klein2015-02-191-0/+1
|/
* Merge pull request #114 from nodiscc/redirect-previous-searchnodiscc2015-02-171-1/+31
|\
| * redirect to previous search (if any) when deleting a linkfeula2015-02-171-1/+31
|/
* fix broken reset.css URL introduced in a6e0134nodiscc2015-02-171-1/+1
* Merge pull request #109 from nodiscc/version-checknodiscc2015-02-146-19/+217
|\
| * Fix missing authors and licenses in COPYINGnodiscc2015-02-144-10/+204
| * Update README and Shaarli's footernodiscc2015-02-142-9/+13
|/
* Merge pull request #63 from pikzen/permaoptionsnodiscc2015-02-074-13/+27
|\
| * Feature: enable/disable permalinks for RSSFlorian Eula2015-02-074-13/+27
|/
* Merge pull request #107 from pikzen/fix-copyingnodiscc2015-01-271-12/+510
|\
| * Fixed license info, reverted qr.js to GPLFlorian Eula2015-01-271-12/+510
|/
* Merge pull request #98 from ArthurHoaro/portnodiscc2015-01-261-4/+4
|\
| * Fixes Port/server config problems - see: https://github.com/shaarli/Shaarli/i...ArthurHoaro2015-01-091-4/+4
* | Merge pull request #99 from pikzen/license-versionnodiscc2015-01-2617-82/+28580
|\ \