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
Arthur
0c4c7ae818
Merge pull request #558 from ArthurHoaro/hashtag4
...
Hashtag system
2016-07-09 07:36:23 +02:00
Arthur
649af5b501
Merge pull request #570 from ArthurHoaro/config-manager
...
Introduce a configuration manager
2016-07-09 07:19:48 +02:00
ArthurHoaro
5ff23f02b8
Add closing PHP tags to JSON config files
2016-06-20 18:30:37 +02:00
VirtualTam
a9cfa38df9
Merge pull request #592 from virtualtam/composer-metadata
...
Update composer metadata
2016-06-16 20:20:34 +02:00
6658463e9e
[fix] private icon not show
2016-06-16 09:31:31 +02:00
VirtualTam
8945c76b62
Update composer metadata
...
Signed-off-by: VirtualTam <virtualtam@flibidi.net>
2016-06-15 21:27:45 +02:00
ArthurHoaro
b302c77c74
Pass the configuration manager to templates
2016-06-15 18:22:19 +02:00
e9cda12d81
[fix] private icon not show
2016-06-15 09:10:11 +02:00
c29027dd1a
Merge branch 'private_link' into myShaarli
2016-06-15 09:03:44 +02:00
9a49486707
Bump version
2016-06-14 12:01:23 +02:00
5ac350359c
[fix] private icon not show
2016-06-14 11:59:10 +02:00
34b2678fd9
[fix] bad link for myShaarli repo
2016-06-14 11:41:43 +02:00
nodiscc
c3599302aa
Firefox Share: Use selected text as description
...
https://developer.mozilla.org/en-US/docs/Mozilla/Projects/Social_API/Share
2016-06-12 15:10:31 +02:00
ArthurHoaro
894a3c4bf3
Rename configuration key for better sections
2016-06-11 09:30:56 +02:00
ArthurHoaro
51def0d849
PluginManager no longer uses singleton pattern
2016-06-11 09:30:56 +02:00
ArthurHoaro
278d9ee283
ConfigManager no longer uses singleton pattern
2016-06-11 09:30:56 +02:00
ArthurHoaro
7f179985b4
Remove remaining settings initialization in index.php
...
Except for those which require external data (timezone and $_SERVER).
2016-06-11 09:30:56 +02:00
ArthurHoaro
da10377b3c
Rename configuration keys and fix GLOBALS in templates
2016-06-11 09:30:56 +02:00