aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ \ | |/ / |/| |
| * | Allow setting of a default note title, see #963Mark Gerarts2017-10-013-1/+3
|/ /
* | Merge pull request #976 from ArthurHoaro/hotfix/url-parenthesesArthurHoaro2017-09-302-1/+11
|\ \
| * | Fix parsing for description links with parenthesesArthurHoaro2017-09-292-1/+11
* | | Merge pull request #975 from virtualtam/robustnessVirtualTam2017-09-303-12/+20
|\ \ \ | |_|/ |/| |
| * | Robustness: safer gzinflate/zlib usageVirtualTam2017-09-281-10/+16
| * | Robustness: safer RainTPL directory handlingVirtualTam2017-09-282-2/+4
| |/
* | Merge pull request #947 from thewilli/wildcardsearchArthurHoaro2017-09-292-47/+167
|\ \ | |/ |/|
| * wildcard tag search supportWilli Eggeling2017-08-302-47/+167
* | Merge pull request #972 from virtualtam/travis/trustyVirtualTam2017-09-194-25/+20
|\ \
| * | Tests: update localization testsVirtualTam2017-09-194-19/+19
| * | Travis: switch to Ubuntu Trusty build environmentVirtualTam2017-09-191-7/+2
|/ /
* | Merge pull request #909 from virtualtam/docker/test-environmentsVirtualTam2017-09-197-0/+208
|\ \
| * | docker: add alpine,debian,ubuntu test imagesVirtualTam2017-09-187-0/+208
* | | Merge pull request #961 from thewilli/private-shaarli-login-redirectVirtualTam2017-09-183-0/+20
|\ \ \ | |/ / |/| |
| * | added option to redirect all anonymous users to login pageWilli Eggeling2017-09-033-0/+20
* | | visited links color: same hue as unvisited links, darkenednodiscc2017-09-041-1/+1
|/ /
* | Merge pull request #939 from ArthurHoaro/hotfix/firefox-social-titleArthurHoaro2017-09-024-4/+69
|\ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 01:38:21 +0000