aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
* 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 #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
| * | Fix typo in test method namejulienCXX2016-07-211-2/+2
|/ /
* | Merge pull request #596 from ArthurHoaro/hotfix/pluginmanager-tpl-varArthur2016-07-102-1/+2
|\ \ | |/ |/| Fix session_protection_disabled variable in configure.php
| * Fix variable in configure.phpArthurHoaro2016-07-102-1/+2
|/
* Merge pull request #558 from ArthurHoaro/hashtag4Arthur2016-07-0910-103/+270
|\ | | | | Hashtag system
| * Hashtag systemArthurHoaro2016-06-0610-104/+271
| | | | | | | | | | | | * Hashtag are auto-linked with a filter search * Supports unicode * Compatible with markdown (excluded in code blocks)
* | Merge pull request #570 from ArthurHoaro/config-managerArthur2016-07-0941-1130/+2096
|\ \ | | | | | | Introduce a configuration manager
| * | Add closing PHP tags to JSON config filesArthurHoaro2016-06-204-2/+18
| | |
| * | Pass the configuration manager to templatesArthurHoaro2016-06-151-0/+2
| | |
| * | Rename configuration key for better sectionsArthurHoaro2016-06-1110-167/+173
| | |
| * | PluginManager no longer uses singleton patternArthurHoaro2016-06-119-94/+63
| | |
| * | ConfigManager no longer uses singleton patternArthurHoaro2016-06-119-275/+342
| | |
| * | Remove remaining settings initialization in index.phpArthurHoaro2016-06-113-78/+42
| | | | | | | | | | | | Except for those which require external data (timezone and $_SERVER).
| * | Rename configuration keys and fix GLOBALS in templatesArthurHoaro2016-06-1118-323/+350
| | |
| * | Use the configuration manager for wallabag and readityourself pluginArthurHoaro2016-06-114-23/+22
| | |
| * | Set the default timezone in index.phpArthurHoaro2016-06-112-3/+2
| | |
| * | Adds ConfigJson which handle the configuration in JSON format.ArthurHoaro2016-06-1113-25/+462
| | | | | | | | | | | | Also use the Updater to make the transition
| * | Replace $GLOBALS configuration with the configuration manager in the whole ↵ArthurHoaro2016-06-1123-856/+422
| | | | | | | | | | | | code base
| * | Introduce a configuration manager (not plugged yet)ArthurHoaro2016-06-118-0/+872
| | |
| * | Configuration template indentingArthurHoaro2016-06-111-36/+78
| | |
* | | Merge pull request #592 from virtualtam/composer-metadataVirtualTam2016-06-161-3/+9
|\ \ \ | | | | | | | | Update composer metadata
| * | | Update composer metadataVirtualTam2016-06-151-3/+9
|/ / / | | | | | | | | | Signed-off-by: VirtualTam <virtualtam@flibidi.net>
* | / Firefox Share: Use selected text as descriptionnodiscc2016-06-121-1/+1
| |/ |/| | | https://developer.mozilla.org/en-US/docs/Mozilla/Projects/Social_API/Share
* | Merge pull request #582 from ArthurHoaro/hotfix/nomarkdownArthur2016-06-062-5/+20
|\ \ | | | | | | The "nomarkdown" tag is no longer private
| * | The tag is no longer privateArthurHoaro2016-05-302-5/+20
| |/ | | | | | | A private tag is never loaded for visitor, making this feature useless.
* | Merge pull request #583 from ArthurHoaro/enhance/tag-caseArthur2016-06-034-6/+15
|\ \ | | | | | | Fixes #497: ignore case difference between tags
| * | Fixes #497: ignore case difference between tagsArthurHoaro2016-05-314-6/+15
| | | | | | | | | | | | | | | | | | | | | | | | While retrieving all tags, case differences will be ignored. This affects: * tag cloud * tag autocompletion
* | | Merge pull request #576 from virtualtam/readme/link-upgradeVirtualTam2016-05-201-0/+1
|\ \ \ | | | | | | | | README: add link to the upgrade and migration wiki page
| * | | README: add link to the upgrade and migration wiki pageVirtualTam2016-05-201-0/+1
|/ / / | | | | | | | | | | | | | | | Relates to #575 Signed-off-by: VirtualTam <virtualtam@flibidi.net>
* | | Merge pull request #574 from shaarli/urlparams-phpsessidVirtualTam2016-05-202-0/+2
|\ \ \ | | | | | | | | Url.php: remove unwanted ?PHPSESSID= URL parameters
| * | | Url.php: remove unwanted ?PHPSESSID= URL parameters,nodiscc2016-05-202-0/+2
|/ / / | | | | | | | | | update test case
* | | Merge pull request #568 from ArthurHoaro/masterArthur2016-05-141-1/+1
|\ \ \ | | |/ | |/| PHP endtag in shaarli_version.php
| * | PHP endtag in shaarli_version.phpArthurHoaro2016-05-141-1/+1
|/ /
* | Merge pull request #567 from ArthurHoaro/v0.7.0v0.7.0Arthur2016-05-1447-197/+73
|\ \ | | | | | | V0.7.0
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 17:37:22 +0000