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

835 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Emilien Klein
6fdbfe817a Merge pull request #42 from nodiscc/new-readme 
Update README
 2014-11-08 17:40:58 +01:00
Emilien Klein
903eb0f99c Merge pull request #39 from nodiscc/master 
add warning about hostname/cookie storage problems during install
 2014-11-08 17:34:01 +01:00
Emilien Klein
19920acc17 Merge pull request #43 from nodiscc/archiveorg-integration 
Add Archive.org integration
 2014-11-08 17:32:12 +01:00
Qwerty
b113dc8e6b Add Archive.org integration 
* adds an "archive" link next to permalinks, linking to the last version of the page on archive.org
 2014-11-05 14:35:52 +01:00
nodiscc
cffa853aae Update README: 
* 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
 2014-11-04 20:35:55 +01:00
nodiscc
01ec179148 index.html: add warning message about hostname/cookie storage problems 
* Fixes https://github.com/sebsauvage/Shaarli/issues/196
 * Fixes https://github.com/sebsauvage/Shaarli/issues/97
 2014-11-03 13:21:14 +01:00
Emilien Klein
36b226ca1b Merge pull request #37 from qwertygc/patch-2 
Update shaarli_version.txt
 2014-10-25 19:01:27 +02:00
Qwerty
2e9af8ab26 Update shaarli_version.txt 
La version actuelle de shaarli est la 0.042.
 2014-10-25 15:25:53 +02:00
Emilien Klein
39e41053ad Merge pull request #36 from nodiscc/https-thumbnails 
thumbnails: force HTTPS for youtube, imgur, vimeo
 2014-10-23 20:06:29 +02:00
Emilien Klein
a4355279cb Merge pull request #35 from nodiscc/optional-atom 
Make ATOM toolbar button optional
 2014-10-23 20:05:13 +02:00
nodiscc
1a663a0f2c thumbnails: force HTTPS for youtube, imgur, vimeo 
* other services also provide thumbs over HTTPS, but the rewrite expression is more complex, so left out for now
 2014-10-23 18:00:21 +02:00
nodiscc
1099d8fcad Make ATOM toolbar button optional 
* 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
 2014-10-23 17:47:30 +02:00
nodiscc
57dbbe51a6 Merge pull request #31 from nodiscc/version-check 
Version check: check against latest version on github
 2014-10-23 17:41:06 +02:00
nodiscc
b11bc5b6f9 update check: check against last version available on github.com/shaarli/Shaarli 
* fixes https://github.com/shaarli/Shaarli/issues/5
 2014-10-21 18:11:16 +02:00
nodiscc
ccfc046c11 add current release version number in shaarli_version.txt 
* release process: please update this file when releasing a new version on github
 2014-10-21 18:11:16 +02:00
nodiscc
736feea58e Merge pull request #30 from nodiscc/master 
add link: in case of empty URL (self-post), prepend "Note: " to the title
 2014-10-21 18:09:33 +02:00
nodiscc
27646ca5b4 add link: in case of empty URL (self-post), prepend "Note: " to the title 
* Thanks to qwertygc (https://github.com/shaarli/Shaarli/pull/23)
 * Fix small typo
 2014-10-21 16:18:25 +02:00
nodiscc
c4a329ede2 Merge pull request #27 from virtualtam/master 
fix: add missing slash when defining RainTPL's temp dir
 2014-10-20 13:59:44 +02:00
VirtualTam
2f2aa06b95 fix: add missing slash when defining RainTPL's temp dir 
Signed-off-by: VirtualTam <virtualtam@flibidi.org>
 2014-10-19 00:57:41 +02:00
nodiscc
ea8f67eb49 gitignore: ignore raintpl generated php pages 2014-09-10 15:20:58 +02:00
nodiscc
bbc6e66ad4 update qr.min.js to 1.1.3 from https://github.com/neocotic/qr.js, update COPYING 
* fixes https://github.com/shaarli/Shaarli/issues/7
 2014-09-05 00:42:39 +02:00
nodiscc
50df2cde74 Merge pull request #12 from nodiscc/iconslicense 
fix icons license and general copyright information
 2014-08-30 21:12:29 +02:00
nodiscc
509b080847 replace unlicensed icons/images, add proper credits 
* fugue icons (http://p.yusukekamiyamane.com/) CC-BY-SA license
  * ornimental bookend (https://openclipart.org/detail/19869/ornimental-bookend---left-by-j4p4n) Public domain license
  * Paper_texture_v5_by_bashcorpo_w1000.jpg source found at http://bashcorpo.deviantart.com/art/Grungy-paper-texture-v-5-22966998 under Public Domain license
  * linecons (https://www.iconfinder.com/iconsets/linecons-free-vector-icons-pack) CC-BY license
  * add credits to COPYING, (get list of committers with git shortlog -sne, and previous contributors from the author's website)
  * Fixes https://github.com/shaarli/Shaarli/issues/10
  * Fixes https://github.com/sebsauvage/Shaarli/issues/8
 2014-08-28 00:09:48 +02:00
nodiscc
e0cbb07872 Merge pull request #19 from nodiscc/master 
bookmarklet: use selected text as description when adding a new link
 2014-08-19 21:52:36 +02:00