aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #83 from pikzen/loop-factornodiscc2014-12-252-40/+32
|\ | | | | Refactored the daily column generation (only one loop)
| * Refactored the daily column generation (only one loop)Florian Eula2014-12-252-40/+32
|/
* fix quoting error introduced in 712501812b6f927b048b9d7f767cb15a370b3c81nodiscc2014-12-161-1/+1
|
* Merge pull request #81 from nodiscc/prevent-disclosurenodiscc2014-12-161-2/+2
|\ | | | | Prevent full path and PHP version disclosures
| * prevent disclosing PHP version on PHP version check errornodiscc2014-12-161-1/+1
| | | | | | | | | | * fixes https://github.com/shaarli/Shaarli/issues/78 * fixes https://github.com/sebsauvage/Shaarli/issues/214
| * prevent disclosing full path when raising "Shaarli directory not writeable" ↵nodiscc2014-12-161-1/+1
|/ | | | | | error * work on https://github.com/shaarli/Shaarli/issues/78
* Merge pull request #69 from nodiscc/masternodiscc2014-12-051-1/+1
|\ | | | | bookmarklet: add ✚ sign to make it more recognizable in toolbars
| * bookmarklet: add ✚ sign to make it more recognizable in toolbarsnodiscc2014-12-051-1/+1
|/
* Merge pull request #68 from virtualtam/hardcoded-stylenodiscc2014-12-0514-48/+161
|\ | | | | CSS: remove hardcoded style from templates
| * CSS: remove hardcoded style from templatesVirtualTam2014-12-0314-48/+161
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes shaarli/Shaarli#29 Style elements refactored as follows: - use existing ids and classes if possible, - else, define new ones and stick with the existing naming convention, - remove hardcoded style attributes from RainTPL templates. Exception: In tpl/tagcloud.html, the display size of each tag is computed at page generation. Signed-off-by: VirtualTam <virtualtam@flibidi.org>
* | Merge pull request #67 from e2jk/issue-66nodiscc2014-12-031-2/+2
|\ \ | |/ |/| Fix issue #66 by adding space before "selected"
| * Fix issue #66 by adding space before "selected"Emilien Klein2014-12-021-2/+2
|/
* Merge pull request #28 from virtualtam/unify-cssnodiscc2014-12-011-353/+798
|\ | | | | Unify css
| * CSS: separate rules with a blank lineVirtualTam2014-12-011-2/+102
| | | | | | | | Signed-off-by: VirtualTam <virtualtam@flibidi.org>
| * CSS: expand one-line declarationsVirtualTam2014-12-011-119/+480
| | | | | | | | | | | | | | Signed-off-by: VirtualTam <virtualtam@flibidi.org> Conflicts: inc/shaarli.css
| * CSS: unify coding style - spaces, brackets, keywordsVirtualTam2014-12-011-230/+223
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Spaces: - before an opening bracket - before a closing bracket - between a keyword and its value(s) - between comma-separated selectors Signed-off-by: VirtualTam <virtualtam@flibidi.org> Conflicts: inc/shaarli.css Conflicts: inc/shaarli.css Conflicts: inc/shaarli.css
| * CSS: replace tabs by spaces, remove trailing whitespaces and empty linesVirtualTam2014-12-011-215/+206
|/ | | | | | | Signed-off-by: VirtualTam <virtualtam@flibidi.org> Conflicts: inc/shaarli.css
* Merge pull request #62 from pikzen/linkurlnodiscc2014-11-212-32/+36
|\ | | | | Added a link to the visible URL in the link list
| * Added a link to the visible URL in the link listFlorian Eula2014-11-212-32/+36
| | | | | | | | | | Corrected CSS to prevent a line from showing underneath Fixes https://github.com/shaarli/Shaarli/issues/53
* | Merge pull request #61 from pikzen/shaarli47nodiscc2014-11-211-0/+8
|\ \ | | | | | | | | | | | | Prevents ?do=addlink from generating a 404 if the user is not logged in Fixes https://github.com/sebsauvage/Shaarli/issues/141 Fixes https://github.com/shaarli/Shaarli/issues/47
| * | Prevents ?do=addlink from generating a 404 if the user is not logged inFlorian Eula2014-11-211-0/+8
| |/ | | | | | | Fixes https://github.com/shaarli/Shaarli/issue/47
* | Merge pull request #60 from pikzen/masternodiscc2014-11-211-7/+25
|\| | | | | | | | | Do not add a tag to the search if it's already being searched for. * Fixes https://github.com/shaarli/Shaarli/issues/50 * Fixes https://github.com/sebsauvage/Shaarli/issues/140
| * Do not add a tag to the search if it's already being searched forFlorian Eula2014-11-211-7/+25
|/
* Merge pull request #59 from tst2005/masternodiscc2014-11-133-8/+8
|\ | | | | uniform if syntax
| * uniform if syntaxTsT2013-10-233-8/+8
| |
* | Merge pull request #54 from nodiscc/tagcloud-urlencodeEmilien Klein2014-11-101-1/+1
|\ \ | | | | | | use urlencode in tagcloud links
| * | use urlencode in tagcloud linksnodiscc2014-11-091-1/+1
|/ / | | | | | | | | | | * prevents unproper escaping of characters like '&' * fixes https://github.com/sebsauvage/Shaarli/issues/85 * fixes https://github.com/shaarli/Shaarli/issues/48
* | Merge pull request #51 from nodiscc/optional-archiveorgnodiscc2014-11-082-0/+3
|\ \ | | | | | | make archive.org integration optional (ARCHIVE_ORG option, defaults to false)
| * | make archive.org integration optional (ARCHIVE_ORG option, defaults to false)nodiscc2014-11-082-0/+3
|/ /
* | Merge pull request #42 from nodiscc/new-readmeEmilien Klein2014-11-081-42/+47
|\ \ | | | | | | Update README
| * | Update README:nodiscc2014-11-041-42/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add screenshots * Use Mediacrush as a CDN for images to reduce load on sebsauvage.net * Improve page layout/sections * Reorder list of features * Add links to wiki and bug tracker * Add proper download links for stable/dev channels * Improve copyright/license notice
* | | Merge pull request #39 from nodiscc/masterEmilien Klein2014-11-081-1/+3
|\ \ \ | | | | | | | | add warning about hostname/cookie storage problems during install
| * | | index.html: add warning message about hostname/cookie storage problemsnodiscc2014-11-031-1/+3
| |/ / | | | | | | | | | | | | * Fixes https://github.com/sebsauvage/Shaarli/issues/196 * Fixes https://github.com/sebsauvage/Shaarli/issues/97
* | | Merge pull request #43 from nodiscc/archiveorg-integrationEmilien Klein2014-11-082-4/+6
|\ \ \ | |/ / |/| | Add Archive.org integration
| * | Add Archive.org integrationQwerty2014-11-052-4/+6
|/ / | | | | | | * adds an "archive" link next to permalinks, linking to the last version of the page on archive.org
* | Merge pull request #37 from qwertygc/patch-2Emilien Klein2014-10-251-1/+1
|\ \ | | | | | | Update shaarli_version.txt
| * | Update shaarli_version.txtQwerty2014-10-251-1/+1
|/ / | | | | La version actuelle de shaarli est la 0.042.
* | Merge pull request #36 from nodiscc/https-thumbnailsEmilien Klein2014-10-231-7/+7
|\ \ | | | | | | thumbnails: force HTTPS for youtube, imgur, vimeo
| * | thumbnails: force HTTPS for youtube, imgur, vimeonodiscc2014-10-231-7/+7
| | | | | | | | | | | | * other services also provide thumbs over HTTPS, but the rewrite expression is more complex, so left out for now
* | | Merge pull request #35 from nodiscc/optional-atomEmilien Klein2014-10-232-1/+4
|\ \ \ | |/ / |/| | Make ATOM toolbar button optional
| * | Make ATOM toolbar button optionalnodiscc2014-10-232-1/+4
|/ / | | | | | | | | * ATOM button display is now configurable using the SHOW_ATOM variable in index.php or data/options.php (defaults to false) * Fixes https://github.com/shaarli/Shaarli/issues/24
* | Merge pull request #31 from nodiscc/version-checknodiscc2014-10-232-1/+2
|\ \ | | | | | | Version check: check against latest version on github
| * | update check: check against last version available on github.com/shaarli/Shaarlinodiscc2014-10-211-1/+1
| | | | | | | | | | | | * fixes https://github.com/shaarli/Shaarli/issues/5
| * | add current release version number in shaarli_version.txtnodiscc2014-10-211-0/+1
|/ / | | | | | | * release process: please update this file when releasing a new version on github
* | Merge pull request #30 from nodiscc/masternodiscc2014-10-211-1/+5
|\ \ | | | | | | add link: in case of empty URL (self-post), prepend "Note: " to the title
| * | add link: in case of empty URL (self-post), prepend "Note: " to the titlenodiscc2014-10-211-1/+5
|/ / | | | | | | | | * Thanks to qwertygc (https://github.com/shaarli/Shaarli/pull/23) * Fix small typo
* | Merge pull request #27 from virtualtam/masternodiscc2014-10-201-2/+2
|\ \ | | | | | | fix: add missing slash when defining RainTPL's temp dir
| * | fix: add missing slash when defining RainTPL's temp dirVirtualTam2014-10-191-2/+2
|/ / | | | | | | Signed-off-by: VirtualTam <virtualtam@flibidi.org>
* | gitignore: ignore raintpl generated php pagesnodiscc2014-09-101-1/+4
| |
* | update qr.min.js to 1.1.3 from https://github.com/neocotic/qr.js, update COPYINGnodiscc2014-09-052-11/+25
| | | | | | | | * fixes https://github.com/shaarli/Shaarli/issues/7
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 20:28:10 +0000