Knah-Tsaeb/MyShaarli
Knah-Tsaeb/MyShaarli
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
709 commits 8 branches 1 tag 12 MiB
Commit graph

709 commits

This branch
This branch
All branches
Author SHA1 Message Date
nodiscc
aa69403cff Merge pull request #63 from pikzen/permaoptions 
New option ENABLE_RSS_PERMALINKS: choose whether the RSS item title link points directly to the link, or to the entry on Shaarli (permalink)
 2015-02-07 19:50:27 +01:00
Florian Eula
ed5b38ddd2 Feature: enable/disable permalinks for RSS 
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
 2015-02-07 03:21:30 +01:00
nodiscc
7d0a0d8a7a Merge pull request #107 from pikzen/fix-copying 
Fix license info: reverted qr.js to GPL, add full GPLv3 and CC-BY licenses
 2015-01-27 13:22:28 +01:00
Florian Eula
5a2cbde945 Fixed license info, reverted qr.js to GPL 
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.
 2015-01-27 13:19:51 +01:00
nodiscc
09850e6a20 Merge pull request #98 from ArthurHoaro/port 
Fix port/server config problems by using php SERVER_NAME instead of HTTP_HOST
 2015-01-26 14:49:56 +01:00
nodiscc
4e7b1bf698 Merge pull request #99 from pikzen/license-version 
Versioned JS files & centralized licenses
 2015-01-26 13:41:06 +01:00
nodiscc
852613dece Merge pull request #100 from virtualtam/daily-timestamp 
daily: display link timestamps
 2015-01-26 13:40:37 +01:00
nodiscc
e57e364c79 Merge pull request #103 from virtualtam/fix-w3c 
w3c: fix HTML syntax errors
 2015-01-26 13:40:14 +01:00
feula
8e0ad1d920 Versioned JS files & centralized licenses 
Updated libraries
Updated copyright dates and the list of contributors.

Added unminified sources for GPL compliance
 2015-01-21 11:46:50 +01:00
VirtualTam
04751e0441 w3c: fix HTML syntax errors 
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>
 2015-01-20 02:53:53 +01:00
VirtualTam
38a2d03e34 daily: display link timestamps 
Fixes #26

Signed-off-by: VirtualTam <virtualtam@flibidi.org>
 2015-01-15 00:05:26 +01:00
nodiscc
486f25a5f4 Merge pull request #93 from ArthurHoaro/scripttag 
Remove language attribute on script tag and improve QRCode JS
 2015-01-11 14:56:22 +01:00
ArthurHoaro
2f32d0746b Fixes Port/server config problems - see: 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
 2015-01-09 11:46:25 +01:00
ArthurHoaro
fe16b01edb * removed the language attribute on the script element since it is obsolete 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
 2015-01-09 09:47:48 +01:00
nodiscc
a2d5ef2127 Merge pull request #77 from ArthurHoaro/w3c 
Make Shaarli's template W3C compliant #64
 2015-01-09 02:34:00 +01:00
