| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge pull request #654 from teromene/archive-org-no-internal | VirtualTam | 2016-10-13 | 2 | -4/+101 |
|\ |
|
| * | Archive.org plugin: do not propose archival of private notes | Teromene | 2016-10-13 | 2 | -4/+101 |
* | | Merge pull request #622 from ArthurHoaro/update-date | Arthur | 2016-10-12 | 8 | -16/+74 |
|\ \ |
|
| * | | Set updated date for items in feeds | ArthurHoaro | 2016-08-03 | 5 | -13/+51 |
| * | | Save the update date in LinkDB and pass it to linklist templates | ArthurHoaro | 2016-08-03 | 3 | -3/+23 |
* | | | Merge pull request #623 from ArthurHoaro/security/reverse-proxy-ban | Arthur | 2016-10-12 | 3 | -1/+94 |
|\ \ \ |
|
| * | | | Add trusted IPs in config and try to ban forwarded IP on failed login | ArthurHoaro | 2016-08-03 | 3 | -1/+94 |
| |/ / |
|
* | | | Merge pull request #656 from ArthurHoaro/v0.8.0v0.8.0 | Arthur | 2016-10-12 | 60 | -999/+1437 |
|\ \ \
| |_|/
|/| | |
|
| * | | Bump version to v0.8.0 | ArthurHoaro | 2016-10-12 | 60 | -999/+1437 |
|/ / |
|
* | | Merge pull request #649 from krypty/dockerfile-issue | VirtualTam | 2016-09-14 | 1 | -1/+1 |
|\ \ |
|
| * | | Add a missing backslash in stable Dockerfile version | Gary Marigliano | 2016-09-14 | 1 | -1/+1 |
|/ / |
|
* | | Merge pull request #646 from virtualtam/composer/check-autoload | VirtualTam | 2016-09-06 | 1 | -0/+10 |
|\ \ |
|
| * | | composer: display an error message if the autoload script is missing | VirtualTam | 2016-09-05 | 1 | -0/+10 |
|/ / |
|
* | | README: fix link address typo | VirtualTam | 2016-08-20 | 1 | -1/+1 |
* | | update link to install instuctions in README | nodiscc | 2016-08-17 | 1 | -1/+1 |
* | | Merge pull request #638 from virtualtam/docker/stable/composer | VirtualTam | 2016-08-14 | 1 | -4/+19 |
|\ \ |
|
| * | | Docker: update dependencies, introduce Composer | VirtualTam | 2016-08-14 | 1 | -4/+19 |
* | | | Merge pull request #633 from virtualtam/docker/composer | VirtualTam | 2016-08-14 | 2 | -15/+38 |
|\ \ \
| |/ /
|/| | |
|
| * | | Docker: update dependencies, introduce Composer | VirtualTam | 2016-08-14 | 2 | -15/+38 |
|/ / |
|
* | | Merge pull request #619 from ArthurHoaro/plugins/param-desc | VirtualTam | 2016-08-13 | 8 | -18/+37 |
|\ \ |
|
| * | | Add a description to wallabag plugin parameters | ArthurHoaro | 2016-08-02 | 1 | -1/+3 |
| * | | Plugin parameter description: Update the templates to display them | ArthurHoaro | 2016-08-02 | 2 | -4/+5 |
| * | | Parse plugin parameters description with the PluginManager | ArthurHoaro | 2016-08-02 | 5 | -13/+29 |
* | | | Merge pull request #636 from virtualtam/fix/final-newline | VirtualTam | 2016-08-13 | 7 | -18/+18 |
|\ \ \ |
|
| * | | | Fix: add missing final newlines, untabify text | VirtualTam | 2016-08-13 | 7 | -18/+18 |
|/ / / |
|
* | | | Merge pull request #635 from virtualtam/fix/import/ie | VirtualTam | 2016-08-13 | 3 | -2/+38 |
|\ \ \ |
|
| * | | | Fix: ensure Internet Explorer bookmark dumps can be imported | VirtualTam | 2016-08-12 | 3 | -2/+38 |
|/ / / |
|
* | | | Merge pull request #634 from virtualtam/composer/gitattributes | VirtualTam | 2016-08-12 | 1 | -1/+0 |
|\ \ \ |
|
| * | | | Fix: keep composer.json in release archives | VirtualTam | 2016-08-12 | 1 | -1/+0 |
|/ / / |
|
* | | | Merge pull request #612 from virtualtam/refactor/bookmark-parser | Arthur | 2016-08-10 | 10 | -122/+779 |
|\ \ \ |
|
| * | | | Refactor bookmark import using a generic Netscape parser | VirtualTam | 2016-08-10 | 10 | -122/+779 |
|/ / / |
|
* | | | Merge pull request #632 from virtualtam/composer/shaarli/netscape-bookmark-pa... | VirtualTam | 2016-08-10 | 1 | -7/+1 |
|\ \ \ |
|
| * | | | Composer: reference shaarli/netscape-bookmark-parser from Packagist | VirtualTam | 2016-08-10 | 1 | -7/+1 |
|/ / / |
|
* | | | Merge pull request #624 from julienCXX/pr-curl-http-fetch | Arthur | 2016-08-09 | 1 | -10/+150 |
|\ \ \ |
|
| * | | | Set cURL as default in HTTP fetching, a fallback method and consistency fixup... | julienCXX | 2016-08-08 | 1 | -10/+150 |
| | |/
| |/| |
|
* | | | Merge pull request #628 from ArthurHoaro/hotfix/default-private | Arthur | 2016-08-07 | 1 | -1/+1 |
|\ \ \ |
|
| * | | | Bugfix: wrong key used to get default private links setting | ArthurHoaro | 2016-08-07 | 1 | -1/+1 |
|/ / / |
|
* | | | Merge pull request #627 from ArthurHoaro/feature/translate-init | Arthur | 2016-08-07 | 3 | -0/+63 |
|\ \ \ |
|
| * | | | Initialize a translation function | ArthurHoaro | 2016-08-07 | 3 | -0/+63 |
|/ / / |
|
* | | | Merge pull request #625 from ArthurHoaro/token | VirtualTam | 2016-08-07 | 2 | -9/+1 |
|\ \ \ |
|
| * | | | Generate a token for every pages | ArthurHoaro | 2016-08-06 | 2 | -9/+1 |
| |/ / |
|
* | | | Merge pull request #626 from ArthurHoaro/hotfix/changepassword | VirtualTam | 2016-08-07 | 1 | -1/+1 |
|\ \ \
| |/ /
|/| | |
|
| * | | Bugfix: enable change password if open shaarli is disabled | ArthurHoaro | 2016-08-06 | 1 | -1/+1 |
|/ / |
|
* | | Merge pull request #621 from ArthurHoaro/hotfix/update-escape-config | VirtualTam | 2016-08-02 | 2 | -2/+26 |
|\ \ |
|
| * | | Fix update method escapeUnescapedConfig | ArthurHoaro | 2016-08-02 | 2 | -2/+26 |
* | | | Merge pull request #618 from ArthurHoaro/tagclean | VirtualTam | 2016-08-02 | 3 | -3/+7 |
|\ \ \
| |/ /
|/| | |
|
| * | | Better whitespace handling in tags | ArthurHoaro | 2016-08-02 | 3 | -28/+6 |
| * | | add unit test | Chris Kuethe | 2016-08-02 | 1 | -0/+26 |
| * | | Better whitespace handling in tags. Fixes #571 | Chris Kuethe | 2016-08-02 | 1 | -2/+2 |
|/ / |
|
* | | Merge pull request #608 from virtualtam/refactor/bookmark-parser | VirtualTam | 2016-07-26 | 3 | -8/+47 |
|\| |
|