| Commit message (Expand) | Author | Age | Files | Lines |
* | Use makefile target to generate MO file and remove it from git | ArthurHoaro | 2017-10-22 | 6 | -65/+102 |
* | JS translation | ArthurHoaro | 2017-10-22 | 3 | -6/+20 |
* | Shaarli's translation | ArthurHoaro | 2017-10-22 | 51 | -246/+2252 |
* | Merge pull request #846 from virtualtam/docker/alpine | VirtualTam | 2017-10-21 | 14 | -53/+73 |
|\ |
|
| * | docker: rename resources for the stable image | VirtualTam | 2017-10-03 | 4 | -0/+0 |
| * | docker: switch to Alpine Linux for the master image | VirtualTam | 2017-10-03 | 14 | -53/+73 |
* | | Merge pull request #996 from virtualtam/fix/user-css | VirtualTam | 2017-10-17 | 2 | -4/+10 |
|\ \ |
|
| * | | Fix: enable access to data/user.css (Apache 2.2 & 2.4) | VirtualTam | 2017-10-16 | 1 | -3/+9 |
| * | | EditorConfig: add .htaccess support | VirtualTam | 2017-10-16 | 1 | -1/+1 |
|/ / |
|
* | | Merge pull request #995 from virtualtam/lint/editorconfig | VirtualTam | 2017-10-16 | 2 | -0/+24 |
|\ \ |
|
| * | | Add EditorConfig configuration | VirtualTam | 2017-10-11 | 2 | -0/+24 |
|/ / |
|
* | | Merge pull request #992 from ArthurHoaro/feature/import-history | VirtualTam | 2017-10-08 | 3 | -48/+65 |
|\ \ |
|
| * | | Don't write History for link import | ArthurHoaro | 2017-10-07 | 3 | -48/+65 |
* | | | Merge pull request #990 from danieljakots/master | VirtualTam | 2017-10-08 | 1 | -5/+5 |
|\ \ \
| |/ /
|/| | |
|
| * | | Fix link in Upgrade-and-migration.md | Daniel Jakots | 2017-10-07 | 1 | -5/+5 |
|/ / |
|
* | | Badge version | ArthurHoaro | 2017-10-07 | 1 | -1/+1 |
* | | Merge pull request #988 from ArthurHoaro/changelog-0.9.2 | ArthurHoaro | 2017-10-07 | 3 | -3/+46 |
|\ \ |
|
| * | | Update AUTHORS | ArthurHoaro | 2017-10-07 | 2 | -3/+8 |
| * | | Changelog v0.9.2 | ArthurHoaro | 2017-10-07 | 1 | -0/+38 |
|/ / |
|
* | | Merge pull request #987 from ArthurHoaro/hotfix/security-issue | ArthurHoaro | 2017-10-07 | 2 | -3/+3 |
|\ \ |
|
| * | | Fix security issue reported by @chbi | ArthurHoaro | 2017-10-07 | 2 | -3/+3 |
* | | | Merge pull request #979 from ArthurHoaro/feature/assets-cache-version | VirtualTam | 2017-10-06 | 6 | -15/+35 |
|\ \ \ |
|
| * | | | Rename shaarli_version constant to uppercase | ArthurHoaro | 2017-10-01 | 3 | -5/+5 |
| * | | | Add a version hash for asset loading to prevent browser's cache issue | ArthurHoaro | 2017-10-01 | 4 | -10/+30 |
| |/ / |
|
* | | | Merge pull request #980 from ArthurHoaro/hotfix/textarea-resize-jumpy | VirtualTam | 2017-10-06 | 1 | -0/+6 |
|\ \ \ |
|
| * | | | Fix jumpy textarea with long content in post edit | ArthurHoaro | 2017-10-01 | 1 | -0/+6 |
| |/ / |
|
* | | | Merge pull request #983 from bvberkum/pullrequest/shaarli-docker-quickstart | VirtualTam | 2017-10-06 | 2 | -0/+89 |
|\ \ \
| |_|/
|/| | |
|
| * | | Minor docker-101 doc updates, typos fixed #983 | B. van Berkum | 2017-10-06 | 1 | -11/+9 |
| * | | Docker quickstart: one more grammar mistake. Made it a bit more terse. | B. van Berkum | 2017-10-03 | 1 | -1/+1 |
| * | | Docker-101: added working systemd config example | B. van Berkum | 2017-10-03 | 1 | -0/+47 |
| * | | Typo's, unified structure a bit. | B. van Berkum | 2017-10-03 | 2 | -10/+5 |
| * | | Docker 101: container start and cleanup | B. van Berkum | 2017-10-03 | 1 | -0/+37 |
| * | | Added docker quickstart example, with user-data volume | B. van Berkum | 2017-10-03 | 1 | -0/+12 |
* | | | Merge pull request #981 from mark-gerarts/default-note-title | VirtualTam | 2017-10-03 | 3 | -1/+3 |
|\ \ \
| |/ /
|/| | |
|
| * | | Allow setting of a default note title, see #963 | Mark Gerarts | 2017-10-01 | 3 | -1/+3 |
|/ / |
|
* | | Merge pull request #976 from ArthurHoaro/hotfix/url-parentheses | ArthurHoaro | 2017-09-30 | 2 | -1/+11 |
|\ \ |
|
| * | | Fix parsing for description links with parentheses | ArthurHoaro | 2017-09-29 | 2 | -1/+11 |
* | | | Merge pull request #975 from virtualtam/robustness | VirtualTam | 2017-09-30 | 3 | -12/+20 |
|\ \ \
| |_|/
|/| | |
|
| * | | Robustness: safer gzinflate/zlib usage | VirtualTam | 2017-09-28 | 1 | -10/+16 |
| * | | Robustness: safer RainTPL directory handling | VirtualTam | 2017-09-28 | 2 | -2/+4 |
| |/ |
|
* | | Merge pull request #947 from thewilli/wildcardsearch | ArthurHoaro | 2017-09-29 | 2 | -47/+167 |
|\ \
| |/
|/| |
|
| * | wildcard tag search support | Willi Eggeling | 2017-08-30 | 2 | -47/+167 |
* | | Merge pull request #972 from virtualtam/travis/trusty | VirtualTam | 2017-09-19 | 4 | -25/+20 |
|\ \ |
|
| * | | Tests: update localization tests | VirtualTam | 2017-09-19 | 4 | -19/+19 |
| * | | Travis: switch to Ubuntu Trusty build environment | VirtualTam | 2017-09-19 | 1 | -7/+2 |
|/ / |
|
* | | Merge pull request #909 from virtualtam/docker/test-environments | VirtualTam | 2017-09-19 | 7 | -0/+208 |
|\ \ |
|
| * | | docker: add alpine,debian,ubuntu test images | VirtualTam | 2017-09-18 | 7 | -0/+208 |
* | | | Merge pull request #961 from thewilli/private-shaarli-login-redirect | VirtualTam | 2017-09-18 | 3 | -0/+20 |
|\ \ \
| |/ /
|/| | |
|
| * | | added option to redirect all anonymous users to login page | Willi Eggeling | 2017-09-03 | 3 | -0/+20 |
* | | | visited links color: same hue as unvisited links, darkened | nodiscc | 2017-09-04 | 1 | -1/+1 |
|/ / |
|