ArthurHoaro
8079dfd1cd W3C compliance (work on issue #64 - 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
 2015-01-08 10:15:05 +01:00
nodiscc
002f9625ec Merge pull request #90 from shaarli/issue-87 
Redirect to home page after deleting a link (Fixes issue 87)
 2015-01-05 20:13:15 +01:00
Emilien Klein
657837af11 Redirect to home page after deleting a link 
Fixes issue 87
 2015-01-04 15:19:14 -05:00
nodiscc
f8d83b35b6 Merge pull request #85 from nodiscc/tagcloud-scaling 
improve tag cloud font size scaling
 2014-12-29 03:00:25 +01:00
nodiscc
1e3b2740e5 improve tag cloud font size scaling 
* use logarithmic scales
 * remove bold style
 2014-12-29 02:59:35 +01:00
nodiscc
3259f1a814 Merge pull request #82 from pikzen/fix-search 
Made tag/title search unicode aware, fixes #75
 2014-12-25 01:21:39 +01:00
nodiscc
169512f0b8 Merge pull request #83 from pikzen/loop-factor 
Refactored the daily column generation (only one loop)
 2014-12-25 01:15:14 +01:00
Florian Eula
cae64e52e4 Refactored the daily column generation (only one loop) 2014-12-25 01:10:58 +01:00
Florian Eula
2e45fdd8ff Made tag/title search unicode aware, fixes #75 2014-12-22 16:43:37 +01:00
nodiscc
60b83e7cf7 fix quoting error introduced in 712501812b 2014-12-16 19:52:06 +01:00
nodiscc
712501812b Merge pull request #81 from nodiscc/prevent-disclosure 
Prevent full path and PHP version disclosures
 2014-12-16 19:26:11 +01:00
nodiscc
509762236b prevent disclosing PHP version on PHP version check error 
* fixes https://github.com/shaarli/Shaarli/issues/78
 * fixes https://github.com/sebsauvage/Shaarli/issues/214
 2014-12-16 19:24:37 +01:00
nodiscc
569be2e8d5 prevent disclosing full path when raising "Shaarli directory not writeable" error 
* work on https://github.com/shaarli/Shaarli/issues/78
 2014-12-16 19:23:36 +01:00
nodiscc
038acd3a7f Merge pull request #69 from nodiscc/master 
bookmarklet: add ✚ sign to make it more recognizable in toolbars
 2014-12-05 20:27:15 +01:00
nodiscc
e0a9e14704 bookmarklet: add ✚ sign to make it more recognizable in toolbars 2014-12-05 20:26:51 +01:00
nodiscc
cdd870b72e Merge pull request #68 from virtualtam/hardcoded-style 
CSS: remove hardcoded style from templates
 2014-12-05 17:56:19 +01:00
VirtualTam
c133612f32 CSS: remove hardcoded style from templates 
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>
 2014-12-03 19:28:43 +01:00
nodiscc
dff9ee543d Merge pull request #67 from e2jk/issue-66 
Fix issue #66 by adding space before "selected"
 2014-12-03 17:18:36 +01:00
Emilien Klein
e5aab50ac4 Fix issue #66 by adding space before "selected" 2014-12-02 23:42:23 +01:00
nodiscc
fdd8fb2be2 Merge pull request #28 from virtualtam/unify-css 
Unify css
 2014-12-01 23:20:52 +01:00
VirtualTam
6e70d65546 CSS: separate rules with a blank line 
Signed-off-by: VirtualTam <virtualtam@flibidi.org>
 2014-12-01 21:55:18 +01:00
VirtualTam
32c8dee39c CSS: expand one-line declarations 
Signed-off-by: VirtualTam <virtualtam@flibidi.org>

Conflicts:
	inc/shaarli.css
 2014-12-01 21:54:48 +01:00
VirtualTam
eeb0fe33a0 CSS: unify coding style - spaces, brackets, keywords 
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
 2014-12-01 21:52:37 +01:00
VirtualTam
9308d39fce CSS: replace tabs by spaces, remove trailing whitespaces and empty lines 
Signed-off-by: VirtualTam <virtualtam@flibidi.org>

Conflicts:
	inc/shaarli.css
 2014-12-01 21:50:34 +01:00
nodiscc
a58240ce8d Merge pull request #62 from pikzen/linkurl 
Added a link to the visible URL in the link list
 2014-11-21 21:16:02 +01:00
Florian Eula
d741c9fc16 Added a link to the visible URL in the link list 
Corrected CSS to prevent a line from showing underneath
Fixes https://github.com/shaarli/Shaarli/issues/53
 2014-11-21 19:43:53 +01:00
nodiscc
9bd6089b57 Merge pull request #61 from pikzen/shaarli47 
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
 2014-11-21 18:42:10 +01:00
Florian Eula
aedc912d36 Prevents ?do=addlink from generating a 404 if the user is not logged in 
Fixes https://github.com/shaarli/Shaarli/issue/47
 2014-11-21 18:31:49 +01:00
nodiscc
4ad88dd190 Merge pull request #60 from pikzen/master 
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
 2014-11-21 18:27:04 +01:00
Florian Eula
732e683bda Do not add a tag to the search if it's already being searched for 2014-11-21 18:19:37 +01:00
nodiscc
9362352e12 Merge pull request #59 from tst2005/master 
uniform if syntax
 2014-11-13 01:48:52 +01:00
Emilien Klein
f2b2ac8c79 Merge pull request #54 from nodiscc/tagcloud-urlencode 
use urlencode in tagcloud links
 2014-11-10 22:16:27 +01:00
nodiscc
0845fb1ab8 use urlencode in tagcloud links 
* prevents unproper escaping of characters like '&'
 * fixes https://github.com/sebsauvage/Shaarli/issues/85
 * fixes https://github.com/shaarli/Shaarli/issues/48
 2014-11-09 21:09:43 +01:00
nodiscc
dffa06ed61 Merge pull request #51 from nodiscc/optional-archiveorg 
make archive.org integration optional (ARCHIVE_ORG option, defaults to false)
 2014-11-08 18:40:27 +01:00
nodiscc
d2f517638c make archive.org integration optional (ARCHIVE_ORG option, defaults to false) 2014-11-08 18:21:19 +01:00