Commit graph

2412 commits

Author SHA1 Message Date
Arthur
ceeb8fbeb8 Merge pull request #670 from virtualtam/travis/composer-cache
Travis: enable Composer cache
2016-10-20 10:51:40 +02:00
VirtualTam
ae04803bb1 Travis: enable Composer cache
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>
2016-10-20 00:28:01 +02:00
VirtualTam
918bd5b912 Merge pull request #661 from virtualtam/release/archive
Update release archive generation
2016-10-19 20:03:47 +02:00
VirtualTam
ca0ed5ca42 Update release archive generation
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>
2016-10-19 19:50:12 +02:00
VirtualTam
efd0773854 Merge pull request #664 from virtualtam/changelog
Add CHANGELOG.md
2016-10-19 11:19:00 +02:00
VirtualTam
c47d9723ce CHANGELOG.md: add an UNPUBLISHED draft for v0.8.1
Relates to #663
See http://keepachangelog.com/en/0.3.0/

Signed-off-by: VirtualTam <virtualtam@flibidi.net>
2016-10-18 22:37:52 +02:00
VirtualTam
17c9ac7c35 CHANGELOG.md: improve formatting, fix typos
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>
2016-10-18 19:27:44 +02:00
VirtualTam
f1f1156d84 CHANGELOG.md: add legacy Shaarli releases
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>
2016-10-18 19:24:09 +02:00
VirtualTam
31081154b9 CHANGELOG.md: add unpublished Shaarli Community releases
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>
2016-10-18 19:07:28 +02:00
VirtualTam
5eb7247852 CHANGELOG.md: add published Shaarli Community releases
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>
2016-10-18 19:07:18 +02:00
Arthur
c1c2102850 Merge pull request #651 from ArthurHoaro/plugin-isso2
Isso comments plugin
2016-10-18 08:14:09 +02:00
VirtualTam
8406a4b670 Merge pull request #662 from virtualtam/fix/feed/self-link
Fix: return the proper value for the "self" feed attribute
2016-10-17 17:58:39 +02:00
VirtualTam
209aa96e7e Merge pull request #660 from virtualtam/fix/template/loop
Cleanup: explicitely loop over PHP variables in templates
2016-10-17 10:20:50 +02:00
ArthurHoaro
bf26e7ebcb Isso comments plugin
Use Isso client to let visitors comments on permalinks
2016-10-17 09:23:14 +02:00
Arthur
06eec9bf76 Merge pull request #659 from ArthurHoaro/plugin-errors
New init function for plugins, supports errors reporting
2016-10-17 08:50:18 +02:00
VirtualTam
44a718090d Fix: return the proper value for the "self" feed attribute
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>
2016-10-16 20:58:15 +02:00
VirtualTam
dec5fe9c69 Cleanup: explicitely loop over PHP variables in templates
Relates to https://github.com/shaarli/Shaarli/issues/613

Before: {loop="someVariable"}
After:  {loop="$someVariable"}

Signed-off-by: VirtualTam <virtualtam@flibidi.net>
2016-10-16 17:41:08 +02:00
VirtualTam
bb70e69059 Merge pull request #658 from ArthurHoaro/hotfix/plugin-desc-bug
Bugfix: display plugin parameter description only if it exists
2016-10-16 16:37:46 +02:00
ArthurHoaro
7fde6de121 New init function for plugins, supports errors reporting
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.
2016-10-14 13:22:58 +02:00
ArthurHoaro
e3de09b4c8 Bugfix: display plugin parameter description only if it exists 2016-10-14 12:48:01 +02:00
VirtualTam
f63632a6fb Merge pull request #654 from teromene/archive-org-no-internal
Archive.org plugin: do not propose archival of private notes

Fixes #637
2016-10-13 18:12:55 +02:00
Teromene
5e148f8a52 Archive.org plugin: do not propose archival of private notes
Fixes #637
2016-10-13 16:37:43 +01:00
Arthur
0354257266 Merge pull request #622 from ArthurHoaro/update-date
Save link update dates and render it in templates and feeds
2016-10-12 14:51:37 +02:00
Arthur
adcdac1dec Merge pull request #623 from ArthurHoaro/security/reverse-proxy-ban
Add trusted IPs in config and try to ban forwarded IP on failed login
2016-10-12 14:48:57 +02:00
Arthur
24cfb960cf Merge pull request #656 from ArthurHoaro/v0.8.0
Bump version to v0.8.0
2016-10-12 12:39:52 +02:00
ArthurHoaro
fdf88d1948 Bump version to v0.8.0
Signed-off-by: ArthurHoaro <arthur@hoa.ro>
2016-10-12 12:36:59 +02:00
VirtualTam
dc8e03bfc4 Merge pull request #649 from krypty/dockerfile-issue
Add a missing backslash in stable Dockerfile version
2016-09-14 12:08:51 +02:00
Gary Marigliano
7329118e9c Add a missing backslash in stable Dockerfile version 2016-09-14 11:08:11 +02:00
VirtualTam
d06c28ef64 Merge pull request #646 from virtualtam/composer/check-autoload
composer: display an error message if the autoload script is missing
2016-09-06 19:17:23 +02:00
VirtualTam
5283175367 composer: display an error message if the autoload script is missing
Closes https://github.com/shaarli/Shaarli/issues/645
Relates to https://github.com/shaarli/Shaarli/issues/607

