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
Sbgodin
abc98ab39d
Merge pull request #20 from nodiscc/fix-typos
...
Fix grammar, punctuation, spelling, trailing whitepaces and newlines; Fix typo in css
2014-08-19 21:33:53 +02:00
nodiscc
ad6c27b7b8
Fix grammar, punctuation, spelling, trailing whitepaces and newlines; Fix typo in css
...
Based on respencer's work at https://github.com/respencer/Shaarli/
Closes https://github.com/sebsauvage/Shaarli/pull/103
2014-08-19 18:01:15 +02:00
nodiscc
1ec633a74f
Merge pull request #11 from Sbgodin/rainVariables
2014-08-12 02:07:15 +02:00
nodiscc
a1795ddcf3
bookmarklet: use selected text as description when adding a new link
...
* Based on romnGit's work at https://github.com/sebsauvage/Shaarli/pull/104
* Fixes https://github.com/shaarli/Shaarli/issues/18
* Closes https://github.com/sebsauvage/Shaarli/pull/104
* Fixes https://github.com/sebsauvage/Shaarli/issues/53
* Fixes https://github.com/sebsauvage/Shaarli/issues/129
* Fixes https://github.com/sebsauvage/Shaarli/issues/33
2014-08-11 00:13:29 +02:00
Christophe HENRY
3bb684f59f
Removes htaccess file creation and adds them in the repository
...
I also removed the previously created placeholders, which after all, have no more utility.
2014-08-04 00:42:49 +02:00
Christophe HENRY
e7416aba2c
Adds empty directories: cache, data, pagecache and tmp. Removes mkdirs.
...
They are still in .gitignore because their future content will still be ignored.
2014-08-04 00:41:55 +02:00
Christophe HENRY
c614a35db8
Removed redundant check on RAINTPL_TMP directory
...
The same test is already on line 93
2014-07-31 23:31:58 +02:00
Christophe HENRY
25f5c59db6
Adds configuration variables, TPL and TMP, for RainTPL
...
The path for templates and temporary files are now part of the configuration.
For a custom install, it's possible to put these writable directories elsewhere than in the read-only source code.
2014-07-31 23:31:58 +02:00
Christophe HENRY
e411f7f9d7
Adds the tip for the title link in the configuration page
2014-07-27 23:32:41 +02:00
Christophe HENRY
ebb2880dfc
Adds a configuration variable "titleLink" which allows to customize the
...
link on the title.
2014-07-27 23:32:41 +02:00
Emilien Klein
4ade7393a3
Release version 0.0.42 beta
2014-07-27 22:57:30 +02:00
f457180534
Merge branch 'master' into myShaarli
2014-04-04 14:18:43 +02:00
f945bb9b05
Merge branch 'master' of git://github.com/sebsauvage/Shaarli
2014-04-04 14:17:19 +02:00
bb2103a4a2
[add] visual image for private link
2014-04-04 14:16:51 +02:00
Sébastien SAUVAGE
48b68c8fa5
Merge pull request #166 from timovn/patch-1
...
Update shaarli.css
2014-02-14 16:52:22 +01:00
timo van neerden
012e76e78c
Update shaarli.css
...
Added word-wrap: break-word; to body, so that that text is well wrapped, and do not permit horizontal scroll-bars (on mobile, with responsive design).
2014-02-14 16:38:05 +01:00
Knah Tsaeb
0396d42bba
Merge branch 'master' into myShaarli
2014-02-12 10:51:35 +01:00
Knah Tsaeb
020df22d1e
Merge branch 'master' of git://github.com/sebsauvage/Shaarli
2014-02-12 10:49:50 +01:00
Sébastien SAUVAGE
15b98c3dc8
Merge pull request #155 from Sbgodin/staySignedInWithCookie
...
"Stay signed in" modification. This will help people with hosts which aggressively clean sessions on server side.
2014-02-09 18:43:52 +01:00
921e7020c9
Merge via branch
2014-01-03 09:49:24 +01:00
f1a8ca9cc8
[fix] warning in search form when empty via field
2014-01-03 09:39:02 +01:00
4123658eae
[upd] change via message (@via to Origine ⇒)
...
[fix] via field for atom
[fix] warning when add new link
2013-12-19 09:53:12 +01:00
8e2b06fd78
[fix] warning when add new link
2013-12-19 09:37:57 +01:00
b55c95e172
Merge branch 'master' into myShaarli
2013-12-19 09:30:59 +01:00
5f9bf1b96e
Merge branch 'master' into via
2013-12-19 09:30:20 +01:00
a9821c6fcd
Merge branch 'master' of git://github.com/sebsauvage/Shaarli
2013-12-19 09:25:58 +01:00
Christophe HENRY
ae00595b1c
A real "Stay signed in": keep the connection
...
Instead of trusting the php session, it uses a cookie. The php session
sooner or later is distroyed if not used. It depends upon the server
settings. Using a cookie ensures that one really stays signed in.
Dev notes: I wanted to avoid merge conflicts, stay with the main
developper standards and keep the "index.php" in one file. That's why
the code may not be that nice. My own dev level my also explain.
2013-12-05 22:26:04 +01:00
Sébastien SAUVAGE
067e66acfe
Corrected overlapping tags
2013-12-04 13:55:42 +01:00
Sébastien SAUVAGE
ab0638edb0
Merge pull request #145 from Alkarex/patch-1
...
smallHash: simplified and improved performance
2013-11-29 13:01:08 -08:00
Sebastien SAUVAGE
53da201749
XSS flaw correction
...
Closes issue https://github.com/sebsauvage/Shaarli/issues/134
2013-11-29 21:53:20 +01:00
7a8068a787
[upd] update input label via
2013-11-21 17:10:47 +01:00
06d803e78e
[upd] change via message (@via to Origine =>)
...
[fix] via field for atom
2013-11-21 16:50:48 +01:00
Alexandre Alapetite
c002ca9c6b
smallHash: simplified and improved performance
...
Unchanged behaviour
2013-11-10 22:50:34 +01:00
TsT
ae22a12b8a
uniform if syntax
2013-10-23 23:21:36 +02:00
e8633c6bbe
[fix] add url prefix for smallhash url for external thumbshot
2013-10-14 14:41:14 +02:00
f80a51a9bf
Merge branch 'master' of git://github.com/sebsauvage/Shaarli
2013-10-11 15:24:33 +02:00
3c49d5a29a
Merge branch 'master' of git://github.com/sebsauvage/Shaarli into via
2013-10-11 15:23:24 +02:00
040eb18ec8
Add source of link (via imput)
2013-10-11 15:18:37 +02:00
Sebastien SAUVAGE
7b2186a63e
Corrected field focus in bookmarklet
...
Focus was not properly given to description field when it's empty.
2013-09-27 17:08:31 +02:00
55ade1a969
Fix bad merge
2013-09-27 10:02:20 +02:00
6cb22b63c5
Merge branch 'master' into myShaarli
...
Conflicts:
tpl/page.header.html
tpl/picwall.html
tpl/tagcloud.html
2013-09-27 09:53:07 +02:00
6f5933d23f
Sync with SebSauvage repo
2013-09-27 09:38:01 +02:00
Sébastien SAUVAGE
2d20481e45
Update README.md
2013-09-26 15:17:43 +02:00
Sebastien SAUVAGE
246e9b4e37
Removed jQuery from almost all pages
...
jQuery has been removed from all pages, except those who really require
it (like autocomplete in link edition).
Immediate gain: All pages weight 286 kb LESS ! \o/
Highlighting in search results has also been temporarly removed (and
will be re-implemented).
2013-09-25 21:27:50 +02:00
Sébastien SAUVAGE
af77b2fd9a
New QR-Code generation code
...
* QR-Code generation now uses a client-side javascript library instead of an external service. This is better for user privacy.
* Library used is http://neocotic.com/qr.js/ (11 kb).
* jQuery is no longer used to display QR-Code (this is a first step in removing jQuery entirely).
* This library is loaded *only* if the QR-Code icon is clicked.
* If javascript is disabled, it will fallback to the external service.
* External service was changed from "invx.com" to "qrfree.kaywa.com" because invx has become bloated.
By loading the javascript library *only* if the icon is clicked, it will prevent the 11 kb lib to be loaded in every page.
2013-09-25 15:17:09 +02:00
Sébastien SAUVAGE
26c9556894
Changed QR-Code CSS (selector and attributes)
2013-09-25 14:58:47 +02:00
