aboutsummaryrefslogtreecommitdiffhomepage
path: root/application
Commit message (Collapse)AuthorAgeFilesLines
...
* | 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
| * | Markdown: don't escape content + sanitize sensible tagsArthurHoaro2016-02-191-1/+17
| | | | | | | | | | | | Instead of trying to fix broken content for Markdown parsing, parse it unescaped, then sanatize sensible tags such as scripts, etc.
* | | Merge pull request #492 from ArthurHoaro/locale-sort-fixArthur2016-02-241-0/+25
|\ \ \ | |_|/ |/| | Fixes #481: tag cloud fatal error
| * | Apply the locale to all categories and move autolocale to Utils.phpArthurHoaro2016-02-191-0/+25
| |/
* / cleanup: use DateTime to format datesVirtualTam2016-02-171-0/+3
|/ | | | | | | | | | | | | | | Closes #270 Modifications: - replace custom date parsing by DateTime calls - use proper date formatting for RSS feeds Deletions: - linkdate2timestamp() - linkdate2rfc822 - linkdate2iso8601 Signed-off-by: VirtualTam <virtualtam@flibidi.net>
* Support text search across link fields.ArthurHoaro2016-02-151-25/+23
|
* Improved search: combine AND, exact terms and exclude search.ArthurHoaro2016-02-151-24/+36
|
* Private/Hidden tagsArthurHoaro2016-02-151-0/+7
| | | | | | | Tags starting with a dot '.' are now private. They can only be seen and searched when logged in. Fixes #315
* Add exclusion in tag searchArthurHoaro2016-02-153-9/+38
| | | | | | | | | | | * Searching '-mytag' will now exlude all shaares with 'mytag' tag. * All tags starting with a '-' are renamed without it (through the Updater). * Unit tests. Minor code changes: * LinkDB->filter() can now take no parameters (get all link depending on logged status). * tagsStrToArray() is now static and filters blank tags.
* Introduce the Updater class whichArthurHoaro2016-02-154-34/+232
| | | | | | | * contains methods designed to be run once. * is able to upgrade the datastore or the configuration. * is based on methods names, stored in a text file with ';' separator (updates.txt). * begins with existing function 'mergeDeprecatedConfigFile()' (options.php).
* Merge pull request #453 from ArthurHoaro/pr450Arthur2016-02-011-13/+32
|\ | | | | Implemented a little more sophisticated searching (squashed)
| * Implemented searching for a phrase in double-quotes or all words in no ↵Florian Voigt2016-02-011-13/+32
| | | | | | | | | | | | particular order. + unit tests
* | Merge pull request #388 from ArthurHoaro/pluginadminArthur2016-01-313-0/+177
|\ \ | | | | | | Fixes #378 - Plugin administration UI.
| * | Fixes #378 - Plugin administration UI.ArthurHoaro2016-01-313-0/+177
| |/
* | Merge pull request #379 from ArthurHoaro/plugin-markdownArthur2016-01-311-8/+0
|\ \ | |/ |/| PLUGIN Markdown
| * PLUGIN MarkdownArthurHoaro2016-01-031-8/+0
| | | | | | | | | | | | | | | | | | | | Parse link description in Markdown (HTML) before rendering. * hard remove of Shaarli's HTML before parsing. * Using Parsedown <https://github.com/erusev/parsedown> PHP lib. * Includes basic markdown CSS. * Style: removed 400px height max limit for shaares. * Unit tests.
* | Bugfix: prevent LinkFilter to work on outdated data.ArthurHoaro2016-01-201-8/+4
| |
* | Merge pull request #441 from virtualtam/tests/check-file-permissionsVirtualTam2016-01-183-0/+0
|\ \ | | | | | | tests: add a make target to check file permissions
| * | tests: add a make target to check file permissionsVirtualTam2016-01-173-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | Additions: - [makefile] check versioned files are not executable - [travis] call the new make target Signed-off-by: VirtualTam <virtualtam@flibidi.net>
* | | fix: use PHP_EOL for carriage returns in file logsVirtualTam2016-01-181-1/+1
|/ / | | | | | | | | | | Relates to #436 Signed-off-by: VirtualTam <virtualtam@flibidi.net>
* | Logging: improve formatting to enable fail2ban parsingVirtualTam2016-01-161-2/+7
| | | | | | | | | | | | | | | | | | | | Fixes #436 Modifications: - remove calls to strval() on safe data - update the date format: 'Y/m/d_H:i:s' => 'Y/m/d H:i:s' Signed-off-by: VirtualTam <virtualtam@flibidi.net>
* | Logging: move logm() from index.php to application/Utils.phpVirtualTam2016-01-161-0/+13
| | | | | | | | | | | | | | | | | | | | | | Relates to #436 Modifications: - inject dependencies to global variables ($_SERVER, $GLOBALS) - apply coding conventions - add test coverage Signed-off-by: VirtualTam <virtualtam@flibidi.net>
* | Fixes #410 - Retrieve title fails in multiple casesArthurHoaro2016-01-114-9/+132
| | | | | | | | | | | | | | | | | | * `get_http_url()` renamed to `get_http_response()`. * Use the same HTTP context to retrieve response headers and content. * Follow HTTP 301 and 302 redirections to retrieve the title (default max 3 redirections). * Add `LinkUtils` to extract titles and charset. * Try to retrieve charset from HTTP headers first (new), then HTML content. * Use mb_string to re-encode title if necessary.
* | Merge pull request #424 from ArthurHoaro/searchArthur2016-01-063-110/+281
|\ \ | | | | | | Link filter refactoring