aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * | Fixes a bug preventing to remove a tag with special chars when searchingArthurHoaro2016-01-061-1/+1
| | |
| * | Fixes #426 - Do not filter with blank tags.ArthurHoaro2016-01-062-5/+7
| | |
| * | Link filter refactoringArthurHoaro2016-01-068-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-buttonsVirtualTam2016-01-031-9/+9
|\ \ \ | | | | | | | | Fixes #428: validate buttons presence instead of value
| * | | Fixes #428: validate buttons presence instead of valueArthurHoaro2016-01-031-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-improveVirtualTam2016-01-029-11/+194
|\ \ \ | | | | | | | | Wallabag plugin improvement
| * | | Wallabag plugin improvementArthurHoaro2015-12-279-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/dockerVirtualTam2016-01-0214-0/+308
|\ \ \ | | | | | | | | Docker: move Dockerfiles to the main repository
| * | | Docker: move Dockerfiles to the main repositoryVirtualTam2016-01-0214-0/+308
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Relates to #420 Fixes: - [all] remove Nginx' 'server_name' attribute - [dev] create the phpinfo() script from the Dockerfile Modifications: - [all] remove documentation/guide (to be added to the wiki) - [all] update maintainer information - [prod] differentiate 'master' (:latest) and 'stable' (:stable) images Signed-off-by: VirtualTam <virtualtam@flibidi.net>
* | | Merge pull request #419 from virtualtam/gitattributesVirtualTam2015-12-241-0/+28
|\ \ \ | |_|/ |/| | Add a .gitattributes to ease repository management
| * | Add a .gitattributes to ease repository managementVirtualTam2015-12-231-0/+28
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Features: - enforce LF (Unix) line endings - omit dev/test resources & code from Git(Hub) archives - treat minified resources (CSS, JS) as binaries to avoid cluttered diffs Resources: - http://git-scm.com/docs/gitattributes - https://git-scm.com/book/en/v2/Customizing-Git-Git-Attributes - https://help.github.com/articles/dealing-with-line-endings/ - http://adaptivepatchwork.com/2012/03/01/mind-the-end-of-your-line/ - https://github.com/Danimoth/gitattributes Signed-off-by: VirtualTam <virtualtam@flibidi.net>
* | Bump version to v0.6.2v0.6.2VirtualTam2015-12-232-3/+3
| | | | | | | | Signed-off-by: VirtualTam <virtualtam@flibidi.net>
* | Merge pull request #418 from ArthurHoaro/qrcode-bugVirtualTam2015-12-233-4/+10
|\ \ | | | | | | QRCode plugin: use url instead of real_url
| * | QRCode plugin: use url instead of real_urlArthurHoaro2015-12-223-4/+10
| |/ | | | | | | | | | | Fixes #414 and avoid usage of redirector in QRCode. Also fixed a bug with URL encoding.
* | Merge pull request #413 from ArthurHoaro/qrcode-effectVirtualTam2015-12-215-24/+52
|\ \ | |/ |/| Fixes QRCode style
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-03 12:42:47 +0000