| Commit message (Expand) | Author | Age | Files | Lines |
* | 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 |
| * | Fix issue 366, Problem when shaaring a link in Reader View of Firefox. | Kevin Canévet | 2016-03-24 | 1 | -1/+15 |
* | | Remove dev cache disabling | ArthurHoaro | 2016-03-26 | 1 | -1/+1 |
* | | Merge pull request #520 from ArthurHoaro/plugins/nomarkdown | Arthur | 2016-03-26 | 3 | -12/+89 |
|\ \ |
|
| * | | Update markdown plugin README documentation | ArthurHoaro | 2016-03-26 | 1 | -11/+23 |
| * | | Markdown: Add the 'meta-tag' `.nomarkdown` which prevent a shaare from being ... | ArthurHoaro | 2016-03-21 | 2 | -1/+66 |
* | | | Merge pull request #515 from ArthurHoaro/template-feeds | Arthur | 2016-03-25 | 16 | -339/+859 |
|\ \ \ |
|
| * | | | Refactor filter in LinkDB | ArthurHoaro | 2016-03-25 | 8 | -106/+158 |
| * | | | Makes escape a recursive function which handle array of strings | ArthurHoaro | 2016-03-25 | 1 | -3/+11 |
| * | | | FeedBuilder unit tests | ArthurHoaro | 2016-03-25 | 3 | -15/+227 |
| * | | | Create a FeedBuilder class which build data for both ATOM and RSS feed. | ArthurHoaro | 2016-03-25 | 3 | -239/+337 |
| * | | | Reword the ENABLE_RSS_PERMALINKS in the settings. | ArthurHoaro | 2016-03-18 | 1 | -2/+5 |
| * | | | Plugin: add render_feed hook and call it while generating ATOM and RSS feed. | ArthurHoaro | 2016-03-18 | 2 | -1/+32 |
| * | | | Refactor showRSS, and make it use the RSS template | ArthurHoaro | 2016-03-18 | 1 | -53/+67 |
| * | | | Refactor showAtom, and make it use the ATOM template | ArthurHoaro | 2016-03-18 | 2 | -67/+60 |
| * | | | Adds a route for ATOM and RSS feeds page | ArthurHoaro | 2016-03-18 | 1 | -0/+12 |
| * | | | Adds a RSS template file | ArthurHoaro | 2016-03-18 | 1 | -0/+34 |
| * | | | Create a template to handle ATOM feed | ArthurHoaro | 2016-03-18 | 1 | -0/+40 |
| * | | | Add method assignAll() to pageBuilder to assign an array of data | ArthurHoaro | 2016-03-18 | 1 | -0/+23 |
| |/ / |
|
* | | | Merge pull request #521 from ArthurHoaro/hotfix/404login | VirtualTam | 2016-03-24 | 1 | -1/+1 |
|\ \ \
| |_|/
|/| | |
|
| * | | Use generateLocation to set the redirection in login (and don't escape the url) | ArthurHoaro | 2016-03-21 | 1 | -1/+1 |
| |/ |
|