aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #576 from virtualtam/readme/link-upgradeVirtualTam2016-05-201-0/+1
|\
| * README: add link to the upgrade and migration wiki pageVirtualTam2016-05-201-0/+1
|/
* Merge pull request #574 from shaarli/urlparams-phpsessidVirtualTam2016-05-202-0/+2
|\
| * Url.php: remove unwanted ?PHPSESSID= URL parameters,nodiscc2016-05-202-0/+2
|/
* Merge pull request #568 from ArthurHoaro/masterArthur2016-05-141-1/+1
|\
| * PHP endtag in shaarli_version.phpArthurHoaro2016-05-141-1/+1
|/
* Merge pull request #567 from ArthurHoaro/v0.7.0v0.7.0Arthur2016-05-1447-197/+73
|\
| * Doc updateArthurHoaro2016-05-1445-194/+70
| * Version bump: v0.7.0ArthurHoaro2016-05-142-3/+3
|/
* Merge pull request #560 from ArthurHoaro/nb-private-shaareArthur2016-05-145-138/+177
|\
| * Add private link counterArthurHoaro2016-05-134-15/+30
| * Extract PageBuilder class from index.phpArthurHoaro2016-05-132-123/+147
* | Merge pull request #556 from ArthurHoaro/login-refillArthur2016-05-142-20/+33
|\ \
| * | Prefill the login field when the authentication has failedArthurHoaro2016-05-062-5/+17
| * | Reindent the login templateArthurHoaro2016-05-061-18/+19
* | | Merge pull request #559 from ArthurHoaro/startsEndWithCaseArthur2016-05-144-23/+35
|\ \ \
| * | | Fix startsWith and endsWith caseArthurHoaro2016-05-104-23/+35
| | |/ | |/|
* | | Merge pull request #566 from ArthurHoaro/md-inline-codeArthur2016-05-131-0/+7
|\ \ \
| * | | Markdown: inline code background colorArthurHoaro2016-05-131-0/+7
| |/ /
* | | Merge pull request #562 from ArthurHoaro/hotfix/561Arthur2016-05-131-6/+0
|\ \ \ | |/ / |/| |
| * | Don't redirect to ?post if ?addlink is reached while logged outArthurHoaro2016-05-111-6/+0
|/ /
* | Merge pull request #557 from ArthurHoaro/remove-deliciousArthur2016-05-102-2/+4
|\ \
| * | Remove delicious from Shaarli descriptionArthurHoaro2016-05-082-2/+4
| |/
* | Merge pull request #554 from virtualtam/fix/bookmark-exportVirtualTam2016-05-064-19/+74
|\ \ | |/ |/|
| * Export: allow prepending notes with the Shaarli instance's URLVirtualTam2016-05-064-19/+74
|/
* Merge pull request #552 from shaarli/readme-doc-pluginsArthur2016-05-051-0/+1
|\
| * add link to plugins docnodiscc2016-05-051-0/+1
* | Merge pull request #553 from ArthurHoaro/typoArthur2016-05-053-5/+5
|\ \
| * | typoArthurHoaro2016-05-053-5/+5
|/ /
* | Merge pull request #551 from ArthurHoaro/hotfix/timezoneArthur2016-05-053-13/+13
|\ \ | |/ |/|
| * Use correct 'UTC' timezoneArthurHoaro2016-05-033-13/+13
* | Merge pull request #532 from ArthurHoaro/hotfix/title-retrieve-the-returnArthur2016-05-036-16/+142
|\ \
| * | Fixes #531 - Title retrieving is failing with multiple use caseArthurHoaro2016-05-036-16/+142
* | | Merge pull request #550 from kalvn/masterArthur2016-05-031-2/+2
|\ \ \
| * | | Renames Awesomeplete dollar variable to avoid conflicts with jQuerykalvn2016-05-031-2/+2
|/ / /
* | | Merge pull request #539 from daniellowtw/bugfix/array_filter-messes-with-keysArthur2016-04-141-1/+1
|\ \ \
| * | | Fix error when filtering search tagsD Low2016-04-141-1/+1
* | | | Merge pull request #540 from ArthurHoaro/doc/update20160414Arthur2016-04-1461-626/+3433
|\ \ \ \ | |/ / / |/| | |
| * | | Update docs from WikiArthurHoaro2016-04-1461-626/+3433
|/ / /
* | | Merge pull request #538 from virtualtam/fix/bookmark-exportVirtualTam2016-04-125-42/+202
|\ \ \
| * | | Refactor Netscape bookmark exportingVirtualTam2016-04-105-42/+202
|/ / /
* | | Merge pull request #537 from virtualtam/tests/dependenciesVirtualTam2016-04-101-1/+1
|\ \ \ | |_|/ |/| |
| * | Tests: update PHPUnit to 4.8.xVirtualTam2016-04-101-1/+1
|/ /
* | Merge pull request #524 from ArthurHoaro/hotfix/redirectorurlArthur2016-04-093-25/+47
|\ \
| * | Fixes #480: add an option to urlencode redirector URLArthurHoaro2016-04-093-25/+47
|/ /
* | Merge pull request #525 from ArthurHoaro/plugins/feeds-markdown2Arthur2016-04-091-0/+19
|\ \
| * | Process feeds content with MarkdownArthurHoaro2016-03-261-0/+19
* | | Merge pull request #527 from ArthurHoaro/hotfix/tagcloud-sizeArthur2016-04-092-7/+12
|\ \ \ | |_|/ |/| |
| * | Fixes #526: bad font size separator in tagcloud with some localeArthurHoaro2016-03-312-7/+12
| |/
* | Merge pull request #522 from ArthurHoaro/hotfix/readershaareVirtualTam2016-03-302-1/+38
|\ \ | |/ |/|