Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #479 from ArthurHoaro/pluginsadmin-error-url | Arthur | 2016-02-15 | 1 | -1/+1 |
|\ | | | | | Fixes typo in plugin admin redirection URL | ||||
| * | Fixes typo in plugin admin redirection URL | ArthurHoaro | 2016-02-15 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #460 from ArthurHoaro/440-editlink-404 | Arthur | 2016-02-15 | 1 | -13/+34 |
|\ \ | | | | | | | Fixes #440 - 404 error after editing a link | ||||
| * | | Fixes #440 - 404 error after editing a link | ArthurHoaro | 2016-02-04 | 1 | -1/+1 |
| | | | | | | | | | | | | Remove unnecessary escape(). | ||||
| * | | Code cleanup: index.php - save_edit | ArthurHoaro | 2016-02-04 | 1 | -12/+33 |
| | | | |||||
* | | | Merge pull request #442 from ArthurHoaro/updater | Arthur | 2016-02-15 | 8 | -86/+550 |
|\ \ \ | |_|/ |/| | | Introduce the Updater class which | ||||
| * | | Introduce the Updater class which | ArthurHoaro | 2016-02-15 | 8 | -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-order | Arthur | 2016-02-11 | 1 | -1/+1 |
|\ \ | | | | | | | Common hooks: process includes before header/footer | ||||
| * | | Common hooks: process includes before header/footer | ArthurHoaro | 2016-02-10 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #472 from ArthurHoaro/wallabag-version-parameter | Arthur | 2016-02-10 | 1 | -1/+1 |
|\ \ | | | | | | | Wallabag plugin: add version parameter in the meta file | ||||
| * | | Wallabag plugin: add version parameter in the meta file | ArthurHoaro | 2016-02-10 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #458 from ArthurHoaro/plugins-init-parameters | Arthur | 2016-02-04 | 1 | -1/+2 |
|\ \ | | | | | | | Initialize plugin parameters array to avoid unnecessary warning. | ||||
| * | | Initialize plugin parameters array to avoid unnecessary warning. | ArthurHoaro | 2016-02-02 | 1 | -1/+2 |
| |/ | |||||
* | | Merge pull request #457 from ArthurHoaro/updatecheck-warning | Arthur | 2016-02-04 | 1 | -0/+3 |
|\ \ | |/ |/| | Add a default value to ENABLE_UPDATECHECK to avoid unnecessary warning | ||||
| * | Add a default value to ENABLE_UPDATECHECK to avoid unnecessary warning. | ArthurHoaro | 2016-02-02 | 1 | -0/+3 |
|/ | |||||
* | Merge pull request #453 from ArthurHoaro/pr450 | Arthur | 2016-02-01 | 2 | -14/+48 |
|\ | | | | | Implemented a little more sophisticated searching (squashed) | ||||
| * | Implemented searching for a phrase in double-quotes or all words in no ↵ | Florian Voigt | 2016-02-01 | 2 | -14/+48 |
| | | | | | | | | | | | | particular order. + unit tests | ||||
* | | Merge pull request #452 from ArthurHoaro/v0.6.3v0.6.3 | Arthur | 2016-01-31 | 2 | -3/+3 |
|\ \ | | | | | | | Bump version to v0.6.3 | ||||
| * | | Bump version to v0.6.3 | ArthurHoaro | 2016-01-31 | 2 | -3/+3 |
|/ / | |||||
* | | Merge pull request #451 from ArthurHoaro/markdown-gitdiff | Arthur | 2016-01-31 | 3 | -57/+57 |
|\ \ | | | | | | | Fixes forced git changes | ||||
| * | | Fixes forced git changes | ArthurHoaro | 2016-01-31 | 3 | -57/+57 |
|/ / | | | | | | | Probably related to the introduction of .gitattribute with forced line ending. | ||||
* | | Merge pull request #388 from ArthurHoaro/pluginadmin | Arthur | 2016-01-31 | 20 | -7/+636 |
|\ \ | | | | | | | Fixes #378 - Plugin administration UI. | ||||
| * | | Fixes #378 - Plugin administration UI. | ArthurHoaro | 2016-01-31 | 20 | -7/+636 |
| | | | |||||
* | | | Merge pull request #379 from ArthurHoaro/plugin-markdown | Arthur | 2016-01-31 | 10 | -9/+1996 |
|\ \ \ | |/ / |/| | | PLUGIN Markdown | ||||
| * | | PLUGIN Markdown | ArthurHoaro | 2016-01-03 | 10 | -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/whitespace | Arthur | 2016-01-31 | 1 | -1/+1 |
|\ \ \ | |_|/ |/| | | remove whitespace | ||||
| * | | fix whitespace | nodiscc | 2016-01-22 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #444 from dimtion/404_template | Arthur | 2016-01-21 | 3 | -6/+45 |
|\ \ | | | | | | | Create 404 template | ||||
| * | | Create 404 template | Dimtion | 2016-01-20 | 3 | -6/+45 |
| | | | | | | | | | | | | Solve #430 for links | ||||
* | | | Bugfix: prevent LinkFilter to work on outdated data. | ArthurHoaro | 2016-01-20 | 2 | -9/+5 |
|/ / | |||||
* | | Merge pull request #441 from virtualtam/tests/check-file-permissions | VirtualTam | 2016-01-18 | 7 | -1/+16 |
|\ \ | | | | | | | tests: add a make target to check file permissions | ||||
| * | | tests: add a make target to check file permissions | VirtualTam | 2016-01-17 | 7 | -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-eol | VirtualTam | 2016-01-18 | 2 | -2/+2 |
|\ \ \ | |/ / |/| | | fix: use PHP_EOL for carriage returns in file logs | ||||
| * | | fix: use PHP_EOL for carriage returns in file logs | VirtualTam | 2016-01-18 | 2 | -2/+2 |
|/ / | | | | | | | | | | | Relates to #436 Signed-off-by: VirtualTam <virtualtam@flibidi.net> | ||||
* | | Merge pull request #438 from virtualtam/utils/logm/date-format | VirtualTam | 2016-01-17 | 2 | -3/+8 |
|\ \ | | | | | | | Logging: improve formatting to enable fail2ban parsing | ||||
| * | | Logging: improve formatting to enable fail2ban parsing | VirtualTam | 2016-01-16 | 2 | -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/logm | VirtualTam | 2016-01-16 | 3 | -13/+84 |
|\ \ | | | | | | | Logging: move logm() from index.php to application/Utils.php | ||||
| * | | Logging: move logm() from index.php to application/Utils.php | VirtualTam | 2016-01-16 | 3 | -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-retrieve | VirtualTam | 2016-01-11 | 8 | -72/+285 |
|\ \ | | | | | | | Fixes #410 - Retrieve title fails in multiple cases | ||||
| * | | Fixes #410 - Retrieve title fails in multiple cases | ArthurHoaro | 2016-01-11 | 8 | -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... | ArthurHoaro | 2016-01-06 | 1 | -71/+71 |
| | | | | | | | | Probably a line ending issue... | ||||
* | | Merge pull request #424 from ArthurHoaro/search | Arthur | 2016-01-06 | 8 | -416/+680 |
|\ \ | | | | | | | Link filter refactoring | ||||
| * | | Fixes a bug preventing to remove a tag with special chars when searching | ArthurHoaro | 2016-01-06 | 1 | -1/+1 |
| | | | |||||
| * | | Fixes #426 - Do not filter with blank tags. | ArthurHoaro | 2016-01-06 | 2 | -5/+7 |
| | | | |||||
| * | | Link filter refactoring | ArthurHoaro | 2016-01-06 | 8 | -411/+673 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * introduce class LinkFilter to handle link filter operation (and lighten LinkDB). * handle 'private only' in filtering. * update template to prefill search fields with current search terms. * coding style. * unit test (mostly move from LinkDB to LinkFilter). PS: preparation for #358 #315 and 'AND' search. | ||||
* | | | Merge pull request #429 from ArthurHoaro/changetag-buttons | VirtualTam | 2016-01-03 | 1 | -9/+9 |
|\ \ \ | | | | | | | | | Fixes #428: validate buttons presence instead of value | ||||
| * | | | Fixes #428: validate buttons presence instead of value | ArthurHoaro | 2016-01-03 | 1 | -9/+9 |
|/ / / | | | | | | | | | | | | | Also adds a validation where renaming with 'fromtag' specified and empty 'totag'. It was causing a 404, now it just re-render the form. | ||||
* | | | Merge pull request #417 from ArthurHoaro/wallabag-improve | VirtualTam | 2016-01-02 | 9 | -11/+194 |
|\ \ \ | | | | | | | | | Wallabag plugin improvement | ||||
| * | | | Wallabag plugin improvement | ArthurHoaro | 2015-12-27 | 9 | -11/+194 |
| | |/ | |/| | | | | | | | | | | | | | | | | | | | * Fixes a bug where URL weren't properly encoded. * Adds Wallabag V2 support. * Adds a URL function to handle trailing slash. * UT. * README updated. | ||||
* | | | Merge pull request #423 from virtualtam/docker | VirtualTam | 2016-01-02 | 14 | -0/+308 |
|\ \ \ | | | | | | | | | Docker: move Dockerfiles to the main repository |