Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #537 from virtualtam/tests/dependencies | VirtualTam | 2016-04-10 | 1 | -1/+1 |
|\ | | | | | Tests: update PHPUnit to 4.8.x | ||||
| * | Tests: update PHPUnit to 4.8.x | VirtualTam | 2016-04-10 | 1 | -1/+1 |
|/ | | | | Signed-off-by: VirtualTam <virtualtam@flibidi.net> | ||||
* | Merge pull request #524 from ArthurHoaro/hotfix/redirectorurl | Arthur | 2016-04-09 | 3 | -25/+47 |
|\ | | | | | Fixes #480: add an option to urlencode redirector URL | ||||
| * | Fixes #480: add an option to urlencode redirector URL | ArthurHoaro | 2016-04-09 | 3 | -25/+47 |
|/ | | | | | | | | * New config: `$GLOBALS['config']['REDIRECTOR_URLENCODE']` (default `true`). * Parameter added to LinkDB constructor. * Fixes a bug with urlencode and escaped url. * In `index.php`, LinkDB is now instanciate once for `importFile()` and `showDaily()`. * TU | ||||
* | Merge pull request #525 from ArthurHoaro/plugins/feeds-markdown2 | Arthur | 2016-04-09 | 1 | -0/+19 |
|\ | | | | | Process feeds content with Markdown | ||||
| * | 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 | ||||
| * | | Fixes #526: bad font size separator in tagcloud with some locale | ArthurHoaro | 2016-03-31 | 2 | -7/+12 |
| |/ | | | | | | | | | * Force the number format with number_format(). * Reduce the size deciment number to 2. | ||||
* | | Merge pull request #522 from ArthurHoaro/hotfix/readershaare | VirtualTam | 2016-03-30 | 2 | -1/+38 |
|\ \ | |/ |/| | Refactor and rebase #380: Firefox reader view links | ||||
| * | Refactor and rebase #380: Firefox reader view links | ArthurHoaro | 2016-03-26 | 2 | -13/+36 |
| | | | | | | | | | | Fixes #366 Closes #380 | ||||
| * | 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 |
|\ \ | | | | | | | Markdown: Add the 'meta-tag' `.nomarkdown` which prevent a shaare fro… | ||||
| * | | Update markdown plugin README documentation | ArthurHoaro | 2016-03-26 | 1 | -11/+23 |
| | | | | | | | | | | | | | | | * Add the `.nomarkdown` section. * Update misleading statements. | ||||
| * | | Markdown: Add the 'meta-tag' `.nomarkdown` which prevent a shaare from being ↵ | ArthurHoaro | 2016-03-21 | 2 | -1/+66 |
| | | | | | | | | | | | | | | | | | | parsed with markdown Also add the tag in tag list in edit_link, so it will appear on autocompletion. | ||||
* | | | Merge pull request #515 from ArthurHoaro/template-feeds | Arthur | 2016-03-25 | 16 | -339/+859 |
|\ \ \ | | | | | | | | | Refactor RSS feeds generation, and do it through templates | ||||
| * | | | Refactor filter in LinkDB | ArthurHoaro | 2016-03-25 | 8 | -106/+158 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * search type now carried by LinkDB in order to factorize code between different search sources. * LinkDB->filter split in 3 method: filterSearch, filterHash, filterDay (we know what type of filter is needed). * filterHash now throw a LinkNotFoundException if it doesn't exist: internal implementation choice, still displays a 404. * Smallhash regex has been rewritten. * Unit tests update | ||||
| * | | | 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 |
| | | | | | | | | | | | | | | | | Create an example of the new hook in the demo plugin. | ||||
| * | | | 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 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Minor changes: * Fix the date which was in a invalid format. * Avoid empty categories (tags). * Use the locale to set the language | ||||
| * | | | 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 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improvements: * Add searchtags in categories domain URL. * Language is now based on the locale. * Add a generator tag. * self link is always displayed. | ||||
| * | | | Create a template to handle ATOM feed | ArthurHoaro | 2016-03-18 | 1 | -0/+40 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ATOM feed improvement: * Adds a subtitle to match RSS feed behavior. * Better syntax for categories (see http://edward.oconnor.cx/2007/02/representing-tags-in-atom ). * Use locale to set the language | ||||
| * | | | 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) | ||||
| * | | Use generateLocation to set the redirection in login (and don't escape the url) | ArthurHoaro | 2016-03-21 | 1 | -1/+1 |
| |/ | |||||
* | | Merge pull request #513 from ArthurHoaro/hotfix/retrieve-title-issue | VirtualTam | 2016-03-14 | 2 | -1/+3 |
|\ \ | |/ |/| | Fixes #512: retrieving title didn't match the first closing tag | ||||
| * | Fixes #512: retrieving title didn't match the first closing tag | ArthurHoaro | 2016-03-08 | 2 | -1/+3 |
|/ | |||||
* | Merge pull request #509 from ArthurHoaro/v0.6.5v0.6.5 | Arthur | 2016-03-02 | 2 | -3/+3 |
|\ | | | | | Bump version to v0.6.5 | ||||
| * | Bump version to v0.6.5 | ArthurHoaro | 2016-03-02 | 2 | -3/+3 |
|/ | | | | Signed-off-by: ArthurHoaro <arthur@hoa.ro> | ||||
* | Merge pull request #504 from ArthurHoaro/hotfix/http_language | Arthur | 2016-03-01 | 1 | -1/+4 |
|\ | | | | | Fixes #503: check that HTTP_ACCEPT_LANGUAGE is set before calling autolocale | ||||
| * | Fixes #503: check that HTTP_ACCEPT_LANGUAGE is set before calling autoLocale() | ArthurHoaro | 2016-02-28 | 1 | -1/+4 |
| | | |||||
* | | Merge pull request #506 from kalvn/master | Arthur | 2016-03-01 | 1 | -1/+4 |
|\ \ | | | | | | | Avoids populating a markdown empty container if there's no description. | ||||
| * | | Avoids populating a markdown empty container if there's no description. | kalvn | 2016-02-28 | 1 | -1/+4 |
| |/ | |||||
* | | Merge pull request #505 from ArthurHoaro/hotfix/multi-reverse-proxy | Arthur | 2016-03-01 | 2 | -2/+25 |
|\ \ | |/ |/| | Fixes #477: support multi reverse proxy with comma syntax | ||||
| * | Fixes #477: support multi reverse proxy with comma syntax | ArthurHoaro | 2016-02-28 | 2 | -2/+25 |
|/ | | | | Going through multiple reverse proxy will store multiple scheme and port in HTTP header separated by a comma. Shaarli will use the first one to generate server_url. | ||||
* | Merge pull request #501 from ArthurHoaro/v0.6.4v0.6.4 | Arthur | 2016-02-28 | 2 | -3/+3 |
|\ | | | | | Bump version to v0.6.4 | ||||
| * | Bump version to v0.6.4 | ArthurHoaro | 2016-02-28 | 2 | -3/+3 |
|/ | | | | Signed-off-by: ArthurHoaro <arthur@hoa.ro> | ||||
* | Merge pull request #500 from ArthurHoaro/plugin-icon-style | Arthur | 2016-02-28 | 5 | -4/+9 |
|\ | | | | | Fixes #411: remove hardcoded plugin icon size | ||||
| * | Fixes #411: remove hardcoded plugin icon size | ArthurHoaro | 2016-02-28 | 5 | -4/+9 |
| | | |||||
* | | Merge pull request #496 from ArthurHoaro/cross-search | Arthur | 2016-02-28 | 6 | -65/+178 |
|\ \ | |/ |/| | Allow crossed search between terms and tags | ||||
| * | Allow crossed search between terms and tags | ArthurHoaro | 2016-02-28 | 6 | -65/+178 |
| | | | | | | | | | | | | | | * Partial fix of #449 * Current use case: search term + click on tag. * LinkFilter now returns all links if no filter is given. * Unit tests. | ||||
* | | Merge pull request #491 from ArthurHoaro/markdown-escape2 | Arthur | 2016-02-25 | 3 | -16/+58 |
|\ \ | | | | | | | Markdown: don't escape content + sanitize sensible tags | ||||
| * | | Markdown: don't escape content + sanitize sensible tags | ArthurHoaro | 2016-02-19 | 3 | -16/+58 |
| | | | | | | | | | | | | Instead of trying to fix broken content for Markdown parsing, parse it unescaped, then sanatize sensible tags such as scripts, etc. | ||||
* | | | Merge pull request #495 from nicolasdanelon/patch-3 | Arthur | 2016-02-24 | 2 | -8/+12 |
|\ \ \ | | | | | | | | | Fixes #494: inputs & labels with plugin name | ||||
| * | | | Update shaarli.css | Nicolas Danelon | 2016-02-23 | 1 | -0/+4 |
| | | | |