| Commit message (Expand) | Author | Age | Files | Lines |
* | README: add link to the upgrade and migration wiki page | VirtualTam | 2016-05-20 | 1 | -0/+1 |
* | Merge pull request #574 from shaarli/urlparams-phpsessid | VirtualTam | 2016-05-20 | 2 | -0/+2 |
|\ |
|
| * | Url.php: remove unwanted ?PHPSESSID= URL parameters, | nodiscc | 2016-05-20 | 2 | -0/+2 |
|/ |
|
* | Merge pull request #568 from ArthurHoaro/master | Arthur | 2016-05-14 | 1 | -1/+1 |
|\ |
|
| * | PHP endtag in shaarli_version.php | ArthurHoaro | 2016-05-14 | 1 | -1/+1 |
|/ |
|
* | Merge pull request #567 from ArthurHoaro/v0.7.0v0.7.0 | Arthur | 2016-05-14 | 47 | -197/+73 |
|\ |
|
| * | Doc update | ArthurHoaro | 2016-05-14 | 45 | -194/+70 |
| * | Version bump: v0.7.0 | ArthurHoaro | 2016-05-14 | 2 | -3/+3 |
|/ |
|
* | Merge pull request #560 from ArthurHoaro/nb-private-shaare | Arthur | 2016-05-14 | 5 | -138/+177 |
|\ |
|
| * | Add private link counter | ArthurHoaro | 2016-05-13 | 4 | -15/+30 |
| * | Extract PageBuilder class from index.php | ArthurHoaro | 2016-05-13 | 2 | -123/+147 |
* | | Merge pull request #556 from ArthurHoaro/login-refill | Arthur | 2016-05-14 | 2 | -20/+33 |
|\ \ |
|
| * | | Prefill the login field when the authentication has failed | ArthurHoaro | 2016-05-06 | 2 | -5/+17 |
| * | | Reindent the login template | ArthurHoaro | 2016-05-06 | 1 | -18/+19 |
* | | | Merge pull request #559 from ArthurHoaro/startsEndWithCase | Arthur | 2016-05-14 | 4 | -23/+35 |
|\ \ \ |
|
| * | | | Fix startsWith and endsWith case | ArthurHoaro | 2016-05-10 | 4 | -23/+35 |
| | |/
| |/| |
|
* | | | Merge pull request #566 from ArthurHoaro/md-inline-code | Arthur | 2016-05-13 | 1 | -0/+7 |
|\ \ \ |
|
| * | | | Markdown: inline code background color | ArthurHoaro | 2016-05-13 | 1 | -0/+7 |
| |/ / |
|
* | | | Merge pull request #562 from ArthurHoaro/hotfix/561 | Arthur | 2016-05-13 | 1 | -6/+0 |
|\ \ \
| |/ /
|/| | |
|
| * | | Don't redirect to ?post if ?addlink is reached while logged out | ArthurHoaro | 2016-05-11 | 1 | -6/+0 |
|/ / |
|
* | | Merge pull request #557 from ArthurHoaro/remove-delicious | Arthur | 2016-05-10 | 2 | -2/+4 |
|\ \ |
|
| * | | Remove delicious from Shaarli description | ArthurHoaro | 2016-05-08 | 2 | -2/+4 |
| |/ |
|
* | | Merge pull request #554 from virtualtam/fix/bookmark-export | VirtualTam | 2016-05-06 | 4 | -19/+74 |
|\ \
| |/
|/| |
|
| * | Export: allow prepending notes with the Shaarli instance's URL | VirtualTam | 2016-05-06 | 4 | -19/+74 |
|/ |
|
* | Merge pull request #552 from shaarli/readme-doc-plugins | Arthur | 2016-05-05 | 1 | -0/+1 |
|\ |
|
| * | add link to plugins doc | nodiscc | 2016-05-05 | 1 | -0/+1 |
* | | Merge pull request #553 from ArthurHoaro/typo | Arthur | 2016-05-05 | 3 | -5/+5 |
|\ \ |
|
| * | | typo | ArthurHoaro | 2016-05-05 | 3 | -5/+5 |
|/ / |
|
* | | Merge pull request #551 from ArthurHoaro/hotfix/timezone | Arthur | 2016-05-05 | 3 | -13/+13 |
|\ \
| |/
|/| |
|
| * | Use correct 'UTC' timezone | ArthurHoaro | 2016-05-03 | 3 | -13/+13 |
* | | Merge pull request #532 from ArthurHoaro/hotfix/title-retrieve-the-return | Arthur | 2016-05-03 | 6 | -16/+142 |
|\ \ |
|
| * | | Fixes #531 - Title retrieving is failing with multiple use case | ArthurHoaro | 2016-05-03 | 6 | -16/+142 |
* | | | Merge pull request #550 from kalvn/master | Arthur | 2016-05-03 | 1 | -2/+2 |
|\ \ \ |
|
| * | | | Renames Awesomeplete dollar variable to avoid conflicts with jQuery | kalvn | 2016-05-03 | 1 | -2/+2 |
|/ / / |
|
* | | | Merge pull request #539 from daniellowtw/bugfix/array_filter-messes-with-keys | Arthur | 2016-04-14 | 1 | -1/+1 |
|\ \ \ |
|
| * | | | Fix error when filtering search tags | D Low | 2016-04-14 | 1 | -1/+1 |
* | | | | Merge pull request #540 from ArthurHoaro/doc/update20160414 | Arthur | 2016-04-14 | 61 | -626/+3433 |
|\ \ \ \
| |/ / /
|/| | | |
|
| * | | | Update docs from Wiki | ArthurHoaro | 2016-04-14 | 61 | -626/+3433 |
|/ / / |
|
* | | | Merge pull request #538 from virtualtam/fix/bookmark-export | VirtualTam | 2016-04-12 | 5 | -42/+202 |
|\ \ \ |
|
| * | | | Refactor Netscape bookmark exporting | VirtualTam | 2016-04-10 | 5 | -42/+202 |
|/ / / |
|
* | | | Merge pull request #537 from virtualtam/tests/dependencies | VirtualTam | 2016-04-10 | 1 | -1/+1 |
|\ \ \
| |_|/
|/| | |
|
| * | | Tests: update PHPUnit to 4.8.x | VirtualTam | 2016-04-10 | 1 | -1/+1 |
|/ / |
|
* | | Merge pull request #524 from ArthurHoaro/hotfix/redirectorurl | Arthur | 2016-04-09 | 3 | -25/+47 |
|\ \ |
|
| * | | Fixes #480: add an option to urlencode redirector URL | ArthurHoaro | 2016-04-09 | 3 | -25/+47 |
|/ / |
|
* | | Merge pull request #525 from ArthurHoaro/plugins/feeds-markdown2 | Arthur | 2016-04-09 | 1 | -0/+19 |
|\ \ |
|
| * | | Process feeds content with Markdown | ArthurHoaro | 2016-03-26 | 1 | -0/+19 |
* | | | Merge pull request #527 from ArthurHoaro/hotfix/tagcloud-size | Arthur | 2016-04-09 | 2 | -7/+12 |
|\ \ \
| |_|/
|/| | |
|
| * | | Fixes #526: bad font size separator in tagcloud with some locale | ArthurHoaro | 2016-03-31 | 2 | -7/+12 |
| |/ |
|
* | | Merge pull request #522 from ArthurHoaro/hotfix/readershaare | VirtualTam | 2016-03-30 | 2 | -1/+38 |
|\ \
| |/
|/| |
|
| * | Refactor and rebase #380: Firefox reader view links | ArthurHoaro | 2016-03-26 | 2 | -13/+36 |