Commit graph

2943 commits

Author SHA1 Message Date
nicofrand
38b95e7be9 Add IPv4 url support (and others beginning by a digit) 2013-08-24 16:31:22 +02:00
EliasZ
db4767e22b config template its import section reflects defines 2013-08-24 16:03:49 +02:00
EliasZ
66b6a3b5e2 graceful error-handling with imports, define where import files are stored 2013-08-24 15:59:51 +02:00
nicofrand
7374ff30ef Add IPv4 url support (and others beginning by a digit) 2013-08-24 11:10:07 +02:00
NumEricR
06cf8fb963 Fix login button wording 2013-08-24 10:27:33 +02:00
NumEricR
6a7d779024 Fix issue on entries' height 2013-08-24 09:56:59 +02:00
NumEricR
5ae45084dc CSS clean up again 2013-08-24 09:53:02 +02:00
Nicolas Lœuillet
38b418b7d6 resolve conflicts 2013-08-23 23:18:36 +02:00
nicofrand
fa5f9764ae Add SHAARLI support to view template 2013-08-23 23:11:34 +02:00
Nicolas Frandeboeuf
fd99a8c02d Revert "Add SHAARLI support to view template"
This reverts commit 0269cd8213.
2013-08-23 23:09:43 +02:00
nicofrand
0269cd8213 Add SHAARLI support to view template 2013-08-23 23:05:45 +02:00
Nicolas Lœuillet
d29b3e5f9e changes in md files 2013-08-23 23:04:56 +02:00
nicofrand
cb844c4238 Restore config modifications related to #162 2013-08-23 22:52:37 +02:00
Nicolas Lœuillet
679b6b85ad preparing to beta4 2013-08-23 22:43:16 +02:00
nicofrand
258d7032bb Clean up the templates markup 2013-08-23 22:38:14 +02:00
Nicolas Lœuillet
6d7defc87c new messages when update / install 2013-08-23 22:24:41 +02:00
Nicolas Frandeboeuf
b548b2192c Clean markup 2013-08-23 22:24:11 +02:00
Nicolas Frandeboeuf
f3e4f109a3 Revert "Clean markup in templates"
This reverts commit 8413a63f7d.
2013-08-23 22:23:55 +02:00
Nicolas Frandeboeuf
8413a63f7d Clean markup in templates 2013-08-23 22:20:04 +02:00
Nicolas Lœuillet
76beb27135 new default content in poche.sqlite 2013-08-23 22:12:37 +02:00
Nicolas Lœuillet
12c9c72984 text in shaarli link 2013-08-23 22:05:14 +02:00
Nicolas Lœuillet
cf9e886076 encode url to share with twitter / email / shaarli 2013-08-23 22:04:09 +02:00
Nicolas Lœuillet
3008e36a3e fix bug #162 links to firefox / chrome / android apps 2013-08-23 22:01:17 +02:00
Nicolas Lœuillet
b64a882696 notice with poche_version undefined' 2013-08-23 21:30:55 +02:00
Nicolas Lœuillet
8be8c44596 gitignore 2013-08-23 21:17:41 +02:00
Nicolas Lœuillet
b48fd706b7 assets directory 2013-08-23 21:16:37 +02:00
Nicolas Lœuillet
d9afe1abd7 Merge branch 'dev' of github.com:inthepoche/poche into dev 2013-08-23 21:15:39 +02:00
Nicolas Lœuillet
70c39d1618 tabs2spaces 2013-08-23 21:07:32 +02:00
Nicolas Lœuillet
ffc966d72f fix bug #151: HTML entities in titles are encoded twice 2013-08-23 21:06:45 +02:00
Nicolas Lœuillet
1e0f9166cc set shaarli to false 2013-08-23 19:49:17 +02:00
Nicolas Lœuillet
c2618ca791 Merge pull request #163 from NumEricR/tools-list
Improve tools list code
2013-08-23 10:42:31 -07:00
NumEricR
4b4afc7322 Add textual content on tools links 2013-08-23 18:45:34 +02:00
Nicolas Lœuillet
8340fedd64 fix bug #150 Add support of text files by setting a default title 2013-08-23 18:29:36 +02:00
Nicolas Lœuillet
b194cf21dc fix bug #147 add db directory in versionning 2013-08-23 18:19:47 +02:00
NumEricR
29773c9729 Fix HTML code of tools lists 2013-08-23 18:10:42 +02:00
Nicolas Lœuillet
fd21828080 updated german translation, thanks to HLFH 2013-08-23 17:43:49 +02:00
Nicolas Lœuillet
a458cff25e Merge pull request #159 from NumEricR/css-cleanup
CSS clean up on style.css file
2013-08-23 08:34:58 -07:00
Nicolas Lœuillet
e93c7c9c46 Merge pull request #160 from nicofrand/dev
Add a print stylesheet
2013-08-23 08:32:03 -07:00
Nicolas Frandeboeuf
00e4700abb Fix #157 2013-08-23 13:45:46 +02:00
NumEricR
096fb74bf1 CSS clean up on style.css file
Syntax homogenization (spaces, lowercase for hexa, ...)
Code refactoring
Simplification of some selectors
Simplification of "0px" and hexa values
More detailed font stack
Add cursor pointer on ".bouton" elements
2013-08-23 12:12:05 +02:00
Nicolas Lœuillet
64fa45e262 Merge pull request #154 from nicofrand/dev
poche won't import the content of some articles
2013-08-22 23:09:46 -07:00
Nicolas Frandeboeuf
57c91e427d Merge branch 'dev' of https://github.com/nicofrand/poche into dev 2013-08-22 00:57:11 +02:00
Nicolas Frandeboeuf
2bf93dc034 Fix #149 2013-08-22 00:49:23 +02:00
Nicolas Lœuillet
746f93c290 fix bug #148 Use of undefined constant POCHE_VERSION 2013-08-20 11:23:32 +02:00
Nicolas Lœuillet
38330bfd65 fix bug #112 link to shaarli 2013-08-20 11:23:00 +02:00
Nicolas Lœuillet
2fdcbd1ac3 typo in gitignore 2013-08-17 21:27:14 +02:00
Nicolas Lœuillet
8d52e6b4e3 Merge branch 'dev' of github.com:inthepoche/poche into dev 2013-08-17 21:26:11 +02:00
Nicolas Lœuillet
e8d1f1e5f0 gitignore 2013-08-17 21:25:53 +02:00
Nicolas Lœuillet
7ba37bd91a Merge pull request #141 from inthepoche/dev
beta3
2013-08-17 11:27:13 -07:00
Nicolas Lœuillet
9067b484ce Merge pull request #140 from inthepoche/master
beta3
2013-08-17 11:23:21 -07:00