aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1173 from virtualtam/docker/cache-volumeVirtualTam2018-07-052-6/+30
|\ | | | | Docker: expose a volume for the thumbnail cache
| * Docker: expose a volume for the thumbnail cacheVirtualTam2018-07-052-6/+30
|/ | | | Signed-off-by: VirtualTam <virtualtam@flibidi.net>
* Merge pull request #1171 from virtualtam/docker/alpine-3.7VirtualTam2018-07-011-1/+1
|\ | | | | Bump the base Docker image to alpine:3.7
| * Bump the base Docker image to alpine:3.7VirtualTam2018-07-011-1/+1
|/ | | | Signed-off-by: VirtualTam <virtualtam@flibidi.net>
* Merge pull request #1167 from virtualtam/mkdocsVirtualTam2018-06-289-25/+47
|\ | | | | Improve Mkdocs build process, fix formatting issues
| * Fix broken documentation links and list formattingVirtualTam2018-06-265-22/+34
| | | | | | | | Signed-off-by: VirtualTam <virtualtam@flibidi.net>
| * Run MkDocs in strict modeVirtualTam2018-06-261-1/+2
| | | | | | | | Signed-off-by: VirtualTam <virtualtam@flibidi.net>
| * Let MkDocs clean previously generated HTML pagesVirtualTam2018-06-262-2/+2
| | | | | | | | Signed-off-by: VirtualTam <virtualtam@flibidi.net>
| * Add a Travis environment for MkDocsVirtualTam2018-06-261-0/+9
|/ | | | Signed-off-by: VirtualTam <virtualtam@flibidi.net>
* Merge pull request #1165 from fbartels/patch-1VirtualTam2018-06-261-0/+1
|\ | | | | add Cloudron to related software
| * Merge branch 'master' into patch-1VirtualTam2018-06-261-0/+1
| |\ | |/ |/|
* | Merge pull request #1164 from lapineige/patch-2VirtualTam2018-06-261-1/+1
|\ \ | | | | | | Other platform integration: add Yunohost install badge
| * | Other platform integration: add Yunohost install badge lapineige2018-06-251-1/+1
|/ / | | | | Add a button to install with Yunohost in a one-click way.
| * add Cloudron to related softwareFelix Bartels2018-06-251-1/+1
|/
* Merge pull request #1155 from shaarli/doc-improvementsnodiscc2018-06-216-173/+178
|\ | | | | Improve documentation (#598, #1105)
| * Improve documentation (#598, #1105)nodiscc2018-06-176-173/+178
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * rework/simplify server configuration/requirements pages (consolidate/simplify SSL/TLS/apache configuration) * update index.md introduction * remove external images (badges) * Fix COPYING link and documentation links * Update features list * dedpulicate information * remove server-requirements.md and move relevant doc to other files * TODO: rework nginx configuration (single configuration example, with commented out blocks for special cases) * TODO: consolidate download/install/configuration pages * remove blank lighttpd configuration section * remove Required? column for composer packages, all libraries are mandatory * php 7.2 compatibilty * clarify that certbot binary and paths may vary depending on install method
* | Merge pull request #1154 from virtualtam/changelogVirtualTam2018-06-204-11/+78
|\ \ | | | | | | Update AUTHORS and CHANGELOG
| * | Update version badges and installation instructionsVirtualTam2018-06-202-6/+6
| | | | | | | | | | | | Signed-off-by: VirtualTam <virtualtam@flibidi.net>
| * | Update AUTHORS and CHANGELOGVirtualTam2018-06-202-5/+72
| |/ | | | | | | Signed-off-by: VirtualTam <virtualtam@flibidi.net>
* | Merge pull request #1158 from virtualtam/master-dockerfileVirtualTam2018-06-2023-261/+87
|\ \ | |/ |/| Master: Build the Docker images from the local sources
| * docker: update image and usage documentationVirtualTam2018-06-172-7/+13
| | | | | | | | | | | | Relates to https://github.com/shaarli/Shaarli/issues/1153 Signed-off-by: VirtualTam <virtualtam@flibidi.net>
| * docker: build the images from the local sourcesVirtualTam2018-06-1713-127/+74
| | | | | | | | | | | | Relates to https://github.com/shaarli/Shaarli/issues/1153 Signed-off-by: VirtualTam <virtualtam@flibidi.net>
| * docker: remove 'stable' resourcesVirtualTam2018-06-164-127/+0
| | | | | | | | | | | | Relates to https://github.com/shaarli/Shaarli/issues/1153 Signed-off-by: VirtualTam <virtualtam@flibidi.net>
| * docker: move testing resources to tests/dockerVirtualTam2018-06-164-0/+0
|/ | | | | | Relates to https://github.com/shaarli/Shaarli/issues/1153 Signed-off-by: VirtualTam <virtualtam@flibidi.net>
* Merge pull request #1152 from ArthurHoaro/hotfix/install-errorArthurHoaro2018-06-071-2/+3
|\ | | | | Fixes an error during the install
| * Fixes an error during the installArthurHoaro2018-06-071-2/+3
|/ | | | was out of scope
* Merge pull request #1151 from kramred/masterArthurHoaro2018-06-071-0/+1
|\ | | | | Add <meta> tag for referrer same-origin also to new default tpl
| * remove environment specific .gitignore entriesMark Schmitz2018-06-071-5/+0
| |
| * Merge remote-tracking branch 'upstream/master'Mark Schmitz2018-06-0759-1610/+4212
| |\ | |/ |/|
* | Merge pull request #1143 from ArthurHoaro/sort-equal-tagsArthurHoaro2018-06-042-8/+121
|\ \ | | | | | | Fix order of tags with the same number of occurrences
| * | Tag sort - UT + comment + fix filter and visibilityArthurHoaro2018-05-292-7/+118
| | | | | | | | | | | | Before this, linksCountPerTag call without would have ignored visibility parameter
| * | Fix order of tags with the same number of occurrencesArthurHoaro2018-05-191-2/+4
| | | | | | | | | | | | Fixes #1142
* | | Merge pull request #1086 from virtualtam/refactor/loginVirtualTam2018-06-0323-563/+1116
|\ \ \ | | | | | | | | Refactor user login and session management
| * | | SessionManager+LoginManager: fix checkLoginState logicVirtualTam2018-06-023-7/+15
| | | | | | | | | | | | | | | | Signed-off-by: VirtualTam <virtualtam@flibidi.net>
| * | | Add test coverage for LoginManager methodsVirtualTam2018-06-024-11/+161
| | | | | | | | | | | | | | | | Signed-off-by: VirtualTam <virtualtam@flibidi.net>
| * | | SessionManager: remove unused UID tokenVirtualTam2018-06-022-19/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There already are dedicated tokens for: - CSRF protection - user stay-signed-in feature, via cookie This token was most likely intended as a randomly generated, server-side, secret key to be used when generating hashes. See http://sebsauvage.net/wiki/doku.php?id=php:session [FR] Relevant section: Une clé secrète unique aléatoire est générée côté serveur (et jamais envoyée). Elle peut servir pour signer les formulaires (HMAC) ou générer des token de formulaires (protection contre XSRF). Voir $_SESSION['uid']. Translation: A unique, server-side secret key is randomly generated (and never transmitted). It can be used to sign forms (HMAC) or generate form tokens (protection against XSRF). See $_SESSION['uid'] Signed-off-by: VirtualTam <virtualtam@flibidi.net>
| * | | Refactor LoginManager stay-signed-in token managementVirtualTam2018-06-024-14/+69
| | | | | | | | | | | | | | | | Signed-off-by: VirtualTam <virtualtam@flibidi.net>
| * | | Refactor session and cookie timeout controlVirtualTam2018-06-024-57/+224
| | | | | | | | | | | | | | | | Signed-off-by: VirtualTam <virtualtam@flibidi.net>
| * | | Move LoginManager and SessionManager to the Security namespaceVirtualTam2018-06-026-7/+8
| | | | | | | | | | | | | | | | Signed-off-by: VirtualTam <virtualtam@flibidi.net>
| * | | LoginManager: remove unused parameterVirtualTam2018-06-022-3/+2
| | | | | | | | | | | | | | | | Signed-off-by: VirtualTam <virtualtam@flibidi.net>
| * | | Login: update PageBuilder and default/vintage templatesVirtualTam2018-06-0212-30/+38
| | | | | | | | | | | | | | | | Signed-off-by: VirtualTam <virtualtam@flibidi.net>
| * | | Pass the client IP ID to LoginManagerVirtualTam2018-06-022-17/+16
| | | | | | | | | | | | | | | | Signed-off-by: VirtualTam <virtualtam@flibidi.net>
| * | | Delegate session operations to SessionManagerVirtualTam2018-06-022-24/+69
| | | | | | | | | | | | | | | | Signed-off-by: VirtualTam <virtualtam@flibidi.net>
| * | | Document LoginManager propertiesVirtualTam2018-05-291-0/+11
| | | | | | | | | | | | | | | | Signed-off-by: VirtualTam <virtualtam@flibidi.net>
| * | | Refactor user credential validation at login timeVirtualTam2018-05-293-111/+146
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed: - move login/password verification to LoginManager - code cleanup Signed-off-by: VirtualTam <virtualtam@flibidi.net>
| * | | Refactor PHP session handling during login/logoutVirtualTam2018-05-292-36/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed: - move $_SESSION handling to SessionManager - code cleanup Signed-off-by: VirtualTam <virtualtam@flibidi.net>
| * | | Refactor SessionManager::$INACTIVITY_TIMEOUTVirtualTam2018-05-292-24/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed: - move INACTIVITY_TIMEOUT to SessionManager - inject a dependency to a SessionManager instance in: - fillSessionInfo() - setup_login_state() - check_auth() - cleanup related code and comments Signed-off-by: VirtualTam <virtualtam@flibidi.net>
| * | | Refactor client session hijacking protectionVirtualTam2018-05-293-13/+86
|/ / / | | | | | | | | | Signed-off-by: VirtualTam <virtualtam@flibidi.net>
* | | Merge pull request #1135 from ArthurHoaro/ci/csslintArthurHoaro2018-05-2920-958/+1444
|\ \ \ | | | | | | | | Reformat SCSS to SASS format and run SASSLint in CI
| * | | Add SASSLint makefile target, and run it in CIArthurHoaro2018-05-108-14/+312
| | | | | | | | | | | | | | | | Also move ESLint and SASSLint config files to a dedicated .dev folder
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-29 19:44:48 +0000