aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * | Add a description to wallabag plugin parametersArthurHoaro2016-08-021-1/+3
| | |
| * | Plugin parameter description: Update the templates to display themArthurHoaro2016-08-022-4/+5
| | |
| * | Parse plugin parameters description with the PluginManagerArthurHoaro2016-08-025-13/+29
| | | | | | | | | | | | | | | | | | Plugin parameter can contain a description in their meta file under the key: parameter.<param_name>="<description>"
* | | Merge pull request #636 from virtualtam/fix/final-newlineVirtualTam2016-08-137-18/+18
|\ \ \ | | | | | | | | Fix: add missing final newlines, untabify text
| * | | Fix: add missing final newlines, untabify textVirtualTam2016-08-137-18/+18
|/ / / | | | | | | | | | Signed-off-by: VirtualTam <virtualtam@flibidi.net>
* | | Merge pull request #635 from virtualtam/fix/import/ieVirtualTam2016-08-133-2/+38
|\ \ \ | | | | | | | | Fix: ensure Internet Explorer bookmark dumps can be imported
| * | | Fix: ensure Internet Explorer bookmark dumps can be importedVirtualTam2016-08-123-2/+38
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Relates to https://github.com/shaarli/Shaarli/issues/607 Modifications: - [application][tests] NetscapeBookmarkUtils: more permissive doctype detection The IE bookmark exports contain extra escape sequences, which can be observed by binary comparison of the reference input data used in tests: $ cmp -b -l -n 8 netscape_basic.htm internet_explorer_encoding.htm 1 74 < 357 M-o 2 41 ! 273 M-; 3 104 D 277 M-? 4 117 O 74 < 5 103 C 41 ! 6 124 T 104 D 7 131 Y 117 O 8 120 P 103 C Signed-off-by: VirtualTam <virtualtam@flibidi.net>
* | | Merge pull request #634 from virtualtam/composer/gitattributesVirtualTam2016-08-121-1/+0
|\ \ \ | | | | | | | | Fix: keep composer.json in release archives
| * | | Fix: keep composer.json in release archivesVirtualTam2016-08-121-1/+0
|/ / / | | | | | | | | | | | | | | | Relates to https://github.com/shaarli/Shaarli/issues/607 Signed-off-by: VirtualTam <virtualtam@flibidi.net>
* | | Merge pull request #612 from virtualtam/refactor/bookmark-parserArthur2016-08-1010-122/+779
|\ \ \ | | | | | | | | Refactor bookmark import using a generic Netscape parser
| * | | Refactor bookmark import using a generic Netscape parserVirtualTam2016-08-1010-122/+779
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Relates to #607 Relates to #608 Relates to #493 (abandoned) Additions: - use Composer's autoload to load 3rd-party dependencies under vendor/ Modifications: - [import] replace the current parser with a generic, stable parser - move code to application/NetscapeBookmarkUtils - improve status report after parsing - [router] use the same endpoint for both bookmark upload and import dialog - [template] update bookmark import options - allow adding tags to all imported links - allow selecting the visibility (privacy) of imported links - [tests] ensure bookmarks are properly parsed and imported in the LinkDB - reuse reference input from the parser's test data See: - https://github.com/shaarli/netscape-bookmark-parser - https://getcomposer.org/doc/01-basic-usage.md#autoloading Signed-off-by: VirtualTam <virtualtam@flibidi.net>
* | | Merge pull request #632 from ↵VirtualTam2016-08-101-7/+1
|\ \ \ | | | | | | | | | | | | | | | | virtualtam/composer/shaarli/netscape-bookmark-parser Composer: reference shaarli/netscape-bookmark-parser from Packagist
| * | | Composer: reference shaarli/netscape-bookmark-parser from PackagistVirtualTam2016-08-101-7/+1
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Relates to https://github.com/shaarli/Shaarli/pull/607 Relates to https://github.com/shaarli/Shaarli/pull/612 Relates to https://github.com/shaarli/netscape-bookmark-parser/issues/15 Modification: - reference the "shaarli" vendor repository on Packagist instead of overriding the upstream package with an SCM repository See https://packagist.org/packages/shaarli/netscape-bookmark-parser Signed-off-by: VirtualTam <virtualtam@flibidi.net>
* | | Merge pull request #624 from julienCXX/pr-curl-http-fetchArthur2016-08-091-10/+150
|\ \ \ | | | | | | | | Added (and set as default) a cURL-based method for fetching HTTP content
| * | | Set cURL as default in HTTP fetching, a fallback method and consistency ↵julienCXX2016-08-081-10/+150
| | |/ | |/| | | | | | | fixup between both methods
* | | Merge pull request #628 from ArthurHoaro/hotfix/default-privateArthur2016-08-071-1/+1
|\ \ \ | | | | | | | | Bugfix: wrong key used to get default private links setting
| * | | Bugfix: wrong key used to get default private links settingArthurHoaro2016-08-071-1/+1
|/ / /
* | | Merge pull request #627 from ArthurHoaro/feature/translate-initArthur2016-08-073-0/+63
|\ \ \ | | | | | | | | Initialize a translation function
| * | | Initialize a translation functionArthurHoaro2016-08-073-0/+63
|/ / / | | | | | | | | | It matches the API of ngettext().
* | | Merge pull request #625 from ArthurHoaro/tokenVirtualTam2016-08-072-9/+1
|\ \ \ | | | | | | | | Generate a token for every pages
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 05:24:23 +0000