aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Merge pull request #1097 from ArthurHoaro/fix/psr-elseifArthurHoaro2018-03-078-15/+15
|\ \ \ | | | | | | | | PSR: use elseif instead of else if
| * | | PSR: use elseif instead of else ifArthurHoaro2018-02-288-15/+15
| |/ / | | | | | | | | | See https://www.php-fig.org/psr/psr-2/\#51-if-elseif-else
* | | Merge pull request #1098 from josqu4red/perms-docker-alpine-latestVirtualTam2018-03-021-0/+2
|\ \ \ | |/ / |/| | Fix permission issue introduced with multi-stage build
| * | Fix permission issue introduced with multi-stage buildJonathan Amiez2018-03-021-0/+2
|/ /
* | Merge pull request #1090 from virtualtam/fix/doxygenVirtualTam2018-02-262-2/+3
|\ \ | |/ |/| Doxygen: ignore data/, simplify Make target
| * Doxygen: ignore data/, simplify Make targetVirtualTam2018-02-232-2/+3
| | | | | | | | Signed-off-by: VirtualTam <virtualtam@flibidi.net>
* | Merge pull request #1085 from virtualtam/docker/multi-stageVirtualTam2018-02-242-23/+29
|\ \ | | | | | | docker: introduce multi-stage image build (master, latest)
| * | docker: introduce multi-stage image build (master, latest)VirtualTam2018-02-142-23/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Relates to https://github.com/shaarli/Shaarli/issues/755 Relates to https://github.com/shaarli/Shaarli/pull/1072 See: - https://docs.docker.com/develop/develop-images/multistage-build/ - https://hub.docker.com/r/library/composer/ - https://github.com/composer/docker - https://github.com/docker-library/docs/tree/master/composer Signed-off-by: VirtualTam <virtualtam@flibidi.net>
* | | Merge pull request #1092 from ArthurHoaro/fix/scuttle-doctype-caseArthurHoaro2018-02-243-2/+25
|\ \ \ | | | | | | | | Ignore the case while checking DOCTYPE during the file import
| * | | Ignore the case while checking DOCTYPE during the file importArthurHoaro2018-02-233-2/+25
| | |/ | |/| | | | | | | Fixes #1091
* | | Merge pull request #1062 from ArthurHoaro/feature/pages-titleArthurHoaro2018-02-243-105/+158
|\ \ \ | |/ / |/| | Use a specific page title in all pages
| * | Use a specific page title in all pagesArthurHoaro2018-02-243-105/+158
|/ / | | | | | | | | | | Also fixed a few French translation issues Fixes #954 #955
* | Merge pull request #1089 from virtualtam/readme/badgesVirtualTam2018-02-221-1/+1
|\ \ | | | | | | Update badges for 'stable'
| * | Update badges for 'stable'VirtualTam2018-02-221-1/+1
|/ / | | | | | | Signed-off-by: VirtualTam <virtualtam@flibidi.net>
* | Merge pull request #1084 from virtualtam/doc/updatesVirtualTam2018-02-164-25/+31
|\ \ | |/ |/| Documentation: cleanup, update references to config(.json)?.php
| * doc: update references to config(.json)?.phpVirtualTam2018-02-143-17/+16
| | | | | | | | | | | | Closes https://github.com/shaarli/Shaarli/issues/1082 Signed-off-by: VirtualTam <virtualtam@flibidi.net>
| * doc: update Directory StructureVirtualTam2018-02-141-8/+15
|/ | | | Signed-off-by: VirtualTam <virtualtam@flibidi.net>
* Merge pull request #1059 from virtualtam/fix/htaccess-gitVirtualTam2018-02-051-0/+8
|\ | | | | htaccess: prevent accessing resources not managed by SCM
| * htaccess: prevent accessing resources not managed by SCMVirtualTam2018-02-051-0/+8
|/ | | | | | | | | See: - https://en.internetwache.org/dont-publicly-expose-git-or-how-we-downloaded-your-websites-sourcecode-an-analysis-of-alexas-1m-28-07-2015/ - https://stackoverflow.com/questions/2530372/how-do-i-disable-directory-browsing - https://httpd.apache.org/docs/current/mod/mod_rewrite.html Signed-off-by: VirtualTam <virtualtam@flibidi.net>
* Merge pull request #1008 from virtualtam/refactor/authenticationVirtualTam2018-02-056-103/+385
|\ | | | | Refactor login / ban management
| * Refactor login / ban authentication stepsVirtualTam2018-02-056-103/+385
|/ | | | | | | | | | | | | | | | | Relates to https://github.com/shaarli/Shaarli/issues/324 Added: - Add the `LoginManager` class to manage logins and bans Changed: - Refactor IP ban management - Simplify logic - Avoid using globals, inject dependencies Fixed: - Use `ban_duration` instead of `ban_after` when setting a new ban Signed-off-by: VirtualTam <virtualtam@flibidi.net>
* Merge pull request #1074 from kalvn/feature/dailymarkdownArthurHoaro2018-02-024-50/+42
|\ | | | | Executes daily hooks before creating columns.
| * Executes daily hooks before creating columns.kalvn2018-02-014-50/+42
| |
* | Merge pull request #1038 from ArthurHoaro/feature/public-only-filterArthurHoaro2018-02-027-54/+94
|\ \ | | | | | | Add a filter to only display public links
| * | Public/private filter: use two separate buttonsArthurHoaro2018-01-245-57/+54
| | | | | | | | | | | | #1038
| * | Add a filter to only display public linksArthurHoaro2017-12-167-53/+96
| | | | | | | | | | | | | | | | | | When the key filter is clicked once, it only displays private link. When it is clicked on again, it becomes red and only public links are displayed. Another click and all links are displayed. The current visibility status is shown in the search banner Fixes #1030
* | | Merge pull request #1003 from ArthurHoaro/ci/php7.2ArthurHoaro2018-02-025-163/+375
|\ \ \ | | | | | | | | Drop PHP 5.5 compatibility and run Travis UT against PHP 7.2
| * | | INTL_IDNA_VARIANT_2003 is deprecatedArthurHoaro2018-02-021-1/+1
| | | | | | | | | | | | | | | | See https://wiki.php.net/rfc/deprecate-and-remove-intl_idna_variant_2003
| * | | Drop PHP 5.5 compatibility and upgrade PHPUnit to v5.xArthurHoaro2018-02-024-162/+373
| | | | | | | | | | | | | | | | PHPUnit 4.x contains deprecated PHP functions in PHP 7.2.
| * | | CI: run UT against PHP 7.2 (currently in Release Candidate)ArthurHoaro2018-02-021-0/+1
|/ / /
* | | BadgeArthurHoaro2018-02-021-1/+1
| | |
* | | Merge pull request #1076 from ArthurHoaro/changelog-v0.9.5ArthurHoaro2018-02-022-1/+6
|\ \ \ | | | | | | | | CHANGELOG + AUTHORS (v0.9.5)
| * | | CHANGELOG + AUTHORSArthurHoaro2018-02-022-1/+6
|/ / /
* | | Merge pull request #1070 from ArthurHoaro/hotfix/lc-messages-warningArthurHoaro2018-02-022-0/+7
|\ \ \ | |_|/ |/| | Use LC_COLLATE instead of LC_MESSAGES if php-intl is not installed
| * | Use LC_COLLATE instead of LC_MESSAGES if php-intl is not installedArthurHoaro2018-01-312-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | As stated in the docs: > LC_MESSAGES for system responses (available if PHP was compiled with libintl) Fixes #1067
* | | Merge pull request #1069 from ArthurHoaro/feature/dependenciesArthurHoaro2018-01-311-89/+89
|\ \ \ | |/ / |/| | Update dependencies and include latest version netscape-bookmark-parser
| * | Update dependencies and include latest version netscape-bookmark-parserArthurHoaro2018-01-311-89/+89
|/ /
* | Merge pull request #1063 from ArthurHoaro/hotfix/legacy-warningsArthurHoaro2018-01-313-3/+18
|\ \ | | | | | | Fix warnings when upgrading from legacy SebSauvage version
| * | Fix warnings when upgrading from legacy SebSauvage versionArthurHoaro2018-01-253-3/+18
| | | | | | | | | | | | Fixes #1040
* | | Update badgesArthurHoaro2018-01-301-2/+2
| | |
* | | Merge pull request #1065 from ArthurHoaro/release-v9.0.4ArthurHoaro2018-01-302-5/+9
|\ \ \ | |/ / |/| | pre release v0.9.4
| * | Update AUTHORSArthurHoaro2018-01-301-4/+5
| | |
| * | Update CHANGELOGArthurHoaro2018-01-301-1/+4
|/ /
* | Merge pull request #977 from ArthurHoaro/feature/dl-filterArthurHoaro2018-01-234-68/+293
|\ \ | | | | | | Extract the title/charset during page download, and check content type
| * | Extract the title/charset during page download, and check content typeArthurHoaro2017-10-284-68/+293
| | | | | | | | | | | | | | | | | | | | | Use CURLOPT_WRITEFUNCTION to check the response code and content type (only allow HTML). Also extract the title and charset during downloading chunk of data, and stop it when everything has been extracted. Closes #579
* | | Merge pull request #1058 from FranckKe/patch-1nodiscc2018-01-181-1/+1
|\ \ \ | | | | | | | | doc: bookmarklet: fix link to issue 196
| * | | Fix link to issue 196Franck Kerbiriou2018-01-181-1/+1
| | | |
* | | | Merge pull request #1057 from shaarli/doc-derefindnodiscc2018-01-181-0/+4
|\ \ \ \ | | | | | | | | | | doc: import: add link to derefind conversion tool
| * | | | doc: import: add link to derefind conversion toolnodiscc2018-01-171-0/+4
| |/ / / | | | | | | | | As mentioned on gitter
* | | | Merge pull request #1049 from shaarli/doc-docker-armnodiscc2018-01-181-0/+1
|\ \ \ \ | |/ / / |/| | | doc: add arm32v7 docker build documentation
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-25 16:17:33 +0000