aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
* Fix an issue with links not being reversed in code blocksArthurHoaro2016-10-224-5/+67
| | | | | | Fixes #672 + Markdown to HTML unit test
* Use Composer to import Parsedown libraryArthurHoaro2016-10-224-1535/+2
| | | | Reference #613
* Merge pull request #673 from virtualtam/cleanup/linkdbVirtualTam2016-10-216-88/+88
|\ | | | | LinkDB: code cleanup
| * LinkDB: explicit method visibilityVirtualTam2016-10-202-7/+7
| | | | | | | | | | | | Relates to https://github.com/shaarli/Shaarli/issues/95 Signed-off-by: VirtualTam <virtualtam@flibidi.net>
| * LinkDB: update datastore method namesVirtualTam2016-10-205-18/+18
| | | | | | | | | | | | Relates to https://github.com/shaarli/Shaarli/issues/95 Signed-off-by: VirtualTam <virtualtam@flibidi.net>
| * LinkDB: do not prefix privates with an underscoreVirtualTam2016-10-202-69/+69
| | | | | | | | | | | | Relates to #95 Signed-off-by: VirtualTam <virtualtam@flibidi.net>
* | Merge pull request #665 from ArthurHoaro/fix/feed-hashtagsVirtualTam2016-10-203-1/+4
|\ \ | |/ |/| Fix hashtag links in Feeds
| * Fix hashtags links in FeedsArthurHoaro2016-10-203-1/+4
| | | | | | | | Make the hashtag link absolute in feeds to work properly in RSS syndication tools.
* | Merge pull request #671 from ArthurHoaro/cleanup-codeVirtualTam2016-10-2013-36/+28
|\ \ | |/ |/| Minor code cleanup: PHPDoc, spelling, unused variables, etc.
| * Minor code cleanup: PHPDoc, spelling, unused variables, etc.ArthurHoaro2016-10-2013-36/+28
|/
* Merge pull request #670 from virtualtam/travis/composer-cacheArthur2016-10-202-1/+5
|\ | | | | Travis: enable Composer cache
| * Travis: enable Composer cacheVirtualTam2016-10-202-1/+5
|/ | | | | | | | See: - https://docs.travis-ci.com/user/caching/ - https://blog.wyrihaximus.net/2015/07/composer-cache-on-travis/ Signed-off-by: VirtualTam <virtualtam@flibidi.net>
* Merge pull request #661 from virtualtam/release/archiveVirtualTam2016-10-192-8/+16
|\ | | | | Update release archive generation
| * Update release archive generationVirtualTam2016-10-192-8/+16
|/ | | | | | | | | | | Relates to https://github.com/shaarli/Shaarli/issues/607 Relates to https://github.com/shaarli/Shaarli/pull/608 Modifications: - match the arborescence of the archives provided by GitHub - generate compressed tarballs Signed-off-by: VirtualTam <virtualtam@flibidi.net>
* Merge pull request #664 from virtualtam/changelogVirtualTam2016-10-192-0/+868
|\ | | | | Add CHANGELOG.md
| * CHANGELOG.md: add an UNPUBLISHED draft for v0.8.1VirtualTam2016-10-181-1/+22
| | | | | | | | | | | | | | Relates to #663 See http://keepachangelog.com/en/0.3.0/ Signed-off-by: VirtualTam <virtualtam@flibidi.net>
| * CHANGELOG.md: improve formatting, fix typosVirtualTam2016-10-181-148/+268
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Relates to #663 See http://keepachangelog.com/en/0.3.0/ See http://sebsauvage.net/wiki/doku.php?id=php:shaarli:history Modifications: - keep 2 newlines between each release section - keep reasonable line lengths (< 90 characters) - remove extra final dots (only kept when there are several sentences) - fix typos - reword/rewrite/curate legacy changelog entries Signed-off-by: VirtualTam <virtualtam@flibidi.net>
| * CHANGELOG.md: add legacy Shaarli releasesVirtualTam2016-10-181-1/+356
| | | | | | | | | | | | | | | | | | | | | | | | | | Relates to https://github.com/shaarli/Shaarli/issues/663 See http://keepachangelog.com/en/0.3.0/ See http://sebsauvage.net/wiki/doku.php?id=php:shaarli:history See http://sebsauvage.net/wiki/doku.php?id=php:shaarli:history&do=revisions See http://sebsauvage.net/rhaa/index.php?q=shaarli These entries correspond to the original (legacy) Shaarli release notes by Sebsauvage. Signed-off-by: VirtualTam <virtualtam@flibidi.net>
| * CHANGELOG.md: add unpublished Shaarli Community releasesVirtualTam2016-10-181-0/+53
| | | | | | | | | | | | | | | | | | | | | | Relates to https://github.com/shaarli/Shaarli/issues/663 See http://keepachangelog.com/en/0.3.0/ These entries correspond to the first lightweight tags present on the Shaarli Community repository. As there are no corresponding release (notes), the changelog is based on relevant elements from the Git commit log. Signed-off-by: VirtualTam <virtualtam@flibidi.net>
| * CHANGELOG.md: add published Shaarli Community releasesVirtualTam2016-10-182-0/+319
|/ | | | | | | | | | Relates to https://github.com/shaarli/Shaarli/issues/663 See http://keepachangelog.com/en/0.3.0/ This file mirrors the content of the Shaarli release notes available at https://github.com/shaarli/Shaarli/releases Signed-off-by: VirtualTam <virtualtam@flibidi.net>
* Merge pull request #651 from ArthurHoaro/plugin-isso2Arthur2016-10-185-0/+210
|\ | | | | Isso comments plugin
| * Isso comments pluginArthurHoaro2016-10-175-0/+210
| | | | | | | | Use Isso client to let visitors comments on permalinks
* | Merge pull request #662 from virtualtam/fix/feed/self-linkVirtualTam2016-10-172-1/+35
|\ \ | | | | | | Fix: return the proper value for the "self" feed attribute
| * | Fix: return the proper value for the "self" feed attributeVirtualTam2016-10-162-1/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes https://github.com/shaarli/Shaarli/issues/629 Closes https://github.com/shaarli/Shaarli/pull/630 Note: you might need to empty the "pagecache" directory for the fix to be taken into account Signed-off-by: VirtualTam <virtualtam@flibidi.net>
* | | Merge pull request #660 from virtualtam/fix/template/loopVirtualTam2016-10-179-12/+12
|\ \ \ | |_|/ |/| | Cleanup: explicitely loop over PHP variables in templates
| * | Cleanup: explicitely loop over PHP variables in templatesVirtualTam2016-10-169-12/+12
| |/ | | | | | | | | | | | | | | | | Relates to https://github.com/shaarli/Shaarli/issues/613 Before: {loop="someVariable"} After: {loop="$someVariable"} Signed-off-by: VirtualTam <virtualtam@flibidi.net>
* | Merge pull request #659 from ArthurHoaro/plugin-errorsArthur2016-10-178-15/+115
|\ \ | |/ |/| New init function for plugins, supports errors reporting
| * New init function for plugins, supports errors reportingArthurHoaro2016-10-148-15/+115
| | | | | | | | | | | | | | | | All plugins can optionally add an init function named `pluginname_init()` which is called when the plugin is loaded. This function is aware of the config, and can return initialization errors, which are displayed in the header template. Note that the previous error system hack no longer work.
* | Merge pull request #658 from ArthurHoaro/hotfix/plugin-desc-bugVirtualTam2016-10-161-1/+3
|\ \ | |/ |/| Bugfix: display plugin parameter description only if it exists
| * Bugfix: display plugin parameter description only if it existsArthurHoaro2016-10-141-1/+3
|/
* Merge pull request #654 from teromene/archive-org-no-internalVirtualTam2016-10-132-4/+101
|\ | | | | | | | | Archive.org plugin: do not propose archival of private notes Fixes #637
| * Archive.org plugin: do not propose archival of private notesTeromene2016-10-132-4/+101
| | | | | | | | Fixes #637
* | Merge pull request #622 from ArthurHoaro/update-dateArthur2016-10-128-16/+74
|\ \ | | | | | | Save link update dates and render it in templates and feeds
| * | Set updated date for items in feedsArthurHoaro2016-08-035-13/+51
| | | | | | | | | | | | | | | RSS doesn't support updated date for items, so we use the ATOM extension. Updated dates also bump the global update
| * | Save the update date in LinkDB and pass it to linklist templatesArthurHoaro2016-08-033-3/+23
| | | | | | | | | | | | It can be used as a timestamp by templates under the key 'updated_timestamp'.
* | | Merge pull request #623 from ArthurHoaro/security/reverse-proxy-banArthur2016-10-123-1/+94
|\ \ \ | | | | | | | | Add trusted IPs in config and try to ban forwarded IP on failed login
| * | | Add trusted IPs in config and try to ban forwarded IP on failed loginArthurHoaro2016-08-033-1/+94
| |/ / | | | | | | | | | | | | | | | | | | | | | * Add a new settings (which needs to be manually set): `security.trusted_proxies` * On login failure, if the `REMOTE_ADDR` is in the trusted proxies, try to retrieve the forwarded IP in headers. * If found, the client address is added in ipbans, else we do nothing. Fixes #409
* | | Merge pull request #656 from ArthurHoaro/v0.8.0v0.8.0Arthur2016-10-1260-999/+1437
|\ \ \ | |_|/ |/| | Bump version to v0.8.0
| * | Bump version to v0.8.0ArthurHoaro2016-10-1260-999/+1437
|/ / | | | | | | Signed-off-by: ArthurHoaro <arthur@hoa.ro>
* | Merge pull request #649 from krypty/dockerfile-issueVirtualTam2016-09-141-1/+1
|\ \ | | | | | | Add a missing backslash in stable Dockerfile version
| * | Add a missing backslash in stable Dockerfile versionGary Marigliano2016-09-141-1/+1
|/ /
* | Merge pull request #646 from virtualtam/composer/check-autoloadVirtualTam2016-09-061-0/+10
|\ \ | | | | | | composer: display an error message if the autoload script is missing
| * | composer: display an error message if the autoload script is missingVirtualTam2016-09-051-0/+10
|/ / | | | | | | | | | | | | Closes https://github.com/shaarli/Shaarli/issues/645 Relates to https://github.com/shaarli/Shaarli/issues/607 Signed-off-by: VirtualTam <virtualtam@flibidi.net>
* | README: fix link address typoVirtualTam2016-08-201-1/+1
| | | | | | | | | | | | Fixes https://github.com/shaarli/Shaarli/issues/642 Signed-off-by: VirtualTam <virtualtam@flibidi.net>
* | update link to install instuctions in READMEnodiscc2016-08-171-1/+1
| |
* | Merge pull request #638 from virtualtam/docker/stable/composerVirtualTam2016-08-141-4/+19
|\ \ | | | | | | Docker: update dependencies, introduce Composer (stable branch)
| * | Docker: update dependencies, introduce ComposerVirtualTam2016-08-141-4/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Relates to https://github.com/shaarli/Shaarli/issues/607 Relates to https://github.com/shaarli/Shaarli/pull/612 Relates to https://github.com/shaarli/Shaarli/pull/624 Relates to https://github.com/shaarli/Shaarli/pull/633 See https://github.com/shaarli/Shaarli/wiki/Server-requirements Modifications: - [prod][stable] refactor Dockerfile - [prod][stable] set $TERM=dumb to avoid debconf-related issues - [prod][stable] install ca-certificates - [prod][stable] cleanup APT cache after installing packages - [prod][stable] use Composer to resolve PHP dependencies Signed-off-by: VirtualTam <virtualtam@flibidi.net>
* | | Merge pull request #633 from virtualtam/docker/composerVirtualTam2016-08-142-15/+38
|\ \ \ | |/ / |/| | Docker: update dependencies, introduce Composer
| * | Docker: update dependencies, introduce ComposerVirtualTam2016-08-142-15/+38
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Relates to https://github.com/shaarli/Shaarli/issues/607 Relates to https://github.com/shaarli/Shaarli/pull/612 Relates to https://github.com/shaarli/Shaarli/pull/624 See https://github.com/shaarli/Shaarli/wiki/Server-requirements Modifications: - [all][env] set $TERM=dumb to avoid debconf-related issues - [all][pkg] install ca-certificates - [all][pkg] cleanup APT cache after installing packages - [dev] refactor Dockerfile - [prod][master] refactor Dockerfile - [prod][master][php] use Composer to resolve PHP dependencies Signed-off-by: VirtualTam <virtualtam@flibidi.net>
* | Merge pull request #619 from ArthurHoaro/plugins/param-descVirtualTam2016-08-138-18/+37
|\ \ | | | | | | Add a description to plugin parameters