| Commit message (Expand) | Author | Age | Files | Lines |
... | |
* | | | Merge pull request #69 from nodiscc/master | nodiscc | 2014-12-05 | 1 | -1/+1 |
|\ \ \
| |_|/
|/| | |
|
| * | | bookmarklet: add ✚ sign to make it more recognizable in toolbars | nodiscc | 2014-12-05 | 1 | -1/+1 |
|/ / |
|
* | | Merge pull request #68 from virtualtam/hardcoded-style | nodiscc | 2014-12-05 | 14 | -48/+161 |
|\ \ |
|
| * | | CSS: remove hardcoded style from templates | VirtualTam | 2014-12-03 | 14 | -48/+161 |
* | | | Merge pull request #67 from e2jk/issue-66 | nodiscc | 2014-12-03 | 1 | -2/+2 |
|\ \ \
| |/ /
|/| | |
|
| * | | Fix issue #66 by adding space before "selected" | Emilien Klein | 2014-12-02 | 1 | -2/+2 |
|/ / |
|
* | | Merge pull request #28 from virtualtam/unify-css | nodiscc | 2014-12-01 | 1 | -353/+798 |
|\ \
| |/
|/| |
|
| * | CSS: separate rules with a blank line | VirtualTam | 2014-12-01 | 1 | -2/+102 |
| * | CSS: expand one-line declarations | VirtualTam | 2014-12-01 | 1 | -119/+480 |
| * | CSS: unify coding style - spaces, brackets, keywords | VirtualTam | 2014-12-01 | 1 | -230/+223 |
| * | CSS: replace tabs by spaces, remove trailing whitespaces and empty lines | VirtualTam | 2014-12-01 | 1 | -215/+206 |
|/ |
|
* | Merge pull request #62 from pikzen/linkurl | nodiscc | 2014-11-21 | 2 | -32/+36 |
|\ |
|
| * | Added a link to the visible URL in the link list | Florian Eula | 2014-11-21 | 2 | -32/+36 |
* | | Merge pull request #61 from pikzen/shaarli47 | nodiscc | 2014-11-21 | 1 | -0/+8 |
|\ \ |
|
| * | | Prevents ?do=addlink from generating a 404 if the user is not logged in | Florian Eula | 2014-11-21 | 1 | -0/+8 |
| |/ |
|
* | | Merge pull request #60 from pikzen/master | nodiscc | 2014-11-21 | 1 | -7/+25 |
|\| |
|
| * | Do not add a tag to the search if it's already being searched for | Florian Eula | 2014-11-21 | 1 | -7/+25 |
|/ |
|
* | Merge pull request #59 from tst2005/master | nodiscc | 2014-11-13 | 3 | -8/+8 |
|\ |
|
| * | uniform if syntax | TsT | 2013-10-23 | 3 | -8/+8 |
* | | Merge pull request #54 from nodiscc/tagcloud-urlencode | Emilien Klein | 2014-11-10 | 1 | -1/+1 |
|\ \ |
|
| * | | use urlencode in tagcloud links | nodiscc | 2014-11-09 | 1 | -1/+1 |
|/ / |
|
* | | Merge pull request #51 from nodiscc/optional-archiveorg | nodiscc | 2014-11-08 | 2 | -0/+3 |
|\ \ |
|
| * | | make archive.org integration optional (ARCHIVE_ORG option, defaults to false) | nodiscc | 2014-11-08 | 2 | -0/+3 |
|/ / |
|
* | | Merge pull request #42 from nodiscc/new-readme | Emilien Klein | 2014-11-08 | 1 | -42/+47 |
|\ \ |
|
| * | | Update README: | nodiscc | 2014-11-04 | 1 | -42/+47 |
* | | | Merge pull request #39 from nodiscc/master | Emilien Klein | 2014-11-08 | 1 | -1/+3 |
|\ \ \ |
|
| * | | | index.html: add warning message about hostname/cookie storage problems | nodiscc | 2014-11-03 | 1 | -1/+3 |
| |/ / |
|
* | | | Merge pull request #43 from nodiscc/archiveorg-integration | Emilien Klein | 2014-11-08 | 2 | -4/+6 |
|\ \ \
| |/ /
|/| | |
|
| * | | Add Archive.org integration | Qwerty | 2014-11-05 | 2 | -4/+6 |
|/ / |
|
* | | Merge pull request #37 from qwertygc/patch-2 | Emilien Klein | 2014-10-25 | 1 | -1/+1 |
|\ \ |
|
| * | | Update shaarli_version.txt | Qwerty | 2014-10-25 | 1 | -1/+1 |
|/ / |
|
* | | Merge pull request #36 from nodiscc/https-thumbnails | Emilien Klein | 2014-10-23 | 1 | -7/+7 |
|\ \ |
|
| * | | thumbnails: force HTTPS for youtube, imgur, vimeo | nodiscc | 2014-10-23 | 1 | -7/+7 |
* | | | Merge pull request #35 from nodiscc/optional-atom | Emilien Klein | 2014-10-23 | 2 | -1/+4 |
|\ \ \
| |/ /
|/| | |
|
| * | | Make ATOM toolbar button optional | nodiscc | 2014-10-23 | 2 | -1/+4 |
|/ / |
|
* | | Merge pull request #31 from nodiscc/version-check | nodiscc | 2014-10-23 | 2 | -1/+2 |
|\ \ |
|
| * | | update check: check against last version available on github.com/shaarli/Shaarli | nodiscc | 2014-10-21 | 1 | -1/+1 |
| * | | add current release version number in shaarli_version.txt | nodiscc | 2014-10-21 | 1 | -0/+1 |
|/ / |
|
* | | Merge pull request #30 from nodiscc/master | nodiscc | 2014-10-21 | 1 | -1/+5 |
|\ \ |
|
| * | | add link: in case of empty URL (self-post), prepend "Note: " to the title | nodiscc | 2014-10-21 | 1 | -1/+5 |
|/ / |
|
* | | Merge pull request #27 from virtualtam/master | nodiscc | 2014-10-20 | 1 | -2/+2 |
|\ \ |
|
| * | | fix: add missing slash when defining RainTPL's temp dir | VirtualTam | 2014-10-19 | 1 | -2/+2 |
|/ / |
|
* | | gitignore: ignore raintpl generated php pages | nodiscc | 2014-09-10 | 1 | -1/+4 |
* | | update qr.min.js to 1.1.3 from https://github.com/neocotic/qr.js, update COPYING | nodiscc | 2014-09-05 | 2 | -11/+25 |
* | | Merge pull request #12 from nodiscc/iconslicense | nodiscc | 2014-08-30 | 15 | -3/+47 |
|\ \ |
|
| * | | replace unlicensed icons/images, add proper credits | nodiscc | 2014-08-28 | 15 | -3/+47 |
|/ / |
|
* | | Merge pull request #19 from nodiscc/master | nodiscc | 2014-08-19 | 2 | -4/+4 |
|\ \ |
|
| * | | bookmarklet: use selected text as description when adding a new link | nodiscc | 2014-08-11 | 2 | -4/+4 |
* | | | Merge pull request #20 from nodiscc/fix-typos | Sbgodin | 2014-08-19 | 5 | -137/+137 |
|\ \ \ |
|
| * | | | Fix grammar, punctuation, spelling, trailing whitepaces and newlines; Fix typ... | nodiscc | 2014-08-19 | 5 | -137/+137 |
| |/ / |
|