aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAgeFilesLines
...
* | | | 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
|\ \ | |/ |/|
| * Refactor and rebase #380: Firefox reader view linksArthurHoaro2016-03-262-13/+36
| * Fix issue 366, Problem when shaaring a link in Reader View of Firefox.Kevin Canévet2016-03-241-1/+15
* | Remove dev cache disablingArthurHoaro2016-03-261-1/+1
* | Merge pull request #520 from ArthurHoaro/plugins/nomarkdownArthur2016-03-263-12/+89
|\ \
| * | Update markdown plugin README documentationArthurHoaro2016-03-261-11/+23
| * | Markdown: Add the 'meta-tag' `.nomarkdown` which prevent a shaare from being ...ArthurHoaro2016-03-212-1/+66
* | | Merge pull request #515 from ArthurHoaro/template-feedsArthur2016-03-2516-339/+859
|\ \ \
| * | | Refactor filter in LinkDBArthurHoaro2016-03-258-106/+158
| * | | Makes escape a recursive function which handle array of stringsArthurHoaro2016-03-251-3/+11
| * | | FeedBuilder unit testsArthurHoaro2016-03-253-15/+227
| * | | Create a FeedBuilder class which build data for both ATOM and RSS feed.ArthurHoaro2016-03-253-239/+337
| * | | Reword the ENABLE_RSS_PERMALINKS in the settings.ArthurHoaro2016-03-181-2/+5
| * | | Plugin: add render_feed hook and call it while generating ATOM and RSS feed.ArthurHoaro2016-03-182-1/+32
| * | | Refactor showRSS, and make it use the RSS templateArthurHoaro2016-03-181-53/+67
| * | | Refactor showAtom, and make it use the ATOM templateArthurHoaro2016-03-182-67/+60
| * | | Adds a route for ATOM and RSS feeds pageArthurHoaro2016-03-181-0/+12
| * | | Adds a RSS template fileArthurHoaro2016-03-181-0/+34
| * | | Create a template to handle ATOM feedArthurHoaro2016-03-181-0/+40
| * | | Add method assignAll() to pageBuilder to assign an array of dataArthurHoaro2016-03-181-0/+23
| |/ /