aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAgeFilesLines
* Bump Shaarli version to v0.9.2v0.9.2ArthurHoaro2017-10-071-1/+1
* Merge branch 'master' into v0.9ArthurHoaro2017-10-0748-229/+832
|\
| * 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
| |\ \
| | * | Firefox Social title: Use document.title instead of RainTPL variableArthurHoaro2017-09-021-1/+2
| | * | Make work behind a reverse proxyArthurHoaro2017-09-023-3/+67
| * | | Merge pull request #956 from virtualtam/fix/make-authorsVirtualTam2017-09-022-10/+10
| |\ \ \
| | * | | Documentation+Makefile: update AUTHORS generationVirtualTam2017-08-292-10/+10
| * | | | Merge pull request #950 from thewilli/delete-fixArthurHoaro2017-09-012-6/+13
| |\ \ \ \
| | * | | | fixed link deletionWilli Eggeling2017-08-302-6/+13
| | | |_|/ | | |/| |
| * | | | Merge pull request #951 from thewilli/fix-dailyArthurHoaro2017-09-011-23/+31
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | fixed daily links if there are no linksWilli Eggeling2017-08-301-23/+31
| | |/ /
| * | | Merge pull request #944 from thewilli/configure-remembermeVirtualTam2017-08-275-3/+13
| |\ \ \ | | |/ / | |/| |
| | * | new setting: default value for 'remember me' checkboxWilli Eggeling2017-08-275-3/+13
| * | | Merge pull request #940 from ArthurHoaro/hotfix/empty-urlsVirtualTam2017-08-271-0/+3
| |\ \ \
| | * | | Generates a permalinks URL if the URL is set to blankArthurHoaro2017-08-251-0/+3
| | | |/ | | |/|
| * | | Merge pull request #942 from thewilli/fix-wiki-linksVirtualTam2017-08-2710-14/+14
| |\ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-23 21:16:29 +0000