aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1005 from virtualtam/refactor/authenticationVirtualTam2017-10-256-138/+272
|\
| * Improve SessionManager testsVirtualTam2017-10-241-0/+23
| * Move session ID check to SessionManagerVirtualTam2017-10-225-90/+97
| * Refactor session token managementVirtualTam2017-10-224-49/+153
* | Merge pull request #1006 from shaarli/doc-cve-2017-15215nodiscc2017-10-241-1/+1
|\ \ | |/ |/|
| * Changelog: link to CVE-2017-15215, give attributionnodiscc2017-10-231-1/+1
|/
* Merge pull request #1004 from virtualtam/doc/docker/reverse-proxyVirtualTam2017-10-221-1/+115
|\
| * Documentation: add reverse proxy examples for Docker imagesVirtualTam2017-10-221-1/+115
* | Merge pull request #1002 from ArthurHoaro/doc/install-dockerArthurHoaro2017-10-221-3/+11
|\ \
| * | Doc: mention Docker docs in the download & install pageArthurHoaro2017-10-221-3/+11
| |/
* | Merge pull request #871 from ArthurHoaro/feature/translationArthurHoaro2017-10-2268-280/+2744
|\ \
| * | Translation documentationArthurHoaro2017-10-228-2/+198
| * | Translations : Working demo example of translation extensionArthurHoaro2017-10-225-35/+86
| * | Add language selection in the configure page of the default themeArthurHoaro2017-10-2210-222/+382
| * | Use makefile target to generate MO file and remove it from gitArthurHoaro2017-10-226-65/+102
| * | JS translationArthurHoaro2017-10-223-6/+20
| * | Shaarli's translationArthurHoaro2017-10-2251-246/+2252
| |/
* | Merge pull request #1001 from virtualtam/docker/latestVirtualTam2017-10-223-6/+67
|\ \ | |/ |/|
| * docker: add 'latest' imageVirtualTam2017-10-213-6/+67
|/
* Merge pull request #846 from virtualtam/docker/alpineVirtualTam2017-10-2114-53/+73
|\
| * docker: rename resources for the stable imageVirtualTam2017-10-034-0/+0
| * docker: switch to Alpine Linux for the master imageVirtualTam2017-10-0314-53/+73
* | Merge pull request #996 from virtualtam/fix/user-cssVirtualTam2017-10-172-4/+10
|\ \
| * | Fix: enable access to data/user.css (Apache 2.2 & 2.4)VirtualTam2017-10-161-3/+9
| * | EditorConfig: add .htaccess supportVirtualTam2017-10-161-1/+1
|/ /
* | Merge pull request #995 from virtualtam/lint/editorconfigVirtualTam2017-10-162-0/+24
|\ \
| * | Add EditorConfig configurationVirtualTam2017-10-112-0/+24
|/ /
* | Merge pull request #992 from ArthurHoaro/feature/import-historyVirtualTam2017-10-083-48/+65
|\ \
| * | Don't write History for link importArthurHoaro2017-10-073-48/+65
* | | Merge pull request #990 from danieljakots/masterVirtualTam2017-10-081-5/+5
|\ \ \ | |/ / |/| |
| * | Fix link in Upgrade-and-migration.mdDaniel Jakots2017-10-071-5/+5
|/ /
* | Badge versionArthurHoaro2017-10-071-1/+1
* | Merge pull request #988 from ArthurHoaro/changelog-0.9.2ArthurHoaro2017-10-073-3/+46
|\ \
| * | Update AUTHORSArthurHoaro2017-10-072-3/+8
| * | Changelog v0.9.2ArthurHoaro2017-10-071-0/+38
|/ /
* | Merge pull request #987 from ArthurHoaro/hotfix/security-issueArthurHoaro2017-10-072-3/+3
|\ \
| * | Fix security issue reported by @chbiArthurHoaro2017-10-072-3/+3
* | | Merge pull request #979 from ArthurHoaro/feature/assets-cache-versionVirtualTam2017-10-066-15/+35
|\ \ \
| * | | Rename shaarli_version constant to uppercaseArthurHoaro2017-10-013-5/+5
| * | | Add a version hash for asset loading to prevent browser's cache issueArthurHoaro2017-10-014-10/+30
| |/ /
* | | Merge pull request #980 from ArthurHoaro/hotfix/textarea-resize-jumpyVirtualTam2017-10-061-0/+6
|\ \ \
| * | | Fix jumpy textarea with long content in post editArthurHoaro2017-10-011-0/+6
| |/ /
* | | Merge pull request #983 from bvberkum/pullrequest/shaarli-docker-quickstartVirtualTam2017-10-062-0/+89
|\ \ \ | |_|/ |/| |
| * | Minor docker-101 doc updates, typos fixed #983B. van Berkum2017-10-061-11/+9
| * | Docker quickstart: one more grammar mistake. Made it a bit more terse.B. van Berkum2017-10-031-1/+1
| * | Docker-101: added working systemd config exampleB. van Berkum2017-10-031-0/+47
| * | Typo's, unified structure a bit.B. van Berkum2017-10-032-10/+5
| * | Docker 101: container start and cleanupB. van Berkum2017-10-031-0/+37
| * | Added docker quickstart example, with user-data volumeB. van Berkum2017-10-031-0/+12
* | | Merge pull request #981 from mark-gerarts/default-note-titleVirtualTam2017-10-033-1/+3
|\ \ \ | |/ / |/| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-14 01:30:46 +0000