aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #114 from nodiscc/redirect-previous-searchnodiscc2015-02-171-1/+31
|\ | | | | redirect to previous search (if any) when deleting a link
| * redirect to previous search (if any) when deleting a linkfeula2015-02-171-1/+31
|/ | | | * Fixes https://github.com/shaarli/Shaarli/issues/110
* fix broken reset.css URL introduced in a6e0134nodiscc2015-02-171-1/+1
|
* Merge pull request #109 from nodiscc/version-checknodiscc2015-02-146-19/+217
|\ | | | | Update README and Shaarli's footer
| * Fix missing authors and licenses in COPYINGnodiscc2015-02-144-10/+204
| | | | | | | | | | | | | | * add idleman for original CSS * add yahoo inc. for CSS reset * split the main css code and the yahoo reset CSS in 2 files * add copyright information for RainTPL, add LGPL license
| * Update README and Shaarli's footernodiscc2015-02-142-9/+13
|/ | | | | | | | | * remove version number display from main page * update project URL in footer, fixes https://github.com/shaarli/Shaarli/issues/89 * update copyright notice in the footer * mention origins of the fork in README, fixes https://github.com/shaarli/Shaarli/issues/105 * update License section in the README * remove screenshots as mediacru.sh is down
* Merge pull request #63 from pikzen/permaoptionsnodiscc2015-02-074-13/+27
|\ | | | | New option ENABLE_RSS_PERMALINKS: choose whether the RSS item title link points directly to the link, or to the entry on Shaarli (permalink)
| * Feature: enable/disable permalinks for RSSFlorian Eula2015-02-074-13/+27
|/ | | | | | | | | | | | | | | | | | | | The option to see the shortlinks or permalinks has been added to the configuration panel. It is a simple checkbox This option is disabled by default (meaning that shortlinks are the default) Updated writeConfig() to save this option Also fixed a slight typo in config.html. Removed useless CSS & fixed a comment Enabled permalinks for the ATOM feed and fixed the isPermaLink attribute for the <guid> tag Reverted to default behavior and clarified its meaning EnableRssPermalinks is an oddly behaving option: when enabled, it shows a permalink in the description and a full link in the element title, and swaps it around when disabled. This clarifies the option for end-users Also, moved enable_rss_permalinks to $GLOBALS['config'] because it is a config option. fix indent
* Merge pull request #107 from pikzen/fix-copyingnodiscc2015-01-271-12/+510
|\ | | | | Fix license info: reverted qr.js to GPL, add full GPLv3 and CC-BY licenses
| * Fixed license info, reverted qr.js to GPLFlorian Eula2015-01-271-12/+510
|/ | | | | | | Added full GPLv3 and CC-BY license I also accidentally declared qr.js as MIT and CC-BY, when it was GPLv3. I don't even.
* Merge pull request #98 from ArthurHoaro/portnodiscc2015-01-261-4/+4
|\ | | | | Fix port/server config problems by using php SERVER_NAME instead of HTTP_HOST
| * Fixes Port/server config problems - see: ↵ArthurHoaro2015-01-091-4/+4
| | | | | | | | | | | | | | https://github.com/shaarli/Shaarli/issues/17 * Use SERVER_NAME instead of HTTP_HOST to define current URL (in serverUrl() * Use SERVER_NAME instead of HTTP_HOST while setting up cookies
* | Merge pull request #99 from pikzen/license-versionnodiscc2015-01-2617-82/+28580
|\ \ | | | | | | Versioned JS files & centralized licenses
| * | Versioned JS files & centralized licensesfeula2015-01-2117-82/+28580
| | | | | | | | | | | | | | | | | | | | | Updated libraries Updated copyright dates and the list of contributors. Added unminified sources for GPL compliance
* | | Merge pull request #100 from virtualtam/daily-timestampnodiscc2015-01-263-0/+10
|\ \ \ | | | | | | | | daily: display link timestamps
| * | | daily: display link timestampsVirtualTam2015-01-153-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | Fixes #26 Signed-off-by: VirtualTam <virtualtam@flibidi.org>
* | | | Merge pull request #103 from virtualtam/fix-w3cnodiscc2015-01-264-4/+5
|\ \ \ \ | |/ / / |/| | | w3c: fix HTML syntax errors
| * | | w3c: fix HTML syntax errorsVirtualTam2015-01-204-4/+5
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #64 All pages: - add `urlencode` when passing the version to a custom stylesheet; - set meaningful values of `alt` and `title` for QR-Code images. Install page: - the form's `action` attribute must be non-empty; - the `valign` attribute is deprecated. Signed-off-by: VirtualTam <virtualtam@flibidi.org>
* | | Merge pull request #93 from ArthurHoaro/scripttagnodiscc2015-01-114-24/+32
|\ \ \ | |_|/ |/| | Remove language attribute on script tag and improve QRCode JS
| * | * removed the language attribute on the script element since it is obsolete ↵ArthurHoaro2015-01-094-24/+32
|/ / | | | | | | | | | | | | | | | | | | and we can safely omit it. * make QRCode JS works with IE : * behave as a normal link if canvas aren't supported (<=IE8) * default parameter values in JS aren't widely supported (see: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Functions/Default_parameters ), use this method instead: http://stackoverflow.com/a/148918/1484919 * dataset isn't supported in IE9 use getAttribute instead * addEventListener works with IE9+ and other browsers
* | Merge pull request #77 from ArthurHoaro/w3cnodiscc2015-01-0911-54/+68
|\ \ | | | | | | Make Shaarli's template W3C compliant #64
| * | W3C compliance (work on issue #64 - ↵ArthurHoaro2015-01-0811-54/+68
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/shaarli/Shaarli/issues/64): * fix duplicate IDs - #paging_older, #paging_newer become classes as the paging is displayed twice (top, bottom) in the linklist * fix duplicate IDs - #paging_privatelinks and #paging_linksperpage become classes * daily links are now valid (use &amp) * name attribute is not used anymore on a tag in link list * center tag is replaced by CSS in picwall and tag cloud * action in form tag can't be empty, use # instead * fixed configure table with CSS instead of cellpadding, border, and valign * export links are now valid * remove "size" in input tag * Fix missing alt attributes for img elements * tpl/daily: Use HTML entities instead of char escape codes * tpl/export: fix missing </span> closing tag * Remove obsolete language attribute on <script> elements
* | Merge pull request #90 from shaarli/issue-87nodiscc2015-01-051-3/+1
|\ \ | | | | | | Redirect to home page after deleting a link (Fixes issue 87)
| * | Redirect to home page after deleting a linkEmilien Klein2015-01-041-3/+1
|/ / | | | | Fixes issue 87
* | Merge pull request #85 from nodiscc/tagcloud-scalingnodiscc2014-12-292-2/+2
|\ \ | | | | | | improve tag cloud font size scaling
| * | improve tag cloud font size scalingnodiscc2014-12-292-2/+2
| | | | | | | | | | | | | | | * use logarithmic scales * remove bold style
* | | Merge pull request #82 from pikzen/fix-searchnodiscc2014-12-251-7/+11
|\ \ \ | | | | | | | | Made tag/title search unicode aware, fixes #75
| * | | Made tag/title search unicode aware, fixes #75Florian Eula2014-12-221-7/+11
| | | |
* | | | 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 16:52:14 +0000