aboutsummaryrefslogtreecommitdiffhomepage
path: root/application
Commit message (Collapse)AuthorAgeFilesLines
* Add trusted IPs in config and try to ban forwarded IP on failed loginArthurHoaro2016-08-031-0/+26
| | | | | | | | * 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-021-2/+2
|\ | | | | Fix update method escapeUnescapedConfig
| * Fix update method escapeUnescapedConfigArthurHoaro2016-08-021-2/+2
| | | | | | | | | | | | | | * Actually run it * unit tests Fixes #611
* | Better whitespace handling in tagsArthurHoaro2016-08-021-1/+1
| | | | | | | | | | | | Correct PR #573 to work properly with hidden tags, and add ReferenceLinkDB UT. Fixes #571 - Closes #573
* | Better whitespace handling in tags. Fixes #571Chris Kuethe2016-08-021-2/+2
|/
* Fixes #600 - Shaarli's title is not set with the new config managerArthurHoaro2016-07-191-8/+2
| | | | | - Fixed title config key - Page title (in head tag) is no longer set through the config manager
* Merge pull request #558 from ArthurHoaro/hashtag4Arthur2016-07-094-56/+107
|\ | | | | Hashtag system
| * Hashtag systemArthurHoaro2016-06-064-57/+108
| | | | | | | | | | | | * 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-0912-311/+905
|\ \ | |/ |/| Introduce a configuration manager
| * Add closing PHP tags to JSON config filesArthurHoaro2016-06-201-1/+14
| |
| * Pass the configuration manager to templatesArthurHoaro2016-06-151-0/+2
| |
| * Rename configuration key for better sectionsArthurHoaro2016-06-115-73/+77
| |
| * PluginManager no longer uses singleton patternArthurHoaro2016-06-111-36/+14
| |
| * ConfigManager no longer uses singleton patternArthurHoaro2016-06-114-95/+101
| |
| * Remove remaining settings initialization in index.phpArthurHoaro2016-06-112-51/+36
| | | | | | | | Except for those which require external data (timezone and $_SERVER).
| * Rename configuration keys and fix GLOBALS in templatesArthurHoaro2016-06-116-76/+150
| |
| * Set the default timezone in index.phpArthurHoaro2016-06-111-3/+0
| |
| * Adds ConfigJson which handle the configuration in JSON format.ArthurHoaro2016-06-115-7/+112
| | | | | | | | Also use the Updater to make the transition
| * Replace $GLOBALS configuration with the configuration manager in the whole ↵ArthurHoaro2016-06-1110-275/+98
| | | | | | | | code base
| * Introduce a configuration manager (not plugged yet)ArthurHoaro2016-06-114-0/+607
| |
* | Merge pull request #583 from ArthurHoaro/enhance/tag-caseArthur2016-06-031-2/+9
|\ \ | | | | | | Fixes #497: ignore case difference between tags
| * | Fixes #497: ignore case difference between tagsArthurHoaro2016-05-311-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | While retrieving all tags, case differences will be ignored. This affects: * tag cloud * tag autocompletion
* | | Url.php: remove unwanted ?PHPSESSID= URL parameters,nodiscc2016-05-201-0/+1
| |/ |/| | | | | update test case
* | Merge pull request #560 from ArthurHoaro/nb-private-shaareArthur2016-05-142-0/+161
|\ \ | | | | | | Private links counter in the header
| * | Add private link counterArthurHoaro2016-05-131-0/+16
| | |
| * | Extract PageBuilder class from index.phpArthurHoaro2016-05-131-0/+145
| | |
* | | Fix startsWith and endsWith caseArthurHoaro2016-05-103-16/+28
|/ /
* | Export: allow prepending notes with the Shaarli instance's URLVirtualTam2016-05-061-4/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Relates to #102 Additions: - application: - export: allow prepending note permalinks with the instance's URL - test coverage Modifications: - export template: switch to an HTML form - link selection (all/private/public) - prepend note permalinks with the instance's URL Signed-off-by: VirtualTam <virtualtam@flibidi.net>
* | typoArthurHoaro2016-05-052-3/+3
| |
* | Merge pull request #551 from ArthurHoaro/hotfix/timezoneArthur2016-05-051-4/+0
|\ \ | | | | | | Use correct 'UTC' timezone
| * | Use correct 'UTC' timezoneArthurHoaro2016-05-031-4/+0
| | |
* | | Merge pull request #532 from ArthurHoaro/hotfix/title-retrieve-the-returnArthur2016-05-033-13/+95
|\ \ \ | | | | | | | | Fixes #531 - Title retrieving is failing with multiple use case
| * | | Fixes #531 - Title retrieving is failing with multiple use caseArthurHoaro2016-05-033-13/+95
| | |/ | |/| | | | | | | see https://github.com/shaarli/Shaarli/issues/531 for details
* | | Fix error when filtering search tagsD Low2016-04-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Arrays are key-value maps. We should reindex the array after a filter since we are using the key and count to do array access in filterTags. An example would be searching for "foo, bar", after the array filter, our array is actually (0 -> foo, 2 -> bar) which will cause an error when trying to access $searchtags[1].
* | | Refactor Netscape bookmark exportingVirtualTam2016-04-101-0/+47
| |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Relates to https://github.com/shaarli/netscape-bookmark-parser/issues/5 Fixes: - respect the Netscape bookmark format "specification" Modifications: - [application] introduce the NetscapeBookmarkUtils class - [template] export - improve formatting, rename export selection parameter - [template] export.bookmarks - template for Netscape exports - [tests] bookmark filtering, additional field generation Signed-off-by: VirtualTam <virtualtam@flibidi.net>
* | Fixes #480: add an option to urlencode redirector URLArthurHoaro2016-04-091-6/+29
|/ | | | | | | | * New config: `$GLOBALS['config']['REDIRECTOR_URLENCODE']` (default `true`). * Parameter added to LinkDB constructor. * Fixes a bug with urlencode and escaped url. * In `index.php`, LinkDB is now instanciate once for `importFile()` and `showDaily()`. * TU
* Merge pull request #522 from ArthurHoaro/hotfix/readershaareVirtualTam2016-03-301-1/+31
|\ | | | | Refactor and rebase #380: Firefox reader view links
| * Refactor and rebase #380: Firefox reader view linksArthurHoaro2016-03-261-13/+29
| | | | | | | | | | Fixes #366 Closes #380
| * Fix issue 366, Problem when shaaring a link in Reader View of Firefox.Kevin Canévet2016-03-241-1/+15
| |
* | Merge pull request #515 from ArthurHoaro/template-feedsArthur2016-03-256-12/+377
|\ \ | |/ |/| Refactor RSS feeds generation, and do it through templates
| * Refactor filter in LinkDBArthurHoaro2016-03-254-24/+74
| | | | | | | | | | | | | | | | * search type now carried by LinkDB in order to factorize code between different search sources. * LinkDB->filter split in 3 method: filterSearch, filterHash, filterDay (we know what type of filter is needed). * filterHash now throw a LinkNotFoundException if it doesn't exist: internal implementation choice, still displays a 404. * Smallhash regex has been rewritten. * Unit tests update
| * Makes escape a recursive function which handle array of stringsArthurHoaro2016-03-251-3/+11
| |
| * Create a FeedBuilder class which build data for both ATOM and RSS feed.ArthurHoaro2016-03-252-1/+296
| |
| * Refactor showAtom, and make it use the ATOM templateArthurHoaro2016-03-181-1/+1
| | | | | | | | | | | | | | | | Minor changes: * Fix the date which was in a invalid format. * Avoid empty categories (tags). * Use the locale to set the language
| * Adds a route for ATOM and RSS feeds pageArthurHoaro2016-03-181-0/+12
| |
* | Fixes #512: retrieving title didn't match the first closing tagArthurHoaro2016-03-081-1/+1
|/
* Fixes #477: support multi reverse proxy with comma syntaxArthurHoaro2016-02-281-2/+12
| | | | Going through multiple reverse proxy will store multiple scheme and port in HTTP header separated by a comma. Shaarli will use the first one to generate server_url.
* Merge pull request #496 from ArthurHoaro/cross-searchArthur2016-02-282-6/+24
|\ | | | | Allow crossed search between terms and tags
| * Allow crossed search between terms and tagsArthurHoaro2016-02-282-6/+24
| | | | | | | | | | | | | | * Partial fix of #449 * Current use case: search term + click on tag. * LinkFilter now returns all links if no filter is given. * Unit tests.
* | Merge pull request #491 from ArthurHoaro/markdown-escape2Arthur2016-02-251-1/+17
|\ \ | | | | | | Markdown: don't escape content + sanitize sensible tags