aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * | | Generate a token for every pagesArthurHoaro2016-08-062-9/+1
| |/ /
* | | Merge pull request #626 from ArthurHoaro/hotfix/changepasswordVirtualTam2016-08-071-1/+1
|\ \ \ | |/ / |/| | Bugfix: enable change password if open shaarli is disabled
| * | Bugfix: enable change password if open shaarli is disabledArthurHoaro2016-08-061-1/+1
|/ /
* | Merge pull request #621 from ArthurHoaro/hotfix/update-escape-configVirtualTam2016-08-022-2/+26
|\ \ | | | | | | Fix update method escapeUnescapedConfig
| * | Fix update method escapeUnescapedConfigArthurHoaro2016-08-022-2/+26
| | | | | | | | | | | | | | | | | | | | | * Actually run it * unit tests Fixes #611
* | | Merge pull request #618 from ArthurHoaro/tagcleanVirtualTam2016-08-023-3/+7
|\ \ \ | |/ / |/| | Better whitespace handling in tags
| * | Better whitespace handling in tagsArthurHoaro2016-08-023-28/+6
| | | | | | | | | | | | | | | | | | Correct PR #573 to work properly with hidden tags, and add ReferenceLinkDB UT. Fixes #571 - Closes #573
| * | add unit testChris Kuethe2016-08-021-0/+26
| | |
| * | Better whitespace handling in tags. Fixes #571Chris Kuethe2016-08-021-2/+2
|/ /
* | Merge pull request #608 from virtualtam/refactor/bookmark-parserVirtualTam2016-07-263-8/+47
|\| | | | | Reference netscape-bookmark-parser & allow generating custom release archives
| * Makefile: generate release archives including 3rd-party librariesVirtualTam2016-07-252-7/+39
| | | | | | | | | | | | | | | | | | | | | | Relates to #607 Archive creation process (tar, zip): - let Composer resolve functional (no-dev) dependencies - call git-archive to generate a release archive - include 3rd-party dependencies to the generated archive Signed-off-by: VirtualTam <virtualtam@flibidi.net>
| * Composer: add shaarli/netscape-bookmark-parserVirtualTam2016-07-231-1/+8
|/ | | | | | | | | Relates to https://github.com/shaarli/Shaarli/issues/607 Relates to https://github.com/kafene/netscape-bookmark-parser/issues/6 The Shaarli-forked version is checked out as a VCS repository. Signed-off-by: VirtualTam <virtualtam@flibidi.net>
* Merge pull request #605 from ArthurHoaro/clean-phpunitArthur2016-07-232-0/+6
|\ | | | | Hide expected 'error_log' while running TU (clean PHPUnit log)
| * Hide expected 'error_log' while running TU (clean PHPUnit log)ArthurHoaro2016-07-232-0/+6
| |
* | Merge pull request #604 from ArthurHoaro/no-deliciousArthur2016-07-232-2/+2
|\ \ | | | | | | Remove Delicious in project description in comments
| * | Remove Delicious in project description in commentsArthurHoaro2016-07-232-2/+2
| |/
* | Merge pull request #601 from ArthurHoaro/hotfix/title-missingArthur2016-07-232-15/+7
|\ \ | | | | | | Fixes #600 - Shaarli's title is not set with the new config manager
| * | Fixes #600 - Shaarli's title is not set with the new config managerArthurHoaro2016-07-192-15/+7
| |/ | | | | | | | | - Fixed title config key - Page title (in head tag) is no longer set through the config manager
* | Merge pull request #603 from julienCXX/pr-fix-test-method-nameArthur2016-07-211-2/+2
|\ \ | | | | | | Fix typo in test method name
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-02 02:35:04 +0000