aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAgeFilesLines
...
* Merge pull request #797 from ArthurHoaro/hotfix/font-gitArthurHoaro2017-03-099-653/+2675
|\
| * Prevent git from messing with font filesArthurHoaro2017-03-099-653/+2675
* | Merge pull request #794 from ArthurHoaro/hotfix/namespaceArthurHoaro2017-03-094-34/+45
|\ \ | |/ |/|
| * Move config exception to dedicated classes with proper namespaceArthurHoaro2017-03-094-34/+45
|/
* Merge pull request #792 from ArthurHoaro/feature/private-filter-visualArthurHoaro2017-03-097-21/+36
|\
| * Fix blocking namespace issueArthurHoaro2017-03-085-20/+24
| * Display private only filter as search parameterArthurHoaro2017-03-083-1/+12
* | Merge pull request #791 from ArthurHoaro/feature/ctrl-enter-submitArthurHoaro2017-03-092-1/+8
|\ \
| * | Submit editlink textarea using CTRL+Enter shortcutArthurHoaro2017-03-082-1/+8
| |/
* | Merge pull request #796 from virtualtam/changelogVirtualTam2017-03-081-0/+4
|\ \ | |/ |/|
| * Add v0.7.1 to CHANGELOG.mdVirtualTam2017-03-081-0/+4
|/
* Merge pull request #790 from ArthurHoaro/feature/intl-datesArthurHoaro2017-03-074-13/+249
|\
| * Fix autoLocale error and cover it with unit testsArthurHoaro2017-03-074-13/+249
* | Merge pull request #750 from ArthurHoaro/feature/intl-datesArthurHoaro2017-03-0612-23/+246
|\|
| * Use all_tests target in Travis CIArthurHoaro2017-03-061-1/+1
| * Run languages tests using PHPUnit test suitesArthurHoaro2017-03-064-7/+38
| * Improve datetime displayArthurHoaro2017-03-068-35/+174
| * Improve autoLocale() detectionArthurHoaro2017-03-062-9/+62
|/
* Merge pull request #788 from virtualtam/application/namespace/configVirtualTam2017-03-0426-47/+62
|\
| * application: introduce the Shaarli\Config namespaceVirtualTam2017-03-0426-47/+62
* | Merge pull request #789 from virtualtam/changelogVirtualTam2017-03-041-7/+18
|\ \ | |/ |/|
| * Update CHANGELOG.mdVirtualTam2017-03-041-7/+18
|/
* Merge pull request #785 from ArthurHoaro/hotfix/markdown-htmlVirtualTam2017-03-046-27/+181
|\
| * Add markdown_escape settingArthurHoaro2017-02-286-27/+181
|/
* Merge pull request #754 from ArthurHoaro/webdesign2ArthurHoaro2017-02-2790-1775/+10721
|\
| * Set the vintage theme by default for the time beingArthurHoaro2017-02-272-0/+54
| * Multiple minor improvements and bugfixes regarding the new templates:ArthurHoaro2017-02-278-42/+116
| * Upgrade awesomplete + fix multiple autocompletion fieldsArthurHoaro2017-02-273-79/+137
| * Fix markdown plugin color overridingArthurHoaro2017-02-271-1/+1
| * Improve plugin_admin.js to support multiple ordered rowsArthurHoaro2017-02-271-7/+15
| * Introduce the new default Shaarli templateArthurHoaro2017-02-2745-0/+8751
| * Move default template to vintage folderArthurHoaro2017-02-2739-0/+1
|/
* Merge pull request #783 from Sbgodin/spaceInBookmarkletsArthurHoaro2017-02-241-9/+3
|\
| * Removes spaces before and after bookmarklet's nameChristophe HENRY2017-02-221-9/+3
|/
* Merge pull request #728 from ArthurHoaro/api/getLinkArthurHoaro2017-02-195-10/+195
|\
| * REST API: implements getLink by ID serviceArthurHoaro2017-02-195-10/+195
|/
* Merge pull request #769 from ArthurHoaro/api/getlinks-visibilityArthurHoaro2017-02-132-31/+24
|\
| * REST API - getLinks: support the visibility parameterArthurHoaro2017-01-172-31/+24
* | Merge pull request #776 from ArthurHoaro/hotfix/linkdb-updateArthurHoaro2017-02-041-15/+15
|\ \
| * | Fixes #775: LinkDB do not access LinkDB before ID system migrationArthurHoaro2017-02-041-15/+15
|/ /
* | Merge pull request #771 from ArthurHoaro/masterArthurHoaro2017-01-203-2/+8
|\ \ | |/ |/|
| * Bump version to v0.8.3ArthurHoaro2017-01-202-2/+2
| * Changelog v0.8.3ArthurHoaro2017-01-201-0/+6
|/
* Merge pull request #768 from ArthurHoaro/feature/get-public-linksArthurHoaro2017-01-175-39/+107
|\
| * Update LinkFilter to be able to filter only public linksArthurHoaro2017-01-165-39/+107
* | Merge pull request #767 from ArthurHoaro/feature/delete-tag-redirectArthurHoaro2017-01-173-3/+3
|\ \
| * | Stay on the changetag page after tag deletionArthurHoaro2017-01-163-3/+3
| |/
* | Merge pull request #766 from ArthurHoaro/hotfix/deletion-redirectArthurHoaro2017-01-171-25/+9
|\ \
| * | Fix redirection after link deletionArthurHoaro2017-01-161-25/+9
| |/
* | Merge pull request #765 from ArthurHoaro/masterArthurHoaro2017-01-163-3/+8
|\|