aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #798 from ArthurHoaro/feature/composer-lockArthurHoaro2017-03-222-1/+2424
|\
| * Include composer.lock in git filesArthurHoaro2017-03-212-1/+2424
* | Merge pull request #816 from ArthurHoaro/project/master-versionArthurHoaro2017-03-225-22/+123
|\ \
| * | Set Shaarli's version only in shaarli_version.php fileArthurHoaro2017-03-213-13/+62
| * | Add an updateMethod to match the current remote branch for updatesArthurHoaro2017-03-121-0/+44
| * | Use 'dev' version on the master branchArthurHoaro2017-03-124-11/+19
* | | Merge pull request #826 from virtualtam/readme/badgesVirtualTam2017-03-211-3/+8
|\ \ \
| * | | README: use explicit version badgesVirtualTam2017-03-191-3/+8
| | |/ | |/|
* | | Merge pull request #804 from ArthurHoaro/feature/atom-defaultArthurHoaro2017-03-215-4/+66
|\ \ \
| * | | Fixes #304: use atom feed as defaultArthurHoaro2017-03-115-4/+66
* | | | Merge pull request #817 from ArthurHoaro/feature/json-conf-parsingArthurHoaro2017-03-213-4/+14
|\ \ \ \ | |_|/ / |/| | |
| * | | Proper error if the conf file is invalid instead of fatal errorArthurHoaro2017-03-123-4/+14
| | |/ | |/|
* | | Merge pull request #815 from ArthurHoaro/theme/display-versionArthurHoaro2017-03-122-1/+6
|\ \ \ | |/ / |/| |
| * | Theme: display shaarli version in the footer when logged inArthurHoaro2017-03-122-1/+6
|/ /
* | Merge pull request #813 from ArthurHoaro/changelogArthurHoaro2017-03-121-0/+8
|\ \
| * | Update changelogArthurHoaro2017-03-121-0/+8
|/ /
* | Merge pull request #811 from ArthurHoaro/theme/awesomplete-overflowArthurHoaro2017-03-122-1/+5
|\ \
| * | Fixes #806: display overflow for awesomplete listArthurHoaro2017-03-122-1/+5
* | | Merge pull request #812 from ArthurHoaro/theme/configure-valignArthurHoaro2017-03-122-1/+2
|\ \ \ | |/ / |/| |
| * | Theme: Vertical align theme select in configureArthurHoaro2017-03-122-1/+2
|/ /
* | Merge pull request #809 from ArthurHoaro/cleanup/inline-jsArthurHoaro2017-03-1214-110/+286
|\ \
| * | Remove inline JS and add LibreJS headers in JS filesArthurHoaro2017-03-1214-110/+286
* | | Merge pull request #808 from ArthurHoaro/demo-readmeArthurHoaro2017-03-111-1/+1
|\ \ \ | |/ / |/| |
| * | Shaarli demo moved to shaarli.orgArthurHoaro2017-03-111-1/+1
* | | Merge pull request #779 from ArthurHoaro/feature/import-parser-logsArthurHoaro2017-03-116-29/+54
|\ \ \
| * | | Fix namespace issueArthurHoaro2017-03-102-0/+2
| * | | Upgrade netscape-bookmark-parser dependency to v2.xArthurHoaro2017-03-101-1/+1
| * | | Link imports are now logged in `data/` folder, and can be debug using `dev.de...ArthurHoaro2017-03-105-28/+51
| |/ /
* | | Merge pull request #803 from ArthurHoaro/feature/awesomplete-autofirstArthurHoaro2017-03-112-2/+2
|\ \ \
| * | | Fixes #657: use data-autofirst parameter for awesomepleteArthurHoaro2017-03-112-2/+2
| |/ /
* | | Merge pull request #805 from ArthurHoaro/mobile-logoArthurHoaro2017-03-111-1/+1
|\ \ \ | |_|/ |/| |
| * | Fixes #793: display the star logo on mobile instead of home logoArthurHoaro2017-03-111-1/+1
| |/
* | Merge pull request #799 from ArthurHoaro/plugins/piwik-urlArthurHoaro2017-03-114-16/+80
|\ \ | |/ |/|
| * Fix #773: set Piwik URL protocolArthurHoaro2017-03-114-16/+80
|/
* 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