Knah-Tsaeb/MyShaarli
Knah-Tsaeb/MyShaarli
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
730 commits 8 branches 1 tag 12 MiB
Commit graph

730 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
ArthurHoaro
cdbc818037 Bugfix: wrong key used to get default private links setting 2016-08-07 12:15:08 +02:00
Arthur
cb30622d8b Merge pull request #627 from ArthurHoaro/feature/translate-init 
Initialize a translation function
 2016-08-07 12:03:48 +02:00
ArthurHoaro
edf3ff5a53 Initialize a translation function 
It matches the API of ngettext().
 2016-08-07 11:54:39 +02:00
VirtualTam
65b2c795d0 Merge pull request #625 from ArthurHoaro/token 
Generate a token for every pages
 2016-08-07 00:29:08 +02:00
VirtualTam
83dbc41a77 Merge pull request #626 from ArthurHoaro/hotfix/changepassword 
Bugfix: enable change password if open shaarli is disabled
 2016-08-07 00:17:42 +02:00
ArthurHoaro
15ff4745ff Bugfix: enable change password if open shaarli is disabled 2016-08-06 14:38:47 +02:00
ArthurHoaro
fd5ac47ea2 Generate a token for every pages 2016-08-06 14:09:26 +02:00
ArthurHoaro
50d1791838 Add trusted IPs in config and try to ban forwarded IP on failed login 
* 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
 2016-08-03 10:36:47 +02:00
ArthurHoaro
c6d876bb2a Set updated date for items in feeds 
RSS doesn't support updated date for items, so we use the ATOM extension.
Updated dates also bump the global update
 2016-08-03 09:54:57 +02:00
ArthurHoaro
9646b7da22 Save the update date in LinkDB and pass it to linklist templates 
It can be used as a timestamp by templates under the key 'updated_timestamp'.
 2016-08-03 09:44:04 +02:00
VirtualTam
c7a42ab1d9 Merge pull request #621 from ArthurHoaro/hotfix/update-escape-config 
Fix update method escapeUnescapedConfig
 2016-08-02 19:46:47 +02:00
VirtualTam
58f0660f80 Merge pull request #618 from ArthurHoaro/tagclean 
Better whitespace handling in tags
 2016-08-02 15:37:43 +02:00
ArthurHoaro
b9f8b83790 Fix update method escapeUnescapedConfig 
* Actually run it
  * unit tests

Fixes #611
 2016-08-02 12:54:55 +02:00
ArthurHoaro
876533e868 Add a description to wallabag plugin parameters 2016-08-02 11:12:05 +02:00
ArthurHoaro
1442afe3cf Plugin parameter description: Update the templates to display them 2016-08-02 11:12:05 +02:00
ArthurHoaro
15170b5164 Parse plugin parameters description with the PluginManager 
Plugin parameter can contain a description in their meta file under the key:

    parameter.<param_name>="<description>"
 2016-08-02 11:12:01 +02:00
ArthurHoaro
9866b40814 Better whitespace handling in tags 
Correct PR #573 to work properly with hidden tags, and add ReferenceLinkDB UT.

Fixes #571 - Closes #573
 2016-08-02 10:34:21 +02:00
Chris Kuethe
32d51093e3 add unit test 2016-08-02 10:22:18 +02:00
Chris Kuethe
4b35853d68 Better whitespace handling in tags. Fixes #571 2016-08-02 10:22:18 +02:00
VirtualTam
efc0c865ba Merge pull request #608 from virtualtam/refactor/bookmark-parser 
Reference netscape-bookmark-parser & allow generating custom release archives
 2016-07-26 22:13:53 +02:00
VirtualTam
559315ba0a Makefile: generate release archives including 3rd-party libraries 
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>
 2016-07-25 23:54:13 +02:00
VirtualTam
7f5ab8c0a4 Composer: add shaarli/netscape-bookmark-parser 
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>
 2016-07-23 17:14:15 +02:00
Arthur
2795cf5e1c Merge pull request #605 from ArthurHoaro/clean-phpunit 
Hide expected 'error_log' while running TU (clean PHPUnit log)
 2016-07-23 14:20:23 +02:00
Arthur
a4cd07eee2 Merge pull request #604 from ArthurHoaro/no-delicious 
Remove Delicious in project description in comments
 2016-07-23 14:16:59 +02:00
ArthurHoaro
87f9f4f9b7 Hide expected 'error_log' while running TU (clean PHPUnit log) 2016-07-23 14:16:07 +02:00
ArthurHoaro
2d97aa7781 Remove Delicious in project description in comments 2016-07-23 14:13:56 +02:00
Arthur
8562009682 Merge pull request #601 from ArthurHoaro/hotfix/title-missing 
Fixes #600 - Shaarli's title is not set with the new config manager
 2016-07-23 10:31:33 +02:00
Arthur
d5307a4e00 Merge pull request #603 from julienCXX/pr-fix-test-method-name 
Fix typo in test method name
 2016-07-21 20:05:49 +02:00
julienCXX
1336a7326b Fix typo in test method name 2016-07-21 19:42:26 +02:00
ArthurHoaro
97ef33bb72 Fixes #600 - Shaarli's title is not set with the new config manager 
- Fixed title config key
  - Page title (in head tag) is no longer set through the config manager
 2016-07-19 18:03:09 +02:00
Arthur
b6e58bab8a Merge pull request #596 from ArthurHoaro/hotfix/pluginmanager-tpl-var 
Fix session_protection_disabled variable in configure.php
 2016-07-10 10:45:01 +02:00
ArthurHoaro
2e193ad387 Fix variable in configure.php 2016-07-10 10:42:21 +02:00