Signed-off-by: VirtualTam <virtualtam@flibidi.net>
2016-09-05 00:04:57 +02:00
VirtualTam
e1fd94b545 README: fix link address typo
Fixes https://github.com/shaarli/Shaarli/issues/642

Signed-off-by: VirtualTam <virtualtam@flibidi.net>
2016-08-20 16:42:35 +02:00
nodiscc
ca089c5bad update link to install instuctions in README 2016-08-17 16:07:54 +02:00
VirtualTam
bb953a0106 Merge pull request #638 from virtualtam/docker/stable/composer
Docker: update dependencies, introduce Composer (stable branch)
2016-08-14 17:11:24 +02:00
VirtualTam
cc951468c0 Merge pull request #633 from virtualtam/docker/composer
Docker: update dependencies, introduce Composer
2016-08-14 16:28:07 +02:00
VirtualTam
665279ec99 Docker: update dependencies, introduce Composer
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>
2016-08-14 16:23:57 +02:00
VirtualTam
90f12b12ca Docker: update dependencies, introduce Composer
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>
2016-08-14 16:21:30 +02:00
VirtualTam
8758bb0ac8 Merge pull request #619 from ArthurHoaro/plugins/param-desc
Add a description to plugin parameters
2016-08-13 14:48:51 +02:00
VirtualTam
eec3666ba6 Merge pull request #636 from virtualtam/fix/final-newline
Fix: add missing final newlines, untabify text
2016-08-13 14:27:14 +02:00
VirtualTam
db6dec0de1 Fix: add missing final newlines, untabify text
Signed-off-by: VirtualTam <virtualtam@flibidi.net>
2016-08-13 14:22:22 +02:00
VirtualTam
f396134bf1 Merge pull request #635 from virtualtam/fix/import/ie
Fix: ensure Internet Explorer bookmark dumps can be imported
2016-08-13 13:59:12 +02:00
VirtualTam
f4ad7bde56 Fix: ensure Internet Explorer bookmark dumps can be imported
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>
2016-08-12 23:22:15 +02:00
VirtualTam
a34d6da642 Merge pull request #634 from virtualtam/composer/gitattributes
Fix: keep composer.json in release archives
2016-08-12 22:09:07 +02:00
VirtualTam
b039a061eb Fix: keep composer.json in release archives
Relates to https://github.com/shaarli/Shaarli/issues/607

Signed-off-by: VirtualTam <virtualtam@flibidi.net>
2016-08-12 22:02:59 +02:00
Arthur
e0dd77c37e Merge pull request #612 from virtualtam/refactor/bookmark-parser
Refactor bookmark import using a generic Netscape parser
2016-08-10 12:10:41 +02:00
VirtualTam
a973afeac7 Refactor bookmark import using a generic Netscape parser
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>
2016-08-10 01:42:44 +02:00
VirtualTam
085157c5cb Merge pull request #632 from virtualtam/composer/shaarli/netscape-bookmark-parser
Composer: reference shaarli/netscape-bookmark-parser from Packagist
2016-08-10 01:00:51 +02:00
VirtualTam
8c4958c508 Composer: reference shaarli/netscape-bookmark-parser from Packagist
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>
2016-08-10 00:47:53 +02:00
Arthur
d0d3623172 Merge pull request #624 from julienCXX/pr-curl-http-fetch
Added (and set as default) a cURL-based method for fetching HTTP content
2016-08-09 13:15:19 +02:00
julienCXX
634783f916 Set cURL as default in HTTP fetching, a fallback method and consistency fixup between both methods 2016-08-08 20:45:50 +02:00
Arthur
6b98d46179 Merge pull request #628 from ArthurHoaro/hotfix/default-private
Bugfix: wrong key used to get default private links setting
2016-08-07 12:16:27 +02:00