aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
...
| * Improved search: combine AND, exact terms and exclude search.ArthurHoaro2016-02-154-29/+83
|/
* Merge pull request #461 from ArthurHoaro/tagcloud-sortArthur2016-02-151-3/+17
|\ | | | | Fixes #456: Tag cloud does not sort tags (fully) alphabetically
| * Fixes #456: Tag cloud does not sort tags (fully) alphabeticallyArthurHoaro2016-02-051-3/+17
| | | | | | | | | | | | | | * Use Collator class to sort tags using the locale (in PECL intl, included in most PHP installation). * Use strcasecmp if Collator is not found. Both sorts are case insensitive.
* | Merge pull request #447 from ArthurHoaro/hidden-tagsArthur2016-02-154-2/+27
|\ \ | | | | | | Private/Hidden tags
| * | Private/Hidden tagsArthurHoaro2016-02-154-2/+27
|/ / | | | | | | | | | | | | Tags starting with a dot '.' are now private. They can only be seen and searched when logged in. Fixes #315
* | Merge pull request #446 from ArthurHoaro/search-tag-excludeArthur2016-02-158-12/+79
|\ \ | | | | | | Add exclusion in tag search
| * | Remove first '-' char when saving tagsArthurHoaro2016-02-151-0/+2
| | |
| * | Add exclusion in tag searchArthurHoaro2016-02-157-12/+77
|/ / | | | | | | | | | | | | | | | | | | | | * 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.
* | Merge pull request #479 from ArthurHoaro/pluginsadmin-error-urlArthur2016-02-151-1/+1
|\ \ | | | | | | Fixes typo in plugin admin redirection URL
| * | Fixes typo in plugin admin redirection URLArthurHoaro2016-02-151-1/+1
| | |
* | | Merge pull request #460 from ArthurHoaro/440-editlink-404Arthur2016-02-151-13/+34
|\ \ \ | | | | | | | | Fixes #440 - 404 error after editing a link
| * | | Fixes #440 - 404 error after editing a linkArthurHoaro2016-02-041-1/+1
| | | | | | | | | | | | | | | | Remove unnecessary escape().
| * | | Code cleanup: index.php - save_editArthurHoaro2016-02-041-12/+33
| | |/ | |/|
* | | Merge pull request #442 from ArthurHoaro/updaterArthur2016-02-158-86/+550
|\ \ \ | |_|/ |/| | Introduce the Updater class which
| * | Introduce the Updater class whichArthurHoaro2016-02-158-86/+550
| |/ | | | | | | | | | | | | * 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 #473 from ArthurHoaro/commonhook-orderArthur2016-02-111-1/+1
|\ \ | | | | | | Common hooks: process includes before header/footer
| * | Common hooks: process includes before header/footerArthurHoaro2016-02-101-1/+1
|/ /
* | Merge pull request #472 from ArthurHoaro/wallabag-version-parameterArthur2016-02-101-1/+1
|\ \ | | | | | | Wallabag plugin: add version parameter in the meta file
| * | Wallabag plugin: add version parameter in the meta fileArthurHoaro2016-02-101-1/+1
|/ /
* | Merge pull request #458 from ArthurHoaro/plugins-init-parametersArthur2016-02-041-1/+2
|\ \ | | | | | | Initialize plugin parameters array to avoid unnecessary warning.
| * | Initialize plugin parameters array to avoid unnecessary warning.ArthurHoaro2016-02-021-1/+2
| |/
* | Merge pull request #457 from ArthurHoaro/updatecheck-warningArthur2016-02-041-0/+3
|\ \ | |/ |/| Add a default value to ENABLE_UPDATECHECK to avoid unnecessary warning
| * Add a default value to ENABLE_UPDATECHECK to avoid unnecessary warning.ArthurHoaro2016-02-021-0/+3
|/
* Merge pull request #453 from ArthurHoaro/pr450Arthur2016-02-012-14/+48
|\ | | | | Implemented a little more sophisticated searching (squashed)
| * Implemented searching for a phrase in double-quotes or all words in no ↵Florian Voigt2016-02-012-14/+48
| | | | | | | | | | | | particular order. + unit tests
* | Merge pull request #452 from ArthurHoaro/v0.6.3v0.6.3Arthur2016-01-312-3/+3
|\ \ | | | | | | Bump version to v0.6.3
| * | Bump version to v0.6.3ArthurHoaro2016-01-312-3/+3
|/ /
* | Merge pull request #451 from ArthurHoaro/markdown-gitdiffArthur2016-01-313-57/+57
|\ \ | | | | | | Fixes forced git changes
| * | Fixes forced git changesArthurHoaro2016-01-313-57/+57
|/ / | | | | | | Probably related to the introduction of .gitattribute with forced line ending.
* | Merge pull request #388 from ArthurHoaro/pluginadminArthur2016-01-3120-7/+636
|\ \ | | | | | | Fixes #378 - Plugin administration UI.
| * | Fixes #378 - Plugin administration UI.ArthurHoaro2016-01-3120-7/+636
| | |
* | | Merge pull request #379 from ArthurHoaro/plugin-markdownArthur2016-01-3110-9/+1996
|\ \ \ | |/ / |/| | PLUGIN Markdown
| * | PLUGIN MarkdownArthurHoaro2016-01-0310-9/+1996
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | Merge pull request #448 from shaarli/whitespaceArthur2016-01-311-1/+1
|\ \ \ | |_|/ |/| | remove whitespace
| * | fix whitespacenodiscc2016-01-221-1/+1
|/ /
* | Merge pull request #444 from dimtion/404_templateArthur2016-01-213-6/+45
|\ \ | | | | | | Create 404 template
| * | Create 404 templateDimtion2016-01-203-6/+45
| | | | | | | | | | | | Solve #430 for links
* | | Bugfix: prevent LinkFilter to work on outdated data.ArthurHoaro2016-01-202-9/+5
|/ /
* | Merge pull request #441 from virtualtam/tests/check-file-permissionsVirtualTam2016-01-187-1/+16
|\ \ | | | | | | tests: add a make target to check file permissions
| * | tests: add a make target to check file permissionsVirtualTam2016-01-177-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | Additions: - [makefile] check versioned files are not executable - [travis] call the new make target Signed-off-by: VirtualTam <virtualtam@flibidi.net>
* | | Merge pull request #443 from virtualtam/fix/logm-eolVirtualTam2016-01-182-2/+2
|\ \ \ | |/ / |/| | fix: use PHP_EOL for carriage returns in file logs
| * | fix: use PHP_EOL for carriage returns in file logsVirtualTam2016-01-182-2/+2
|/ / | | | | | | | | | | Relates to #436 Signed-off-by: VirtualTam <virtualtam@flibidi.net>
* | Merge pull request #438 from virtualtam/utils/logm/date-formatVirtualTam2016-01-172-3/+8
|\ \ | | | | | | Logging: improve formatting to enable fail2ban parsing
| * | Logging: improve formatting to enable fail2ban parsingVirtualTam2016-01-162-3/+8
|/ / | | | | | | | | | | | | | | | | | | 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>
* | Merge pull request #437 from virtualtam/refactor/utils/logmVirtualTam2016-01-163-13/+84
|\ \ | | | | | | Logging: move logm() from index.php to application/Utils.php
| * | Logging: move logm() from index.php to application/Utils.phpVirtualTam2016-01-163-13/+84
|/ / | | | | | | | | | | | | | | | | | | | | Relates to #436 Modifications: - inject dependencies to global variables ($_SERVER, $GLOBALS) - apply coding conventions - add test coverage Signed-off-by: VirtualTam <virtualtam@flibidi.net>
* | Merge pull request #432 from ArthurHoaro/title-retrieveVirtualTam2016-01-118-72/+285
|\ \ | | | | | | Fixes #410 - Retrieve title fails in multiple cases
| * | Fixes #410 - Retrieve title fails in multiple casesArthurHoaro2016-01-118-72/+285
|/ / | | | | | | | | | | | | | | | | * `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.
* | Git *wants* to rewrite this file in the exact same way...ArthurHoaro2016-01-061-71/+71
| | | | | | | | Probably a line ending issue...
* | Merge pull request #424 from ArthurHoaro/searchArthur2016-01-068-416/+680
|\ \ | | | | | | Link filter refactoring